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).

2 files changed, 8 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 460d6bed0b6..e5010af2902 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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)
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 9e32a2f5c64..238754e8584 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -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)