(input-method-exit-on-first-char):

[gnu-emacs] / lisp / indent.el

diff --git a/lisp/indent.el b/lisp/indent.el
index 6639f4b2100a353ae7e5f1ea43a827d438c95abe..8d20fb2bba57db008eaa68fce13ba64550d2ae0f 100644 (file)
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -56,7 +56,8 @@
 
 (defun insert-tab (&optional prefix-arg)
   (let ((count (prefix-numeric-value prefix-arg)))
-    (if abbrev-mode
+    (if (and abbrev-mode
+            (eq (char-syntax (preceding-char)) ?w))
        (expand-abbrev))
     (if indent-tabs-mode
        (insert-char ?\t count)
@@ -338,7 +339,9 @@ An indent point is a non-whitespace character following whitespace.
 If the previous nonblank line has no indent points beyond the
 column point starts at, `tab-to-tab-stop' is done instead."
   (interactive "P")
-  (if abbrev-mode (expand-abbrev))
+  (if (and abbrev-mode
+          (eq (char-syntax (preceding-char)) ?w))
+      (expand-abbrev))
   (let ((start-column (current-column))
        indent)
     (save-excursion
@@ -365,7 +368,7 @@ column point starts at, `tab-to-tab-stop' is done instead."
 
 (defcustom tab-stop-list
   '(8 16 24 32 40 48 56 64 72 80 88 96 104 112 120)
-  "*List of tab stop positions used by `tab-to-tab-stops'.
+  "*List of tab stop positions used by `tab-to-tab-stop'.
 This should be a list of integers, ordered from smallest to largest."
   :group 'indent
   :type '(repeat integer))