aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2013-09-12 15:36:23 -0400
committerStefan Monnier2013-09-12 15:36:23 -0400
commit1f1e06e2728d2dc8656f4e96aea876ad13916bfa (patch)
treef5f8474294b1abb95b79a85590fdf91ba77a305a
parentd96ad42239cbf481c292e750aa8b6fd5a19ddb7e (diff)
downloademacs-1f1e06e2728d2dc8656f4e96aea876ad13916bfa.tar.gz
emacs-1f1e06e2728d2dc8656f4e96aea876ad13916bfa.zip
* 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 @@
12013-09-12 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * abbrev.el (abbrev--check-chars): Fix thinko (bug#15329).
4
12013-08-23 Glenn Morris <rgm@gnu.org> 52013-08-23 Glenn Morris <rgm@gnu.org>
2 6
3 * emacs-lisp/package.el (package-buffer-info): Fix message typo. 7 * 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:
615 "Check if the characters in ABBREV have word syntax in either the 615 "Check if the characters in ABBREV have word syntax in either the
616current (if global is nil) or standard syntax table." 616current (if global is nil) or standard syntax table."
617 (with-syntax-table 617 (with-syntax-table
618 (cond ((null global) (standard-syntax-table)) 618 (cond ((null global) (syntax-table))
619 ;; ((syntax-table-p global) global) 619 ;; ((syntax-table-p global) global)
620 (t (syntax-table))) 620 (t (standard-syntax-table)))
621 (when (string-match "\\W" abbrev) 621 (when (string-match "\\W" abbrev)
622 (let ((badchars ()) 622 (let ((badchars ())
623 (pos 0)) 623 (pos 0))