From: Juri Linkov <juri@linkov.net>
To: 59486@debbugs.gnu.org
Subject: bug#59486: completion-auto-wrap disobeyed by vertical navigation
Date: Tue, 22 Nov 2022 19:38:57 +0200 [thread overview]
Message-ID: <8635aayjm6.fsf@mail.linkov.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
In a multi-column layout, the keys <left> and <right>
wrap to the beginning/end of the completions buffer,
but <up> and <down> don't. Here is a patch that supports
completion-auto-wrap for wrapping to the top/bottom:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: next-line-completion.patch --]
[-- Type: text/x-diff, Size: 3612 bytes --]
diff --git a/lisp/simple.el b/lisp/simple.el
index 0f44b14948c..459af2fcf55 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -9572,6 +9574,8 @@ completion-list-mode-map
(define-key map "\C-m" 'choose-completion)
(define-key map "\e\e\e" 'delete-completion-window)
(define-key map [remap keyboard-quit] #'delete-completion-window)
+ (define-key map [up] 'previous-line-completion)
+ (define-key map [down] 'next-line-completion)
(define-key map [left] 'previous-completion)
(define-key map [right] 'next-completion)
(define-key map [?\t] 'next-completion)
@@ -9736,6 +9740,77 @@ next-completion
(when (/= 0 n)
(switch-to-minibuffer))))
+(defun previous-line-completion (&optional n)
+ "Move to the item on the previous line in the completion list.
+With prefix argument N, move back N items line-wise (negative N
+means move forward).
+
+Also see the `completion-auto-wrap' variable."
+ (interactive "p")
+ (next-line-completion (- n)))
+
+(defun next-line-completion (&optional n)
+ "Move to the item on the next line in the completion list.
+With prefix argument N, move N items line-wise (negative N
+means move backward).
+
+Also see the `completion-auto-wrap' variable."
+ (interactive "p")
+ (let ((column (current-column))
+ pos)
+ (catch 'bound
+ (while (> n 0)
+ (setq pos nil)
+ (save-excursion
+ (while (and (not pos) (not (eobp)))
+ (forward-line 1)
+ (when (and (not (eobp))
+ (eq (move-to-column column) column)
+ (get-text-property (point) 'mouse-face))
+ (setq pos (point)))))
+ (if pos
+ (goto-char pos)
+ (when completion-auto-wrap
+ (let ((column (current-column)))
+ (save-excursion
+ (goto-char (point-min))
+ (when (and (eq (move-to-column column) column)
+ (get-text-property (point) 'mouse-face))
+ (setq pos (point)))
+ (while (and (not pos) (not (eobp)))
+ (forward-line 1)
+ (when (and (eq (move-to-column column) column)
+ (get-text-property (point) 'mouse-face))
+ (setq pos (point)))))
+ (if pos (goto-char pos)))))
+ (setq n (1- n)))
+
+ (while (< n 0)
+ (setq pos nil)
+ (save-excursion
+ (while (and (not pos) (not (bobp)))
+ (forward-line -1)
+ (when (and (not (bobp))
+ (eq (move-to-column column) column)
+ (get-text-property (point) 'mouse-face))
+ (setq pos (point)))))
+ (if pos
+ (goto-char pos)
+ (when completion-auto-wrap
+ (let ((column (current-column)))
+ (save-excursion
+ (goto-char (point-max))
+ (when (and (eq (move-to-column column) column)
+ (get-text-property (point) 'mouse-face))
+ (setq pos (point)))
+ (while (and (not pos) (not (bobp)))
+ (forward-line -1)
+ (when (and (eq (move-to-column column) column)
+ (get-text-property (point) 'mouse-face))
+ (setq pos (point)))))
+ (if pos (goto-char pos)))))
+ (setq n (1+ n))))))
+
(defun choose-completion (&optional event no-exit no-quit)
"Choose the completion at point.
If EVENT, use EVENT's position to determine the starting position.
next reply other threads:[~2022-11-22 17:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-22 17:38 Juri Linkov [this message]
2022-11-23 18:49 ` bug#59486: completion-auto-wrap disobeyed by vertical navigation Juri Linkov
2022-11-24 7:59 ` Juri Linkov
2022-11-24 8:13 ` Eli Zaretskii
2022-11-24 18:30 ` Juri Linkov
2022-11-24 18:43 ` Eli Zaretskii
2022-11-25 7:47 ` Juri Linkov
2022-11-25 8:38 ` Eli Zaretskii
2022-11-28 7:56 ` Juri Linkov
2023-10-31 7:44 ` Juri Linkov
2023-11-01 17:45 ` Juri Linkov
2023-11-02 8:11 ` Eli Zaretskii
2023-11-02 17:14 ` Juri Linkov
2023-11-05 17:53 ` Juri Linkov
2023-11-15 17:45 ` Juri Linkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8635aayjm6.fsf@mail.linkov.net \
--to=juri@linkov.net \
--cc=59486@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).