From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kim Storm Newsgroups: gmane.emacs.bugs Subject: bug#18886: 24.4; M-v no longer works in CUA-mode. Date: Sun, 02 Nov 2014 18:04:35 +0100 Message-ID: <54566423.6050105@cua.dk> References: <54526B57.8080508@cua.dk> <5452A1F6.2070303@cua.dk> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1414948047 31601 80.91.229.3 (2 Nov 2014 17:07:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 2 Nov 2014 17:07:27 +0000 (UTC) Cc: 18886@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Nov 02 18:07:19 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XkycY-0007an-Qd for geb-bug-gnu-emacs@m.gmane.org; Sun, 02 Nov 2014 18:07:19 +0100 Original-Received: from localhost ([::1]:58419 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkycY-00054z-BH for geb-bug-gnu-emacs@m.gmane.org; Sun, 02 Nov 2014 12:07:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35213) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkycO-00053G-FA for bug-gnu-emacs@gnu.org; Sun, 02 Nov 2014 12:07:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XkycI-0004vL-Bl for bug-gnu-emacs@gnu.org; Sun, 02 Nov 2014 12:07:08 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:49085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkycI-0004vE-8H for bug-gnu-emacs@gnu.org; Sun, 02 Nov 2014 12:07:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XkycH-0000Z9-NS for bug-gnu-emacs@gnu.org; Sun, 02 Nov 2014 12:07:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Kim Storm Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 02 Nov 2014 17:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18886 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 18886-submit@debbugs.gnu.org id=B18886.14149479612075 (code B ref 18886); Sun, 02 Nov 2014 17:07:01 +0000 Original-Received: (at 18886) by debbugs.gnu.org; 2 Nov 2014 17:06:01 +0000 Original-Received: from localhost ([127.0.0.1]:46298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XkybJ-0000XH-3e for submit@debbugs.gnu.org; Sun, 02 Nov 2014 12:06:01 -0500 Original-Received: from ispc3.dotserv.com ([178.20.216.13]:50716) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1XkybG-0000X3-GO for 18886@debbugs.gnu.org; Sun, 02 Nov 2014 12:05:59 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by ispc3.dotserv.com (Postfix) with ESMTP id 3F52380B74788; Sun, 2 Nov 2014 18:05:52 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at ispc3.dotserv.com Original-Received: from ispc3.dotserv.com ([127.0.0.1]) by localhost (ispc3.dotserv.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6uBciXqx4sf8; Sun, 2 Nov 2014 18:05:43 +0100 (CET) Original-Received: from [10.1.82.9] (1405ds6-amb.0.fullrate.dk [90.184.76.141]) (Authenticated sender: storm@cua.dk) by ispc3.dotserv.com (Postfix) with ESMTPSA id C033980387236; Sun, 2 Nov 2014 18:05:43 +0100 (CET) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 In-Reply-To: <5452A1F6.2070303@cua.dk> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:95386 On 2014-10-30 21:39, Kim Storm wrote: > On 2014-10-30 20:23, Stefan Monnier wrote: >> BTW, I think that instead of scavenging the undo log we should place an >> overlay at the last delete so we can directly grab the "replacement >> text". > Yes - I would like to do that, as the current code is deficient in the > sense > that any movement or editing will terminate the "replacement text". > I will try it when I have some time to improve on it. Hi Stefan, I have made some progress on this: The following patch eliminates the undo-list hack. It works much better than before, as it is now possible to edit the replacement text before repeating the substitution using M-v. This has always been annoying for me, so I really appreciate your suggestion. Since there is only one active replacement text across all buffers, it makes more sense for me to use an overlay to keep track of the replacement text. If you could install this, I would appreciate it very much. Kim |2014-11-02 Kim F. Storm * delsel.el (|||delsel--replace-text-or-position): Delete var. ||||| (delete-selection-replacement-face): New defcustom. ||| (delsel--replace-text, delsel--replace-overlay): New vars. | (delete-active-region, delete-selection-repeat-replace-region): Use overlay to track replacement text instead of abusing the undo-list; this allows the text to be edited before it is used for substitutions. Add highlight to the replacement text. | --- tmp/delsel.el 2014-11-02 17:45:25.440201850 +0100 +++ delsel.el 2014-11-02 17:49:49.000000000 +0100 @@ -54,9 +54,23 @@ ;;; Code: -(defvar delete-selection-save-to-register nil +(defcustom delete-selection-save-to-register nil "If non-nil, deleted region text is stored in this register. -Value must be the register (key) to use.") +Value must be the register (key) to use." + :type '(choice + (const :tag "None" nil) + (character :tag "Register (Key)")) + :group 'editing-basics) + +(defcustom delete-selection-replacement-face 'highlight + "If non-nil, active region replacement text is shown in this face. +The highlighted text is the text that will be inserted by +the `delete-selection-repeat-replace-region' command." + :type 'face + :group 'editing-basics + :set (lambda (symbol value) + (if delsel--replace-overlay + (overlay-put delsel--replace-overlay 'face value)))) ;;;###autoload (defalias 'pending-delete-mode 'delete-selection-mode) @@ -76,7 +90,8 @@ (remove-hook 'pre-command-hook 'delete-selection-pre-hook) (add-hook 'pre-command-hook 'delete-selection-pre-hook))) -(defvar delsel--replace-text-or-position nil) +(defvar delsel--replace-overlay nil) ;overlay +(defvar delsel--replace-text nil) ;text from overlay (defun delete-active-region (&optional killp) "Delete the active region. @@ -89,9 +104,14 @@ (delete-selection-save-to-register (set-register delete-selection-save-to-register (funcall region-extract-function t)) - (setq delsel--replace-text-or-position - (cons (current-buffer) - (and (consp buffer-undo-list) (car buffer-undo-list))))) + (if delsel--replace-overlay + (move-overlay delsel--replace-overlay (point) (point) (current-buffer)) + (setq delsel--replace-overlay + (make-overlay (point) (point) (current-buffer) nil t)) + (if delete-selection-replacement-face + (overlay-put delsel--replace-overlay 'face + delete-selection-replacement-face))) + (setq delsel--replace-text nil)) (t (funcall region-extract-function 'delete-only))) t) @@ -106,47 +126,30 @@ (get-register delete-selection-save-to-register))) (count (if (consp arg) (point-max) (prefix-numeric-value current-prefix-arg)))) - (if (not (and old-text - (> (length old-text) 0) - (or (stringp delsel--replace-text-or-position) - (buffer-live-p (car delsel--replace-text-or-position))))) + (if (not (and old-text (> (length old-text) 0))) (message "No known previous replacement") ;; If this is the first use after overwriting regions, ;; find the replacement text by looking at the undo list. - (when (consp delsel--replace-text-or-position) - (let ((buffer (car delsel--replace-text-or-position)) - (elt (cdr delsel--replace-text-or-position))) - (setq delsel--replace-text-or-position nil) - (with-current-buffer buffer - (save-restriction - (widen) - ;; Find the text that replaced the region via the undo list. - (let ((ul buffer-undo-list) u s e) - (when elt - (while (consp ul) - (setq u (car ul) ul (cdr ul)) - (cond - ((eq u elt) ;; got it - (setq ul nil)) - ((and (consp u) (integerp (car u)) (integerp (cdr u))) - (if (and s (= (cdr u) s)) - (setq s (car u)) - (setq s (car u) e (cdr u))))))) - (cond ((and s e (<= s e) (= s (mark t))) - (setq delsel--replace-text-or-position - (filter-buffer-substring s e)) - (set-text-properties - 0 (length delsel--replace-text-or-position) - nil delsel--replace-text-or-position)) - ((and (null s) (eq u elt)) ;; Nothing inserted. - (setq delsel--replace-text-or-position "")) - (t - (message "Cannot locate replacement text")))))))) - (while (and (> count 0) - delsel--replace-text-or-position - (search-forward old-text nil t)) - (replace-match delsel--replace-text-or-position nil t) - (setq count (1- count)))))) + (when (and (null delsel--replace-text) + delsel--replace-overlay + (buffer-live-p (overlay-buffer delsel--replace-overlay))) + (with-current-buffer (overlay-buffer delsel--replace-overlay) + (let ((s (overlay-start delsel--replace-overlay)) + (e (overlay-end delsel--replace-overlay))) + (when (/= s e) + (setq delsel--replace-text + (filter-buffer-substring s e)) + (set-text-properties + 0 (length delsel--replace-text) + nil delsel--replace-text)))) + (delete-overlay delsel--replace-overlay)) + (if delsel--replace-text + (while (and (> count 0) + delsel--replace-text + (search-forward old-text nil t)) + (replace-match delsel--replace-text nil t) + (setq count (1- count))) + (message "Cannot locate replacement text"))))) (defun delete-selection-helper (type) "Delete selection according to TYPE: