diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-10-24 17:36:09 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-10-24 17:36:09 -0400 |
| commit | 0c382083b6b550c26fad8ac7f59b1ba09663e728 (patch) | |
| tree | 811262fd6093232799dabb83600551ba63cecaac /doc/lispref | |
| parent | d77d0953b5ddb05ea7ad19556f37a5f5c4d3a67b (diff) | |
| parent | 23c261f58fceed14e04b3ba928007fde9567d8e2 (diff) | |
| download | emacs-0c382083b6b550c26fad8ac7f59b1ba09663e728.tar.gz | |
Merge changes from emacs-23
Diffstat (limited to 'doc/lispref')
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/display.texi | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 887578e9b5c..15a33a4aabf 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2010-10-22 Eli Zaretskii <eliz@gnu.org> + + * display.texi (Window Systems): Deprecate use of window-system as + a predicate. + 2010-10-23 Glenn Morris <rgm@gnu.org> * help.texi (Documentation Basics): Remove mentions of digest-doc and diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index f4092cfa7ea..92f96d302d9 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -5928,6 +5928,14 @@ selected frame). The list of possible symbols it returns is the same one documented for the variable @code{window-system} above. @end defun + Do @emph{not} use @code{window-system} and +@code{initial-window-system} as predicates or boolean flag variables, +if you want to write code that works differently on text terminals and +graphic displays. That is because @code{window-system} is not a good +indicator of Emacs capabilities on a given display type. Instead, use +@code{display-graphic-p} or any of the other @code{display-*-p} +predicates described in @ref{Display Feature Testing}. + @defvar window-setup-hook This variable is a normal hook which Emacs runs after handling the initialization files. Emacs runs this hook after it has completed |