diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2014-04-25 18:11:07 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2014-04-25 18:11:07 +0200 |
| commit | dff4a9f6a4e9e42de6177e29faa7e3524b47e6d4 (patch) | |
| tree | 60924b65da522416f928b436f8525f5bc8bfc3d7 /lisp/emacs-lisp | |
| parent | 8de17fac97652d77bffd24e41b0097c863bd752b (diff) | |
| parent | 844465d6cac7c243e37e446067b1a2e06be293da (diff) | |
| download | emacs-dff4a9f6a4e9e42de6177e29faa7e3524b47e6d4.tar.gz emacs-dff4a9f6a4e9e42de6177e29faa7e3524b47e6d4.tar.bz2 emacs-dff4a9f6a4e9e42de6177e29faa7e3524b47e6d4.zip | |
Merge from emacs-24; up to 2014-04-25T10:35:01Z!michael.albinus@gmx.de
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl.el | 1 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el index fc09ff004e1..d99166e41c1 100644 --- a/lisp/emacs-lisp/cl.el +++ b/lisp/emacs-lisp/cl.el @@ -29,6 +29,7 @@ (require 'cl-lib) (require 'macroexp) +(require 'gv) ;; (defun cl--rename () ;; (let ((vdefs ()) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 30df19d5f63..7e00d0b2cf9 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -74,7 +74,7 @@ It has `lisp-mode-abbrev-table' as its parent." (modify-syntax-entry ?` "' " table) (modify-syntax-entry ?' "' " table) (modify-syntax-entry ?, "' " table) - (modify-syntax-entry ?@ "' " table) + (modify-syntax-entry ?@ "_ p" table) ;; Used to be singlequote; changed for flonums. (modify-syntax-entry ?. "_ " table) (modify-syntax-entry ?# "' " table) |