aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2014-05-21 19:35:31 +0300
committerEli Zaretskii2014-05-21 19:35:31 +0300
commit13a83f0501d080de5ae775b770925d535eb3ac83 (patch)
treeb3703545472b2ecaf953d225bb5697b593f2267b /lisp
parent5e2e0fa4565f2496fa5db299e30d6b08088cedde (diff)
downloademacs-13a83f0501d080de5ae775b770925d535eb3ac83.tar.gz
emacs-13a83f0501d080de5ae775b770925d535eb3ac83.zip
Fix bug #17532 with unclear docs of setting frame's font.
lisp/frame.el (set-frame-font): Doc fix. lisp/menu-bar.el (menu-set-font): Doc fix. doc/emacs/frames.texi (Fonts): Clarify which frames are affected by setting font from the menu and in default-frame-alist.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/frame.el8
-rw-r--r--lisp/menu-bar.el2
3 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f70c04d2ab..df22726d882 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12014-05-21 Eli Zaretskii <eliz@gnu.org>
2
3 * frame.el (set-frame-font): Doc fix.
4
5 * menu-bar.el (menu-set-font): Doc fix. (Bug#17532)
6
12014-05-21 Dmitry Gutov <dgutov@yandex.ru> 72014-05-21 Dmitry Gutov <dgutov@yandex.ru>
2 8
3 * emacs-lisp/package.el (package--download-one-archive): Use 9 * emacs-lisp/package.el (package--download-one-archive): Use
diff --git a/lisp/frame.el b/lisp/frame.el
index d699d243023..5e9b5351005 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1107,10 +1107,10 @@ number of lines and columns.
1107 1107
1108If FRAMES is nil, apply the font to the selected frame only. 1108If FRAMES is nil, apply the font to the selected frame only.
1109If FRAMES is non-nil, it should be a list of frames to act upon, 1109If FRAMES is non-nil, it should be a list of frames to act upon,
1110or t meaning all graphical frames. Also, if FRAME is non-nil, 1110or t meaning all existing graphical frames.
1111alter the user's Customization settings as though the 1111Also, if FRAMES is non-nil, alter the user's Customization settings
1112font-related attributes of the `default' face had been \"set in 1112as though the font-related attributes of the `default' face had been
1113this session\", so that the font is applied to future frames." 1113\"set in this session\", so that the font is applied to future frames."
1114 (interactive 1114 (interactive
1115 (let* ((completion-ignore-case t) 1115 (let* ((completion-ignore-case t)
1116 (font (completing-read "Font name: " 1116 (font (completing-read "Font name: "
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 436d8f611a8..f9cbc62b464 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -662,7 +662,7 @@ by \"Save Options\" in Custom buffers.")
662;; Function for setting/saving default font. 662;; Function for setting/saving default font.
663 663
664(defun menu-set-font () 664(defun menu-set-font ()
665 "Interactively select a font and make it the default." 665 "Interactively select a font and make it the default on all existing frames."
666 (interactive) 666 (interactive)
667 (set-frame-font (if (fboundp 'x-select-font) 667 (set-frame-font (if (fboundp 'x-select-font)
668 (x-select-font) 668 (x-select-font)