(which-func-mode, which-func-ff-hook)

(which-function-mode): Remove references to
which-func-mode-global.

2 files changed, 10 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 596f13aef76..1ff3b7dfd67 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2001-07-13  Gerd Moellmann  <gerd@gnu.org>
 
+        * which-func.el (which-func-mode, which-func-ff-hook)
+        (which-function-mode): Remove references to
+        which-func-mode-global.
+
         * calendar/cal-islam.el (calendar-goto-islamic-date): Add 
         autoload cookie.
 
diff --git a/lisp/which-func.el b/lisp/which-func.el
index 0d4dfd6b93d..1bcd0ea97c9 100644
--- a/lisp/which-func.el
+++ b/lisp/which-func.el
@@ -1,6 +1,6 @@
 ;;; which-func.el --- Print current function in mode line
 
-;; Copyright (C) 1994, 1997, 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1997, 1998, 2001 Free Software Foundation, Inc.
 
 ;; Author:   Alex Rezinsky <alexr@msil.sps.mot.com>
 ;;           (doesn't seem to be responsive any more)
@@ -127,7 +127,7 @@ and you want to simplify them for the mode line
 
 (defvar which-func-mode nil
   "Non-nil means display current function name in mode line.
-This makes a difference only if `which-func-mode-global' is non-nil")
+This makes a difference only if `which-function-mode' is non-nil")
 (make-variable-buffer-local 'which-func-mode)
 ;;(put 'which-func-mode 'permanent-local t)
 
@@ -137,8 +137,9 @@ This makes a difference only if `which-func-mode-global' is non-nil")
   "File find hook for Which Function mode.
 It creates the Imenu index for the buffer, if necessary."
   (setq which-func-mode
-        (and which-func-mode-global
-             (or (eq which-func-modes t) (member major-mode which-func-modes))))
+        (and which-function-mode
+             (or (eq which-func-modes t)
+                 (member major-mode which-func-modes))))
 
   (condition-case nil
       (if (and which-func-mode
@@ -177,7 +178,7 @@ continuously displayed in the mode line, in certain major modes.
 With prefix ARG, turn Which Function mode on iff arg is positive,
 and off otherwise."
   :global t :group 'which-func
-  (if which-func-mode-global
+  (if which-function-mode
       ;;Turn it on
       (progn
         (add-hook 'post-command-idle-hook 'which-func-update)