* bug#13805: query-replace-regexp has conflicting interactive defaults
@ 2013-02-24 20:38 Richard Copley
2013-02-25 0:03 ` Juri Linkov
0 siblings, 1 reply; 3+ messages in thread
From: Richard Copley @ 2013-02-24 20:38 UTC (permalink / raw)
To: 13805
`query-replace-regexp' offers to repeat the last replacement, but
then goes off and does something exciting and new instead.
IMHO replace-regexp and friends should not default their
argument using the thing at point, because the user doesn't have
control of point: it is by definition at one end of the region to be
searched. That means the default is useful only in exceptional
cases, and just a distraction otherwise.
From `emacs -Q':
M-% . RET ! RET ;; To put a replacement into the history.
M-b ;; To place point before the word "buffer" in *scratch*.
C-M-% ;; Prompts "Query replace regexp (default . -> !): ".
RET ;; Prompts "Query replace regexp \_<buffer\.\_> with: ".
RET ! ;; Replaces "buffer" with "".
In GNU Emacs 24.3.50.1 (i386-mingw-nt6.2.9200)
of 2013-02-24 on MACHINE
Bzr revision: 111868 rgm@gnu.org-20130224194517-l50airg5zdb6y0cr
Windowing system distributor `Microsoft Corp.', version 6.2.9200
Configured using:
`configure --with-gcc (4.7) --cflags -I c:/gnuwin32/include --ldflags
-L c:/gnuwin32/lib'
Important settings:
value of $LANG: ENG
locale-coding-system: cp1252
default enable-multibyte-characters: t
Major mode: Lisp Interaction
Minor modes in effect:
tooltip-mode: t
mouse-wheel-mode: t
tool-bar-mode: t
menu-bar-mode: t
file-name-shadow-mode: t
global-font-lock-mode: t
font-lock-mode: t
blink-cursor-mode: t
auto-composition-mode: t
auto-encryption-mode: t
auto-compression-mode: t
line-number-mode: t
transient-mark-mode: t
Recent input:
M-% . <return> ! <return> M-b C-M-% <return> ? <return>
! M-x r e p o r t - e m a c s - b u g <return>
Recent messages:
For information about GNU Emacs and the GNU system, type C-h C-a.
Mark set
Replaced 0 occurrences
Mark set
Replaced 1 occurrence
Load-path shadows:
None found.
Features:
(shadow sort gnus-util mail-extr emacsbug message format-spec rfc822 mml
easymenu mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231
mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums
mm-util mail-prsvr mail-utils time-date tooltip ediff-hook vc-hooks
lisp-float-type mwheel dos-w32 ls-lisp w32-common-fns disp-table w32-win
w32-vars tool-bar dnd fontset image regexp-opt fringe tabulated-list
newcomment lisp-mode register page menu-bar rfn-eshadow timer select
scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cham
georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao
korean japanese hebrew greek romanian slovak czech european ethiopic
indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple
abbrev minibuffer button faces cus-face macroexp files text-properties
overlay sha1 md5 base64 format env code-pages mule custom widget
hashtable-print-readable backquote make-network-process w32notify w32
multi-tty emacs)
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#13805: query-replace-regexp has conflicting interactive defaults
2013-02-24 20:38 bug#13805: query-replace-regexp has conflicting interactive defaults Richard Copley
@ 2013-02-25 0:03 ` Juri Linkov
2013-02-25 20:58 ` Juri Linkov
0 siblings, 1 reply; 3+ messages in thread
From: Juri Linkov @ 2013-02-25 0:03 UTC (permalink / raw)
To: Richard Copley; +Cc: 13805
> From `emacs -Q':
> M-% . RET ! RET ;; To put a replacement into the history.
> M-b ;; To place point before the word "buffer" in *scratch*.
> C-M-% ;; Prompts "Query replace regexp (default . -> !): ".
> RET ;; Prompts "Query replace regexp \_<buffer\.\_> with: ".
> RET ! ;; Replaces "buffer" with "".
The default logic was broken a week ago in revno:111803.
This patch should restore the previous correct behavior:
=== modified file 'lisp/replace.el'
--- lisp/replace.el 2013-02-22 17:13:05 +0000
+++ lisp/replace.el 2013-02-25 00:01:21 +0000
@@ -592,7 +592,8 @@ (defun read-regexp (prompt &optional def
Non-nil HISTORY is a symbol to use for the history list.
If HISTORY is nil, `regexp-history' is used."
- (let* ((defaults
+ (let* ((default (if (consp defaults) (car defaults) defaults))
+ (defaults
(append
(if (listp defaults) defaults (list defaults))
(list
@@ -610,7 +611,6 @@ (defun read-regexp (prompt &optional def
(car (symbol-value
query-replace-from-history-variable)))))
(defaults (delete-dups (delq nil (delete "" defaults))))
- (default (car defaults))
;; Do not automatically add default to the history for empty input.
(history-add-new-input nil)
(input (read-from-minibuffer
To avoid similar confusion in the future, I propose to improve the
terminology and give the variables proper names, i.e. to rename the
variable `defaults' to `suggestions' (a list of values available via `M-n')
as opposed to the variable `default' (a single value used when the user
accepts empty input). This patch could be applied over the above patch:
=== modified file 'lisp/replace.el'
--- lisp/replace.el 2013-02-25 00:01:21 +0000
+++ lisp/replace.el 2013-02-25 00:02:12 +0000
@@ -593,7 +593,7 @@
Non-nil HISTORY is a symbol to use for the history list.
If HISTORY is nil, `regexp-history' is used."
(let* ((default (if (consp defaults) (car defaults) defaults))
- (defaults
+ (suggestions
(append
(if (listp defaults) defaults (list defaults))
(list
@@ -610,7 +610,7 @@
(regexp-quote (or (car search-ring) ""))
(car (symbol-value
query-replace-from-history-variable)))))
- (defaults (delete-dups (delq nil (delete "" defaults))))
+ (suggestions (delete-dups (delq nil (delete "" suggestions))))
;; Do not automatically add default to the history for empty input.
(history-add-new-input nil)
(input (read-from-minibuffer
@@ -621,7 +621,7 @@
(query-replace-descr default)))
(t
(format "%s: " prompt)))
- nil nil nil (or history 'regexp-history) defaults t)))
+ nil nil nil (or history 'regexp-history) suggestions t)))
(if (equal input "")
(or default input)
(prog1 input
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#13805: query-replace-regexp has conflicting interactive defaults
2013-02-25 0:03 ` Juri Linkov
@ 2013-02-25 20:58 ` Juri Linkov
0 siblings, 0 replies; 3+ messages in thread
From: Juri Linkov @ 2013-02-25 20:58 UTC (permalink / raw)
To: Richard Copley; +Cc: 13805-done
>> From `emacs -Q':
>> M-% . RET ! RET ;; To put a replacement into the history.
>> M-b ;; To place point before the word "buffer" in *scratch*.
>> C-M-% ;; Prompts "Query replace regexp (default . -> !): ".
>> RET ;; Prompts "Query replace regexp \_<buffer\.\_> with: ".
>> RET ! ;; Replaces "buffer" with "".
>
> The default logic was broken a week ago in revno:111803.
> This patch should restore the previous correct behavior:
This is fixed now, thanks for the bug report.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-25 20:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-24 20:38 bug#13805: query-replace-regexp has conflicting interactive defaults Richard Copley
2013-02-25 0:03 ` Juri Linkov
2013-02-25 20:58 ` Juri Linkov
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).