diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-05-09 10:03:21 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-05-09 10:03:21 -0700 |
| commit | 5c890bfc191d0cf18dccbbf50ebdcde946a0d7fb (patch) | |
| tree | 8e14f3cedc3fba87248f49c2e960f6bf3cfe2da7 /lisp/cus-start.el | |
| parent | 196bc13b7bc5a29fa4d27e83d7cf0db4d99aa8b7 (diff) | |
| parent | be0d1cac83d14596406571f9cb668031ec5675ac (diff) | |
| download | emacs-5c890bfc191d0cf18dccbbf50ebdcde946a0d7fb.tar.gz emacs-5c890bfc191d0cf18dccbbf50ebdcde946a0d7fb.tar.bz2 emacs-5c890bfc191d0cf18dccbbf50ebdcde946a0d7fb.zip | |
Merge from origin/emacs-27
be0d1cac83 (origin/emacs-27) Small fix for type of 'display-fill-colu...
c5e5839776 Fix customization of 'display-fill-column-indicator-charac...
d5c184aa3e Refer to fill column indicator Info node in some places.
e13300ae50 Merge branch 'emacs-27' of git.sv.gnu.org:/srv/git/emacs i...
0bae57033f Fix GTK's Tool Bar menu radio buttons
4c98aa7ea5 Minor clarifications in NEWS
a1cbd05f38 Improve documentation of 'with-suppressed-warnings'.
4a895c1b26 Fix a typo in a comment
2caf3e997e Improve documentation of Hi Lock mode
7081c1d66f Fix typos in the Emacs user manual
0385771e2f Fix references to Speedbar in VHDL mode
a76cafea0d Fix handling of FROM = t and TO = t by 'window-text-pixel-...
# Conflicts:
# etc/NEWS
# src/xdisp.c
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index dff4d9a6060..6632687da47 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -771,9 +771,16 @@ since it could result in memory overflow and make Emacs crash." :safe (lambda (value) (or (booleanp value) (integerp value)))) (display-fill-column-indicator-character display-fill-column-indicator - character + (choice + (character :tag "Use U+2502 to indicate fill column" + :value ?│) + (character :tag "Use | to indicate fill column" + :value ?|) + (const :tag "If possible, use U+2502 to indicate fill column, otherwise use |" + :value nil) + character) "27.1" - :safe characterp) + :safe (lambda (value) (or (characterp value) (null value)))) ;; xfaces.c (scalable-fonts-allowed display boolean "22.1") ;; xfns.c |