(mouse-save-then-kill-delete-region): Turn off change hooks

[bpt/emacs.git] / lisp / mouse.el

diff --git a/lisp/mouse.el b/lisp/mouse.el
index b319b12..b447bff 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -89,10 +89,7 @@ This command must be bound to a mouse click."
   (mouse-minibuffer-check click)
   (let ((start (event-start click)))
     (select-window (posn-window start))
-    (let ((new-height (if (eq (posn-point start) 'vertical-scroll-bar)
-                         (scroll-bar-scale (posn-col-row start)
-                                           (1- (window-height)))
-                       (1+ (cdr (posn-col-row (event-end click))))))
+    (let ((new-height (1+ (cdr (posn-col-row (event-end click)))))
          (first-line window-min-height)
          (last-line (- (window-height) window-min-height)))
       (if (< last-line first-line)
@@ -411,11 +408,15 @@ This does not delete the region; it acts like \\[kill-ring-save]."
     ;; Delete, but make the undo-list entry share with the kill ring.
     ;; First, delete just one char, so in case buffer is being modified
     ;; for the first time, the undo list records that fact.
-    (delete-region beg
-                  (+ beg (if (> end beg) 1 -1)))
+    (let (before-change-function after-change-function
+         before-change-functions after-change-functions)
+      (delete-region beg
+                    (+ beg (if (> end beg) 1 -1))))
     (let ((buffer-undo-list buffer-undo-list))
       ;; Undo that deletion--but don't change the undo list!
-      (primitive-undo 1 buffer-undo-list)
+      (let (before-change-function after-change-function
+           before-change-functions after-change-functions)
+       (primitive-undo 1 buffer-undo-list))
       ;; Now delete the rest of the specified region,
       ;; but don't record it.
       (setq buffer-undo-list t)
@@ -629,32 +630,17 @@ This must be bound to a button-down mouse event."
                                              click-count)))
                  (move-overlay mouse-secondary-overlay
                                (car range) (nth 1 range))))
-
-              ;; Are we moving on a different window on the same frame?
-              ((and (windowp (posn-window end))
-                    (eq (window-frame (posn-window end)) start-frame))
-               (let ((mouse-row
-                      (+ (nth 1 (window-edges (posn-window end)))
-                         (cdr (posn-col-row end)))))
-                 (cond
-                  ((< mouse-row top)
-                   (mouse-scroll-subr
-                    (- mouse-row top) mouse-secondary-overlay start-point))
-                  ((and (not (eobp))
-                        (>= mouse-row bottom))
-                   (mouse-scroll-subr (1+ (- mouse-row bottom))
-                                      mouse-drag-overlay start-point)))))
-
-              (t
-               (let ((mouse-y (cdr (cdr (mouse-position))))
-                     (menu-bar-lines (or (cdr (assq 'menu-bar-lines
-                                                    (frame-parameters)))
-                                         0)))
-
-                 ;; Are we on the menu bar?
-                 (and (integerp mouse-y) (< mouse-y menu-bar-lines)
-                      (mouse-scroll-subr (- mouse-y menu-bar-lines)
-                                         mouse-secondary-overlay start-point))))))))
+               (t
+                (let ((mouse-row (cdr (cdr (mouse-position)))))
+                  (cond
+                   ((null mouse-row))
+                   ((< mouse-row top)
+                    (mouse-scroll-subr
+                     (- mouse-row top) mouse-secondary-overlay start-point))
+                   ((and (not (eobp))
+                         (>= mouse-row bottom))
+                    (mouse-scroll-subr (1+ (- mouse-row bottom))
+                                       mouse-secondary-overlay start-point)))))))))
 
        (if (and (eq (get (event-basic-type event) 'event-kind) 'mouse-click)
                 (eq (posn-window (event-end event)) start-window)
@@ -1204,13 +1190,28 @@ and selects that window."
          (setq buffer completion-reference-buffer))
       (save-excursion
        (goto-char (posn-point (event-start event)))
-       (skip-chars-backward "^ \t\n")
-       (let ((beg (point)))
+       (let (beg end)
          (skip-chars-forward "^ \t\n")
-         (setq choice (buffer-substring beg (point))))))
+         (while (looking-at " [^ \n\t]")
+           (forward-char 1)
+           (skip-chars-forward "^ \t\n"))
+         (setq end (point))
+         (skip-chars-backward "^ \t\n")
+         (while (and (= (preceding-char) ?\ )
+                     (not (and (> (point) (1+ (point-min)))
+                               (= (char-after (- (point) 2)) ?\ ))))
+           (backward-char 1)
+           (skip-chars-backward "^ \t\n"))
+         (setq beg (point))
+         (setq choice (buffer-substring beg end)))))
     (let ((owindow (selected-window)))
       (select-window (posn-window (event-start event)))
-      (bury-buffer)
+      (if (and (one-window-p t 'selected-frame)
+              (window-dedicated-p (selected-window)))
+         ;; This is a special buffer's frame
+         (iconify-frame (selected-frame))
+       (or (window-dedicated-p (selected-window))
+           (bury-buffer)))
       (select-window owindow))
     (choose-completion-string choice buffer)))
 \f