Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

1 files changed, 32 insertions, 0 deletions

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 744fe7f69ee..c28b8a147fc 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -584,6 +584,38 @@ 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")
              ;; xfaces.c
              (scalable-fonts-allowed display boolean "22.1")
              ;; xfns.c