summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorF. Jason Park <jp@neverwas.me>2024-09-29 11:02:48 -0700
committerF. Jason Park <jp@neverwas.me>2024-09-29 16:43:39 -0700
commite3c45b9d707db824588e2bd9ae34c05911dfcc5a (patch)
tree340db0567fa4ba09fec31f3bd35d963d1acd7cd6
parentdf593b5a619d63b620f8fd569ecf032dab2602d9 (diff)
Remove erc-fill binding for cycling visual movement
* etc/ERC-NEWS: Announce removal of troublesome key binding first introduced in ERC 5.6 as part of the `erc-fill-wrap' module. * lisp/erc/erc-fill.el (erc-fill-wrap-mode-map): Remove key binding for `erc-fill-wrap-cycle-visual-movement'. * test/lisp/erc/erc-fill-tests.el (erc-fill-wrap-visual-keys--body) (erc-fill-wrap-visual-keys--prompt): Replace "C-c a" key simulations. (Bug#73553)
-rw-r--r--etc/ERC-NEWS5
-rw-r--r--lisp/erc/erc-fill.el1
-rw-r--r--test/lisp/erc/erc-fill-tests.el8
3 files changed, 9 insertions, 5 deletions
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 34cf9ceb377..b267db5502e 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -26,6 +26,11 @@ In fast-moving channels and in queries with long-winded bots, the
on account of a rather stingy buffering threshold of 512 characters.
Now configurable, its default has been relaxed eightfold to 4096.
+** Stray key binding removed from 'erc-fill-wrap-mode-map'.
+The command 'erc-fill-wrap-cycle-visual-movement' was mistakenly given
+the key binding "C-c a" in an inadvertent holdover from development. It
+has been removed.
+
** New option determines 'keep-place-indicator's influence on 'truncate'.
Option 'erc-keep-place-indicator-truncation' manages the tension between
truncation and place keeping, prioritizing one or the other.
diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
index c499789b2e4..1e81adbf6ba 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -413,7 +413,6 @@ is 0, reset to value of `erc-fill-wrap-visual-keys'."
"<remap> <toggle-truncate-lines>" #'erc-fill-wrap-toggle-truncate-lines
"<remap> <next-line>" #'erc-fill--wrap-next-line
"<remap> <previous-line>" #'erc-fill--wrap-previous-line
- "C-c a" #'erc-fill-wrap-cycle-visual-movement
;; Not sure if this is problematic because `erc-bol' takes no args.
"<remap> <erc-bol>" #'erc-fill--wrap-beginning-of-line)
diff --git a/test/lisp/erc/erc-fill-tests.el b/test/lisp/erc/erc-fill-tests.el
index b52a996f184..bab1695a171 100644
--- a/test/lisp/erc/erc-fill-tests.el
+++ b/test/lisp/erc/erc-fill-tests.el
@@ -341,7 +341,7 @@
(should (search-forward "done to her." nil t)))
(ert-info ("Value: nil")
- (execute-kbd-macro "\C-ca")
+ (call-interactively #'erc-fill-wrap-cycle-visual-movement)
(should-not erc-fill--wrap-visual-keys)
(goto-char (point-min))
(should (search-forward "in debug mode" nil t))
@@ -351,7 +351,7 @@
(should (eql ?\] (char-before (point)))))
(ert-info ("Value: t")
- (execute-kbd-macro "\C-ca")
+ (call-interactively #'erc-fill-wrap-cycle-visual-movement)
(should (eq erc-fill--wrap-visual-keys t))
(goto-char (point-min))
(should (search-forward "that he hath" nil t))
@@ -387,7 +387,7 @@
(should (eobp)))
(ert-info ("Value: nil") ; same
- (execute-kbd-macro "\C-ca")
+ (call-interactively #'erc-fill-wrap-cycle-visual-movement)
(should-not erc-fill--wrap-visual-keys)
(execute-kbd-macro "\C-y")
(should (looking-back "its buffer\\."))
@@ -397,7 +397,7 @@
(should (eobp)))
(ert-info ("Value: non-input")
- (execute-kbd-macro "\C-ca")
+ (call-interactively #'erc-fill-wrap-cycle-visual-movement)
(should (eq erc-fill--wrap-visual-keys t))
(execute-kbd-macro "\C-y")
(execute-kbd-macro "\C-a")