*** empty log message ***

2 files changed, 36 insertions, 34 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cbedeed2af2..32f4d243fce 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,10 @@
-2006-02-21  Giorgos Keramidas  <keramida@ceid.upatras.gr>
+2006-02-21  Kim F. Storm  <storm@cua.dk>
+
+	* fringe.el: Cleanup as file is now pre-loaded.
+	(fringe-bitmaps): Initialize unconditionally.
+	(fringe-mode, set-fringe-style): Remove autoload cookies.
+
+2006-02-21  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
 
 	* fringe.el (fringe-bitmaps): Rename `horisontal-bar' to
 	`horizontal-bar'.
diff --git a/lisp/fringe.el b/lisp/fringe.el
index 06defd2ee0d..e3d7de10d22 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -1,4 +1,4 @@
-;;; fringe.el --- change fringes appearance in various ways
+;;; fringe.el --- fringe setup and control
 
 ;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
@@ -25,8 +25,9 @@
 
 ;;; Commentary:
 
-;; This file contains helpful functions for customizing the appearance
-;; of the fringe.
+;; This file contains code to initialize the built-in fringe bitmaps
+;; as well as helpful functions for customizing the appearance of the
+;; fringe.
 
 ;; The code is influenced by scroll-bar.el and avoid.el.  The author
 ;; gratefully acknowledge comments and suggestions made by Miles
@@ -40,33 +41,25 @@
   :version "22.1"
   :group 'frames)
 
-;; Standard fringe bitmaps
-
-(defmacro fringe-bitmap-p (symbol)
-  "Return non-nil if SYMBOL is a fringe bitmap."
-  `(get ,symbol 'fringe))
-
-(defvar fringe-bitmaps)
-
-(unless (or (not (boundp 'fringe-bitmaps))
-	    (get 'left-truncation 'fringe))
-  (let ((bitmaps '(question-mark
-		   left-arrow right-arrow up-arrow down-arrow
-		   left-curly-arrow right-curly-arrow
-		   left-triangle right-triangle
-		   top-left-angle top-right-angle
-		   bottom-left-angle bottom-right-angle
-		   left-bracket right-bracket
-		   filled-rectangle hollow-rectangle
-		   filled-square hollow-square
-		   vertical-bar horizontal-bar
-		   empty-line))
-	(bn 1))
-    (while bitmaps
-      (push (car bitmaps) fringe-bitmaps)
-      (put (car bitmaps) 'fringe bn)
-      (setq bitmaps (cdr bitmaps)
-	    bn (1+ bn)))))
+;; Define the built-in fringe bitmaps and setup default mappings
+
+(let ((bitmaps '(question-mark
+		 left-arrow right-arrow up-arrow down-arrow
+		 left-curly-arrow right-curly-arrow
+		 left-triangle right-triangle
+		 top-left-angle top-right-angle
+		 bottom-left-angle bottom-right-angle
+		 left-bracket right-bracket
+		 filled-rectangle hollow-rectangle
+		 filled-square hollow-square
+		 vertical-bar horizontal-bar
+		 empty-line))
+      (bn 1))
+  (while bitmaps
+    (push (car bitmaps) fringe-bitmaps)
+    (put (car bitmaps) 'fringe bn)
+    (setq bitmaps (cdr bitmaps)
+	  bn (1+ bn))))
 
 (setq-default fringe-indicator-alist
       '((truncation . (left-arrow right-arrow))
@@ -89,6 +82,12 @@
 	(hbar . horizontal-bar)
 	(hollow-small . hollow-square)))
 
+
+(defmacro fringe-bitmap-p (symbol)
+  "Return non-nil if SYMBOL is a fringe bitmap."
+  `(get ,symbol 'fringe))
+
+
 ;; Control presence of fringes
 
 (defvar fringe-mode)
@@ -158,7 +157,6 @@ See `fringe-mode' for possible values and their effect."
       ;; 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.
 This variable can be nil (the default) meaning the fringes should have
@@ -216,7 +214,6 @@ frame parameter is used."
 	       nil
 	     0)))))
 
-;;;###autoload
 (defun fringe-mode (&optional mode)
   "Set the default appearance of fringes on all frames.
 
@@ -242,7 +239,6 @@ frame only, see the command `set-fringe-style'."
   (interactive (list (fringe-query-style 'all-frames)))
   (set-fringe-mode mode))
 
-;;;###autoload
 (defun set-fringe-style (&optional mode)
   "Set the default appearance of fringes on the selected frame.