From: Daniel Colascione <dancol@dancol.org>
Date: Tue, 22 Apr 2014 21:46:19 +0000 (-0700)
Subject: 2014-04-22  Daniel Colascione  <dancol@dancol.org>
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/1b0f10d2df1c58921644fe286dfb7a159fa56904

2014-04-22  Daniel Colascione  <dancol@dancol.org>

	* emacs-lisp/byte-run.el (function-put): Unbreak build: don't
	use defun to define `function-put'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 623d81f471..3caac76cb8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -35,6 +35,11 @@
 	* net/tramp-sh.el (tramp-get-ls-command): Use "-b" argument if
 	possible.
 
+2014-04-22  Daniel Colascione  <dancol@dancol.org>
+
+	* emacs-lisp/byte-run.el (function-put): Unbreak build: don't
+	use defun to define `function-put'.
+
 2014-04-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/lisp-mode.el (lisp--match-hidden-arg): New function.
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index e5f8feb888..0edcf6197b 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -30,6 +30,17 @@
 
 ;;; Code:
 
+(defalias 'function-put
+  ;; We don't want people to just use `put' because we can't conveniently
+  ;; hook into `put' to remap old properties to new ones.  But for now, there's
+  ;; no such remapping, so we just call `put'.
+  #'(lambda (f prop value) (put f prop value))
+  "Set function F's property PROP to VALUE.
+The namespace for PROP is shared with symbols.
+So far, F can only be a symbol, not a lambda expression.")
+(function-put 'defmacro 'doc-string-elt 3)
+(function-put 'defmacro 'lisp-indent-function 2)
+
 ;; `macro-declaration-function' are both obsolete (as marked at the end of this
 ;; file) but used in many .elc files.
 
@@ -140,17 +151,6 @@ and should return the code to use to set this property.
 
 This is used by `declare'.")
 
-(defun function-put (f prop value)
-  "Set function F's property PROP to VALUE.
-The namespace for PROP is shared with symbols.
-So far, F can only be a symbol, not a lambda expression."
-  ;; We don't want people to just use `put' because we can't conveniently
-  ;; hook into `put' to remap old properties to new ones.  But for now, there's
-  ;; no such remapping, so we just call `put'.
-  (put f prop value))
-
-(function-put 'defmacro 'doc-string-elt 3)
-(function-put 'defmacro 'lisp-indent-function 2)
 (defalias 'defmacro
   (cons
    'macro
@@ -250,7 +250,8 @@ The return value is undefined.
                                  (cons arglist body))))))
       (if declarations
           (cons 'prog1 (cons def declarations))
-        def))))
+          def))))
+
 
 ;; Redefined in byte-optimize.el.
 ;; This is not documented--it's not clear that we should promote it.