summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2013-09-12 15:36:23 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2013-09-12 15:36:23 -0400
commit1f1e06e2728d2dc8656f4e96aea876ad13916bfa (patch)
treef5f8474294b1abb95b79a85590fdf91ba77a305a
parentd96ad42239cbf481c292e750aa8b6fd5a19ddb7e (diff)
downloademacs-1f1e06e2728d2dc8656f4e96aea876ad13916bfa.tar.gz
* lisp/abbrev.el (abbrev--check-chars): Fix thinko.
Fixes: debbugs:15329
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/abbrev.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eec861a1dcd..1ea13a9a0be 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-12 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * abbrev.el (abbrev--check-chars): Fix thinko (bug#15329).
+
2013-08-23 Glenn Morris <rgm@gnu.org>
* emacs-lisp/package.el (package-buffer-info): Fix message typo.
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index bd09653103f..1fe5c0c4786 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -615,9 +615,9 @@ An obsolete but still supported calling form is:
"Check if the characters in ABBREV have word syntax in either the
current (if global is nil) or standard syntax table."
(with-syntax-table
- (cond ((null global) (standard-syntax-table))
+ (cond ((null global) (syntax-table))
;; ((syntax-table-p global) global)
- (t (syntax-table)))
+ (t (standard-syntax-table)))
(when (string-match "\\W" abbrev)
(let ((badchars ())
(pos 0))