Mercurial > emacs

changeset 36698:e976eee4983f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(make_lispy_event, make_lispy_movement): Adjust calls to buffer_posn_from_coords to new format.
author Gerd Moellmann <gerd@gnu.org>
date Fri, 09 Mar 2001 14:51:01 +0000
parents 7526acd3385c
children fd6df4c5c815
files src/keyboard.c
diffstat 1 files changed, 25 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/keyboard.c	Fri Mar 09 14:50:33 2001 +0000
+++ b/src/keyboard.c	Fri Mar 09 14:51:01 2001 +0000
@@ -4777,7 +4777,12 @@
 		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 @@
 	    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 @@
 	    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 @@
 	  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)
 	{