TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

core: fix potential undefined function error with transient hooks

Browse source 
Fixes #10930
This commit is contained in:
syl20bnr 2018-07-04 15:38:15 -04:00
parent ba2f692366
commit a861177c4a
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/core-hooks.el
View file

@ -53,8 +53,11 @@ If FUNC is a lambda you must give it a name with FNAME. "
,(if (functionp hook) ,(if (functionp hook)
`(advice-remove ',hook ',hfunc) `(advice-remove ',hook ',hfunc)
`(remove-hook ',hook ',hfunc)) `(remove-hook ',hook ',hfunc))
(fmakunbound ',hfunc) ;; instead of unbinding we reset the
,(when fname `(fmakunbound ',fname))))) ;; functions to be the `ignore' function.
;; see: https://github.com/syl20bnr/spacemacs/issues/10930
(fset ',hfunc 'ignore)
,(when fname `(fset ',fname 'ignore)))))
(if (functionp hook) (if (functionp hook)
`((advice-add ',hook :before ',hfunc)) `((advice-add ',hook :before ',hfunc))
`((add-hook ',hook ',hfunc))))) `((add-hook ',hook ',hfunc)))))