(custom-variable-prompt): Doc change. Use custom-variable-p.

[gnu-emacs] / lisp / fringe.el

diff --git a/lisp/fringe.el b/lisp/fringe.el
index 5a4dce128c6332379bc5df3e322dc6c523dd4688..8ec6d142077c6bd36e6555a1a4b803e54506ec62 100644 (file)
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -51,7 +51,9 @@ See `fringe-mode' for possible values and their effect."
   ;; Apply it to default-frame-alist.
   (let ((parameter (assq 'left-fringe default-frame-alist)))
     (if (consp parameter)
-       (setcdr parameter fringe-mode)
+       (setcdr parameter (if (consp fringe-mode)
+                             (car fringe-mode)
+                           fringe-mode))
       (setq default-frame-alist
            (cons (cons 'left-fringe (if (consp fringe-mode)
                                         (car fringe-mode)
@@ -59,7 +61,9 @@ See `fringe-mode' for possible values and their effect."
                  default-frame-alist))))
   (let ((parameter (assq 'right-fringe default-frame-alist)))
     (if (consp parameter)
-       (setcdr parameter fringe-mode)
+       (setcdr parameter (if (consp fringe-mode)
+                             (cdr fringe-mode)
+                           fringe-mode))
       (setq default-frame-alist
            (cons (cons 'right-fringe (if (consp fringe-mode)
                                          (cdr fringe-mode)
@@ -97,6 +101,7 @@ you can use the interactive function `toggle-fringe'"
                 (const :tag "Only right" (0 . nil))
                 (const :tag "Only left" (nil . 0))
                 (const :tag "Half width" (5 . 5))
+                (const :tag "Minimal" (1 . 1))
                 (integer :tag "Specific width")
                 (cons :tag "Different left/right sizes"
                       (integer :tag "Left width")