diff options
| author | Eli Zaretskii | 2010-12-04 13:45:59 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2010-12-04 13:45:59 +0200 |
| commit | 4f1948eb4c9e4ba07c50978363c565368d406de1 (patch) | |
| tree | 6822fd52b182c9a74a428f79807e82593210a3ea /doc | |
| parent | 62d72a4a699e91940934bb607d932f263fd13beb (diff) | |
| download | emacs-4f1948eb4c9e4ba07c50978363c565368d406de1.tar.gz emacs-4f1948eb4c9e4ba07c50978363c565368d406de1.zip | |
display.texi (Optional Mode Line): Make the description of load-average
more accurate.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 3 | ||||
| -rw-r--r-- | doc/emacs/display.texi | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 6f1f706fb58..ffaeafad015 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2010-12-04 Eli Zaretskii <eliz@gnu.org> | 1 | 2010-12-04 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * display.texi (Optional Mode Line): Make the description of | ||
| 4 | load-average more accurate. | ||
| 5 | |||
| 3 | * msdog.texi (Windows HOME): Mention that HOME can also be set in the | 6 | * msdog.texi (Windows HOME): Mention that HOME can also be set in the |
| 4 | registry, with a cross-reference. | 7 | registry, with a cross-reference. |
| 5 | (Windows Startup): New node. Move the stuff about the current | 8 | (Windows Startup): New node. Move the stuff about the current |
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 7946a451c54..cc251f2cc8e 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi | |||
| @@ -1007,11 +1007,12 @@ their parentheses. It looks like this: | |||
| 1007 | @noindent | 1007 | @noindent |
| 1008 | @vindex display-time-24hr-format | 1008 | @vindex display-time-24hr-format |
| 1009 | Here @var{hh} and @var{mm} are the hour and minute, followed always by | 1009 | Here @var{hh} and @var{mm} are the hour and minute, followed always by |
| 1010 | @samp{am} or @samp{pm}. @var{l.ll} is the average number of running | 1010 | @samp{am} or @samp{pm}. @var{l.ll} is the average number, collected |
| 1011 | processes in the whole system recently. (Some fields may be missing if | 1011 | for the last few minutes, of processes in the whole system that were |
| 1012 | your operating system cannot support them.) If you prefer time display | 1012 | either running or ready to run (i.e.@: were waiting for an available |
| 1013 | in 24-hour format, set the variable @code{display-time-24hr-format} | 1013 | processor). (Some fields may be missing if your operating system |
| 1014 | to @code{t}. | 1014 | cannot support them.) If you prefer time display in 24-hour format, |
| 1015 | set the variable @code{display-time-24hr-format} to @code{t}. | ||
| 1015 | 1016 | ||
| 1016 | @cindex mail (on mode line) | 1017 | @cindex mail (on mode line) |
| 1017 | @vindex display-time-use-mail-icon | 1018 | @vindex display-time-use-mail-icon |