diff options
| author | Eli Zaretskii | 2000-02-17 14:01:20 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2000-02-17 14:01:20 +0000 |
| commit | 53c80cf65ea01af58e3f71654847d55dfa6f5416 (patch) | |
| tree | 5edd2ab4bd35930aa86714f609f7994fb3a15727 | |
| parent | 2503c8b1aee911d3a53a7950e39eab34c05192fb (diff) | |
| download | emacs-53c80cf65ea01af58e3f71654847d55dfa6f5416.tar.gz emacs-53c80cf65ea01af58e3f71654847d55dfa6f5416.zip | |
(list-faces-display): Use display-mouse-p, not window-system.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/faces.el | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6c28abb998a..275f89e5aa1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2000-02-17 Eli Zaretskii <eliz@is.elta.co.il> | 1 | 2000-02-17 Eli Zaretskii <eliz@is.elta.co.il> |
| 2 | 2 | ||
| 3 | * faces.el (list-faces-display): Use display-mouse-p instead of | ||
| 4 | window-system. | ||
| 5 | |||
| 3 | * menu-bar.el (global-map): Menu-bar items converted to the new | 6 | * menu-bar.el (global-map): Menu-bar items converted to the new |
| 4 | format (menu-item..., rearranged for better CUA compliance, and | 7 | format (menu-item..., rearranged for better CUA compliance, and |
| 5 | their names changed for better clarity. Help strings added. | 8 | their names changed for better clarity. Help strings added. |
diff --git a/lisp/faces.el b/lisp/faces.el index 8d2a47a262a..dadfe68e623 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -971,7 +971,7 @@ The sample text is a string that comes from the variable | |||
| 971 | (substitute-command-keys | 971 | (substitute-command-keys |
| 972 | (concat | 972 | (concat |
| 973 | "Use " | 973 | "Use " |
| 974 | (if window-system "\\[help-follow-mouse] or ") | 974 | (if (display-mouse-p) "\\[help-follow-mouse] or ") |
| 975 | "\\[help-follow] or on a face name to customize it\n" | 975 | "\\[help-follow] or on a face name to customize it\n" |
| 976 | "or on its sample text for a decription of the face.\n\n"))) | 976 | "or on its sample text for a decription of the face.\n\n"))) |
| 977 | (setq help-xref-stack nil) | 977 | (setq help-xref-stack nil) |