diff options
| -rw-r--r-- | doc/emacs/ChangeLog | 2 | ||||
| -rw-r--r-- | doc/emacs/display.texi | 18 |
2 files changed, 12 insertions, 8 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index a9210fbefe6..3e0d0c72f22 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-02-04 Glenn Morris <rgm@gnu.org> | 1 | 2012-02-04 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * display.texi (Colors): Mention list-colors-sort. | ||
| 4 | |||
| 3 | * files.texi (File Conveniences): Mention image animation. | 5 | * files.texi (File Conveniences): Mention image animation. |
| 4 | 6 | ||
| 5 | 2012-01-31 Chong Yidong <cyd@gnu.org> | 7 | 2012-01-31 Chong Yidong <cyd@gnu.org> |
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 6e69b723204..8159b8cc6aa 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi | |||
| @@ -524,16 +524,18 @@ specify a color for a face---for instance, when customizing the face | |||
| 524 | or an @dfn{RGB triplet}. | 524 | or an @dfn{RGB triplet}. |
| 525 | 525 | ||
| 526 | @findex list-colors-display | 526 | @findex list-colors-display |
| 527 | @vindex list-colors-sort | ||
| 527 | A color name is a pre-defined name, such as @samp{dark orange} or | 528 | A color name is a pre-defined name, such as @samp{dark orange} or |
| 528 | @samp{medium sea green}. To view a list of color names, type @kbd{M-x | 529 | @samp{medium sea green}. To view a list of color names, type @kbd{M-x |
| 529 | list-colors-display}. If you run this command on a graphical display, | 530 | list-colors-display}. To control the order in which colors are shown, |
| 530 | it shows the full range of color names known to Emacs (these are the | 531 | customize @code{list-colors-sort}. If you run this command on a |
| 531 | standard X11 color names, defined in X's @file{rgb.txt} file). If you | 532 | graphical display, it shows the full range of color names known to Emacs |
| 532 | run the command on a text-only terminal, it shows only a small subset | 533 | (these are the standard X11 color names, defined in X's @file{rgb.txt} |
| 533 | of colors that can be safely displayed on such terminals. However, | 534 | file). If you run the command on a text-only terminal, it shows only a |
| 534 | Emacs understands X11 color names even on text-only terminals; if a | 535 | small subset of colors that can be safely displayed on such terminals. |
| 535 | face is given a color specified by an X11 color name, it is displayed | 536 | However, Emacs understands X11 color names even on text-only terminals; |
| 536 | using the closest-matching terminal color. | 537 | if a face is given a color specified by an X11 color name, it is |
| 538 | displayed using the closest-matching terminal color. | ||
| 537 | 539 | ||
| 538 | An RGB triplet is a string of the form @samp{#RRGGBB}. Each of the | 540 | An RGB triplet is a string of the form @samp{#RRGGBB}. Each of the |
| 539 | R, G, and B components is a hexadecimal number specifying the | 541 | R, G, and B components is a hexadecimal number specifying the |