diff options
| author | Glenn Morris <rgm@gnu.org> | 2016-12-12 15:20:39 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2016-12-12 15:20:39 -0500 |
| commit | 61f8c2386c29fe44d7ebf6fa816f140a2d918110 (patch) | |
| tree | 918424b26f637890f84b61585f9d31f62a53c504 /lisp | |
| parent | 940df47741c5e7be1c1c84d7371da492018f0d8a (diff) | |
| download | emacs-61f8c2386c29fe44d7ebf6fa816f140a2d918110.tar.gz emacs-61f8c2386c29fe44d7ebf6fa816f140a2d918110.tar.bz2 emacs-61f8c2386c29fe44d7ebf6fa816f140a2d918110.zip | |
Minor advice.el fix
* lisp/emacs-lisp/advice.el (ad-preactivate-advice):
Avoid setting the function definition of nil.
This was happening during bootstrap of org-compat.el,
apparently due to eager macro expansion of code behind
a (featurep 'xemacs) test.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/emacs-lisp/advice.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index c0da59c81cb..b621ac507da 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -2830,7 +2830,7 @@ advised definition from scratch." (ad-get-cache-id function)))) (ad-set-advice-info function old-advice-info) (advice-remove function advicefunname) - (fset advicefunname old-advice) + (if advicefunname (fset advicefunname old-advice)) (if old-advice (advice-add function :around advicefunname))))) |