(Version, mh-version): Update for release 7.95.

[gnu-emacs] / lisp / fringe.el

diff --git a/lisp/fringe.el b/lisp/fringe.el
index f9ddd87931f014d859e6517ba741defe280a9e6c..317fff0973c1b33197330a5c06d3cfbf24b04b18 100644 (file)
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -1,6 +1,6 @@
-;;; fringe.el --- change fringes appearance in various ways
+;;; fringe.el --- fringe setup and control
 
-;; Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Maintainer: FSF
@@ -20,13 +20,14 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; 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
@@ -35,32 +36,57 @@
 
 ;;; Code:
 
-;; Standard fringe bitmaps
+(defgroup fringe nil
+  "Window fringes."
+  :version "22.1"
+  :group 'frames)
 
-(defmacro fringe-bitmap-p (symbol)
-  "Return non-nil if SYMBOL is a fringe bitmap."
-  `(get ,symbol 'fringe))
+;; Define the built-in fringe bitmaps and setup default mappings
 
-(defvar fringe-bitmaps)
-
-(unless (or (not (boundp 'fringe-bitmaps))
-           (get 'left-truncation 'fringe))
-  (let ((bitmaps '(left-truncation right-truncation
-                  up-arrow down-arrow
-                  continued-line continuation-line
-                  overlay-arrow
+(when (boundp 'fringe-bitmaps)
+  (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-box-cursor hollow-box-cursor hollow-square
-                  bar-cursor hbar-cursor
+                  filled-rectangle hollow-rectangle
+                  filled-square hollow-square
+                  vertical-bar horizontal-bar
                   empty-line))
-       (bn 2))
+       (bn 1))
     (while bitmaps
       (push (car bitmaps) fringe-bitmaps)
       (put (car bitmaps) 'fringe bn)
       (setq bitmaps (cdr bitmaps)
-           bn (1+ bn)))))
+           bn (1+ bn))))
+
+  (setq-default fringe-indicator-alist
+               '((truncation . (left-arrow right-arrow))
+                 (continuation . (left-curly-arrow right-curly-arrow))
+                 (overlay-arrow . right-triangle)
+                 (up . up-arrow)
+                 (down . down-arrow)
+                 (top . (top-left-angle top-right-angle))
+                 (bottom . (bottom-left-angle bottom-right-angle
+                            top-right-angle top-left-angle))
+                 (top-bottom . (left-bracket right-bracket
+                                top-right-angle top-left-angle))
+                 (empty-line . empty-line)
+                 (unknown . question-mark)))
+
+  (setq-default fringe-cursor-alist
+               '((box . filled-rectangle)
+                 (hollow . hollow-rectangle)
+                 (bar . vertical-bar)
+                 (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
@@ -132,7 +158,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
@@ -145,7 +170,7 @@ To set this variable in a Lisp program, use `set-fringe-mode' to make
 it take real effect.
 Setting the variable with a customization buffer also takes effect.
 If you only want to modify the appearance of the fringe in one frame,
-you can use the interactive function `toggle-fringe'"
+you can use the interactive function `set-fringe-style'."
   :type '(choice (const :tag "Default width" nil)
                 (const :tag "No fringes" 0)
                 (const :tag "Only right" (0 . nil))
@@ -156,7 +181,7 @@ you can use the interactive function `toggle-fringe'"
                 (cons :tag "Different left/right sizes"
                       (integer :tag "Left width")
                       (integer :tag "Right width")))
-  :group 'frames
+  :group 'fringe
   :require 'fringe
   :initialize 'fringe-mode-initialize
   :set 'set-fringe-mode-1)
@@ -169,7 +194,10 @@ If ALL-FRAMES, the negation of the fringe values in
 Otherwise the negation of the fringe value in the currently selected
 frame parameter is used."
   (let ((mode (intern (completing-read
-                      "Select fringe mode for all frames (type ? for list): "
+                      (concat
+                       "Select fringe mode for "
+                       (if all-frames "all frames" "selected frame")
+                       " (type ? for list): ")
                       '(("none") ("default") ("left-only")
                         ("right-only") ("half") ("minimal"))
                       nil t))))
@@ -187,7 +215,6 @@ frame parameter is used."
               nil
             0)))))
 
-;;;###autoload
 (defun fringe-mode (&optional mode)
   "Set the default appearance of fringes on all frames.
 
@@ -213,7 +240,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.