diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2017-08-30 19:31:48 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2017-09-25 19:39:19 -0400 |
| commit | a58d0c590a777be98e58cd8c92ee1381e07e9b2d (patch) | |
| tree | a4044cc9b64cd8932cd6afaa1ef7efc7aca900ed /lisp/emacs-lisp | |
| parent | 3a68dec32730eddfc066b3b9528f4bc63b5fa9f6 (diff) | |
| download | emacs-a58d0c590a777be98e58cd8c92ee1381e07e9b2d.tar.gz emacs-a58d0c590a777be98e58cd8c92ee1381e07e9b2d.tar.bz2 emacs-a58d0c590a777be98e58cd8c92ee1381e07e9b2d.zip | |
Fix loading of smie-config rules (Bug#24848)
* lisp/emacs-lisp/smie.el (smie-config--setter): Use `set-default'
instead of `setq-default'.
(smie-config): Use `custom-initialize-set' instead of
`custom-initialize-default' as the :initialize argument.
* lisp/progmodes/sh-script.el (sh-learn-buffer-indent): Mention that
we call `smie-config-guess' so that the user will have a chance to
find the correct docstring to consult. Remove hedging comments
regarding use of abnormal hooks.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/smie.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 87c4782e217..da1e12b1408 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -1956,7 +1956,7 @@ E.g. provided via a file-local call to `smie-config-local'.") (defvar smie-config--modefuns nil) (defun smie-config--setter (var value) - (setq-default var value) + (set-default var value) (let ((old-modefuns smie-config--modefuns)) (setq smie-config--modefuns nil) (pcase-dolist (`(,mode . ,rules) value) @@ -1982,7 +1982,7 @@ value with which to replace it." ;; FIXME improve value-type. :type '(choice (const nil) (alist :key-type symbol)) - :initialize 'custom-initialize-default + :initialize 'custom-initialize-set :set #'smie-config--setter) (defun smie-config-local (rules) |