diff options
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/emacs-lisp/re-builder.el | 2 | ||||
| -rw-r--r-- | lisp/files.el | 2 | ||||
| -rw-r--r-- | lisp/net/browse-url.el | 4 | ||||
| -rw-r--r-- | lisp/server.el | 2 | ||||
| -rw-r--r-- | lisp/textmodes/reftex-toc.el | 4 |
6 files changed, 16 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fde62f1fc4d..a7348b7cd7e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2013-07-31 Dmitry Antipov <dmantipov@yandex.ru> + + * emacs-lisp/re-builder.el (reb-color-display-p): + * files.el (save-buffers-kill-terminal): + * net/browse-url.el (browse-url): + * server.el (server-save-buffers-kill-terminal): + * textmodes/reftex-toc.el (reftex-toc, reftex-toc-revert): + Prefer nil to selected-frame for the first arg of frame-parameter. + 2013-07-30 Stephen Berman <stephen.berman@gmx.net> * minibuffer.el (completion--twq-all): Try and preserve each diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el index 9b73bea065f..d463bfac412 100644 --- a/lisp/emacs-lisp/re-builder.el +++ b/lisp/emacs-lisp/re-builder.el @@ -319,7 +319,7 @@ Except for Lisp syntax this is the same as `reb-regexp'.") (eq 'color ;; emacs/xemacs compatibility (if (fboundp 'frame-parameter) - (frame-parameter (selected-frame) 'display-type) + (frame-parameter nil 'display-type) (if (fboundp 'frame-property) (frame-property (selected-frame) 'display-type))))) diff --git a/lisp/files.el b/lisp/files.el index 10d66e0b2e0..1be0304302f 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -6479,7 +6479,7 @@ With prefix ARG, silently save all file-visiting buffers, then kill. If emacsclient was started with a list of filenames to edit, then only these files will be asked to be saved." (interactive "P") - (if (frame-parameter (selected-frame) 'client) + (if (frame-parameter nil 'client) (server-save-buffers-kill-terminal arg) (save-buffers-kill-emacs arg))) 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." ;; When connected to various displays, be careful to use the display of ;; the currently selected frame, rather than the original start display, ;; which may not even exist any more. - (if (stringp (frame-parameter (selected-frame) 'display)) - (setenv "DISPLAY" (frame-parameter (selected-frame) 'display))) + (if (stringp (frame-parameter nil 'display)) + (setenv "DISPLAY" (frame-parameter nil 'display))) (if (and (consp function) (not (functionp function))) ;; The `function' can be an alist; look down it for first match diff --git a/lisp/server.el b/lisp/server.el index 05ac345d904..8a2a466a315 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1611,7 +1611,7 @@ With ARG non-nil, silently save all file-visiting buffers, then kill. If emacsclient was started with a list of filenames to edit, then only these files will be asked to be saved." - (let ((proc (frame-parameter (selected-frame) 'client))) + (let ((proc (frame-parameter nil 'client))) (cond ((eq proc 'nowait) ;; Nowait frames have no client buffer list. (if (cdr (frame-list)) diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index 248e36a5299..b7d57733467 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el @@ -229,7 +229,7 @@ When called with a raw C-u prefix, rescan the document first." (car (reftex-where-am-I)))) (unsplittable (if (fboundp 'frame-property) (frame-property (selected-frame) 'unsplittable) - (frame-parameter (selected-frame) 'unsplittable))) + (frame-parameter nil 'unsplittable))) offset toc-window) (if (setq toc-window (get-buffer-window @@ -587,7 +587,7 @@ With prefix arg 1, restrict index to the section at point." (let ((unsplittable (if (fboundp 'frame-property) (frame-property (selected-frame) 'unsplittable) - (frame-parameter (selected-frame) 'unsplittable))) + (frame-parameter nil 'unsplittable))) (reftex-rebuilding-toc t)) (if unsplittable (switch-to-buffer |