aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/browse-url.el17
-rw-r--r--lisp/net/tramp.el3
2 files changed, 11 insertions, 9 deletions
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index c5a2218e36e..098f2988f1b 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -357,6 +357,15 @@ Defaults to the value of `browse-url-epiphany-arguments' at the time
357 :type '(repeat (string :tag "Argument")) 357 :type '(repeat (string :tag "Argument"))
358 :group 'browse-url) 358 :group 'browse-url)
359 359
360;; GNOME means of invoking either Mozilla or Netrape.
361(defvar browse-url-gnome-moz-program "gnome-moz-remote")
362
363(defcustom browse-url-gnome-moz-arguments '()
364 "*A list of strings passed to the GNOME mozilla viewer as arguments."
365 :version "21.1"
366 :type '(repeat (string :tag "Argument"))
367 :group 'browse-url)
368
360(defcustom browse-url-mozilla-new-window-is-tab nil 369(defcustom browse-url-mozilla-new-window-is-tab nil
361 "*Whether to open up new windows in a tab or a new window. 370 "*Whether to open up new windows in a tab or a new window.
362If non-nil, then open the URL in a new tab rather than a new window if 371If non-nil, then open the URL in a new tab rather than a new window if
@@ -1032,14 +1041,6 @@ used instead of `browse-url-new-window-flag'."
1032 browse-url-epiphany-program 1041 browse-url-epiphany-program
1033 (append browse-url-epiphany-startup-arguments (list url)))))) 1042 (append browse-url-epiphany-startup-arguments (list url))))))
1034 1043
1035;; GNOME means of invoking either Mozilla or Netrape.
1036(defvar browse-url-gnome-moz-program "gnome-moz-remote")
1037(defcustom browse-url-gnome-moz-arguments '()
1038 "*A list of strings passed to the GNOME mozilla viewer as arguments."
1039 :version "21.1"
1040 :type '(repeat (string :tag "Argument"))
1041 :group 'browse-url)
1042
1043;;;###autoload 1044;;;###autoload
1044(defun browse-url-gnome-moz (url &optional new-window) 1045(defun browse-url-gnome-moz (url &optional new-window)
1045 "Ask Mozilla/Netscape to load URL via the GNOME program `gnome-moz-remote'. 1046 "Ask Mozilla/Netscape to load URL via the GNOME program `gnome-moz-remote'.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index e153ab3341f..502dc5e5115 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -159,7 +159,8 @@ Nil means to use a separate filename syntax for Tramp.")
159 159
160(defgroup tramp nil 160(defgroup tramp nil
161 "Edit remote files with a combination of rsh and rcp or similar programs." 161 "Edit remote files with a combination of rsh and rcp or similar programs."
162 :group 'files) 162 :group 'files
163 :version "21.4")
163 164
164(defcustom tramp-verbose 9 165(defcustom tramp-verbose 9
165 "*Verbosity level for tramp.el. 0 means be silent, 10 is most verbose." 166 "*Verbosity level for tramp.el. 0 means be silent, 10 is most verbose."