APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1320843070 0
# Node ID cc8ea7ed4286d0eca21c76c96f9787025d2b8d86
# Parent 4218b56833b3762e4226b0321fca51f4f1422df8
Mention when compiled functions are built-in, help.el.
2011-11-09 Aidan Kehoe <kehoea(a)parhasard.net>
* help.el (describe-function-1):
When printing compiled functions, mention whether they're
built-in.
diff -r 4218b56833b3 -r cc8ea7ed4286 lisp/ChangeLog
--- a/lisp/ChangeLog Wed Nov 02 17:50:39 2011 +0000
+++ b/lisp/ChangeLog Wed Nov 09 12:51:10 2011 +0000
@@ -1,3 +1,9 @@
+2011-11-09 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * help.el (describe-function-1):
+ When printing compiled functions, mention whether they're
+ built-in.
+
2011-11-02 Aidan Kehoe <kehoea(a)parhasard.net>
* bytecomp.el (byte-compile-lambda):
diff -r 4218b56833b3 -r cc8ea7ed4286 lisp/help.el
--- a/lisp/help.el Wed Nov 02 17:50:39 2011 +0000
+++ b/lisp/help.el Wed Nov 09 12:51:10 2011 +0000
@@ -1395,33 +1395,37 @@
macrop t)
(setq fndef def))
(if aliases (princ aliases))
- (let ((int #'(lambda (string an-p macro-p)
- (princ (format
- (gettext (concat
- (cond ((commandp def)
- "an interactive ")
- (an-p "an ")
- (t "a "))
- "%s"
- (cond
- ((eq 'neither macro-p)
- "")
- (macro-p " macro")
- (t " function"))))
- string)))))
+ (labels
+ ((int (string an-p macro-p)
+ (princ (format
+ (gettext (concat
+ (cond ((commandp def)
+ "an interactive ")
+ (an-p "an ")
+ (t "a "))
+ "%s"
+ (cond
+ ((eq 'neither macro-p)
+ "")
+ (macro-p " macro")
+ (t " function"))))
+ string))))
+ (declare (inline int))
(cond ((or (stringp def) (vectorp def))
(princ "a keyboard macro.")
(setq kbd-macro-p t))
((special-operator-p fndef)
- (funcall int "built-in special operator" nil 'neither))
+ (int "built-in special operator" nil 'neither))
((subrp fndef)
- (funcall int "built-in" nil macrop))
+ (int "built-in" nil macrop))
((compiled-function-p fndef)
- (funcall int "compiled Lisp" nil macrop))
+ (int (concat (if (built-in-symbol-file function 'defun)
+ "built-in "
+ "") "compiled Lisp") nil macrop))
((eq (car-safe fndef) 'lambda)
- (funcall int "Lisp" nil macrop))
+ (int "Lisp" nil macrop))
((eq (car-safe def) 'autoload)
- (funcall int "autoloaded Lisp" t (elt def 4)))
+ (int "autoloaded Lisp" t (elt def 4)))
((and (symbolp def) (not (fboundp def)))
(princ "a symbol with a void (unbound) function definition."))
(t
--
‘Iodine deficiency was endemic in parts of the UK until, through what has been
described as “an unplanned and accidental public health triumph”, iodine was
added to cattle feed to improve milk production in the 1930s.’
(EN Pearce, Lancet, June 2011)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches