Merge from emacs-24; up to 2013-01-03T02:31:36Z!rgm@gnu.org

[gnu-emacs] / lisp / abbrev.el

diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index d7d4482693dbfbfb1aa9da3262ecb96f6bf792ca..458d8741ac84748bf2e9eeade65d35f86a6def54 100644 (file)
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -607,9 +607,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))