From: Mark Oteiza <mvoteiza@udel.edu>
To: Eli Zaretskii <eliz@gnu.org>
Cc: mbork@mbork.pl, 24580@debbugs.gnu.org
Subject: bug#24580: 25.2.50; query-replace history doesn't work
Date: Mon, 3 Oct 2016 20:24:51 -0400 [thread overview]
Message-ID: <20161004002451.GA31025@holos.localdomain> (raw)
In-Reply-To: <83h98tq4vn.fsf@gnu.org>
On 03/10/16 at 10:16am, Eli Zaretskii wrote:
> > Date: Sun, 2 Oct 2016 21:08:43 -0400
> > From: Mark Oteiza <mvoteiza@udel.edu>
> > Cc: mbork@mbork.pl, 24580@debbugs.gnu.org
> >
> > > > > The problem lies (at least) in query-replace-read-from, where
> > > > > query-replace-from-to is let bound, and later read-from-minibuffer
> > > > > refers to the symbol 'query-replace-from-to. At first sight, it looks
> > > > > like it could be fixed by putting some of the setup done by these
> > > > > bindings into the minibuffer setup hook.
> > > >
> > > > Isn't there a less intrusive change to fix this? A significant change
> > > > like the one you propose is more risky, but if there's no safer one, I
> > > > guess we should take it.
> > >
> > > Perhaps just adding a (defvar query-replace-from-to-history …) will be
> > > sufficient. That read-from-minibuffer and friends' HIST argument can
> > > only be a symbol is a bit frustrating.
> >
> > Surely there is a better way.
>
> Isn't this exactly the minibuffer setup hook method that I wanted to
> avoid?
Yes
> Does a simple defvar you suggested before not work?
No, unless I erred somehow, which is likely, because what I tried first
(binding minibuffer-history) didn't appear to work either. However, the
following does appear to solve the issue.
diff --git a/lisp/replace.el b/lisp/replace.el
index 4256751..4fc48d4 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -174,7 +174,7 @@ query-replace-read-from
(propertize "\0"
'display query-replace-from-to-separator
'separator t)))
- (query-replace-from-to-history
+ (minibuffer-history
(append
(when separator
(mapcar (lambda (from-to)
@@ -186,7 +186,7 @@ query-replace-read-from
(minibuffer-allow-text-properties t) ; separator uses text-properties
(prompt
(if (and query-replace-defaults separator)
- (format "%s (default %s): " prompt (car query-replace-from-to-history))
+ (format "%s (default %s): " prompt (car minibuffer-history))
(format "%s: " prompt)))
(from
;; The save-excursion here is in case the user marks and copies
@@ -198,9 +198,9 @@ query-replace-read-from
(setq-local text-property-default-nonsticky
(cons '(separator . t) text-property-default-nonsticky)))
(if regexp-flag
- (read-regexp prompt nil 'query-replace-from-to-history)
+ (read-regexp prompt)
(read-from-minibuffer
- prompt nil nil nil 'query-replace-from-to-history
+ prompt nil nil nil nil
(car (if regexp-flag regexp-search-ring search-ring)) t)))))
(to))
(if (and (zerop (length from)) query-replace-defaults)
next prev parent reply other threads:[~2016-10-04 0:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-01 6:43 bug#24580: 25.2.50; query-replace history doesn't work Marcin Borkowski
2016-10-01 8:40 ` Eli Zaretskii
2016-10-02 4:17 ` Mark Oteiza
2016-10-02 7:02 ` Eli Zaretskii
2016-10-02 16:51 ` Mark Oteiza
2016-10-03 1:08 ` Mark Oteiza
2016-10-03 7:16 ` Eli Zaretskii
2016-10-04 0:24 ` Mark Oteiza [this message]
2016-10-04 6:36 ` Eli Zaretskii
2016-10-05 15:39 ` Mark Oteiza
2016-10-03 7:08 ` Eli Zaretskii
2016-10-03 11:24 ` Mark Oteiza
2016-10-03 12:14 ` Eli Zaretskii
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=20161004002451.GA31025@holos.localdomain \
--to=mvoteiza@udel.edu \
--cc=24580@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=mbork@mbork.pl \
/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).