diff options
| author | Eli Zaretskii | 2015-08-21 16:32:29 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2015-08-21 16:32:29 +0300 |
| commit | c1402c58710c62b07aaa1e6cdee34ff20dfd4e8a (patch) | |
| tree | 7004b1fc3691b1612668bdef06be0968b5bdecfb | |
| parent | 88f18ca334600a8d867b7c158a3abdeb6004c08e (diff) | |
| download | emacs-c1402c58710c62b07aaa1e6cdee34ff20dfd4e8a.tar.gz emacs-c1402c58710c62b07aaa1e6cdee34ff20dfd4e8a.zip | |
Fix documentation of 'menu-set-font' and 'set-frame-font'
* lisp/menu-bar.el (menu-set-font): Doc fix. (Bug#21303)
* doc/lispref/frames.texi (Frame Font): Document that
set-frame-font with the last argument 't' will also make the font
the default for the future GUI frames.
| -rw-r--r-- | doc/lispref/frames.texi | 2 | ||||
| -rw-r--r-- | lisp/menu-bar.el | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 91c512c0ab4..65eeec6aea2 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi | |||
| @@ -744,7 +744,7 @@ frame fixed by adjusting the number of lines and columns. | |||
| 744 | If the optional argument @var{frames} is @code{nil}, this applies the | 744 | If the optional argument @var{frames} is @code{nil}, this applies the |
| 745 | font to the selected frame only. If @var{frames} is non-@code{nil}, it | 745 | font to the selected frame only. If @var{frames} is non-@code{nil}, it |
| 746 | should be a list of frames to act upon, or @code{t} meaning all existing | 746 | should be a list of frames to act upon, or @code{t} meaning all existing |
| 747 | graphical frames. | 747 | and all future graphical frames. |
| 748 | @end deffn | 748 | @end deffn |
| 749 | 749 | ||
| 750 | 750 | ||
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 6a2ff630698..d57ba742113 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el | |||
| @@ -652,7 +652,9 @@ by \"Save Options\" in Custom buffers.") | |||
| 652 | ;; Function for setting/saving default font. | 652 | ;; Function for setting/saving default font. |
| 653 | 653 | ||
| 654 | (defun menu-set-font () | 654 | (defun menu-set-font () |
| 655 | "Interactively select a font and make it the default on all existing frames." | 655 | "Interactively select a font and make it the default on all frames. |
| 656 | |||
| 657 | The selected font will be the default on both the existing and futire frames." | ||
| 656 | (interactive) | 658 | (interactive) |
| 657 | (set-frame-font (if (fboundp 'x-select-font) | 659 | (set-frame-font (if (fboundp 'x-select-font) |
| 658 | (x-select-font) | 660 | (x-select-font) |