[Emacs-diffs] /srv/bzr/emacs/trunk r106548: * lisp/isearch.el (isearch-yank-x-selection): Deactivate mark.

[Stefan Monnier]

------------------------------------------------------------
revno: 106548
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10022
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2011-11-29 13:39:16 -0500
message:
  * lisp/isearch.el (isearch-yank-x-selection): Deactivate mark.
modified:
  lisp/ChangeLog
  lisp/isearch.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-11-29 15:55:54 +0000
+++ b/lisp/ChangeLog    2011-11-29 18:39:16 +0000
@@ -1,3 +1,7 @@
+2011-11-29  Stefan Monnier  <address@hidden>
+
+       * isearch.el (isearch-yank-x-selection): Deactivate mark (bug#10022).
+
 2011-11-29  Chong Yidong  <address@hidden>
 
        * indent.el (indent-for-tab-command, indent-according-to-mode):

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2011-11-27 18:17:40 +0000
+++ b/lisp/isearch.el   2011-11-29 18:39:16 +0000
@@ -1548,7 +1548,10 @@
 (defun isearch-yank-x-selection ()
   "Pull current X selection into search string."
   (interactive)
-  (isearch-yank-string (x-get-selection)))
+  (isearch-yank-string (x-get-selection))
+  ;; If `x-get-selection' returned the text from the active region,
+  ;; then it "used" the mark which we should hence deactivate.
+  (when select-active-regions (deactivate-mark)))
 
 
 (defun isearch-mouse-2 (click)