aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-11-20 12:54:00 -0500
committerStefan Monnier2012-11-20 12:54:00 -0500
commit3837d988dd8892064c86ee483c6f09b2bacd7604 (patch)
tree4b319e1a38bde5fe817bef8530614090577c3685
parentea6de9b1f867a49a1ad062ca54e461cd3b1e003f (diff)
downloademacs-3837d988dd8892064c86ee483c6f09b2bacd7604.tar.gz
emacs-3837d988dd8892064c86ee483c6f09b2bacd7604.zip
* lisp/emacs-lisp/byte-run.el (defun-declarations-alist): Fix last change.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/byte-run.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4be61545f7f..edb1a65266e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-11-20 Stefan Monnier <monnier@iro.umontreal.ca> 12012-11-20 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * emacs-lisp/byte-run.el (defun-declarations-alist): Fix last change.
4
3 * subr.el (called-interactively-p-functions): New var. 5 * subr.el (called-interactively-p-functions): New var.
4 (internal--called-interactively-p--get-frame): New macro. 6 (internal--called-interactively-p--get-frame): New macro.
5 (called-interactively-p, interactive-p): Rewrite in Lisp. 7 (called-interactively-p, interactive-p): Rewrite in Lisp.
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 06f404d615c..b4582a41d6c 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -88,7 +88,7 @@ The return value of this function is not used."
88 ,(if (eq (car-safe compiler-function) 'lambda) 88 ,(if (eq (car-safe compiler-function) 'lambda)
89 `(lambda ,(append (cadr compiler-function) args) 89 `(lambda ,(append (cadr compiler-function) args)
90 ,@(cddr compiler-function)) 90 ,@(cddr compiler-function))
91 #',compiler-function))))) 91 `#',compiler-function)))))
92 (list 'doc-string 92 (list 'doc-string
93 #'(lambda (f _args pos) 93 #'(lambda (f _args pos)
94 (list 'put (list 'quote f) ''doc-string-elt (list 'quote pos)))) 94 (list 'put (list 'quote f) ''doc-string-elt (list 'quote pos))))