[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117014: 2014-04-22 Daniel Colascione <address@hidde
From: |
Daniel Colascione |
Subject: |
[Emacs-diffs] trunk r117014: 2014-04-22 Daniel Colascione <address@hidden> |
Date: |
Tue, 22 Apr 2014 21:46:49 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117014
revision-id: address@hidden
parent: address@hidden
committer: Daniel Colascione <address@hidden>
branch nick: trunk
timestamp: Tue 2014-04-22 14:46:19 -0700
message:
2014-04-22 Daniel Colascione <address@hidden>
* emacs-lisp/byte-run.el (function-put): Unbreak build: don't
use defun to define `function-put'.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/emacs-lisp/byte-run.el byterun.el-20091113204419-o5vbwnq5f7feedwu-2586
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-04-22 21:32:51 +0000
+++ b/lisp/ChangeLog 2014-04-22 21:46:19 +0000
@@ -35,6 +35,11 @@
* net/tramp-sh.el (tramp-get-ls-command): Use "-b" argument if
possible.
+2014-04-22 Daniel Colascione <address@hidden>
+
+ * emacs-lisp/byte-run.el (function-put): Unbreak build: don't
+ use defun to define `function-put'.
+
2014-04-22 Stefan Monnier <address@hidden>
* emacs-lisp/lisp-mode.el (lisp--match-hidden-arg): New function.
=== modified file 'lisp/emacs-lisp/byte-run.el'
--- a/lisp/emacs-lisp/byte-run.el 2014-04-22 16:22:13 +0000
+++ b/lisp/emacs-lisp/byte-run.el 2014-04-22 21:46:19 +0000
@@ -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 @@
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 @@
(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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117014: 2014-04-22 Daniel Colascione <address@hidden>,
Daniel Colascione <=