From: Juri Linkov <juri@jurta.org>
To: Dani Moncayo <dmoncayo@gmail.com>
Cc: 10885@debbugs.gnu.org
Subject: bug#10885: Replace expressions: enhance functionality when searching in filled paragraphs
Date: Fri, 07 Sep 2012 12:28:59 +0300 [thread overview]
Message-ID: <87a9x25gh0.fsf@mail.jurta.org> (raw)
In-Reply-To: <CAH8Pv0iXHDQYoBf1iT98G8S3LnBst=m+Na3mLr3VC0a2bQqnHA@mail.gmail.com> (Dani Moncayo's message of "Fri, 7 Sep 2012 10:33:19 +0200")
> I think replace-regexp-lax-whitespace is needed while the Isearch
> counterpart (isearch-regexp-lax-whitespace) exists, if you want to
> support the option I was asking for, whereby the lax-whitespace
> settings in query-replace[-regexp] are "connected" (or "redirected")
> to the Isearch counterparts.
>
> And IMO this option is important, for a consistent user-experience.
The reason why replace-regexp-lax-whitespace is important to have
is not just for consistency but because replace-lax-whitespace
should not affect regexp replacements. But currently its value applies
to regexp replacements because it depends on calls from isearch that has
a separate variable for regexp that starts a lax-whitespace regexp replacement
to replace the same regexp matches as in isearch. So actually a lax-whitespace
regexp replacement feature exists in replace.el implicitly. A clean way to
fix this problem is to add a new option replace-regexp-lax-whitespace:
=== modified file 'lisp/replace.el'
--- lisp/replace.el 2012-09-06 09:12:16 +0000
+++ lisp/replace.el 2012-09-07 09:27:35 +0000
@@ -35,7 +35,15 @@ (defcustom case-replace t
(defcustom replace-lax-whitespace nil
"Non-nil means `query-replace' matches a sequence of whitespace chars.
-When you enter a space or spaces in the strings or regexps to be replaced,
+When you enter a space or spaces in the strings to be replaced,
+it will match any sequence matched by the regexp `search-whitespace-regexp'."
+ :type 'boolean
+ :group 'matching
+ :version "24.3")
+
+(defcustom replace-regexp-lax-whitespace nil
+ "Non-nil means `query-replace-regexp' matches a sequence of whitespace chars.
+When you enter a space or spaces in the regexps to be replaced,
it will match any sequence matched by the regexp `search-whitespace-regexp'."
:type 'boolean
:group 'matching
@@ -282,7 +290,7 @@ (defun query-replace-regexp (regexp to-s
all caps, or capitalized, then its replacement is upcased or
capitalized.)
-If `replace-lax-whitespace' is non-nil, a space or spaces in the regexp
+If `replace-regexp-lax-whitespace' is non-nil, a space or spaces in the regexp
to be replaced will match a sequence of whitespace chars defined by the
regexp in `search-whitespace-regexp'.
@@ -362,7 +370,7 @@ (defun query-replace-regexp-eval (regexp
Preserves case in each replacement if `case-replace' and `case-fold-search'
are non-nil and REGEXP has no uppercase letters.
-If `replace-lax-whitespace' is non-nil, a space or spaces in the regexp
+If `replace-regexp-lax-whitespace' is non-nil, a space or spaces in the regexp
to be replaced will match a sequence of whitespace chars defined by the
regexp in `search-whitespace-regexp'.
@@ -499,7 +507,7 @@ (defun replace-regexp (regexp to-string
Preserve case in each match if `case-replace' and `case-fold-search'
are non-nil and REGEXP has no uppercase letters.
-If `replace-lax-whitespace' is non-nil, a space or spaces in the regexp
+If `replace-regexp-lax-whitespace' is non-nil, a space or spaces in the regexp
to be replaced will match a sequence of whitespace chars defined by the
regexp in `search-whitespace-regexp'.
@@ -1790,9 +1798,9 @@ (defun perform-replace (from-string repl
(let ((isearch-regexp regexp-flag)
(isearch-word delimited-flag)
(isearch-lax-whitespace
- (and replace-lax-whitespace (not regexp-flag)))
+ replace-lax-whitespace)
(isearch-regexp-lax-whitespace
- (and replace-lax-whitespace regexp-flag))
+ replace-regexp-lax-whitespace)
(isearch-case-fold-search case-fold-search)
(isearch-forward t))
(isearch-search-fun))))
@@ -2151,9 +2159,9 @@ (defun replace-highlight (match-beg matc
(isearch-regexp regexp-flag)
(isearch-word delimited-flag)
(isearch-lax-whitespace
- (and replace-lax-whitespace (not regexp-flag)))
+ replace-lax-whitespace)
(isearch-regexp-lax-whitespace
- (and replace-lax-whitespace regexp-flag))
+ replace-regexp-lax-whitespace)
(isearch-case-fold-search case-fold-search)
(isearch-forward t)
(isearch-error nil))
=== modified file 'lisp/isearch.el'
--- lisp/isearch.el 2012-09-06 09:12:16 +0000
+++ lisp/isearch.el 2012-09-07 09:27:42 +0000
@@ -1613,10 +1613,9 @@ (defun isearch-query-replace (&optional
;; `isearch-no-upper-case-p' in `perform-replace'
(search-upper-case nil)
(replace-lax-whitespace
- (and search-whitespace-regexp
- (if isearch-regexp
- isearch-regexp-lax-whitespace
- isearch-lax-whitespace)))
+ isearch-lax-whitespace)
+ (replace-regexp-lax-whitespace
+ isearch-regexp-lax-whitespace)
;; Set `isearch-recursive-edit' to nil to prevent calling
;; `exit-recursive-edit' in `isearch-done' that terminates
;; the execution of this command when it is non-nil.
next prev parent reply other threads:[~2012-09-07 9:28 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-26 1:02 bug#10885: Replace expressions: enhance functionality when searching in filled paragraphs linuxfever
2012-02-26 1:57 ` Glenn Morris
2012-02-26 7:16 ` Kevin Rodgers
2012-02-28 10:04 ` Dani Moncayo
2012-02-28 10:09 ` Dani Moncayo
2012-02-28 10:42 ` Juri Linkov
2012-02-29 0:12 ` Glenn Morris
2012-02-29 0:41 ` Juri Linkov
2012-03-11 8:59 ` Dani Moncayo
2012-03-11 10:48 ` Juri Linkov
2012-09-02 9:45 ` Juri Linkov
2012-09-02 11:32 ` Juri Linkov
2012-09-05 8:38 ` Juri Linkov
2012-09-05 14:38 ` Stefan Monnier
2012-09-06 8:54 ` Juri Linkov
2012-09-06 15:54 ` Dani Moncayo
2012-09-06 16:50 ` Juri Linkov
2012-09-06 17:39 ` Dani Moncayo
2012-09-06 19:11 ` Juri Linkov
2012-09-06 19:15 ` Juri Linkov
2012-09-06 19:45 ` Dani Moncayo
2012-09-06 20:21 ` Dani Moncayo
2012-09-06 21:25 ` Stefan Monnier
2012-09-07 8:33 ` Dani Moncayo
2012-09-07 9:28 ` Juri Linkov [this message]
2012-09-09 22:15 ` Juri Linkov
2012-09-05 14:39 ` Stefan Monnier
2012-02-26 10:10 ` linuxfever
2012-02-26 21:22 ` Stefan Monnier
2012-02-26 10:17 ` Dani Moncayo
2012-02-27 10:58 ` Juri Linkov
2012-02-27 13:27 ` Dani Moncayo
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=87a9x25gh0.fsf@mail.jurta.org \
--to=juri@jurta.org \
--cc=10885@debbugs.gnu.org \
--cc=dmoncayo@gmail.com \
/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).