diff options
| author | Kenichi Handa | 1997-08-26 11:45:49 +0000 |
|---|---|---|
| committer | Kenichi Handa | 1997-08-26 11:45:49 +0000 |
| commit | fce31d5183bbde12934a9314a673ca4527c12039 (patch) | |
| tree | c32ff9cec08e9a902a6bb48604f2f9048dd452df /lisp/replace.el | |
| parent | 1e206719d56dd185c2167cc0d4c1b3c6f857582e (diff) | |
| download | emacs-fce31d5183bbde12934a9314a673ca4527c12039.tar.gz emacs-fce31d5183bbde12934a9314a673ca4527c12039.zip | |
(query-replace-read-args): Locally bind
minibuffer-inherit-input-method to t to make a minibuffer inherit
the current input method.
(map-query-replace-regexp, keep-lines, flush-lines): Likewise.
(how-many, occur): Likewise.
Diffstat (limited to 'lisp/replace.el')
| -rw-r--r-- | lisp/replace.el | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index 3d5b012f43a..e3b7dc87b83 100644 --- a/lisp/replace.el +++ b/lisp/replace.el | |||
| @@ -43,10 +43,10 @@ That becomes the \"string to replace\".") | |||
| 43 | (setq from (car (if regexp-flag regexp-search-ring search-ring))) | 43 | (setq from (car (if regexp-flag regexp-search-ring search-ring))) |
| 44 | (setq from (read-from-minibuffer (format "%s: " string) | 44 | (setq from (read-from-minibuffer (format "%s: " string) |
| 45 | nil nil nil | 45 | nil nil nil |
| 46 | 'query-replace-history))) | 46 | 'query-replace-history nil t))) |
| 47 | (setq to (read-from-minibuffer (format "%s %s with: " string from) | 47 | (setq to (read-from-minibuffer (format "%s %s with: " string from) |
| 48 | nil nil nil | 48 | nil nil nil |
| 49 | 'query-replace-history)) | 49 | 'query-replace-history nil t)) |
| 50 | (list from to current-prefix-arg))) | 50 | (list from to current-prefix-arg))) |
| 51 | 51 | ||
| 52 | (defun query-replace (from-string to-string &optional arg) | 52 | (defun query-replace (from-string to-string &optional arg) |
| @@ -110,12 +110,12 @@ before rotating to the next." | |||
| 110 | (car regexp-search-ring) | 110 | (car regexp-search-ring) |
| 111 | (read-from-minibuffer "Map query replace (regexp): " | 111 | (read-from-minibuffer "Map query replace (regexp): " |
| 112 | nil nil nil | 112 | nil nil nil |
| 113 | 'query-replace-history))) | 113 | 'query-replace-history nil t))) |
| 114 | (setq to (read-from-minibuffer | 114 | (setq to (read-from-minibuffer |
| 115 | (format "Query replace %s with (space-separated strings): " | 115 | (format "Query replace %s with (space-separated strings): " |
| 116 | from) | 116 | from) |
| 117 | nil nil nil | 117 | nil nil nil |
| 118 | 'query-replace-history)) | 118 | 'query-replace-history nil t)) |
| 119 | (list from to current-prefix-arg))) | 119 | (list from to current-prefix-arg))) |
| 120 | (let (replacements) | 120 | (let (replacements) |
| 121 | (if (listp to-strings) | 121 | (if (listp to-strings) |
| @@ -187,7 +187,7 @@ A match split across lines preserves all the lines it lies in. | |||
| 187 | Applies to all lines after point." | 187 | Applies to all lines after point." |
| 188 | (interactive (list (read-from-minibuffer | 188 | (interactive (list (read-from-minibuffer |
| 189 | "Keep lines (containing match for regexp): " | 189 | "Keep lines (containing match for regexp): " |
| 190 | nil nil nil 'regexp-history))) | 190 | nil nil nil 'regexp-history nil t))) |
| 191 | (save-excursion | 191 | (save-excursion |
| 192 | (or (bolp) (forward-line 1)) | 192 | (or (bolp) (forward-line 1)) |
| 193 | (let ((start (point))) | 193 | (let ((start (point))) |
| @@ -214,7 +214,7 @@ If a match is split across lines, all the lines it lies in are deleted. | |||
| 214 | Applies to lines after point." | 214 | Applies to lines after point." |
| 215 | (interactive (list (read-from-minibuffer | 215 | (interactive (list (read-from-minibuffer |
| 216 | "Flush lines (containing match for regexp): " | 216 | "Flush lines (containing match for regexp): " |
| 217 | nil nil nil 'regexp-history))) | 217 | nil nil nil 'regexp-history nil t))) |
| 218 | (save-excursion | 218 | (save-excursion |
| 219 | (while (and (not (eobp)) | 219 | (while (and (not (eobp)) |
| 220 | (re-search-forward regexp nil t)) | 220 | (re-search-forward regexp nil t)) |
| @@ -226,9 +226,9 @@ Applies to lines after point." | |||
| 226 | (defalias 'count-matches 'how-many) | 226 | (defalias 'count-matches 'how-many) |
| 227 | (defun how-many (regexp) | 227 | (defun how-many (regexp) |
| 228 | "Print number of matches for REGEXP following point." | 228 | "Print number of matches for REGEXP following point." |
| 229 | (interactive (list (read-from-minibuffer | 229 | (interactive (list(read-from-minibuffer |
| 230 | "How many matches for (regexp): " | 230 | "How many matches for (regexp): " |
| 231 | nil nil nil 'regexp-history))) | 231 | nil nil nil 'regexp-history nil t))) |
| 232 | (let ((count 0) opoint) | 232 | (let ((count 0) opoint) |
| 233 | (save-excursion | 233 | (save-excursion |
| 234 | (while (and (not (eobp)) | 234 | (while (and (not (eobp)) |
| @@ -389,7 +389,7 @@ the matching is case-sensitive." | |||
| 389 | (format "List lines matching regexp (default `%s'): " | 389 | (format "List lines matching regexp (default `%s'): " |
| 390 | default) | 390 | default) |
| 391 | "List lines matching regexp: ") | 391 | "List lines matching regexp: ") |
| 392 | nil nil nil 'regexp-history))) | 392 | nil nil nil 'regexp-history nil t))) |
| 393 | (if (string-equal input "") | 393 | (if (string-equal input "") |
| 394 | default | 394 | default |
| 395 | (set-text-properties 0 (length input) nil input) | 395 | (set-text-properties 0 (length input) nil input) |