aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Richard2014-11-20 12:09:30 +0100
committerNicolas Richard2014-11-25 13:18:40 +0100
commit8be099a2c10ce4718e6630cef6b6ca1983617264 (patch)
tree1464d01bd74abbd37c0ca1919c8e703922b7878b
parent10f2f8aafa5de5821718cc4a7fc8ed87dfdf895a (diff)
downloademacs-8be099a2c10ce4718e6630cef6b6ca1983617264.tar.gz
emacs-8be099a2c10ce4718e6630cef6b6ca1983617264.zip
byte-run.el (function-put): Match argument names to docstring (bug#19118).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/byte-run.el7
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 12f81b76693..d4f1dbd2177 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-11-20 Nicolas Richard <theonewiththeevillook@yahoo.fr>
2
3 * emacs-lisp/byte-run.el (function-put): Match argument names to
4 docstring.
5
12014-11-24 Sam Steingold <sds@gnu.org> 62014-11-24 Sam Steingold <sds@gnu.org>
2 7
3 * vc/vc-hooks.el (vc-directory-exclusion-list): 8 * vc/vc-hooks.el (vc-directory-exclusion-list):
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 1f8b04ec8f0..8bf63ea572e 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -34,10 +34,11 @@
34 ;; We don't want people to just use `put' because we can't conveniently 34 ;; We don't want people to just use `put' because we can't conveniently
35 ;; hook into `put' to remap old properties to new ones. But for now, there's 35 ;; hook into `put' to remap old properties to new ones. But for now, there's
36 ;; no such remapping, so we just call `put'. 36 ;; no such remapping, so we just call `put'.
37 #'(lambda (f prop value) (put f prop value)) 37 #'(lambda (function prop value)
38 "Set function F's property PROP to VALUE. 38 "Set FUNCTION's property PROP to VALUE.
39The namespace for PROP is shared with symbols. 39The namespace for PROP is shared with symbols.
40So far, F can only be a symbol, not a lambda expression.") 40So far, FUNCTION can only be a symbol, not a lambda expression."
41 (put function prop value)))
41(function-put 'defmacro 'doc-string-elt 3) 42(function-put 'defmacro 'doc-string-elt 3)
42(function-put 'defmacro 'lisp-indent-function 2) 43(function-put 'defmacro 'lisp-indent-function 2)
43 44