diff options
| author | Rasmus <rasmus@gmx.us> | 2017-09-29 10:41:51 +0200 |
|---|---|---|
| committer | Rasmus <rasmus@gmx.us> | 2017-09-29 10:41:51 +0200 |
| commit | d4b2bbdc73ace5cb0971a32a75941486489d1cc5 (patch) | |
| tree | dc92eb83d4a66f112e3688ad10632e14ca6601ff /lisp/emacs-lisp/smie.el | |
| parent | eaefbc26d5c6cffbe4a22d3a9f4c7e6209a7b5a7 (diff) | |
| parent | af130f900fc499f71ea22f10ba055a75ce35ed4e (diff) | |
| download | emacs-d4b2bbdc73ace5cb0971a32a75941486489d1cc5.tar.gz emacs-d4b2bbdc73ace5cb0971a32a75941486489d1cc5.tar.bz2 emacs-d4b2bbdc73ace5cb0971a32a75941486489d1cc5.zip | |
Merge branch 'emacs-26' into scratch/org-mode-merge
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) |