1 files changed, 27 insertions, 11 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 786e97d7d89..4937cc445bd 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5144,20 +5144,37 @@ make_lispy_position (f, x, y, time)
                                          &object, &dx, &dy, &width, &height);
           if (STRINGP (string))
             string_info = Fcons (string, make_number (charpos));
+          if (part == ON_LEFT_MARGIN)
+            wx = 0;
+          else
+            wx = window_box_right_offset (w, TEXT_AREA) - 1;
+        }
+      else if (part == ON_LEFT_FRINGE)
+        {
+          posn = Qleft_fringe;
+          rx = 0;
+          dx = wx;
+          wx = (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
+                ? 0
+                : window_box_width (w, LEFT_MARGIN_AREA));
+          dx -= wx;
         }
-      else if (part == ON_LEFT_FRINGE || part == ON_RIGHT_FRINGE)
+      else if (part == ON_RIGHT_FRINGE)
         {
-          posn = (part == ON_LEFT_FRINGE) ? Qleft_fringe : Qright_fringe;
+          posn = Qright_fringe;
           rx = 0;
           dx = wx;
-          if (part == ON_RIGHT_FRINGE)
-            dx -= (window_box_width (w, LEFT_MARGIN_AREA)
-                   + window_box_width (w, TEXT_AREA)
-                   + (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
-                      ? window_box_width (w, RIGHT_MARGIN_AREA)
-                      : 0));
-          else if (!WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w))
-            dx -= window_box_width (w, LEFT_MARGIN_AREA);
+          wx = (window_box_width (w, LEFT_MARGIN_AREA)
+                + window_box_width (w, TEXT_AREA)
+                + (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
+                   ? window_box_width (w, RIGHT_MARGIN_AREA)
+                   : 0));
+          dx -= wx;
+        }
+      else
+        {
+          /* Note: We have no special posn for part == ON_SCROLL_BAR.  */
+          wx = max (WINDOW_LEFT_MARGIN_WIDTH (w), wx);
         }
 
       if (textpos < 0)
@@ -5166,7 +5183,6 @@ make_lispy_position (f, x, y, time)
           struct display_pos p;
           int dx2, dy2;
           int width2, height2;
-          wx = max (WINDOW_LEFT_MARGIN_WIDTH (w), wx);
           string2 = buffer_posn_from_coords (w, &wx, &wy, &p,
                                              &object2, &dx2, &dy2,
                                              &width2, &height2);