[Emacs-diffs] Changes to emacs/lisp/fringe.el,v

[Martin Rudalics]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Martin Rudalics <m061211>       08/01/10 18:44:27

Index: fringe.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/fringe.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- fringe.el   8 Jan 2008 20:44:58 -0000       1.31
+++ fringe.el   10 Jan 2008 18:44:27 -0000      1.32
@@ -93,6 +93,10 @@
 
 (defvar fringe-mode)
 
+(defvar fringe-mode-explicit nil
+  "Non-nil means `set-fringe-mode' should really do something.
+This is nil while loading `fringe.el', and t afterward.")
+
 (defun set-fringe-mode-1 (ignore value)
   "Call `set-fringe-mode' with VALUE.
 See `fringe-mode' for valid values and their effect.
@@ -104,13 +108,14 @@
 See `fringe-mode' for possible values and their effect."
   (setq fringe-mode value)
 
+  (when fringe-mode-explicit
   (modify-all-frames-parameters
    (list (cons 'left-fringe (if (consp fringe-mode)
                                (car fringe-mode)
                              fringe-mode))
         (cons 'right-fringe (if (consp fringe-mode)
                                 (cdr fringe-mode)
-                              fringe-mode)))))
+                                fringe-mode))))))
 
 ;; For initialization of fringe-mode, take account of changes
 ;; made explicitly to default-frame-alist.
@@ -159,6 +164,10 @@
   :initialize 'fringe-mode-initialize
   :set 'set-fringe-mode-1)
 
+;; We just set fringe-mode, but that was the default.
+;; If it is set again, that is for real.
+(setq fringe-mode-explicit t)
+
 (defun fringe-query-style (&optional all-frames)
   "Query user for fringe style.
 Returns values suitable for left-fringe and right-fringe frame parameters.