Commit bd6a8414 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(isearch-*-char): Do nothing special if quoted with \.

parent e13322a0
...@@ -1008,9 +1008,9 @@ If no previous match was done, just beep." ...@@ -1008,9 +1008,9 @@ If no previous match was done, just beep."
(looking-at (if isearch-regexp isearch-string (looking-at (if isearch-regexp isearch-string
(regexp-quote isearch-string)))) (regexp-quote isearch-string))))
(error nil)) (error nil))
(or isearch-yank-flag (or isearch-yank-flag
(<= (match-end 0) (<= (match-end 0)
(min isearch-opoint isearch-barrier)))) (min isearch-opoint isearch-barrier))))
(progn (progn
(setq isearch-success t (setq isearch-success t
isearch-invalid-regexp nil isearch-invalid-regexp nil
...@@ -1042,20 +1042,23 @@ If no previous match was done, just beep." ...@@ -1042,20 +1042,23 @@ If no previous match was done, just beep."
"Handle * and ? specially in regexps." "Handle * and ? specially in regexps."
(interactive) (interactive)
(if isearch-regexp (if isearch-regexp
(let ((idx (length isearch-string)))
(progn (while (and (> idx 0)
(setq isearch-adjusted t) (eq (aref isearch-string (1- idx)) ?\\))
;; Get the isearch-other-end from before the last search. (setq idx (1- idx)))
;; We want to start from there, (when (= (mod (- (length isearch-string) idx) 2) 0)
;; so that we don't retreat farther than that. (setq isearch-adjusted t)
;; (car isearch-cmds) is after last search; ;; Get the isearch-other-end from before the last search.
;; (car (cdr isearch-cmds)) is from before it. ;; We want to start from there,
(let ((cs (nth 5 (car (cdr isearch-cmds))))) ;; so that we don't retreat farther than that.
(setq cs (or cs isearch-barrier)) ;; (car isearch-cmds) is after last search;
(goto-char ;; (car (cdr isearch-cmds)) is from before it.
(if isearch-forward (let ((cs (nth 5 (car (cdr isearch-cmds)))))
(max cs isearch-barrier) (setq cs (or cs isearch-barrier))
(min cs isearch-barrier)))))) (goto-char
(if isearch-forward
(max cs isearch-barrier)
(min cs isearch-barrier)))))))
(isearch-process-search-char (isearch-last-command-char))) (isearch-process-search-char (isearch-last-command-char)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment