From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Thierry Volpiatto Newsgroups: gmane.emacs.bugs Subject: bug#25482: 26.0.50; Allow setting `query-replace-from-to-separator` to nil Date: Sat, 28 Jan 2017 07:50:19 +0100 Message-ID: <87r33n3cgk.fsf@gmail.com> References: <871svzzcn4.fsf@gmail.com> <83lgu76nuf.fsf@gnu.org> <87vatac0a2.fsf@gmail.com> <83a8am6u6q.fsf@gnu.org> <87y3y6ezge.fsf@gmail.com> <8337gd7udo.fsf@gnu.org> <87o9z1n4o3.fsf@gmail.com> <83lgu252zc.fsf@gnu.org> <87o9yy26pg.fsf@gmail.com> <83fuka4yzj.fsf@gnu.org> <87vat65h3o.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1485586304 12525 195.159.176.226 (28 Jan 2017 06:51:44 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 28 Jan 2017 06:51:44 +0000 (UTC) User-Agent: mu4e 0.9.19; emacs 24.5.1 Cc: 25482@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jan 28 07:51:40 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cXMqs-0000Wp-9k for geb-bug-gnu-emacs@m.gmane.org; Sat, 28 Jan 2017 07:51:10 +0100 Original-Received: from localhost ([::1]:50201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cXMqu-0002HF-MP for geb-bug-gnu-emacs@m.gmane.org; Sat, 28 Jan 2017 01:51:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cXMqo-0002H8-7L for bug-gnu-emacs@gnu.org; Sat, 28 Jan 2017 01:51:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cXMql-00080Z-3V for bug-gnu-emacs@gnu.org; Sat, 28 Jan 2017 01:51:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:50544) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cXMqk-00080Q-R1 for bug-gnu-emacs@gnu.org; Sat, 28 Jan 2017 01:51:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cXMqk-0001wI-5Q for bug-gnu-emacs@gnu.org; Sat, 28 Jan 2017 01:51:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Thierry Volpiatto Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 28 Jan 2017 06:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25482 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 25482-submit@debbugs.gnu.org id=B25482.14855862327411 (code B ref 25482); Sat, 28 Jan 2017 06:51:02 +0000 Original-Received: (at 25482) by debbugs.gnu.org; 28 Jan 2017 06:50:32 +0000 Original-Received: from localhost ([127.0.0.1]:48743 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cXMqF-0001vS-Qw for submit@debbugs.gnu.org; Sat, 28 Jan 2017 01:50:32 -0500 Original-Received: from mail-wm0-f45.google.com ([74.125.82.45]:37069) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cXMqD-0001vC-Kb for 25482@debbugs.gnu.org; Sat, 28 Jan 2017 01:50:30 -0500 Original-Received: by mail-wm0-f45.google.com with SMTP id c206so172246560wme.0 for <25482@debbugs.gnu.org>; Fri, 27 Jan 2017 22:50:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version:content-transfer-encoding; bh=PrppIVPYp6zX+eyI+I/y4oFGUu6YssfhKyRjqU+GJZw=; b=ClbncmYYPmyxi40L6P73iNybyT0IqirwyqSstYYvlcbMu7CRK9fAJ6nGWvo9uG4Fpq k6xG1fZ+0EfKHDcCSlHhcgtJ8AzOhvYUpSAMrQMmOtoeYOZO5aXYvuCwa6BGoX9stJbc v635YaByCQkpQFqG23ySj+ssrii+qLkwWGNSq+DBmyn/8sY/Jup2MaVkTPXxLUYZZd4U GRWx6nKFeW6omyHRCVuj90OiOUuFYwhafc9v4jX+1nBchsaafIo33to2WR50P9kt7aoY XdHk4JQd0PvMcM3hpMBD1g0ipJYNGHXQRDIO8gxqN4Aap4OQG6bnhT0BHzHllo03Ncdr TLAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version:content-transfer-encoding; bh=PrppIVPYp6zX+eyI+I/y4oFGUu6YssfhKyRjqU+GJZw=; b=rrWeZLE5+R5oqVPrgwuxa9TZejgCm/MsFwzZZBzpu7K7N2pi4pp9/4FGGFKgLF8WVW wTs2BqMqon/qSIuFs8qk9o9DVISxU7wBbkKked1Ghn8lcGe3TOJndbsbm5Tf1NfUVXhh 3UB+ETlPRZdadSVk7uZh+KcrqKT3cYHpfkF63HcOs8+70gBIxzOZh8H9v41KsL1eAo9i 3GNOXo/HWzIq6uqK5mauEzahGqNd0K/kx4D1XSqKTDyuZbrbj2hkCY7Bm1Um59P/3BEC W+zw9ZD9D3/oemb86upq/g1pCqj0qXO2dL2mLbSq/DoA2BIzcyDAi1CYQmlJCChWMu5/ Mmbg== X-Gm-Message-State: AIkVDXLd9Myy/JOzoahlnjqHorZq+OK95qEBMU7gmsLbJA+JoS/duvXVJWhouAXzKPAKRw== X-Received: by 10.28.87.19 with SMTP id l19mr6186070wmb.95.1485586223578; Fri, 27 Jan 2017 22:50:23 -0800 (PST) Original-Received: from dell-14z ([37.169.101.111]) by smtp.gmail.com with ESMTPSA id t123sm7385816wmt.8.2017.01.27.22.50.21 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 27 Jan 2017 22:50:22 -0800 (PST) In-reply-to: <87vat65h3o.fsf@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:128704 Archived-At: Just to not leave this unfinished, here the last patch I did which simplify code. - defcustom is simple (string or nil). - No need to reevaluate defcustom at every time. - setq is usable. - splitting is now simple with all the text property dance removed. - plain string is added to history instead of a crap string. 1 file changed, 29 insertions(+), 37 deletions(-) lisp/replace.el | 66 +++++++++++++++++++++++++-------------------------------- modified lisp/replace.el @@ -79,15 +79,12 @@ That becomes the \"string to replace\".") to the minibuffer that reads the string to replace, or invoke replacements from Isearch by using a key sequence like `C-s C-s M-%'." "24.3") -(defcustom query-replace-from-to-separator - (propertize (if (char-displayable-p ?→) " → " " -> ") - 'face 'minibuffer-prompt) - "String that separates FROM and TO in the history of replacement pairs." - ;; Avoids error when attempt to autoload char-displayable-p fails - ;; while preparing to dump, also stops customize-rogue listing this. - :initialize 'custom-initialize-delay +(defcustom query-replace-from-to-separator " → " + "String that separates FROM and TO in the history of replacement pairs. +When nil or the string provided not displayable the default separator \" -> \" +will be used instead." :group 'matching - :type '(choice string (sexp :tag "Display specification")) + :type '(choice string) :version "25.1") (defcustom query-replace-from-history-variable 'query-replace-history @@ -149,15 +146,12 @@ See `replace-regexp' and `query-replace-regexp-eval'.") (defun query-replace-descr (string) (mapconcat 'isearch-text-char-description string "")) -(defun query-replace--split-string (string) - "Split string STRING at a character with property `separator'" - (let* ((length (length string)) - (split-pos (text-property-any 0 length 'separator t string))) - (if (not split-pos) - (substring-no-properties string) - (cl-assert (not (text-property-any (1+ split-pos) length 'separator t string))) - (cons (substring-no-properties string 0 split-pos) - (substring-no-properties string (1+ split-pos) length))))) +(defun query-replace--split-string (string separator) + "Split string STRING at `query-replace-from-to-separator'." + (cond ((string-match separator string) + (cons (substring-no-properties string 0 (match-beginning 0)) + (substring-no-properties string (match-end 0)))) + (t (substring-no-properties string)))) (defun query-replace-read-from (prompt regexp-flag) "Query and return the `from' argument of a query-replace operation. @@ -165,49 +159,47 @@ The return value can also be a pair (FROM . TO) indicating that the user wants to replace FROM with TO." (if query-replace-interactive (car (if regexp-flag regexp-search-ring search-ring)) - ;; Reevaluating will check char-displayable-p that is - ;; unavailable while preparing to dump. - (custom-reevaluate-setting 'query-replace-from-to-separator) (let* ((history-add-new-input nil) - (separator - (when query-replace-from-to-separator - (propertize "\0" - 'display query-replace-from-to-separator - 'separator t))) + (sep-char (and (stringp query-replace-from-to-separator) + (replace-regexp-in-string + " " "" query-replace-from-to-separator))) + (separator (propertize + (if (and sep-char + (char-displayable-p (string-to-char sep-char))) + query-replace-from-to-separator + " -> ") + 'face 'minibuffer-prompt)) (minibuffer-history (append - (when separator (mapcar (lambda (from-to) (concat (query-replace-descr (car from-to)) separator (query-replace-descr (cdr from-to)))) - query-replace-defaults)) + query-replace-defaults) (symbol-value query-replace-from-history-variable))) - (minibuffer-allow-text-properties t) ; separator uses text-properties (prompt - (if (and query-replace-defaults separator) - (format "%s (default %s): " prompt (car minibuffer-history)) + (if query-replace-defaults + (format "%s (default %s %s %s): " + prompt + (query-replace-descr (caar query-replace-defaults)) + separator + (query-replace-descr (cdar query-replace-defaults))) (format "%s: " prompt))) (from ;; The save-excursion here is in case the user marks and copies ;; a region in order to specify the minibuffer input. ;; That should not clobber the region for the query-replace itself. (save-excursion - (minibuffer-with-setup-hook - (lambda () - (setq-local text-property-default-nonsticky - (cons '(separator . t) text-property-default-nonsticky))) (if regexp-flag (read-regexp prompt nil 'minibuffer-history) (read-from-minibuffer - prompt nil nil nil nil - (car (if regexp-flag regexp-search-ring search-ring)) t))))) + prompt nil nil nil nil (car search-ring) t)))) (to)) (if (and (zerop (length from)) query-replace-defaults) (cons (caar query-replace-defaults) (query-replace-compile-replacement (cdar query-replace-defaults) regexp-flag)) - (setq from (query-replace--split-string from)) + (setq from (query-replace--split-string from separator)) (when (consp from) (setq to (cdr from) from (car from))) (add-to-history query-replace-from-history-variable from nil t) ;; Warn if user types \n or \t, but don't reject the input. -- Thierry