Merge branch 'master' into emacs24

Conflicts:
	js2-mode.el

diff --git a/js2-mode.el b/js2-mode.el
index 365bfa772334850663b084610aa8fdf4ea157d94..0e4d5184bc1718a94dc399753aab65caac430c95 100644 (file)
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -10490,9 +10490,10 @@ buffer will only rebuild its `js2-mode-ast' if the buffer is dirty."
   "Debugging aid:  highlight selected AST node on mouse click."
   (interactive "e")
   (mouse-set-point event)
-  (let ((node (js2-node-at-point))
-        beg end)
-    (when js2-mode-show-overlay
+  (setq deactivate-mark t)
+  (when js2-mode-show-overlay
+    (let ((node (js2-node-at-point))
+          beg end)
       (if (null node)
           (message "No node found at location %s" (point))
         (setq beg (js2-node-abs-pos node)
@@ -10509,8 +10510,6 @@ buffer will only rebuild its `js2-mode-ast' if the buffer is dirty."
                      (js2-node-short-name (js2-node-parent node))
                    "nil"))))))
 
-(put 'js2-mode-show-node 'CUA 'move)
-
 (defun js2-mode-hide-overlay (&optional p1 p2)
   "Remove the debugging overlay when the point moves.
 P1 and P2 are the old and new values of point, respectively."