[Emacs-diffs] trunk r117145: Unbreak the build

[Daniel Colascione]

------------------------------------------------------------
revno: 117145
revision-id: address@hidden
parent: address@hidden
committer: Daniel Colascione <address@hidden>
branch nick: debug
timestamp: Sat 2014-05-24 12:51:52 -0700
message:
  Unbreak the build
  
  * lisp/emacs-lisp/nadvice.el (defun): Write in eval-and-compile to avoid
  breaking the build.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/nadvice.el     nadvice.el-20121015213644-851fdxs2vximj8nr-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-24 15:14:47 +0000
+++ b/lisp/ChangeLog    2014-05-24 19:51:52 +0000
@@ -1,3 +1,8 @@
+2014-05-24  Daniel Colascione  <address@hidden>
+
+       * emacs-lisp/nadvice.el (defun): Write in eval-and-compile to avoid
+       breaking the build.
+
 2014-05-24  Leo Liu  <address@hidden>
 
        * calc/calc.el (math-bignum): Handle most-negative-fixnum.  (Bug#17556)

=== modified file 'lisp/emacs-lisp/nadvice.el'
--- a/lisp/emacs-lisp/nadvice.el        2014-05-12 05:25:34 +0000
+++ b/lisp/emacs-lisp/nadvice.el        2014-05-24 19:51:52 +0000
@@ -232,11 +232,12 @@
           ;; 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)