mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
* 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.
This commit is contained in:
parent
f6e8d3c111
commit
3b734d1c00
6 changed files with 16 additions and 7 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)))))
|
||||
|
||||
|
|
|
|||
|
|
@ -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)))
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue