[Emacs-diffs] Changes to emacs/lisp/net/browse-url.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/net/browse-url.el
diff -c emacs/lisp/net/browse-url.el:1.31.2.1 
emacs/lisp/net/browse-url.el:1.31.2.2
*** emacs/lisp/net/browse-url.el:1.31.2.1       Fri Apr 16 12:50:32 2004
--- emacs/lisp/net/browse-url.el        Mon Jun 28 07:29:48 2004
***************
*** 577,589 ****
  
  (defun browse-url-interactive-arg (prompt)
    "Read a URL from the minibuffer, prompting with PROMPT.
! Default to the URL at or before point.  If invoked with a mouse button,
! set point to the position clicked first.  Return a list for use in
! `interactive' containing the URL and `browse-url-new-window-flag' or its
! negation if a prefix argument was given."
    (let ((event (elt (this-command-keys) 0)))
      (and (listp event) (mouse-set-point event)))
!   (list (read-string prompt (browse-url-url-at-point))
        (not (eq (null browse-url-new-window-flag)
                 (null current-prefix-arg)))))
  
--- 577,598 ----
  
  (defun browse-url-interactive-arg (prompt)
    "Read a URL from the minibuffer, prompting with PROMPT.
! If `transient-mark-mode' is non-nil and the mark is active,
! it defaults to the current region, else to the URL at or before
! point.  If invoked with a mouse button, it moves point to the
! position clicked before acting.
! 
! This function returns a list (URL NEW-WINDOW-FLAG)
! for use in `interactive'."
    (let ((event (elt (this-command-keys) 0)))
      (and (listp event) (mouse-set-point event)))
!   (list (read-string prompt (or (and transient-mark-mode mark-active
!                                    ;; rfc2396 Appendix E.
!                                    (replace-regexp-in-string
!                                     "[\t\r\f\n ]+" ""
!                                     (buffer-substring-no-properties
!                                      (region-beginning) (region-end))))
!                               (browse-url-url-at-point)))
        (not (eq (null browse-url-new-window-flag)
                 (null current-prefix-arg)))))
  
***************
*** 847,853 ****
    (or (eq (process-exit-status process) 0)
        (let* ((process-environment (browse-url-process-environment)))
        ;; Netscape not running - start it
!       (message "Starting Netscape...")
        (apply 'start-process (concat "netscape" url) nil
               browse-url-netscape-program
               (append browse-url-netscape-startup-arguments (list url))))))
--- 856,862 ----
    (or (eq (process-exit-status process) 0)
        (let* ((process-environment (browse-url-process-environment)))
        ;; Netscape not running - start it
!       (message "Starting %s..." browse-url-netscape-program)
        (apply 'start-process (concat "netscape" url) nil
               browse-url-netscape-program
               (append browse-url-netscape-startup-arguments (list url))))))
***************
*** 918,924 ****
    (or (eq (process-exit-status process) 0)
        (let* ((process-environment (browse-url-process-environment)))
        ;; Mozilla is not running - start it
!       (message "Starting Mozilla...")
        (apply 'start-process (concat "mozilla " url) nil
               browse-url-mozilla-program
               (append browse-url-mozilla-startup-arguments (list url))))))
--- 927,933 ----
    (or (eq (process-exit-status process) 0)
        (let* ((process-environment (browse-url-process-environment)))
        ;; Mozilla is not running - start it
!       (message "Starting %s..." browse-url-mozilla-program)
        (apply 'start-process (concat "mozilla " url) nil
               browse-url-mozilla-program
               (append browse-url-mozilla-startup-arguments (list url))))))
***************
*** 968,974 ****
    (or (eq (process-exit-status process) 0)
        (let* ((process-environment (browse-url-process-environment)))
        ;; Galeon is not running - start it
!       (message "Starting Galeon...")
        (apply 'start-process (concat "galeon " url) nil
               browse-url-galeon-program
               (append browse-url-galeon-startup-arguments (list url))))))
--- 977,983 ----
    (or (eq (process-exit-status process) 0)
        (let* ((process-environment (browse-url-process-environment)))
        ;; Galeon is not running - start it
!       (message "Starting %s..." browse-url-galeon-program)
        (apply 'start-process (concat "galeon " url) nil
               browse-url-galeon-program
               (append browse-url-galeon-startup-arguments (list url))))))
***************
*** 1017,1023 ****
    (or (eq (process-exit-status process) 0)
        (let* ((process-environment (browse-url-process-environment)))
        ;; Epiphany is not running - start it
!       (message "Starting Epiphany...")
        (apply 'start-process (concat "epiphany " url) nil
               browse-url-epiphany-program
               (append browse-url-epiphany-startup-arguments (list url))))))
--- 1026,1032 ----
    (or (eq (process-exit-status process) 0)
        (let* ((process-environment (browse-url-process-environment)))
        ;; Epiphany is not running - start it
!       (message "Starting %s..." browse-url-epiphany-program)
        (apply 'start-process (concat "epiphany " url) nil
               browse-url-epiphany-program
               (append browse-url-epiphany-startup-arguments (list url))))))
***************
*** 1098,1107 ****
          (message "Signalling Mosaic...done")
          )
        ;; Mosaic not running - start it
!       (message "Starting Mosaic...")
        (apply 'start-process "xmosaic" nil browse-url-mosaic-program
             (append browse-url-mosaic-arguments (list url)))
!       (message "Starting Mosaic...done"))))
  
  ;; --- Grail ---
  
--- 1107,1116 ----
          (message "Signalling Mosaic...done")
          )
        ;; Mosaic not running - start it
!       (message "Starting %s..." browse-url-mosaic-program)
        (apply 'start-process "xmosaic" nil browse-url-mosaic-program
             (append browse-url-mosaic-arguments (list url)))
!       (message "Starting %s...done" browse-url-mosaic-program))))
  
  ;; --- Grail ---