summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2018-03-19 11:17:20 +0200
committerEli Zaretskii <eliz@gnu.org>2018-03-19 11:17:20 +0200
commit415ff1a0e141b74a53df1d8411113b1cd0c9ce90 (patch)
tree42a24eebad05e10c73f6e5c9ec0c25a6441d64da
parentf022b1bdf885007363518ec1474ef5820ee6b6d6 (diff)
downloademacs-415ff1a0e141b74a53df1d8411113b1cd0c9ce90.tar.gz
Followup to last change in browse-url.el
* lisp/net/browse-url.el (browse-url-emacs): Doc fix to follow up the previous change. (Bug#30673) * etc/NEWS: Mention the change in 'browse-url-emacs'.
-rw-r--r--etc/NEWS5
-rw-r--r--lisp/net/browse-url.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/etc/NEWS b/etc/NEWS
index b6c4157384c..99f3f27486b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -144,6 +144,11 @@ for abbrevs that have them.
* Changes in Specialized Modes and Packages in Emacs 27.1
+** Browse-url
+*** The function 'browse-url-emacs' can now visit a URL in selected window.
+It now treats the optional 2nd argument to mean that the URL should be
+shown in the currently selected window.
+
** Ecomplete
*** The ecomplete sorting has changed to a decay-based algorithm.
This can be controlled by the new `ecomplete-sort-predicate' variable.
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 3b5169d4734..bdedcb2bd3e 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1243,7 +1243,9 @@ used instead of `browse-url-new-window-flag'."
;;;###autoload
(defun browse-url-emacs (url &optional same-window)
- "Ask Emacs to load URL into a buffer and show it in another window."
+ "Ask Emacs to load URL into a buffer and show it in another window.
+Optional argument SAME-WINDOW non-nil means show the URL in the
+currently selected window instead."
(interactive (browse-url-interactive-arg "URL: "))
(require 'url-handlers)
(let ((file-name-handler-alist