From: Glenn Morris <rgm@gnu.org>
Date: Sat, 12 Apr 2003 15:45:59 +0000 (+0000)
Subject: (f90-abbrev-start): Only offer help if abbrev-mode is active.
X-Git-Tag: ttn-vms-21-2-B4~10536
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be550ccc612bdfae9d976c1f0d81b41e0a5140d5;p=emacs.git

(f90-abbrev-start): Only offer help if abbrev-mode is active.
---

diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 05619ce1370..db26449b4c0 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1677,8 +1677,8 @@ Any other key combination is executed normally."
     (setq c (if (fboundp 'next-command-event) ; XEmacs
                 (event-to-character (next-command-event))
               (read-event)))
-    ;; Insert char if not equal to `?'.
-    (if (or (eq c ??) (eq c help-char))
+    ;; Insert char if not equal to `?', or if abbrev-mode is off.
+    (if (and abbrev-mode (or (eq c ??) (eq c help-char)))
 	(f90-abbrev-help)
       (setq unread-command-events (list c)))))