[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/fringe.el
From: |
Richard M . Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/fringe.el |
Date: |
Sun, 17 Oct 2004 03:09:12 -0400 |
Index: emacs/lisp/fringe.el
diff -c emacs/lisp/fringe.el:1.13 emacs/lisp/fringe.el:1.14
*** emacs/lisp/fringe.el:1.13 Fri Oct 15 23:38:17 2004
--- emacs/lisp/fringe.el Sun Oct 17 06:49:55 2004
***************
*** 113,118 ****
--- 113,137 ----
fringe-mode))))
(setq frames (cdr frames)))))
+ ;; For initialization of fringe-mode, take account of changes
+ ;; made explicitly to default-frame-alist.
+ (defun fringe-mode-initialize (symbol value)
+ (let* ((left-pair (assq 'left-fringe default-frame-alist))
+ (right-pair (assq 'right-fringe default-frame-alist))
+ (left (cdr left-pair))
+ (right (cdr right-pair)))
+ (if (or left-pair right-pair)
+ ;; If there's something in default-frame-alist for fringes,
+ ;; don't change it, but reflect that into the value of fringe-mode.
+ (progn
+ (setq fringe-mode (cons left right))
+ (if (equal fringe-mode '(nil . nil))
+ (setq fringe-mode nil))
+ (if (equal fringe-mode '(0 . 0))
+ (setq fringe-mode 0)))
+ ;; Otherwise impose the user-specified value of fringe-mode.
+ (custom-initialize-reset symbol value))))
+
;;;###autoload
(defcustom fringe-mode nil
"*Specify appearance of fringes on all frames.
***************
*** 139,144 ****
--- 158,164 ----
(integer :tag "Right width")))
:group 'frames
:require 'fringe
+ :initialize 'fringe-mode-initialize
:set 'set-fringe-mode-1)
(defun fringe-query-style (&optional all-frames)