[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 ad5572b 35/64: Fix custom types for cursor-in-non
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] emacs-25 ad5572b 35/64: Fix custom types for cursor-in-non-selected-windows |
Date: |
Sun, 01 May 2016 18:18:41 +0000 |
branch: emacs-25
commit ad5572b20f46dc678989cecd2d64926e1e1c846c
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Fix custom types for cursor-in-non-selected-windows
* lisp/cus-start.el (standard): Use the same custom types for
cursor-in-non-selected-windows as for cursor-type (bug#19214).
(cherry picked from commit b66bc0cced786e0320e1c3b0758bd3c434d4e8b5)
---
lisp/cus-start.el | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 5be61ce..001d638 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -54,7 +54,8 @@
;; :risky - risky-local-variable property
;; :safe - safe-local-variable property
;; :tag - custom-tag property
-(let (standard native-p prop propval
+(let (standard
+ native-p prop propval
;; This function turns a value
;; into an expression which produces that value.
(quoter (lambda (sexp)
@@ -67,27 +68,27 @@
(stringp sexp)
(numberp sexp))
sexp
- (list 'quote sexp)))))
+ (list 'quote sexp))))
+ (cursor-type-types
+ '(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))))
(pcase-dolist
(`(,symbol ,group ,type ,version . ,rest)
- '(;; alloc.c
+ `(;; alloc.c
(gc-cons-threshold alloc integer)
(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)))
+ (cursor-type display ,cursor-type-types)
(mode-line-format mode-line sexp) ;Hard to do right.
(major-mode internal function)
(case-fold-search matching boolean)
@@ -147,7 +148,7 @@ Leaving \"Default\" unchecked is equivalent with specifying
a default of
(line-spacing display (choice (const :tag "none" nil) number)
"22.1")
(cursor-in-non-selected-windows
- cursor boolean nil
+ cursor ,cursor-type-types nil
:tag "Cursor In Non-selected Windows"
:set (lambda (symbol value)
(set-default symbol value)
- [Emacs-diffs] emacs-25 8748c21 14/64: Add a doc string to `winner-mode', (continued)
- [Emacs-diffs] emacs-25 8748c21 14/64: Add a doc string to `winner-mode', Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 ff834ff 39/64: Add a link from Tool Bar to Images, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 7350d3d 47/64: apropos-print doc fix, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 8f1e784 32/64: Explictly explain that package-initialize loads the packages, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 8c66ebf 57/64: Further define-obsolete-* doc fixups, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 2abc85e 41/64: Transform mentions of `eval-after-load' to `with-eval-after-load', Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 bbda22c 43/64: add-timeout doc fix, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 350792e 62/64: global-eldoc-mode doc fix, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 6b39501 55/64: Mention with-silent-modifications in the lispref manual, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 69f7940 63/64: cua-prefix-override-inhibit-delay doc fix, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 ad5572b 35/64: Fix custom types for cursor-in-non-selected-windows,
Lars Ingebrigtsen <=
- [Emacs-diffs] emacs-25 8aa4147 64/64: tramp.texi: Revert last change due to backward compatibility, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 619f1ed 29/64: Move doc of backup-directory-alist to the Backup node, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 c3b3b90 61/64: normal-top-level-add-subdirs-to-load-path doc fix, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 2ef780f 34/64: Doc clarification to mwheel-scroll, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 1378680 31/64: Have the doc strings of `load-path' and `require' mention each other, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 ed8474e 33/64: Clarify the doc of eval-expression-print-format, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 925af7e 27/64: Fill the doc string of font-lock-keywords, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 6d8c2d0 49/64: custom-buffer-style doc fix, Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 3cbc1e3 07/64: Change all occurrences of "Mouse-[0-9]" to "mouse-[0-9]", Lars Ingebrigtsen, 2016/05/01
- [Emacs-diffs] emacs-25 25b4cf3 56/64: Describe WHEN in all the define-obsolete- macros, Lars Ingebrigtsen, 2016/05/01