diff options
| author | Stefan Kangas | 2022-07-23 01:37:59 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2022-07-23 01:37:59 +0200 |
| commit | df508ffd2bedf901996d8899c63183aaf327f887 (patch) | |
| tree | 0d1ebe7b35b43957f5de6ffa95c5b0794df69dc5 /test | |
| parent | f268cdc185b5e98456434da0cfda963b614227fd (diff) | |
| parent | ae1ace1cf4a8b0624f72a8f76e702d78b643ea32 (diff) | |
| download | emacs-df508ffd2bedf901996d8899c63183aaf327f887.tar.gz emacs-df508ffd2bedf901996d8899c63183aaf327f887.zip | |
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 'test')
| -rw-r--r-- | test/lisp/help-fns-tests.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/lisp/help-fns-tests.el b/test/lisp/help-fns-tests.el index e3fed60b4cb..7ff7aa1ccd7 100644 --- a/test/lisp/help-fns-tests.el +++ b/test/lisp/help-fns-tests.el | |||
| @@ -64,13 +64,13 @@ Return first line of the output of (describe-function-1 FUNC)." | |||
| 64 | 64 | ||
| 65 | (ert-deftest help-fns-test-lisp-defun () | 65 | (ert-deftest help-fns-test-lisp-defun () |
| 66 | (let ((regexp (if (featurep 'native-compile) | 66 | (let ((regexp (if (featurep 'native-compile) |
| 67 | "a native compiled Lisp function in .+subr\\.el" | 67 | "a native-compiled Lisp function in .+subr\\.el" |
| 68 | "a compiled Lisp function in .+subr\\.el")) | 68 | "a byte-compiled Lisp function in .+subr\\.el")) |
| 69 | (result (help-fns-tests--describe-function 'last))) | 69 | (result (help-fns-tests--describe-function 'last))) |
| 70 | (should (string-match regexp result)))) | 70 | (should (string-match regexp result)))) |
| 71 | 71 | ||
| 72 | (ert-deftest help-fns-test-lisp-defsubst () | 72 | (ert-deftest help-fns-test-lisp-defsubst () |
| 73 | (let ((regexp "a compiled Lisp function in .+subr\\.el") | 73 | (let ((regexp "a byte-compiled Lisp function in .+subr\\.el") |
| 74 | (result (help-fns-tests--describe-function 'posn-window))) | 74 | (result (help-fns-tests--describe-function 'posn-window))) |
| 75 | (should (string-match regexp result)))) | 75 | (should (string-match regexp result)))) |
| 76 | 76 | ||