Merge from emacs-24; up to 2012-05-07T21:26:08Z!rgm@gnu.org

[gnu-emacs] / lisp / follow.el

diff --git a/lisp/follow.el b/lisp/follow.el
index 0dea1917f859cf103de9863ca0bb978ecd7f42ad..a74862cb5d0dc88cf4a2d81de6b85b1703a73eda 100644 (file)
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -334,8 +334,8 @@ property `follow-mode-use-cache' to non-nil.")
 (defvar follow-active-menu nil
   "The menu visible when Follow mode is active.")
 
-(defvar follow-deactive-menu nil
-  "The menu visible when Follow mode is deactivated.")
+(defvar follow-inactive-menu nil
+  "The menu visible when Follow mode is inactive.")
 
 (defvar follow-inside-post-command-hook nil
   "Non-nil when inside Follow modes `post-command-hook'.