From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: select yank via completion Date: Thu, 19 Nov 2020 09:54:34 +0200 Organization: LINKOV.NET Message-ID: <87d009iykt.fsf@mail.linkov.net> References: <87wnymda5g.fsf@mail.linkov.net> <87ima5he8j.fsf@mail.linkov.net> <87mtzfzt9a.fsf@mail.linkov.net> <87k0uifp3w.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="21199"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (x86_64-pc-linux-gnu) Cc: spacibba@aol.com, Jean Louis , andreyk.mad@gmail.com, emacs-devel@gnu.org, rudalics@gmx.at, Gregory Heytings , Eli Zaretskii , Drew Adams To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Nov 19 08:58:49 2020 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kfeq9-0005PF-5h for ged-emacs-devel@m.gmane-mx.org; Thu, 19 Nov 2020 08:58:49 +0100 Original-Received: from localhost ([::1]:57754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfeq8-0000uQ-7V for ged-emacs-devel@m.gmane-mx.org; Thu, 19 Nov 2020 02:58:48 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfepE-0008T6-PC for emacs-devel@gnu.org; Thu, 19 Nov 2020 02:57:52 -0500 Original-Received: from relay6-d.mail.gandi.net ([217.70.183.198]:42985) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfepC-0001Y8-DQ; Thu, 19 Nov 2020 02:57:52 -0500 X-Originating-IP: 91.129.97.46 Original-Received: from mail.gandi.net (m91-129-97-46.cust.tele2.ee [91.129.97.46]) (Authenticated sender: juri@linkov.net) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 53D06C0006; Thu, 19 Nov 2020 07:57:35 +0000 (UTC) In-Reply-To: (Stefan Monnier's message of "Wed, 18 Nov 2020 17:04:16 -0500") Received-SPF: pass client-ip=217.70.183.198; envelope-from=juri@linkov.net; helo=relay6-d.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/19 02:57:48 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:259414 Archived-At: --=-=-= Content-Type: text/plain >> BTW, there is another TODO item in minibuffer.el: >> >> ;; - indicate how to display the completions in *Completions* (turn >> ;; \n into something else, add special boundaries between >> ;; completions). E.g. when completing from the kill-ring. >> >> Such pre-processing can be performed by the caller. >> For a long time I used the command 'yank-from-kill-ring' >> bound to 'C-M-y' that relies on query-replace-descr >> to display newlines as ^J and displays long completions >> with an ellipsis at the end and an ellipsis on leading whitespace. > > Looks great, thanks. Any reason you bind it to C-M-y instead > of to "M-y that doesn't immediately follow C-y"? Oops, I don't remember why I forgot about no-op M-y. Here is a better patch. There is still a small problem: sometimes it's handy to slightly edit a previous string from kill-ring before inserting it. But with completing-read it's not easy to insert the space character, e.g. after 'M-p' while editing, typing 'SPC' errors with "[No matches]" and doesn't insert a space character. Could you recommend a more lightweight version of completing-read that doesn't override the 'SPC' key? --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=yank-from-kill-ring.patch Content-Transfer-Encoding: 8bit diff --git a/lisp/simple.el b/lisp/simple.el index bb28145502..32850b4b7c 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -5362,27 +5362,29 @@ yank-pop property, in the way that `yank' does." (interactive "*p") (if (not (eq last-command 'yank)) - (user-error "Previous command was not a yank")) - (setq this-command 'yank) - (unless arg (setq arg 1)) - (let ((inhibit-read-only t) - (before (< (point) (mark t)))) - (if before - (funcall (or yank-undo-function 'delete-region) (point) (mark t)) - (funcall (or yank-undo-function 'delete-region) (mark t) (point))) - (setq yank-undo-function nil) - (set-marker (mark-marker) (point) (current-buffer)) - (insert-for-yank (current-kill arg)) - ;; Set the window start back where it was in the yank command, - ;; if possible. - (set-window-start (selected-window) yank-window-start t) - (if before - ;; This is like exchange-point-and-mark, but doesn't activate the mark. - ;; It is cleaner to avoid activation, even though the command - ;; loop would deactivate the mark because we inserted text. - (goto-char (prog1 (mark t) - (set-marker (mark-marker) (point) (current-buffer)))))) - nil) + (call-interactively 'yank-from-kill-ring) + (setq this-command 'yank) + (unless arg (setq arg 1)) + (let ((inhibit-read-only t) + (before (< (point) (mark t)))) + (if before + (funcall (or yank-undo-function 'delete-region) (point) (mark t)) + (funcall (or yank-undo-function 'delete-region) (mark t) (point))) + (setq yank-undo-function nil) + (set-marker (mark-marker) (point) (current-buffer)) + (insert-for-yank (current-kill arg)) + ;; Set the window start back where it was in the yank command, + ;; if possible. + (set-window-start (selected-window) yank-window-start t) + (if before + ;; This is like exchange-point-and-mark, but doesn't activate the mark. + ;; It is cleaner to avoid activation, even though the command + ;; loop would deactivate the mark because we inserted text. + (goto-char (prog1 (mark t) + (set-marker (mark-marker) (point) (current-buffer)))))) + nil)) + +(put 'yank-pop 'delete-selection t) (defun yank (&optional arg) "Reinsert (\"paste\") the last stretch of killed text. @@ -5449,6 +5451,56 @@ rotate-yank-pointer With ARG, rotate that many kills forward (or backward, if negative)." (interactive "p") (current-kill arg)) + +(defvar yank-from-kill-ring-history) +(defun yank-from-kill-ring (string) + "Insert the kill-ring item selected from the minibuffer history. +Use minibuffer navigation and search commands to browse the kill-ring +in the minibuffer history before typing RET to insert the item, +or use completion on the elements of the kill-ring." + (interactive + (list (let* ((history-add-new-input nil) + ;; Remove keymaps from text properties of copied string, + ;; because typing RET in the minibuffer might call + ;; an irrelevant command from the map of copied string. + (yank-from-kill-ring-history + (mapcar (lambda (s) + (remove-list-of-text-properties + 0 (length s) + '( + keymap local-map action mouse-action + button category help-args) + s) + s) + kill-ring)) + (completions + (mapcar (lambda (s) + (let* ((s (query-replace-descr s)) + (b 0)) + ;; Add ellipsis on leading whitespace + (when (string-match "\\`[[:space:]]+" s) + (setq b (match-end 0)) + (add-text-properties 0 b `(display "…") s)) + (when (> (length s) (- 40 b)) + (add-text-properties + (min (+ b 40) (length s)) (length s) + `(display "…") s)) + s)) + yank-from-kill-ring-history))) + (completing-read "Yank from kill-ring: " + (lambda (string pred action) + (if (eq action 'metadata) + ;; Keep sorted by recency + '(metadata (display-sort-function . identity)) + (complete-with-action action completions string pred))) + nil nil nil + 'yank-from-kill-ring-history)))) + (setq yank-window-start (window-start)) + (push-mark) + (insert-for-yank string)) + +(put 'yank-from-kill-ring 'delete-selection t) + ;; Some kill commands. --=-=-=--