[Emacs-diffs] trunk r117351: In ruler-mode fix calculation of column from mouse position (Bug#17768).

[Martin Rudalics]

------------------------------------------------------------
revno: 117351
revision-id: address@hidden
parent: address@hidden
author: Andrea Rossetti <address@hidden>
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Mon 2014-06-16 08:37:37 +0200
message:
  In ruler-mode fix calculation of column from mouse position (Bug#17768).
  
  * 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).
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/ruler-mode.el             
rulermode.el-20091113204419-o5vbwnq5f7feedwu-2250

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-16 05:05:05 +0000
+++ b/lisp/ChangeLog    2014-06-16 06:37:37 +0000
@@ -1,4 +1,9 @@
-<<<<<<< TREE
+2014-06-16  Andrea Rossetti  <address@hidden>  (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  <address@hidden>
 
@@ -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  <address@hidden>      
-       * play/dunnet.el If a lamp is in the room, you won't be eaten by a grue.
-       
-=======
 2014-06-15  Michael Albinus  <address@hidden>
 
        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  <address@hidden>
 
        * Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el)

=== modified file 'lisp/ruler-mode.el'
--- a/lisp/ruler-mode.el        2014-01-01 07:43:34 +0000
+++ b/lisp/ruler-mode.el        2014-06-16 06:37:37 +0000
@@ -306,7 +306,6 @@
   "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 @@
     (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 @@
     (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)