2 files changed, 26 insertions, 15 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c8b0cdd2942..911c39fd0df 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-27  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * fringe.el (fringe-indicators): Add fake defvar to avoid compiler
+        warning.  Delay real definition, which uses
+        `set-fringe-indicators-1' till after the definition of that
+        function.
+
 2004-11-28  Kim F. Storm  <storm@cua.dk>
 
         * fringe.el (fringe): New defgroup.
diff --git a/lisp/fringe.el b/lisp/fringe.el
index ce207cc8517..3f1e9393136 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 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Maintainer: FSF
@@ -257,20 +257,10 @@ SIDE must be the symbol `left' or `right'."
                0)
            (float (frame-char-width))))
 
-
-;;;###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)
+;; 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.
@@ -290,6 +280,20 @@ This is usually invoked when setting `fringe-indicators' via customize."
           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