From 0f7b074f4a6e8e6418d06ab6d3b206b4524381af Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 3 Nov 2012 23:24:00 +0800 Subject: [PATCH] * lisp/cus-start.el: Make cursor-type customizable. * src/buffer.c (cursor_type): Untabify docstring. Fixes: debbugs:11633 --- lisp/ChangeLog | 4 ++++ lisp/cus-start.el | 13 +++++++++++++ src/ChangeLog | 4 ++++ src/buffer.c | 16 ++++++++-------- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e4e35a74a45..d040d331903 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-11-03 Chong Yidong + + * cus-start.el: Make cursor-type customizable (Bug#11633). + 2012-11-02 Glenn Morris * filecache.el: No need to load find-lisp when compiling. diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 2279dc2bf20..5e81e1545b6 100644 --- 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 f5f5c9e897a..1595537267d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-11-03 Chong Yidong + + * buffer.c (cursor_type): Untabify docstring. + 2012-11-03 Dmitry Antipov * frame.h (struct frame): Drop can_have_scroll_bars member diff --git a/src/buffer.c b/src/buffer.c index 0b3dde27968..347f27edc3a 100644 --- 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 -- 2.39.5