[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.2 
emacs/lisp/net/browse-url.el:1.31.2.3
*** emacs/lisp/net/browse-url.el:1.31.2.2       Mon Jun 28 07:29:48 2004
--- emacs/lisp/net/browse-url.el        Fri Nov 12 02:52:59 2004
***************
*** 357,362 ****
--- 357,371 ----
    :type '(repeat (string :tag "Argument"))
    :group 'browse-url)
  
+ ;; GNOME means of invoking either Mozilla or Netrape.
+ (defvar browse-url-gnome-moz-program "gnome-moz-remote")
+ 
+ (defcustom browse-url-gnome-moz-arguments '()
+   "*A list of strings passed to the GNOME mozilla viewer as arguments."
+   :version "21.1"
+   :type '(repeat (string :tag "Argument"))
+   :group 'browse-url)
+ 
  (defcustom browse-url-mozilla-new-window-is-tab nil
    "*Whether to open up new windows in a tab or a new window.
  If non-nil, then open the URL in a new tab rather than a new window if
***************
*** 596,605 ****
        (not (eq (null browse-url-new-window-flag)
                 (null current-prefix-arg)))))
  
! ;; interactive-p needs to be called at a function's top-level, hence
! ;; the macro.
  (defmacro browse-url-maybe-new-window (arg)
!   `(if (not (interactive-p))
         ,arg
       browse-url-new-window-flag))
  
--- 605,615 ----
        (not (eq (null browse-url-new-window-flag)
                 (null current-prefix-arg)))))
  
! ;; called-interactive-p needs to be called at a function's top-level, hence
! ;; this macro.  We use that rather than interactive-p because
! ;; use in a keyboard macro should not change this behavior.
  (defmacro browse-url-maybe-new-window (arg)
!   `(if (or noninteractive (not (called-interactively-p)))
         ,arg
       browse-url-new-window-flag))
  
***************
*** 1031,1044 ****
               browse-url-epiphany-program
               (append browse-url-epiphany-startup-arguments (list url))))))
  
- ;; GNOME means of invoking either Mozilla or Netrape.
- (defvar browse-url-gnome-moz-program "gnome-moz-remote")
- (defcustom browse-url-gnome-moz-arguments '()
-   "*A list of strings passed to the GNOME mozilla viewer as arguments."
-   :version "21.1"
-   :type '(repeat (string :tag "Argument"))
-   :group 'browse-url)
- 
  ;;;###autoload
  (defun browse-url-gnome-moz (url &optional new-window)
    "Ask Mozilla/Netscape to load URL via the GNOME program `gnome-moz-remote'.
--- 1041,1046 ----