diff options
| author | Eli Zaretskii | 2014-05-21 19:35:31 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-05-21 19:35:31 +0300 |
| commit | 13a83f0501d080de5ae775b770925d535eb3ac83 (patch) | |
| tree | b3703545472b2ecaf953d225bb5697b593f2267b /doc | |
| parent | 5e2e0fa4565f2496fa5db299e30d6b08088cedde (diff) | |
| download | emacs-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 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/emacs/frames.texi | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 7858c78847f..c97ef315724 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-05-21 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * frames.texi (Fonts): Clarify which frames are affected by | ||
| 4 | setting font from the menu and in default-frame-alist. | ||
| 5 | (Bug#17532) | ||
| 6 | |||
| 1 | 2014-05-12 Eli Zaretskii <eliz@gnu.org> | 7 | 2014-05-12 Eli Zaretskii <eliz@gnu.org> |
| 2 | 8 | ||
| 3 | * mule.texi (Language Environments): Remove unused @anchor. | 9 | * mule.texi (Language Environments): Remove unused @anchor. |
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index 8dd387b5fa0..cd8347369d3 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi | |||
| @@ -494,13 +494,14 @@ the mouse cursor to the chosen frame. | |||
| 494 | @cindex fonts | 494 | @cindex fonts |
| 495 | 495 | ||
| 496 | By default, Emacs displays text on graphical displays using a | 496 | By default, Emacs displays text on graphical displays using a |
| 497 | 12-point monospace font. There are several different ways to specify | 497 | 10-point monospace font. There are several different ways to specify |
| 498 | a different font: | 498 | a different font: |
| 499 | 499 | ||
| 500 | @itemize | 500 | @itemize |
| 501 | @item | 501 | @item |
| 502 | Click on @samp{Set Default Font} in the @samp{Options} menu. To save | 502 | Click on @samp{Set Default Font} in the @samp{Options} menu. This |
| 503 | this for future sessions, click on @samp{Save Options} in the | 503 | makes the selected font the default on all existing graphical frames. |
| 504 | To save this for future sessions, click on @samp{Save Options} in the | ||
| 504 | @samp{Options} menu. | 505 | @samp{Options} menu. |
| 505 | 506 | ||
| 506 | @item | 507 | @item |
| @@ -513,6 +514,10 @@ Add a line to your init file, modifying the variable | |||
| 513 | '(font . "DejaVu Sans Mono-10")) | 514 | '(font . "DejaVu Sans Mono-10")) |
| 514 | @end example | 515 | @end example |
| 515 | 516 | ||
| 517 | @noindent | ||
| 518 | This makes the font the default on all graphical frames created after | ||
| 519 | restarting Emacs with that init file. | ||
| 520 | |||
| 516 | @cindex X defaults file | 521 | @cindex X defaults file |
| 517 | @cindex X resources file | 522 | @cindex X resources file |
| 518 | @item | 523 | @item |