diff options
| author | Richard M. Stallman <rms@gnu.org> | 1994-09-30 09:16:06 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1994-09-30 09:16:06 +0000 |
| commit | 9bac56a6c83bbb5eb7ed4281dfc3189ad05e38a1 (patch) | |
| tree | 7e3c8f4f522180a774ea4e000d93979f1989f6eb /lisp/isearch.el | |
| parent | cdaa39727a2ad035f8ea6045624100a1413ee2d8 (diff) | |
| download | emacs-9bac56a6c83bbb5eb7ed4281dfc3189ad05e38a1.tar.gz | |
(isearch-mode): Don't set deactivate-mark here.
(isearch-done): In Transient Mark mode, don't set mark if is active.
Diffstat (limited to 'lisp/isearch.el')
| -rw-r--r-- | lisp/isearch.el | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index 3bcc23a2f9e..ddea96cd268 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -4,7 +4,7 @@ ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu> -;; |$Date: 1994/08/30 07:03:33 $|$Revision: 1.72 $ +;; |$Date: 1994/08/30 21:20:09 $|$Revision: 1.73 $ ;; This file is part of GNU Emacs. @@ -514,10 +514,6 @@ is treated as a regexp. See \\[isearch-forward] for more info." (setq isearch-mode " Isearch") ;; forward? regexp? (set-buffer-modified-p (buffer-modified-p)) ; update modeline - ;; It is ugly to show region highlighting while the search - ;; is going on. And we don't want the mark active at the end either. - (setq deactivate-mark t) - (isearch-push-state) (make-local-variable 'overriding-local-map) @@ -598,7 +594,8 @@ is treated as a regexp. See \\[isearch-forward] for more info." ;; Maybe should test difference between and set mark iff > threshold. (if (/= (point) isearch-opoint) (progn - (push-mark isearch-opoint t) + (or (and transient-mark-mode mark-active) + (push-mark isearch-opoint t)) (or executing-macro (> (minibuffer-depth) 0) (message "Mark saved where search started"))) ;; (message "") why is this needed? |