diff options
author | Eli Zaretskii <eliz@gnu.org> | 2017-09-29 10:02:33 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2017-09-29 10:02:33 +0300 |
commit | c1ac8c170f17a98b7e5d6e098f707daeb71ea27d (patch) | |
tree | dffdc5f4a509ec200b69c09f52b979f42d31e10b /lisp/emacs-lisp/smie.el | |
parent | 18073beb14f393b4bbcc92890a89dcfcb75fb7ac (diff) | |
parent | af130f900fc499f71ea22f10ba055a75ce35ed4e (diff) | |
download | emacs-c1ac8c170f17a98b7e5d6e098f707daeb71ea27d.tar.gz emacs-c1ac8c170f17a98b7e5d6e098f707daeb71ea27d.tar.bz2 emacs-c1ac8c170f17a98b7e5d6e098f707daeb71ea27d.zip |
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
Diffstat (limited to 'lisp/emacs-lisp/smie.el')
-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) |