aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
authorDmitry Antipov2013-07-31 10:52:26 +0400
committerDmitry Antipov2013-07-31 10:52:26 +0400
commit3b734d1c0083841bcdbdbf1b38bb283a4ba1fbb6 (patch)
treed76c0a3c92be2e4add47854d5a1a6f4a40dbe3cf /lisp/net
parentf6e8d3c1118c52ab0158e85174bf98e7ca4a2dce (diff)
downloademacs-3b734d1c0083841bcdbdbf1b38bb283a4ba1fbb6.tar.gz
emacs-3b734d1c0083841bcdbdbf1b38bb283a4ba1fbb6.zip
* lisp/emacs-lisp/re-builder.el (reb-color-display-p):
* lisp/files.el (save-buffers-kill-terminal): * lisp/net/browse-url.el (browse-url): * lisp/server.el (server-save-buffers-kill-terminal): * lisp/textmodes/reftex-toc.el (reftex-toc, reftex-toc-revert): Prefer nil to selected-frame for the first arg of frame-parameter.
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/browse-url.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index feae435c779..70173dbc0b3 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -816,8 +816,8 @@ first, if that exists."
816 ;; When connected to various displays, be careful to use the display of 816 ;; When connected to various displays, be careful to use the display of
817 ;; the currently selected frame, rather than the original start display, 817 ;; the currently selected frame, rather than the original start display,
818 ;; which may not even exist any more. 818 ;; which may not even exist any more.
819 (if (stringp (frame-parameter (selected-frame) 'display)) 819 (if (stringp (frame-parameter nil 'display))
820 (setenv "DISPLAY" (frame-parameter (selected-frame) 'display))) 820 (setenv "DISPLAY" (frame-parameter nil 'display)))
821 (if (and (consp function) 821 (if (and (consp function)
822 (not (functionp function))) 822 (not (functionp function)))
823 ;; The `function' can be an alist; look down it for first match 823 ;; The `function' can be an alist; look down it for first match