diff options
| author | Chong Yidong | 2012-01-28 11:21:04 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-01-28 11:21:04 +0800 |
| commit | 2680c30938c8f553a2d76dfe12313028b08c6dc7 (patch) | |
| tree | 557e25cd3c685773f18c50a37bcf2a1d176df9cb | |
| parent | 0e24a8b2f490baa90f726639134d04ec82078b98 (diff) | |
| download | emacs-2680c30938c8f553a2d76dfe12313028b08c6dc7.tar.gz emacs-2680c30938c8f553a2d76dfe12313028b08c6dc7.zip | |
* lisp/frame.el (set-cursor-color): Doc fix.
* doc/emacs/display.texi (Faces): Add xref to Colors node.
Fixes: debbugs:352
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/display.texi | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/frame.el | 6 |
4 files changed, 12 insertions, 2 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 5c56720a40e..edbd20fe984 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-01-28 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * display.texi (Faces): Add xref to Colors node. | ||
| 4 | |||
| 1 | 2012-01-27 Dani Moncayo <dmoncayo@gmail.com> | 5 | 2012-01-27 Dani Moncayo <dmoncayo@gmail.com> |
| 2 | 6 | ||
| 3 | * buffers.texi (Select Buffer): Clarify explanation of switching | 7 | * buffers.texi (Select Buffer): Clarify explanation of switching |
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 67feb791fe1..6e69b723204 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi | |||
| @@ -493,7 +493,7 @@ attribute is taken from the face named @code{default}. | |||
| 493 | 493 | ||
| 494 | The @code{default} face is the default for displaying text, and all | 494 | The @code{default} face is the default for displaying text, and all |
| 495 | of its attributes are specified. Its background color is also used as | 495 | of its attributes are specified. Its background color is also used as |
| 496 | the frame's background color. | 496 | the frame's background color. @xref{Colors}. |
| 497 | 497 | ||
| 498 | @cindex cursor face | 498 | @cindex cursor face |
| 499 | Another special face is the @code{cursor} face. On graphical | 499 | Another special face is the @code{cursor} face. On graphical |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 29bf8e7a414..c683f94444b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-01-28 Chong Yidong <cyd@gnu.org> | 1 | 2012-01-28 Chong Yidong <cyd@gnu.org> |
| 2 | 2 | ||
| 3 | * frame.el (set-cursor-color): Doc fix (Bug#352). | ||
| 4 | |||
| 3 | * mail/rmail.el (rmail-start-mail): Add send-action again (Bug#10625). | 5 | * mail/rmail.el (rmail-start-mail): Add send-action again (Bug#10625). |
| 4 | (rmail-mail-return): Switch to NEWBUF only if it is non-nil. | 6 | (rmail-mail-return): Switch to NEWBUF only if it is non-nil. |
| 5 | 7 | ||
diff --git a/lisp/frame.el b/lisp/frame.el index 842d07abf50..88ae712bab2 100644 --- a/lisp/frame.el +++ b/lisp/frame.el | |||
| @@ -1108,7 +1108,11 @@ To get the frame's current foreground color, use `frame-parameters'." | |||
| 1108 | (defun set-cursor-color (color-name) | 1108 | (defun set-cursor-color (color-name) |
| 1109 | "Set the text cursor color of the selected frame to COLOR-NAME. | 1109 | "Set the text cursor color of the selected frame to COLOR-NAME. |
| 1110 | When called interactively, prompt for the name of the color to use. | 1110 | When called interactively, prompt for the name of the color to use. |
| 1111 | To get the frame's current cursor color, use `frame-parameters'." | 1111 | This works by setting the `cursor-color' frame parameter on the |
| 1112 | selected frame. | ||
| 1113 | |||
| 1114 | You can also set the text cursor color, for all frames, by | ||
| 1115 | customizing the `cursor' face." | ||
| 1112 | (interactive (list (read-color "Cursor color: "))) | 1116 | (interactive (list (read-color "Cursor color: "))) |
| 1113 | (modify-frame-parameters (selected-frame) | 1117 | (modify-frame-parameters (selected-frame) |
| 1114 | (list (cons 'cursor-color color-name)))) | 1118 | (list (cons 'cursor-color color-name)))) |