diff options
| author | F. Jason Park | 2024-08-19 22:40:25 -0700 |
|---|---|---|
| committer | F. Jason Park | 2024-09-29 16:13:01 -0700 |
| commit | 8f326e0ba23f88ee5ef25fb89f6c7cedbdbda89e (patch) | |
| tree | 0778e67c3a5427c5e8b08fd39114d932c0ee9403 /test | |
| parent | dd4c67907eb3084c6f55828c51bca1675a98376d (diff) | |
| download | emacs-8f326e0ba23f88ee5ef25fb89f6c7cedbdbda89e.tar.gz emacs-8f326e0ba23f88ee5ef25fb89f6c7cedbdbda89e.zip | |
; Rename internal variable in erc-fill
* lisp/erc/erc-fill.el (erc--fill-wrap-scrolltobottom-exempt-p):
Rename to `erc-fill--wrap-scrolltobottom-exempt-p' so prefix matches
library and feature.
(erc-fill--wrap-ensure-dependencies): Update variable name.
* lisp/erc/erc-truncate.el (erc-max-buffer-size): Don't mention
`erc-insert-post-hook' in doc string because truncation now happens
elsewhere.
(erc-truncate-buffer-to-size): Update obsolete comment that describes
pre-5.5/Emacs 29 behavior.
* test/lisp/erc/erc-fill-tests.el (erc-fill-tests--wrap-populate):
Update variable name.
* test/lisp/erc/resources/erc-d/erc-d-tests.el
(erc-d-u--canned-load-dialog--basic)
(erc-d-u--canned-load-dialog--intermingled)
(erc-d-u--rewrite-for-slow-mo): Timeouts.
* test/lisp/erc/resources/erc-d/resources/basic.eld: Timeouts.
* test/lisp/erc/resources/erc-scenarios-common.el
(erc-scenarios-common--make-bindings): Use updated variable name.
(Bug#72736)
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/erc/erc-fill-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/erc/resources/erc-d/erc-d-tests.el | 8 | ||||
| -rw-r--r-- | test/lisp/erc/resources/erc-d/resources/basic.eld | 2 | ||||
| -rw-r--r-- | test/lisp/erc/resources/erc-scenarios-common.el | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/test/lisp/erc/erc-fill-tests.el b/test/lisp/erc/erc-fill-tests.el index f8bfc362085..b52a996f184 100644 --- a/test/lisp/erc/erc-fill-tests.el +++ b/test/lisp/erc/erc-fill-tests.el | |||
| @@ -52,7 +52,7 @@ | |||
| 52 | 52 | ||
| 53 | (defun erc-fill-tests--wrap-populate (test) | 53 | (defun erc-fill-tests--wrap-populate (test) |
| 54 | (let ((original-window-buffer (window-buffer (selected-window))) | 54 | (let ((original-window-buffer (window-buffer (selected-window))) |
| 55 | (erc--fill-wrap-scrolltobottom-exempt-p t) | 55 | (erc-fill--wrap-scrolltobottom-exempt-p t) |
| 56 | (erc-stamp--tz t) | 56 | (erc-stamp--tz t) |
| 57 | (erc-fill-function 'erc-fill-wrap) | 57 | (erc-fill-function 'erc-fill-wrap) |
| 58 | (pre-command-hook pre-command-hook) | 58 | (pre-command-hook pre-command-hook) |
diff --git a/test/lisp/erc/resources/erc-d/erc-d-tests.el b/test/lisp/erc/resources/erc-d/erc-d-tests.el index dd0d5f8cb87..63d304907ea 100644 --- a/test/lisp/erc/resources/erc-d/erc-d-tests.el +++ b/test/lisp/erc/resources/erc-d/erc-d-tests.el | |||
| @@ -50,7 +50,7 @@ | |||
| 50 | '(0 ":irc.example.org 422 tester :MOTD File is missing")))) | 50 | '(0 ":irc.example.org 422 tester :MOTD File is missing")))) |
| 51 | (should (equal (car (funcall reap)) '(mode-user 5 "MODE tester +i"))) | 51 | (should (equal (car (funcall reap)) '(mode-user 5 "MODE tester +i"))) |
| 52 | (should (equal (funcall reap) | 52 | (should (equal (funcall reap) |
| 53 | '((mode-chan 1.2 "MODE #chan") | 53 | '((mode-chan 3.2 "MODE #chan") |
| 54 | (0.1 ":bob!~bob@example.org PRIVMSG #chan :hey")))) | 54 | (0.1 ":bob!~bob@example.org PRIVMSG #chan :hey")))) |
| 55 | ;; See `define-error' site for `iter-end-of-sequence' | 55 | ;; See `define-error' site for `iter-end-of-sequence' |
| 56 | (ert-info ("EOB detected") (should-not (erc-d-u--read-dialog exes)))) | 56 | (ert-info ("EOB detected") (should-not (erc-d-u--read-dialog exes)))) |
| @@ -74,7 +74,7 @@ | |||
| 74 | 74 | ||
| 75 | (should (equal (funcall user) '(user 0.2 "USER user 0 * :tester"))) | 75 | (should (equal (funcall user) '(user 0.2 "USER user 0 * :tester"))) |
| 76 | (should (equal (funcall modu) '(mode-user 5 "MODE tester +i"))) | 76 | (should (equal (funcall modu) '(mode-user 5 "MODE tester +i"))) |
| 77 | (should (equal (funcall modc) '(mode-chan 1.2 "MODE #chan"))) | 77 | (should (equal (funcall modc) '(mode-chan 3.2 "MODE #chan"))) |
| 78 | 78 | ||
| 79 | (cl-loop repeat 8 do (funcall user)) ; skip a few | 79 | (cl-loop repeat 8 do (funcall user)) ; skip a few |
| 80 | (should (equal (funcall user) | 80 | (should (equal (funcall user) |
| @@ -147,7 +147,7 @@ | |||
| 147 | (should (equal (car (funcall reap exes)) | 147 | (should (equal (car (funcall reap exes)) |
| 148 | '(mode-user 15 "MODE tester +i"))) | 148 | '(mode-user 15 "MODE tester +i"))) |
| 149 | (should (equal (car (funcall reap exes)) | 149 | (should (equal (car (funcall reap exes)) |
| 150 | '(mode-chan 11.2 "MODE #chan"))) | 150 | '(mode-chan 13.2 "MODE #chan"))) |
| 151 | (should-not (erc-d-u--read-dialog exes))) | 151 | (should-not (erc-d-u--read-dialog exes))) |
| 152 | 152 | ||
| 153 | (ert-info ("Rewrite for slowmo bounded") | 153 | (ert-info ("Rewrite for slowmo bounded") |
| @@ -176,7 +176,7 @@ | |||
| 176 | (should (equal (car (funcall reap exes-custom)) | 176 | (should (equal (car (funcall reap exes-custom)) |
| 177 | '(mode-user 10 "MODE tester +i"))) | 177 | '(mode-user 10 "MODE tester +i"))) |
| 178 | (should (equal (car (funcall reap exes-custom)) | 178 | (should (equal (car (funcall reap exes-custom)) |
| 179 | '(mode-chan 2.4 "MODE #chan"))) | 179 | '(mode-chan 6.4 "MODE #chan"))) |
| 180 | (should-not (erc-d-u--read-dialog exes-custom)))) | 180 | (should-not (erc-d-u--read-dialog exes-custom)))) |
| 181 | 181 | ||
| 182 | (should-not (get-buffer "basic.eld")) | 182 | (should-not (get-buffer "basic.eld")) |
diff --git a/test/lisp/erc/resources/erc-d/resources/basic.eld b/test/lisp/erc/resources/erc-d/resources/basic.eld index 80e46d9a279..bbc8713d699 100644 --- a/test/lisp/erc/resources/erc-d/resources/basic.eld +++ b/test/lisp/erc/resources/erc-d/resources/basic.eld | |||
| @@ -27,5 +27,5 @@ | |||
| 27 | (0 ":irc.example.org 366 alice #chan :End of NAMES list")) | 27 | (0 ":irc.example.org 366 alice #chan :End of NAMES list")) |
| 28 | 28 | ||
| 29 | ;; Some comment (to prevent regression) | 29 | ;; Some comment (to prevent regression) |
| 30 | ((mode-chan 1.2 "MODE #chan") | 30 | ((mode-chan 3.2 "MODE #chan") |
| 31 | (0.1 ":bob!~bob@example.org PRIVMSG #chan :hey")) | 31 | (0.1 ":bob!~bob@example.org PRIVMSG #chan :hey")) |
diff --git a/test/lisp/erc/resources/erc-scenarios-common.el b/test/lisp/erc/resources/erc-scenarios-common.el index 0dc82c98d5f..130b0aae109 100644 --- a/test/lisp/erc/resources/erc-scenarios-common.el +++ b/test/lisp/erc/resources/erc-scenarios-common.el | |||
| @@ -150,7 +150,7 @@ | |||
| 150 | (timer-list (copy-sequence timer-list)) | 150 | (timer-list (copy-sequence timer-list)) |
| 151 | (timer-idle-list (copy-sequence timer-idle-list)) | 151 | (timer-idle-list (copy-sequence timer-idle-list)) |
| 152 | (erc-auth-source-parameters-join-function nil) | 152 | (erc-auth-source-parameters-join-function nil) |
| 153 | (erc--fill-wrap-scrolltobottom-exempt-p t) | 153 | (erc-fill--wrap-scrolltobottom-exempt-p t) |
| 154 | (erc-autojoin-channels-alist nil) | 154 | (erc-autojoin-channels-alist nil) |
| 155 | (erc-server-auto-reconnect nil) | 155 | (erc-server-auto-reconnect nil) |
| 156 | (erc-after-connect nil) | 156 | (erc-after-connect nil) |