diff options
| author | Stefan Kangas | 2024-12-26 23:24:50 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2024-12-26 23:24:50 +0100 |
| commit | 85ca91ff912da7c3a672e4bfe6ce103a23ddec73 (patch) | |
| tree | 2d57082afd768c6dc7f1e9a33ecb2a6db611b5b5 | |
| parent | 099e439ea99d794502f403b6de53b8589d7b6d6e (diff) | |
| download | emacs-85ca91ff912da7c3a672e4bfe6ce103a23ddec73.tar.gz emacs-85ca91ff912da7c3a672e4bfe6ce103a23ddec73.zip | |
Drop support form gnome-moz-remote from browse-url
* lisp/net/browse-url.el (browse-url-gnome-moz-program)
(browse-url-gnome-moz-arguments, browse-url-gnome-moz): Delete
functions and variables obsolete since Emacs 25.1.
| -rw-r--r-- | etc/NEWS | 3 | ||||
| -rw-r--r-- | lisp/net/browse-url.el | 39 |
2 files changed, 3 insertions, 39 deletions
| @@ -330,6 +330,9 @@ For better integration with the Qutebrowser, set | |||
| 330 | *** Support for the Conkeror web browser has been removed. | 330 | *** Support for the Conkeror web browser has been removed. |
| 331 | It has been obsolete since Emacs 28.1. | 331 | It has been obsolete since Emacs 28.1. |
| 332 | 332 | ||
| 333 | *** Support for gnome-moz-remote has been removed. | ||
| 334 | It has been obsolete since Emacs 25.1. | ||
| 335 | |||
| 333 | ** CL-Lib | 336 | ** CL-Lib |
| 334 | 337 | ||
| 335 | +++ | 338 | +++ |
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 9dd990108df..4f4196044d1 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el | |||
| @@ -376,18 +376,6 @@ Defaults to the value of `browse-url-epiphany-arguments' at the time | |||
| 376 | :type 'string | 376 | :type 'string |
| 377 | :version "29.1") | 377 | :version "29.1") |
| 378 | 378 | ||
| 379 | ;; GNOME means of invoking Mozilla. | ||
| 380 | (defvar browse-url-gnome-moz-program "gnome-moz-remote") | ||
| 381 | |||
| 382 | (make-obsolete-variable 'browse-url-gnome-moz-program nil "25.1") | ||
| 383 | |||
| 384 | (defcustom browse-url-gnome-moz-arguments '() | ||
| 385 | "A list of strings passed to the GNOME mozilla viewer as arguments." | ||
| 386 | :version "21.1" | ||
| 387 | :type '(repeat (string :tag "Argument"))) | ||
| 388 | |||
| 389 | (make-obsolete-variable 'browse-url-gnome-moz-arguments nil "25.1") | ||
| 390 | |||
| 391 | (defcustom browse-url-mozilla-new-window-is-tab nil | 379 | (defcustom browse-url-mozilla-new-window-is-tab nil |
| 392 | "Whether to open up new Mozilla windows in a tab or a new window. | 380 | "Whether to open up new Mozilla windows in a tab or a new window. |
| 393 | If non-nil, then open the URL in a new tab rather than a new window if | 381 | If non-nil, then open the URL in a new tab rather than a new window if |
| @@ -1119,7 +1107,6 @@ instead of `browse-url-new-window-flag'." | |||
| 1119 | ((eq system-type 'android) | 1107 | ((eq system-type 'android) |
| 1120 | 'browse-url-default-android-browser) | 1108 | 'browse-url-default-android-browser) |
| 1121 | ((browse-url-can-use-xdg-open) 'browse-url-xdg-open) | 1109 | ((browse-url-can-use-xdg-open) 'browse-url-xdg-open) |
| 1122 | ;;; ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz) | ||
| 1123 | ((executable-find browse-url-firefox-program) 'browse-url-firefox) | 1110 | ((executable-find browse-url-firefox-program) 'browse-url-firefox) |
| 1124 | ((executable-find browse-url-chromium-program) 'browse-url-chromium) | 1111 | ((executable-find browse-url-chromium-program) 'browse-url-chromium) |
| 1125 | ((executable-find browse-url-kde-program) 'browse-url-kde) | 1112 | ((executable-find browse-url-kde-program) 'browse-url-kde) |
| @@ -1465,32 +1452,6 @@ currently selected window instead." | |||
| 1465 | 1452 | ||
| 1466 | (function-put 'browse-url-emacs 'browse-url-browser-kind 'internal) | 1453 | (function-put 'browse-url-emacs 'browse-url-browser-kind 'internal) |
| 1467 | 1454 | ||
| 1468 | ;;;###autoload | ||
| 1469 | (defun browse-url-gnome-moz (url &optional new-window) | ||
| 1470 | "Ask Mozilla to load URL via the GNOME program `gnome-moz-remote'. | ||
| 1471 | Default to the URL around or before point. The strings in variable | ||
| 1472 | `browse-url-gnome-moz-arguments' are also passed. | ||
| 1473 | |||
| 1474 | When called interactively, if variable `browse-url-new-window-flag' is | ||
| 1475 | non-nil, load the document in a new browser window, otherwise use an | ||
| 1476 | existing one. A non-nil interactive prefix argument reverses the | ||
| 1477 | effect of `browse-url-new-window-flag'. | ||
| 1478 | |||
| 1479 | When called non-interactively, optional second argument NEW-WINDOW is | ||
| 1480 | used instead of `browse-url-new-window-flag'." | ||
| 1481 | (declare (obsolete nil "25.1")) | ||
| 1482 | (interactive (browse-url-interactive-arg "URL: ")) | ||
| 1483 | (apply #'start-process (concat "gnome-moz-remote " url) | ||
| 1484 | nil | ||
| 1485 | browse-url-gnome-moz-program | ||
| 1486 | (append | ||
| 1487 | browse-url-gnome-moz-arguments | ||
| 1488 | (if (browse-url-maybe-new-window new-window) | ||
| 1489 | '("--newwin")) | ||
| 1490 | (list "--raise" url)))) | ||
| 1491 | |||
| 1492 | (function-put 'browse-url-gnome-moz 'browse-url-browser-kind 'external) | ||
| 1493 | |||
| 1494 | ;; --- W3 --- | 1455 | ;; --- W3 --- |
| 1495 | 1456 | ||
| 1496 | ;; External. | 1457 | ;; External. |