aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2010-10-23 14:13:39 -0700
committerGlenn Morris2010-10-23 14:13:39 -0700
commit66c6abf0d76aad59cf5defee7ea63f9fb356839d (patch)
treedc430c8cb7579d6ccd7cf496844fcbc8c647e4d6 /lisp
parentf3d87560bad3428c61d763a02e8a3a6b66d5d45a (diff)
downloademacs-66c6abf0d76aad59cf5defee7ea63f9fb356839d.tar.gz
emacs-66c6abf0d76aad59cf5defee7ea63f9fb356839d.zip
Sync docs of cursor-in-non-selected-windows between Lisp and C.
* lisp/frame.el (cursor-in-non-selected-windows): Sync doc with C version. * src/buffer.c (syms_of_buffer) <cursor-in-non-selected-windows>: Sync doc with Lisp version.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/frame.el10
2 files changed, 7 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 296badae594..07350947106 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
12010-10-23 Glenn Morris <rgm@gnu.org> 12010-10-23 Glenn Morris <rgm@gnu.org>
2 2
3 * frame.el (auto-hscroll-mode): Sync doc with C version. 3 * frame.el (auto-hscroll-mode, cursor-in-non-selected-windows):
4 Sync docs with C version.
4 5
5 * term/ns-win.el (xw-defined-colors): 6 * term/ns-win.el (xw-defined-colors):
6 * term/x-win.el (xw-defined-colors): Make docs identical to w32-win. 7 * term/x-win.el (xw-defined-colors): Make docs identical to w32-win.
diff --git a/lisp/frame.el b/lisp/frame.el
index 82feab16f0d..431c2aefff4 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1593,12 +1593,12 @@ cursor shapes."
1593 1593
1594 1594
1595(defcustom cursor-in-non-selected-windows t 1595(defcustom cursor-in-non-selected-windows t
1596 "Non-nil means show a hollow box cursor in non-selected windows. 1596 "Non-nil means show a cursor in non-selected windows.
1597If nil, don't show a cursor except in the selected window. 1597If nil, only shows a cursor in the selected window.
1598If t, display a cursor related to the usual cursor type 1598If t, displays a cursor related to the usual cursor type
1599 \(a solid box becomes hollow, a bar becomes a narrower bar). 1599\(a solid box becomes hollow, a bar becomes a narrower bar).
1600You can also specify the cursor type as in the `cursor-type' variable. 1600You can also specify the cursor type as in the `cursor-type' variable.
1601Use Custom to set this variable to get the display updated." 1601Use Custom to set this variable and update the display."
1602 :tag "Cursor In Non-selected Windows" 1602 :tag "Cursor In Non-selected Windows"
1603 :type 'boolean 1603 :type 'boolean
1604 :group 'cursor 1604 :group 'cursor