[Emacs-diffs] /srv/bzr/emacs/trunk r104856: * lisp/mouse.el (mouse--strip-first-event): New function.

[Stefan Monnier]

------------------------------------------------------------
revno: 104856
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-01 13:58:14 -0400
message:
  * lisp/mouse.el (mouse--strip-first-event): New function.
  (function-key-map): Use it to map fringe clicks to normal clicks by default.
modified:
  lisp/ChangeLog
  lisp/mouse.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-01 17:45:31 +0000
+++ b/lisp/ChangeLog    2011-07-01 17:58:14 +0000
@@ -1,5 +1,9 @@
 2011-07-01  Stefan Monnier  <address@hidden>
 
+       * mouse.el (mouse--strip-first-event): New function.
+       (function-key-map): Use it to map fringe clicks to normal clicks
+       by default.
+
        * vc/vc-bzr.el (vc-bzr-revision-keywords): Update.
        (vc-bzr-revision-completion-table): Add support for annotate and date.
 

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2011-06-01 15:34:41 +0000
+++ b/lisp/mouse.el     2011-07-01 17:58:14 +0000
@@ -2092,17 +2092,19 @@
 (global-set-key [double-mouse-1] 'mouse-set-point)
 (global-set-key [triple-mouse-1] 'mouse-set-point)
 
-;; Clicking on the fringes causes hscrolling:
-(global-set-key [left-fringe mouse-1]  'mouse-set-point)
-(global-set-key [right-fringe mouse-1] 'mouse-set-point)
+(defun mouse--strip-first-event (_prompt)
+  (substring (this-single-command-raw-keys) 1))
+
+(define-key function-key-map [left-fringe mouse-1] 'mouse--strip-first-event)
+(define-key function-key-map [right-fringe mouse-1] 'mouse--strip-first-event)
 
 (global-set-key [mouse-2]      'mouse-yank-primary)
 ;; Allow yanking also when the corresponding cursor is "in the fringe".
-(global-set-key [right-fringe mouse-2] 'mouse-yank-at-click)
-(global-set-key [left-fringe mouse-2] 'mouse-yank-at-click)
+(define-key function-key-map [right-fringe mouse-2] 'mouse--strip-first-event)
+(define-key function-key-map [left-fringe mouse-2] 'mouse--strip-first-event)
 (global-set-key [mouse-3]      'mouse-save-then-kill)
-(global-set-key [right-fringe mouse-3] 'mouse-save-then-kill)
-(global-set-key [left-fringe mouse-3]  'mouse-save-then-kill)
+(define-key function-key-map [right-fringe mouse-3] 'mouse--strip-first-event)
+(define-key function-key-map [left-fringe mouse-3] 'mouse--strip-first-event)
 
 ;; By binding these to down-going events, we let the user use the up-going
 ;; event to make the selection, saving a click.