(tab-to-tab-stop): Expand abbrevs only after a word-char.

1 files changed, 2 insertions, 1 deletions

diff --git a/lisp/indent.el b/lisp/indent.el
index 9aaaf299423..dd2f95771bf 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -419,7 +419,8 @@ You can add or remove colons and then do \\<edit-tab-stops-map>\\[edit-tab-stops
 The variable `tab-stop-list' is a list of columns at which there are tab stops.
 Use \\[edit-tab-stops] to edit them interactively."
   (interactive)
-  (if abbrev-mode (expand-abbrev))
+  (and abbrev-mode (= (char-syntax (preceding-char)) ?w)
+       (expand-abbrev))
   (let ((tabs tab-stop-list))
     (while (and tabs (>= (current-column) (car tabs)))
       (setq tabs (cdr tabs)))