Mercurial > emacs
comparison lisp/net/browse-url.el @ 90044:cb7f41387eb3
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-70
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-669
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-678
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-679
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-680
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-688
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-689
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-690
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-691
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-69
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-70
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-71
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 12 Nov 2004 02:53:04 +0000 |
parents | 4c90ffeb71c5 6793f695fda7 |
children | fb79180b618d |
comparison
equal
deleted
inserted
replaced
90043:e24e2e78deda | 90044:cb7f41387eb3 |
---|---|
355 Defaults to the value of `browse-url-epiphany-arguments' at the time | 355 Defaults to the value of `browse-url-epiphany-arguments' at the time |
356 `browse-url' is loaded." | 356 `browse-url' is loaded." |
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. |
362 If non-nil, then open the URL in a new tab rather than a new window if | 371 If non-nil, then open the URL in a new tab rather than a new window if |
363 `browse-url-mozilla' is asked to open it in a new window." | 372 `browse-url-mozilla' is asked to open it in a new window." |
364 :type 'boolean | 373 :type 'boolean |
594 (region-beginning) (region-end)))) | 603 (region-beginning) (region-end)))) |
595 (browse-url-url-at-point))) | 604 (browse-url-url-at-point))) |
596 (not (eq (null browse-url-new-window-flag) | 605 (not (eq (null browse-url-new-window-flag) |
597 (null current-prefix-arg))))) | 606 (null current-prefix-arg))))) |
598 | 607 |
599 ;; interactive-p needs to be called at a function's top-level, hence | 608 ;; called-interactive-p needs to be called at a function's top-level, hence |
600 ;; the macro. | 609 ;; this macro. We use that rather than interactive-p because |
610 ;; use in a keyboard macro should not change this behavior. | |
601 (defmacro browse-url-maybe-new-window (arg) | 611 (defmacro browse-url-maybe-new-window (arg) |
602 `(if (not (interactive-p)) | 612 `(if (or noninteractive (not (called-interactively-p))) |
603 ,arg | 613 ,arg |
604 browse-url-new-window-flag)) | 614 browse-url-new-window-flag)) |
605 | 615 |
606 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 616 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
607 ;; Browse current buffer | 617 ;; Browse current buffer |
1028 ;; Epiphany is not running - start it | 1038 ;; Epiphany is not running - start it |
1029 (message "Starting %s..." browse-url-epiphany-program) | 1039 (message "Starting %s..." browse-url-epiphany-program) |
1030 (apply 'start-process (concat "epiphany " url) nil | 1040 (apply 'start-process (concat "epiphany " url) nil |
1031 browse-url-epiphany-program | 1041 browse-url-epiphany-program |
1032 (append browse-url-epiphany-startup-arguments (list url)))))) | 1042 (append browse-url-epiphany-startup-arguments (list url)))))) |
1033 | |
1034 ;; GNOME means of invoking either Mozilla or Netrape. | |
1035 (defvar browse-url-gnome-moz-program "gnome-moz-remote") | |
1036 (defcustom browse-url-gnome-moz-arguments '() | |
1037 "*A list of strings passed to the GNOME mozilla viewer as arguments." | |
1038 :version "21.1" | |
1039 :type '(repeat (string :tag "Argument")) | |
1040 :group 'browse-url) | |
1041 | 1043 |
1042 ;;;###autoload | 1044 ;;;###autoload |
1043 (defun browse-url-gnome-moz (url &optional new-window) | 1045 (defun browse-url-gnome-moz (url &optional new-window) |
1044 "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'. |
1045 Default to the URL around or before point. The strings in variable | 1047 Default to the URL around or before point. The strings in variable |