diff options
| author | Glenn Morris <rgm@gnu.org> | 2016-12-12 20:03:20 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2016-12-12 20:03:20 -0500 |
| commit | 8db7b65d66f01e90a05cc9f11c67667233d84ca0 (patch) | |
| tree | 88edb5d03bef9d3f2dcec6aff41830f2b8a9cd96 /lisp/emacs-lisp | |
| parent | 3e651e3c6b241eaeab70e63c267366e9678b6b52 (diff) | |
| download | emacs-8db7b65d66f01e90a05cc9f11c67667233d84ca0.tar.gz emacs-8db7b65d66f01e90a05cc9f11c67667233d84ca0.tar.bz2 emacs-8db7b65d66f01e90a05cc9f11c67667233d84ca0.zip | |
Minor fix for define-derived-mode
* lisp/emacs-lisp/derived.el (define-derived-mode):
Do not let eg eval-defun reset the values of syntax or abbrev tables,
since they might have been defined externally. (Bug#16160)
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/derived.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el index 0f7691af0f4..31170270f5c 100644 --- a/lisp/emacs-lisp/derived.el +++ b/lisp/emacs-lisp/derived.el @@ -217,16 +217,17 @@ No problems result if this variable is not bound. ,(if declare-syntax `(progn (unless (boundp ',syntax) - (put ',syntax 'definition-name ',child)) - (defvar ,syntax (make-syntax-table)) + (put ',syntax 'definition-name ',child) + (defvar ,syntax (make-syntax-table))) (unless (get ',syntax 'variable-documentation) (put ',syntax 'variable-documentation (purecopy ,(format "Syntax table for `%s'." child)))))) ,(if declare-abbrev `(progn - (put ',abbrev 'definition-name ',child) - (defvar ,abbrev - (progn (define-abbrev-table ',abbrev nil) ,abbrev)) + (unless (boundp ',abbrev) + (put ',abbrev 'definition-name ',child) + (defvar ,abbrev + (progn (define-abbrev-table ',abbrev nil) ,abbrev))) (unless (get ',abbrev 'variable-documentation) (put ',abbrev 'variable-documentation (purecopy ,(format "Abbrev table for `%s'." child)))))) |