summaryrefslogtreecommitdiff
path: root/lisp/help-fns.el
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2022-07-23 01:37:59 +0200
committerStefan Kangas <stefan@marxist.se>2022-07-23 01:37:59 +0200
commitdf508ffd2bedf901996d8899c63183aaf327f887 (patch)
tree0d1ebe7b35b43957f5de6ffa95c5b0794df69dc5 /lisp/help-fns.el
parentf268cdc185b5e98456434da0cfda963b614227fd (diff)
parentae1ace1cf4a8b0624f72a8f76e702d78b643ea32 (diff)
downloademacs-df508ffd2bedf901996d8899c63183aaf327f887.tar.gz
Merge from origin/emacs-28
ae1ace1cf4 Adjust help-fns.el tests for recent change 04bdcf4aaa * src/terminal.c (Fframe_terminal): Use active voice 7fa491a9e9 Improve 'terminal-live-p' docstring some more b9ac8c29ae Improve terminal-live-p docstring 0b4c81a152 * lisp/net/tramp-gvfs.el (tramp-gvfs-dbus-event-vector): F... 8f8373170f * lisp/progmodes/cperl-mode.el: Don't mention obsolete arc... 25bc330a6d Make 'describe-function' say "byte-compiled" when appropriate 2b31e667be ;Improve documentation of locale-specific string comparison
Diffstat (limited to 'lisp/help-fns.el')
-rw-r--r--lisp/help-fns.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index dc64a09f3d8..efee44f7b30 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -1030,7 +1030,7 @@ Returns a list of the form (REAL-FUNCTION DEF ALIASED REAL-DEF)."
(aliased
(format-message "an alias for `%s'" real-def))
((subr-native-elisp-p def)
- (concat beg "native compiled Lisp function"))
+ (concat beg "native-compiled Lisp function"))
((subrp def)
(concat beg (if (eq 'unevalled (cdr (subr-arity def)))
"special form"
@@ -1049,7 +1049,7 @@ Returns a list of the form (REAL-FUNCTION DEF ALIASED REAL-DEF)."
(macrop function))
(concat beg "Lisp macro"))
((byte-code-function-p def)
- (concat beg "compiled Lisp function"))
+ (concat beg "byte-compiled Lisp function"))
((module-function-p def)
(concat beg "module function"))
((eq (car-safe def) 'lambda)