From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 12 Sep 2013 19:36:23 +0000 (-0400)
Subject: * lisp/abbrev.el (abbrev--check-chars): Fix thinko.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1593^2~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1f1e06e2728d2dc8656f4e96aea876ad13916bfa;p=emacs.git

* lisp/abbrev.el (abbrev--check-chars): Fix thinko.

Fixes: debbugs:15329
---

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))