* lisp/cus-start.el: Make cursor-type customizable.

* src/buffer.c (cursor_type): Untabify docstring.

Fixes: debbugs:11633

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4e35a74a459953120da23abf080652db54c5e56..d040d331903270c62bf24251b22cef02af079fb7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-03  Chong Yidong  <cyd@gnu.org>
+
+       * cus-start.el: Make cursor-type customizable (Bug#11633).
+
 2012-11-02  Glenn Morris  <rgm@gnu.org>
 
        * filecache.el: No need to load find-lisp when compiling.

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 2279dc2bf203215ed88f578cd9bac1e4a435349f..5e81e1545b6374c09eb838d2275e13ede350fc04 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -51,6 +51,19 @@
             (gc-cons-percentage alloc float)
             (garbage-collection-messages alloc boolean)
             ;; buffer.c
+            (cursor-type
+             display
+             (choice
+              (const :tag "Frame default" t)
+              (const :tag "Filled box" box)
+              (const :tag "Hollow cursor" hollow)
+              (const :tag "Vertical bar" bar)
+              (cons  :tag "Vertical bar with specified width"
+                     (const bar) integer)
+              (const :tag "Horizontal bar" hbar)
+              (cons  :tag "Horizontal bar with specified width"
+                     (const hbar) integer)
+              (const :tag "None "nil)))
             (mode-line-format mode-line sexp) ;Hard to do right.
             (major-mode internal function)
             (case-fold-search matching boolean)

diff --git a/src/ChangeLog b/src/ChangeLog
index f5f5c9e897a8e9652f8aa07f77dd53612f3f2272..1595537267d47b9bc49b6817ab72c46b0ced9e92 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-03  Chong Yidong  <cyd@gnu.org>
+
+       * buffer.c (cursor_type): Untabify docstring.
+
 2012-11-03  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * frame.h (struct frame): Drop can_have_scroll_bars member

diff --git a/src/buffer.c b/src/buffer.c
index 0b3dde279680d02fd80e344b97a344814ce8eff6..347f27edc3ac2fd1d926fd3b1febad488a97b5de 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -6210,15 +6210,15 @@ is a member of the list.  */);
                     doc: /* Cursor to use when this buffer is in the selected window.
 Values are interpreted as follows:
 
-  t              use the cursor specified for the frame
-  nil            don't display a cursor
-  box            display a filled box cursor
-  hollow         display a hollow box cursor
-  bar            display a vertical bar cursor with default width
-  (bar . WIDTH)          display a vertical bar cursor with width WIDTH
-  hbar           display a horizontal bar cursor with default height
+  t               use the cursor specified for the frame
+  nil             don't display a cursor
+  box             display a filled box cursor
+  hollow          display a hollow box cursor
+  bar             display a vertical bar cursor with default width
+  (bar . WIDTH)   display a vertical bar cursor with width WIDTH
+  hbar            display a horizontal bar cursor with default height
   (hbar . HEIGHT) display a horizontal bar cursor with height HEIGHT
-  ANYTHING ELSE          display a hollow box cursor
+  ANYTHING ELSE   display a hollow box cursor
 
 When the buffer is displayed in a non-selected window, the
 cursor's appearance is instead controlled by the variable