[Emacs-diffs] master df9bec3: Adjust defcustom form for 'auto-hscroll-mode'

[Eli Zaretskii]

branch: master
commit df9bec3b39b12b33db8f5a97d86797f6636e5e7d
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Adjust defcustom form for 'auto-hscroll-mode'
    
    * lisp/cus-start.el (standard) <auto-hscroll-mode>: Adjust the
    defcustom form.  Suggested by Stephen Berman <address@hidden>.
---
 lisp/cus-start.el | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 117b23d..e11f749 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -556,7 +556,15 @@ since it could result in memory overflow and make Emacs 
crash."
                      (const :tag "Text-image-horiz" :value text-image-horiz)
                      (const :tag "System default" :value nil)) "24.1")
              (tool-bar-max-label-size frames integer "24.1")
-            (auto-hscroll-mode scrolling boolean "21.1")
+            (auto-hscroll-mode scrolling
+                                (choice
+                                 (const :tag "Don't scroll automatically"
+                                        :value nil)
+                                 (const :tag "Scroll the entire window"
+                                        :value t)
+                                 (const :tag "Scroll only the current line"
+                                        :value 'current-line))
+                                "26.1")
             (void-text-area-pointer cursor
                                     (choice
                                      (const :tag "Standard (text pointer)" 
:value nil)