diff options
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/cus-start.el | 11 | ||||
-rw-r--r-- | lisp/display-fill-column-indicator.el | 10 | ||||
-rw-r--r-- | lisp/faces.el | 10 |
3 files changed, 15 insertions, 16 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index b935776a2df..4c4d5ebb16d 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -650,11 +650,14 @@ since it could result in memory overflow and make Emacs crash." "26.1") (display-fill-column-indicator display-fill-column-indicator - (choice - (const :tag "Off (nil)" :value nil) - (const :tag "On (t)" :value t)) - "27.1") + 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") diff --git a/lisp/display-fill-column-indicator.el b/lisp/display-fill-column-indicator.el index f6b7352c21b..6d5f5a9f894 100644 --- a/lisp/display-fill-column-indicator.el +++ b/lisp/display-fill-column-indicator.el @@ -1,6 +1,6 @@ ;;; display-fill-column-indicator.el --- interface for display-fill-column-indicator -*- lexical-binding: t -*- -;; Copyright (C) 2017-2019 Free Software Foundation, Inc. +;; Copyright (C) 2019 Free Software Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org ;; Keywords: convenience @@ -37,18 +37,18 @@ ;;; Code: (defgroup display-fill-column-indicator nil - "Display a fill column indicator in th buffer." + "Display a fill column indicator in the buffer." :group 'convenience :group 'display) ;;;###autoload (define-minor-mode display-fill-column-indicator-mode - "Toggle display fill column indicator. + "Toggle display of fill-column indicator. This uses `display-fill-column-indicator' internally. -To change the position of the column displayed by default, -customize `display-fill-column-indicator-column' you can change the +To change the position of the column displayed by default +customize `display-fill-column-indicator-column'. You can change the character for the indicator setting `display-fill-column-indicator-character'." :lighter nil (if display-fill-column-indicator-mode diff --git a/lisp/faces.el b/lisp/faces.el index 121cf7ef1d2..b9332790642 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -2501,15 +2501,11 @@ unwanted effects." :group 'display-line-numbers) ;; Definition stolen from display-line-numbers. -(defface fill-column-face +(defface fill-column-indicator '((t :inherit (shadow default))) - "Face for displaying fill column indicator line. + "Face for displaying fill column indicator. This face is used when `display-fill-column-indicator-mode' is -non-nil. - -If you customize the font of this face, make sure it is a -monospaced font, otherwise the line's characters will not line -up horizontally." +non-nil." :version "27.1" :group 'basic-faces :group 'display-fill-column-indicator) |