From: Daniel Colascione <dancol@dancol.org>
Date: Sat, 24 May 2014 19:51:52 +0000 (-0700)
Subject: Unbreak the build
X-Git-Tag: emacs-25.0.90~2640^2~63
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8bb17f6471522c30630d0571a8b31d09554a17c2;p=emacs.git

Unbreak the build

* lisp/emacs-lisp/nadvice.el (defun): Write in eval-and-compile to avoid
breaking the build.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b786027f76d..a14af45cc74 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-24  Daniel Colascione  <dancol@dancol.org>
+
+	* emacs-lisp/nadvice.el (defun): Write in eval-and-compile to avoid
+	breaking the build.
+
 2014-05-24  Leo Liu  <sdl.web@gmail.com>
 
 	* calc/calc.el (math-bignum): Handle most-negative-fixnum.  (Bug#17556)
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 01027c43148..66a4f8fdea7 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -232,11 +232,12 @@ different, but `function-equal' will hopefully ignore those differences.")
           ;; This function acts like the t special value in buffer-local hooks.
           (lambda (&rest args) (apply (default-value var) args)))))
 
-(defun advice--normalize-place (place)
-  (cond ((eq 'local (car-safe place)) `(advice--buffer-local ,@(cdr place)))
-        ((eq 'var (car-safe place))   (nth 1 place))
-        ((symbolp place)              `(default-value ',place))
-        (t place)))
+(eval-and-compile
+  (defun advice--normalize-place (place)
+    (cond ((eq 'local (car-safe place)) `(advice--buffer-local ,@(cdr place)))
+          ((eq 'var (car-safe place))   (nth 1 place))
+          ((symbolp place)              `(default-value ',place))
+          (t place))))
 
 ;;;###autoload
 (defmacro add-function (where place function &optional props)