X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/086add1519b5c5a69a1a35aadbfd4d7cc6a2b294..0f0b350b8863bb74455b4e07f4f3372657acd22d:/lisp/fringe.el

diff --git a/lisp/fringe.el b/lisp/fringe.el
index 71914bd95f..a32d6b5902 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -1,6 +1,6 @@
 ;;; fringe.el --- change fringes appearance in various ways
 
-;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Maintainer: FSF
@@ -150,7 +150,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))
@@ -174,7 +174,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))))
@@ -257,43 +260,6 @@ SIDE must be the symbol `left' or `right'."
 	       0)
            (float (frame-char-width))))
 
-;; Fake defvar.  Real definition using defcustom is below.  The fake
-;; defvar is necessary because `fringe-indicators' and
-;; `set-fringe-indicators-1' mutually use each other.
-(defvar fringe-indicators)
-
-(defun set-fringe-indicators-1 (ignore value)
-  "Set fringe indicators according to VALUE.
-This is usually invoked when setting `fringe-indicators' via customize."
-  (setq fringe-indicators value)
-  (setq default-indicate-empty-lines nil)
-  (setq default-indicate-buffer-boundaries
-	(cond
-	 ((memq value '(left right t))
-	  value)
-	 ((eq value 'box)
-	  '((top . left) (bottom . right)))
-	 ((eq value 'mixed)
-	  '((top . left) (t . right)))
-	 ((eq value 'empty)
-	  (setq default-indicate-empty-lines t)
-	  nil)
-	 (t nil))))
-
-;;;###autoload
-(defcustom fringe-indicators nil
-  "Visually indicate buffer boundaries and scrolling.
-Setting this variable, changes `default-indicate-buffer-boundaries'."
-  :type '(choice (const :tag "No indicators" nil)
-		 (const :tag "On left" left)
-		 (const :tag "On right" right)
-		 (const :tag "Opposite, no arrows" box)
-		 (const :tag "Opposite, arrows right" mixed)
-		 (const :tag "Empty lines" empty))
-  :group 'fringe
-  :require 'fringe
-  :set 'set-fringe-indicators-1)
-
 (provide 'fringe)
 
 ;;; arch-tag: 6611ef60-0869-47ed-8b93-587ee7d3ff5d