diff options
Diffstat (limited to 'lisp/replace.el')
| -rw-r--r-- | lisp/replace.el | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index be0ecda20fa..5e44677b0f8 100644 --- a/lisp/replace.el +++ b/lisp/replace.el | |||
| @@ -252,7 +252,7 @@ or capitalized.) | |||
| 252 | 252 | ||
| 253 | Ignore read-only matches if `query-replace-skip-read-only' is non-nil, | 253 | Ignore read-only matches if `query-replace-skip-read-only' is non-nil, |
| 254 | ignore hidden matches if `search-invisible' is nil, and ignore more | 254 | ignore hidden matches if `search-invisible' is nil, and ignore more |
| 255 | matches using a non-nil `isearch-filter-predicates'. | 255 | matches using `isearch-filter-predicate'. |
| 256 | 256 | ||
| 257 | If `replace-lax-whitespace' is non-nil, a space or spaces in the string | 257 | If `replace-lax-whitespace' is non-nil, a space or spaces in the string |
| 258 | to be replaced will match a sequence of whitespace chars defined by the | 258 | to be replaced will match a sequence of whitespace chars defined by the |
| @@ -306,7 +306,7 @@ capitalized.) | |||
| 306 | 306 | ||
| 307 | Ignore read-only matches if `query-replace-skip-read-only' is non-nil, | 307 | Ignore read-only matches if `query-replace-skip-read-only' is non-nil, |
| 308 | ignore hidden matches if `search-invisible' is nil, and ignore more | 308 | ignore hidden matches if `search-invisible' is nil, and ignore more |
| 309 | matches using a non-nil `isearch-filter-predicates'. | 309 | matches using `isearch-filter-predicate'. |
| 310 | 310 | ||
| 311 | If `replace-regexp-lax-whitespace' is non-nil, a space or spaces in the regexp | 311 | If `replace-regexp-lax-whitespace' is non-nil, a space or spaces in the regexp |
| 312 | to be replaced will match a sequence of whitespace chars defined by the | 312 | to be replaced will match a sequence of whitespace chars defined by the |
| @@ -390,7 +390,7 @@ are non-nil and REGEXP has no uppercase letters. | |||
| 390 | 390 | ||
| 391 | Ignore read-only matches if `query-replace-skip-read-only' is non-nil, | 391 | Ignore read-only matches if `query-replace-skip-read-only' is non-nil, |
| 392 | ignore hidden matches if `search-invisible' is nil, and ignore more | 392 | ignore hidden matches if `search-invisible' is nil, and ignore more |
| 393 | matches using a non-nil `isearch-filter-predicates'. | 393 | matches using `isearch-filter-predicate'. |
| 394 | 394 | ||
| 395 | If `replace-regexp-lax-whitespace' is non-nil, a space or spaces in the regexp | 395 | If `replace-regexp-lax-whitespace' is non-nil, a space or spaces in the regexp |
| 396 | to be replaced will match a sequence of whitespace chars defined by the | 396 | to be replaced will match a sequence of whitespace chars defined by the |
| @@ -484,7 +484,7 @@ then its replacement is upcased or capitalized.) | |||
| 484 | 484 | ||
| 485 | Ignore read-only matches if `query-replace-skip-read-only' is non-nil, | 485 | Ignore read-only matches if `query-replace-skip-read-only' is non-nil, |
| 486 | ignore hidden matches if `search-invisible' is nil, and ignore more | 486 | ignore hidden matches if `search-invisible' is nil, and ignore more |
| 487 | matches using a non-nil `isearch-filter-predicates'. | 487 | matches using `isearch-filter-predicate'. |
| 488 | 488 | ||
| 489 | If `replace-lax-whitespace' is non-nil, a space or spaces in the string | 489 | If `replace-lax-whitespace' is non-nil, a space or spaces in the string |
| 490 | to be replaced will match a sequence of whitespace chars defined by the | 490 | to be replaced will match a sequence of whitespace chars defined by the |
| @@ -530,7 +530,7 @@ are non-nil and REGEXP has no uppercase letters. | |||
| 530 | 530 | ||
| 531 | Ignore read-only matches if `query-replace-skip-read-only' is non-nil, | 531 | Ignore read-only matches if `query-replace-skip-read-only' is non-nil, |
| 532 | ignore hidden matches if `search-invisible' is nil, and ignore more | 532 | ignore hidden matches if `search-invisible' is nil, and ignore more |
| 533 | matches using a non-nil `isearch-filter-predicates'. | 533 | matches using `isearch-filter-predicate'. |
| 534 | 534 | ||
| 535 | If `replace-regexp-lax-whitespace' is non-nil, a space or spaces in the regexp | 535 | If `replace-regexp-lax-whitespace' is non-nil, a space or spaces in the regexp |
| 536 | to be replaced will match a sequence of whitespace chars defined by the | 536 | to be replaced will match a sequence of whitespace chars defined by the |
| @@ -2087,9 +2087,8 @@ make, or the user didn't cancel the call." | |||
| 2087 | 'read-only nil)))) | 2087 | 'read-only nil)))) |
| 2088 | (setq skip-read-only-count (1+ skip-read-only-count))) | 2088 | (setq skip-read-only-count (1+ skip-read-only-count))) |
| 2089 | ;; Optionally filter out matches. | 2089 | ;; Optionally filter out matches. |
| 2090 | ((not (run-hook-with-args-until-failure | 2090 | ((not (funcall isearch-filter-predicate |
| 2091 | 'isearch-filter-predicates | 2091 | (nth 0 real-match-data) (nth 1 real-match-data))) |
| 2092 | (nth 0 real-match-data) (nth 1 real-match-data))) | ||
| 2093 | (setq skip-filtered-count (1+ skip-filtered-count))) | 2092 | (setq skip-filtered-count (1+ skip-filtered-count))) |
| 2094 | ;; Optionally ignore invisible matches. | 2093 | ;; Optionally ignore invisible matches. |
| 2095 | ((not (or (eq search-invisible t) | 2094 | ((not (or (eq search-invisible t) |