[Emacs-diffs] Changes to emacs/lisp/mouse.el [lexbind]

[Miles Bader]

Index: emacs/lisp/mouse.el
diff -c emacs/lisp/mouse.el:1.241.2.9 emacs/lisp/mouse.el:1.241.2.10
*** emacs/lisp/mouse.el:1.241.2.9       Fri Oct 29 02:05:09 2004
--- emacs/lisp/mouse.el Thu Nov  4 13:12:41 2004
***************
*** 1029,1041 ****
        (echo-keystrokes 0)
        event events key ignore
        (x-lost-selection-functions
!        (if (boundp 'x-lost-selection-functions)
!            (copy-sequence x-lost-selection-functions))))
!     (add-hook 'x-lost-selection-hook
              (lambda (seltype)
!               (if (eq seltype 'PRIMARY)
!                   (progn (setq ignore t)
!                          (throw 'mouse-show-mark t)))))
      (if transient-mark-mode
        (delete-overlay mouse-drag-overlay)
        (move-overlay mouse-drag-overlay (point) (mark t)))
--- 1029,1041 ----
        (echo-keystrokes 0)
        event events key ignore
        (x-lost-selection-functions
!        (when (boundp 'x-lost-selection-functions)
!            (copy-sequence x-lost-selection-functions))))
!     (add-hook 'x-lost-selection-functions
              (lambda (seltype)
!               (when (eq seltype 'PRIMARY)
!                   (setq ignore t)
!                   (throw 'mouse-show-mark t))))
      (if transient-mark-mode
        (delete-overlay mouse-drag-overlay)
        (move-overlay mouse-drag-overlay (point) (mark t)))
***************
*** 1065,1072 ****
                                          nil keys)
                      (setq events nil)))))))
      ;; If we lost the selection, just turn off the highlighting.
!     (if ignore
!       nil
        ;; For certain special keys, delete the region.
        (if (member key mouse-region-delete-keys)
          (delete-region (overlay-start mouse-drag-overlay)
--- 1065,1071 ----
                                          nil keys)
                      (setq events nil)))))))
      ;; If we lost the selection, just turn off the highlighting.
!     (unless ignore
        ;; For certain special keys, delete the region.
        (if (member key mouse-region-delete-keys)
          (delete-region (overlay-start mouse-drag-overlay)
***************
*** 1113,1119 ****
  Prefix arguments are interpreted as with \\[yank].
  If `mouse-yank-at-point' is non-nil, insert at point
  regardless of where you click."
!   (interactive "*e\nP")
    ;; Give temporary modes such as isearch a chance to turn off.
    (run-hooks 'mouse-leave-buffer-hook)
    (or mouse-yank-at-point (mouse-set-point click))
--- 1112,1118 ----
  Prefix arguments are interpreted as with \\[yank].
  If `mouse-yank-at-point' is non-nil, insert at point
  regardless of where you click."
!   (interactive "e\nP")
    ;; Give temporary modes such as isearch a chance to turn off.
    (run-hooks 'mouse-leave-buffer-hook)
    (or mouse-yank-at-point (mouse-set-point click))
***************
*** 1415,1421 ****
  Move point to the end of the inserted text.
  If `mouse-yank-at-point' is non-nil, insert at point
  regardless of where you click."
!   (interactive "*e")
    ;; Give temporary modes such as isearch a chance to turn off.
    (run-hooks 'mouse-leave-buffer-hook)
    (or mouse-yank-at-point (mouse-set-point click))
--- 1414,1420 ----
  Move point to the end of the inserted text.
  If `mouse-yank-at-point' is non-nil, insert at point
  regardless of where you click."
!   (interactive "e")
    ;; Give temporary modes such as isearch a chance to turn off.
    (run-hooks 'mouse-leave-buffer-hook)
    (or mouse-yank-at-point (mouse-set-point click))