From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 9 Mar 2001 14:51:01 +0000 (+0000)
Subject: (make_lispy_event, make_lispy_movement): Adjust
X-Git-Tag: emacs-pretest-21.0.100~93
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a955ffa20ce30736171729e9bac97be1beb16c3b;p=emacs.git

(make_lispy_event, make_lispy_movement): Adjust
calls to buffer_posn_from_coords to new format.
---

diff --git a/src/keyboard.c b/src/keyboard.c
index c806bd7265e..a73936e9198 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4777,7 +4777,12 @@ make_lispy_event (event)
 		else if (part == 2)
 		  posn = Qvertical_line;
 		else
-		  XSETINT (posn, buffer_posn_from_coords (w, &wx, &wy));
+		  {
+		    Lisp_Object object;
+		    struct display_pos p;
+		    buffer_posn_from_coords (w, &wx, &wy, &object, &p);
+		    posn = make_number (CHARPOS (p.pos));
+		  }
 	      }
 
 	    position
@@ -5071,9 +5076,13 @@ make_lispy_event (event)
 	    else if (part == 3)
 	      posn = Qheader_line;
 	    else
-	      XSETINT (posn,
-		       buffer_posn_from_coords (XWINDOW (window),
-						&column, &row));
+	      {
+		Lisp_Object object;
+		struct display_pos p;
+		buffer_posn_from_coords (XWINDOW (window), &column, &row,
+					 &object, &p);
+		posn = make_number (CHARPOS (p.pos));
+	      }
 	  }
 
 	{
@@ -5150,7 +5159,12 @@ make_lispy_event (event)
 	    else if (part == 3)
 	      posn = Qheader_line;
 	    else
-	      XSETINT (posn, buffer_posn_from_coords (w, &wx, &wy));
+	      {
+		Lisp_Object object;
+		struct display_pos p;
+		buffer_posn_from_coords (w, &wx, &wy, &object, &p);
+		posn = make_number (CHARPOS (p.pos));
+	      }
 	  }
 
 	{
@@ -5262,7 +5276,12 @@ make_lispy_movement (frame, bar_window, part, x, y, time)
 	  else if (area == 3)
 	    posn = Qheader_line;
 	  else
-	    XSETINT (posn, buffer_posn_from_coords (w, &wx, &wy));
+	    {
+	      Lisp_Object object;
+	      struct display_pos p;
+	      buffer_posn_from_coords (w, &wx, &wy, &object, &p);
+	      posn = make_number (CHARPOS (p.pos));
+	    }
 	}
       else if (frame != 0)
 	{