procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

In ruler-mode fix calculation of column from mouse position (Bug#17768).

Browse source 
* ruler-mode.el (ruler-mode-window-col)
(ruler-mode-mouse-set-left-margin)
(ruler-mode-mouse-set-right-margin): Fix calculation of column
from mouse position (Bug#17768).
This commit is contained in:
Andrea Rossetti 2014-06-16 08:37:37 +02:00 • committed by Martin Rudalics
parent eca36e9213
commit 680d0ff968
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lisp/ChangeLog
View file

@ -1,4 +1,9 @@
<<<<<<< TREE
2014-06-16 Andrea Rossetti <andrea.rossetti@gmail.com> (tiny change)
* ruler-mode.el (ruler-mode-window-col)
(ruler-mode-mouse-set-left-margin)
(ruler-mode-mouse-set-right-margin): Fix calculation of column
from mouse position (Bug#17768).
2014-06-16 Ron Schnell <ronnie@driver-aces.com>
@ -7,10 +12,6 @@
* play/dunnet.el (dun-unix-verbs): Added ssh as alias to rlogin, because nobody knows what rlogin is anymore.
* play/dunnet.el (dun-help): Bumped version number, updated contact info.
2014-06-14 Ron Schnell <ronnie@driver-aces.com>
* play/dunnet.el If a lamp is in the room, you won't be eaten by a grue.
=======
2014-06-15 Michael Albinus <michael.albinus@gmx.de>
Sync with Tramp 2.2.10.
@ -145,7 +146,6 @@
* play/dunnet.el (dun-describe-room, dun-mode):
If a lamp is in the room, you won't be eaten by a grue.
>>>>>>> MERGE-SOURCE
2014-06-13 Glenn Morris <rgm@gnu.org>
* Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el)

5
lisp/ruler-mode.el
View file

@ -306,7 +306,6 @@ or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or
"Return a column number relative to the selected window.
N is a column number relative to selected frame."
(- n
(car (window-edges))
(or (car (window-margins)) 0)
(fringe-columns 'left)
(scroll-bar-columns 'left)))
@ -321,7 +320,7 @@ START-EVENT is the mouse click event."
(when (eq start end) ;; mouse click
(save-selected-window
(select-window (posn-window start))
(setq col (- (car (posn-col-row start)) (car (window-edges))
(setq col (- (car (posn-col-row start))
(scroll-bar-columns 'left))
w (- (ruler-mode-full-window-width)
(scroll-bar-columns 'left)
@ -343,7 +342,7 @@ START-EVENT is the mouse click event."
(when (eq start end) ;; mouse click
(save-selected-window
(select-window (posn-window start))
(setq col (- (car (posn-col-row start)) (car (window-edges))
(setq col (- (car (posn-col-row start))
(scroll-bar-columns 'left))
w (- (ruler-mode-full-window-width)
(scroll-bar-columns 'left)