From: Glenn Morris <rgm@gnu.org>
Date: Mon, 12 Dec 2016 20:20:39 +0000 (-0500)
Subject: Minor advice.el fix
X-Git-Tag: emacs-26.0.90~1123
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=61f8c2386c29fe44d7ebf6fa816f140a2d918110;p=emacs.git

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.
---

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)))))