diff options
| author | Juri Linkov <juri@linkov.net> | 2019-08-06 00:38:58 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2019-08-06 00:38:58 +0300 |
| commit | aa624a092db1e2c2e09345a08e3609095a9f9fc3 (patch) | |
| tree | 9b6080a55a5ebae1ecb5f2e8093f8a91abb6f992 /lisp/cus-start.el | |
| parent | 0c9075f0af275e4a44cda363d61313c2667c5e7d (diff) | |
| download | emacs-aa624a092db1e2c2e09345a08e3609095a9f9fc3.tar.gz | |
* lisp/cus-start.el: Add :safe to display-fill-column-indicator (bug#36861)
(display-fill-column-indicator)
(display-fill-column-indicator-column)
(display-fill-column-indicator-character): Add :safe predicates.
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 102 |
1 files changed, 57 insertions, 45 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index e1d0bce2ad0..ddb9546ad1a 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -616,52 +616,64 @@ since it could result in memory overflow and make Emacs crash." (const :tag "Grow only" :value grow-only)) "25.1") (display-raw-bytes-as-hex display boolean "26.1") - (display-line-numbers display-line-numbers - (choice - (const :tag "Off (nil)" :value nil) - (const :tag "Absolute line numbers" - :value t) - (const :tag "Relative line numbers" - :value relative) - (const :tag "Visually relative line numbers" - :value visual)) - "26.1") - (display-line-numbers-width display-line-numbers - (choice - (const :tag "Dynamically computed" - :value nil) - (integer :menu-tag "Fixed number of columns" - :value 2 - :format "%v")) - "26.1") - (display-line-numbers-current-absolute display-line-numbers - (choice - (const :tag "Display actual number of current line" - :value t) - (const :tag "Display zero as number of current line" - :value nil)) - "26.1") - (display-line-numbers-widen display-line-numbers - (choice - (const :tag "Disregard narrowing when calculating line numbers" - :value t) - (const :tag "Count lines from beginning of narrowed region" - :value nil)) - "26.1") + (display-line-numbers + display-line-numbers + (choice + (const :tag "Off (nil)" :value nil) + (const :tag "Absolute line numbers" + :value t) + (const :tag "Relative line numbers" + :value relative) + (const :tag "Visually relative line numbers" + :value visual)) + "26.1") + (display-line-numbers-width + display-line-numbers + (choice + (const :tag "Dynamically computed" + :value nil) + (integer :menu-tag "Fixed number of columns" + :value 2 + :format "%v")) + "26.1") + (display-line-numbers-current-absolute + display-line-numbers + (choice + (const :tag "Display actual number of current line" + :value t) + (const :tag "Display zero as number of current line" + :value nil)) + "26.1") + (display-line-numbers-widen + display-line-numbers + (choice + (const :tag "Disregard narrowing when calculating line numbers" + :value t) + (const :tag "Count lines from beginning of narrowed region" + :value nil)) + "26.1") - (display-fill-column-indicator display-fill-column-indicator - boolean "27.1") - (display-fill-column-indicator-column display-fill-column-indicator - (choice - (const :tag "Use fill-column variable" - :value t) - (const :tag "Fixed column number" - :value 70 - :format "%v") - integer) - "27.1") - (display-fill-column-indicator-character display-fill-column-indicator - character "27.1") + (display-fill-column-indicator + display-fill-column-indicator + boolean + "27.1" + :safe booleanp) + (display-fill-column-indicator-column + display-fill-column-indicator + (choice + (const :tag "Use fill-column variable" + :value t) + (const :tag "Fixed column number" + :value 70 + :format "%v") + integer) + "27.1" + :safe (lambda (value) (or (booleanp value) (integerp value)))) + (display-fill-column-indicator-character + display-fill-column-indicator + character + "27.1" + :safe characterp) ;; xfaces.c (scalable-fonts-allowed display boolean "22.1") ;; xfns.c |