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: Fri, 20 Nov 2020 10:53:39 +0200 Organization: LINKOV.NET Message-ID: <87o8jsiems.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> <87d009iykt.fsf@mail.linkov.net> <3341c426-3a86-4ef0-a0ca-9102191a925b@default> 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="26262"; 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, Stefan Monnier , Gregory Heytings , Eli Zaretskii To: Drew Adams Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Nov 20 11:09:31 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 1kg3MA-0006hh-KA for ged-emacs-devel@m.gmane-mx.org; Fri, 20 Nov 2020 11:09:30 +0100 Original-Received: from localhost ([::1]:35754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kg3M9-0004rI-Jl for ged-emacs-devel@m.gmane-mx.org; Fri, 20 Nov 2020 05:09:29 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:49738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kg3LO-00043x-Ub for emacs-devel@gnu.org; Fri, 20 Nov 2020 05:08:44 -0500 Original-Received: from relay11.mail.gandi.net ([217.70.178.231]:45169) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kg3LK-0004IR-Tl; Fri, 20 Nov 2020 05:08:42 -0500 Original-Received: from mail.gandi.net (m91-129-97-46.cust.tele2.ee [91.129.97.46]) (Authenticated sender: juri@linkov.net) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 9C34E100012; Fri, 20 Nov 2020 10:08:25 +0000 (UTC) In-Reply-To: <3341c426-3a86-4ef0-a0ca-9102191a925b@default> (Drew Adams's message of "Thu, 19 Nov 2020 09:00:13 -0800 (PST)") Received-SPF: pass client-ip=217.70.178.231; envelope-from=juri@linkov.net; helo=relay11.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, 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:259475 Archived-At: --=-=-= Content-Type: text/plain >> 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? > > It's _always_ handy to be able to edit a kill-ring entry > before inserting it into the minibuffer. BTW, sometimes it's also handy to just browse the kill-ring without immediately inserting an entry, to copy an edited entry (that adds a new kill-ring entry) to paste later. To allow such browsing we need to remove "*" from the interactive spec of 'yank-pop'. > It took decades to even get `SPC' to be self-inserting for > `read-file-name'. I raised the same issue for `completing-read' at > that time (and before then). So now a new patch let-binds (minibuffer-completing-file-name t) around completing-read to allow inserting SPC, problem solved: --=-=-= 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..589b3648c2 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -5360,29 +5360,83 @@ yank-pop "This command honors the `yank-handled-properties' and `yank-excluded-properties' variables, and the `yank-handler' text property, in the way that `yank' does." - (interactive "*p") + (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) + +(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) + (ellipsis (if (char-displayable-p ?…) "…" "...")) + ;; 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 ,ellipsis) s)) + (when (> (length s) (- 40 b)) + (add-text-properties + (min (+ b 40) (length s)) (length s) + `(display ,ellipsis) s)) + s)) + yank-from-kill-ring-history)) + ;; Allow ‘SPC’ to be inserted literally. + (minibuffer-completing-file-name t)) + (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) (defun yank (&optional arg) "Reinsert (\"paste\") the last stretch of killed text. --=-=-=--