summaryrefslogtreecommitdiff
path: root/lisp/info.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2009-07-15 01:25:32 +0000
committerChong Yidong <cyd@stupidchicken.com>2009-07-15 01:25:32 +0000
commitf9be2e356915fd56496dc2583e4856b5ccf95664 (patch)
tree0c618bbfeca73e3583da5a02204238c3e9f851a7 /lisp/info.el
parentcbd61418b367a9329ed51b5748019a75a5c7e9cf (diff)
downloademacs-f9be2e356915fd56496dc2583e4856b5ccf95664.tar.gz
* simple.el (deactivate-mark): Optional argument FORCE.
(set-mark): Use deactivate-mark. * info.el (Info-search): No need to check transient-mark-mode before calling deactivate-mark. * select.el (x-set-selection): Doc fix. (x-valid-simple-selection-p): Allow buffer values. (xselect--selection-bounds): Handle buffer values. Suggested by David De La Harpe Golden. * mouse.el (mouse-set-region, mouse-drag-track): Call copy-region-as-kill before setting the mark, to let select-active-regions work. * simple.el (deactivate-mark): If select-active-regions is non-nil, copy the selection data into a string. (activate-mark): If select-active-regions is non-nil, set the selection to the current buffer. (set-mark): Update selection if select-active-regions is non-nil. * select.el (x-valid-simple-selection-p): Allow buffer values.
Diffstat (limited to 'lisp/info.el')
-rw-r--r--lisp/info.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/info.el b/lisp/info.el
index 03618cc098d..af4e0b141bd 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1693,8 +1693,7 @@ If DIRECTION is `backward', search in the reverse direction."
(format "Regexp search%s: "
(if case-fold-search "" " case-sensitively")))
nil 'Info-search-history)))
- (when transient-mark-mode
- (deactivate-mark))
+ (deactivate-mark)
(when (equal regexp "")
(setq regexp (car Info-search-history)))
(when regexp