[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/gnus-cloud fa5680a 1/3: Merge branch 'master' of g
|
From: |
Teodor Zlatanov |
|
Subject: |
[Emacs-diffs] scratch/gnus-cloud fa5680a 1/3: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs |
|
Date: |
Wed, 6 Jul 2016 15:35:02 +0000 (UTC) |
branch: scratch/gnus-cloud
commit fa5680a7b34cafa51351c1b57897657429348bac
Merge: 71f8e35 a7e302d
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
lisp/faces.el | 2 +-
lisp/international/mule-diag.el | 2 +-
lisp/menu-bar.el | 22 ++++++++--------------
lisp/mouse.el | 8 +++-----
lisp/scroll-bar.el | 8 ++------
src/frame.c | 16 ++++++++++++++++
6 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/lisp/faces.el b/lisp/faces.el
index d5fc3ce..426de3b 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2881,7 +2881,7 @@ also the same size as FACE on FRAME, or fail."
pattern face)))
(error "No fonts match `%s'" pattern)))
(car fonts))
- (cdr (assq 'font (frame-parameters (selected-frame))))))
+ (frame-parameter nil 'font)))
(defcustom font-list-limit 100
"This variable is obsolete and has no effect."
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 731d688..f543083 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -1114,7 +1114,7 @@ system which uses fontsets)."
(insert "\n\n")
(if window-system
- (let ((font (cdr (assq 'font (frame-parameters)))))
+ (let ((font (frame-parameter nil 'font)))
(insert "The font and fontset of the selected frame are:\n"
" font: " font "\n"
" fontset: " (face-attribute 'default :fontset) "\n"))
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index a654118..c4f094a 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -989,49 +989,43 @@ The selected font will be the default on both the
existing and future frames."
(customize-set-variable 'horizontal-scroll-bar-mode nil))
(defvar menu-bar-showhide-scroll-bar-menu
- (let ((menu (make-sparse-keymap "Scroll-bar")))
+ (let ((menu (make-sparse-keymap "Scroll-bar"))
+ (vsb (frame-parameter nil 'vertical-scroll-bars))
+ (hsb (frame-parameter nil 'horizontal-scroll-bars)))
(bindings--define-key menu [horizontal]
'(menu-item "Horizontal"
menu-bar-horizontal-scroll-bar
:help "Horizontal scroll bar"
:visible (horizontal-scroll-bars-available-p)
- :button (:radio . (cdr (assq 'horizontal-scroll-bars
- (frame-parameters))))))
+ :button (:radio . hsb)))
(bindings--define-key menu [none-horizontal]
'(menu-item "None-horizontal"
menu-bar-no-horizontal-scroll-bar
:help "Turn off horizontal scroll bars"
:visible (horizontal-scroll-bars-available-p)
- :button (:radio . (not (cdr (assq 'horizontal-scroll-bars
- (frame-parameters)))))))
+ :button (:radio . (not hsb))))
(bindings--define-key menu [right]
'(menu-item "On the Right"
menu-bar-right-scroll-bar
:help "Scroll-bar on the right side"
:visible (display-graphic-p)
- :button (:radio . (eq (cdr (assq 'vertical-scroll-bars
- (frame-parameters)))
- 'right))))
+ :button (:radio . (eq vsb 'right))))
(bindings--define-key menu [left]
'(menu-item "On the Left"
menu-bar-left-scroll-bar
:help "Scroll-bar on the left side"
:visible (display-graphic-p)
- :button (:radio . (eq (cdr (assq 'vertical-scroll-bars
- (frame-parameters)))
- 'left))))
+ :button (:radio . (eq vsb 'left))))
(bindings--define-key menu [none]
'(menu-item "None"
menu-bar-no-scroll-bar
:help "Turn off scroll-bar"
:visible (display-graphic-p)
- :button (:radio . (eq (cdr (assq 'vertical-scroll-bars
- (frame-parameters)))
- nil))))
+ :button (:radio . (nilp vsb))))
menu))
(defun menu-bar-frame-for-menubar ()
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 8d72753..53d5a22 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -420,10 +420,8 @@ must be one of the symbols `header', `mode', or
`vertical'."
(let ((divider-width (frame-right-divider-width frame)))
(when (and (or (not (numberp divider-width))
(zerop divider-width))
- (eq (cdr (assq 'vertical-scroll-bars
- (frame-parameters frame)))
- 'left))
- (setq window (window-in-direction 'left window t))))))
+ (eq (frame-parameter frame 'vertical-scroll-bars) 'left))
+ (setq window (window-in-direction 'left window t))))))
(let* ((exitfun nil)
(move
@@ -1705,7 +1703,7 @@ and selects that window."
;; Font selection.
(defun font-menu-add-default ()
- (let* ((default (cdr (assq 'font (frame-parameters (selected-frame)))))
+ (let* ((default (frame-parameter nil 'font))
(font-alist x-fixed-font-alist)
(elt (or (assoc "Misc" font-alist) (nth 1 font-alist))))
(if (assoc "Default" elt)
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 838f9bf..e5fe316 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -183,9 +183,7 @@ when they are turned on; if it is nil, they go on the left."
(interactive "P")
(if (null arg)
(setq arg
- (if (cdr (assq 'vertical-scroll-bars
- (frame-parameters (selected-frame))))
- -1 1))
+ (if (frame-parameter nil 'vertical-scroll-bars) -1 1))
(setq arg (prefix-numeric-value arg)))
(modify-frame-parameters
(selected-frame)
@@ -199,9 +197,7 @@ With ARG, turn vertical scroll bars on if and only if ARG
is positive."
(interactive "P")
(if (null arg)
(setq arg
- (if (cdr (assq 'horizontal-scroll-bars
- (frame-parameters (selected-frame))))
- -1 1))
+ (if (frame-parameter nil 'horizontal-scroll-bars) -1 1))
(setq arg (prefix-numeric-value arg)))
(modify-frame-parameters
(selected-frame)
diff --git a/src/frame.c b/src/frame.c
index 540b69f..22143ab 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2607,6 +2607,22 @@ If FRAME is nil, describe the currently selected frame.
*/)
/* Avoid consing in frequent cases. */
if (EQ (parameter, Qname))
value = f->name;
+#ifdef HAVE_WINDOW_SYSTEM
+ /* These are used by vertical motion commands. */
+ else if (EQ (parameter, Qvertical_scroll_bars))
+ value = (f->vertical_scroll_bar_type == vertical_scroll_bar_none
+ ? Qnil
+ : (f->vertical_scroll_bar_type == vertical_scroll_bar_left
+ ? Qleft : Qright));
+ else if (EQ (parameter, Qhorizontal_scroll_bars))
+ value = f->horizontal_scroll_bars ? Qt : Qnil;
+ else if (EQ (parameter, Qline_spacing) && f->extra_line_spacing == 0)
+ /* If this is non-zero, we can't determine whether the user specified
+ an integer or float value without looking through 'param_alist'. */
+ value = make_number (0);
+ else if (EQ (parameter, Qfont) && FRAME_X_P (f))
+ value = FRAME_FONT (f)->props[FONT_NAME_INDEX];
+#endif /* HAVE_WINDOW_SYSTEM */
#ifdef HAVE_X_WINDOWS
else if (EQ (parameter, Qdisplay) && FRAME_X_P (f))
value = XCAR (FRAME_DISPLAY_INFO (f)->name_list_element);