(set-fringe-mode): Work when updating

`default-frame-alist'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 57b7b2290489f07fb8f4e77b84b53bb56de0d8f4..1d3bf6d479e22e6718f0fd22194486097309a65f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-26  Simon Josefsson  <jas@extundo.com>
+
+       * fringe.el (set-fringe-mode): Work when updating
+       `default-frame-alist'.
+
 2002-05-26  Kim F. Storm  <storm@cua.dk>
 
        * emulation/cua-base.el (cua--repeat-replace-text): New variable.

diff --git a/lisp/fringe.el b/lisp/fringe.el
index c7be27b061f845c0dd0969d000e59358354ff52c..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)