Mercurial > emacs

comparison src/keyboard.c @ 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 604d7fae62d1
children 55c887a0c742
comparison
equal deleted inserted replaced
36697:7526acd3385c 36698:e976eee4983f
4775 string_info = Fcons (string, make_number (charpos)); 4775 string_info = Fcons (string, make_number (charpos));
4776 } 4776 }
4777 else if (part == 2) 4777 else if (part == 2)
4778 posn = Qvertical_line; 4778 posn = Qvertical_line;
4779 else 4779 else
4780 XSETINT (posn, buffer_posn_from_coords (w, &wx, &wy)); 4780 {
4781 Lisp_Object object;
4782 struct display_pos p;
4783 buffer_posn_from_coords (w, &wx, &wy, &object, &p);
4784 posn = make_number (CHARPOS (p.pos));
4785 }
4781 } 4786 }
4782 4787
4783 position 4788 position
4784 = Fcons (window, 4789 = Fcons (window,
4785 Fcons (posn, 4790 Fcons (posn,
5069 else if (part == 2) 5074 else if (part == 2)
5070 posn = Qvertical_line; 5075 posn = Qvertical_line;
5071 else if (part == 3) 5076 else if (part == 3)
5072 posn = Qheader_line; 5077 posn = Qheader_line;
5073 else 5078 else
5074 XSETINT (posn, 5079 {
5075 buffer_posn_from_coords (XWINDOW (window), 5080 Lisp_Object object;
5076 &column, &row)); 5081 struct display_pos p;
5082 buffer_posn_from_coords (XWINDOW (window), &column, &row,
5083 &object, &p);
5084 posn = make_number (CHARPOS (p.pos));
5085 }
5077 } 5086 }
5078 5087
5079 { 5088 {
5080 Lisp_Object head, position; 5089 Lisp_Object head, position;
5081 5090
5148 else if (part == 2) 5157 else if (part == 2)
5149 posn = Qvertical_line; 5158 posn = Qvertical_line;
5150 else if (part == 3) 5159 else if (part == 3)
5151 posn = Qheader_line; 5160 posn = Qheader_line;
5152 else 5161 else
5153 XSETINT (posn, buffer_posn_from_coords (w, &wx, &wy)); 5162 {
5163 Lisp_Object object;
5164 struct display_pos p;
5165 buffer_posn_from_coords (w, &wx, &wy, &object, &p);
5166 posn = make_number (CHARPOS (p.pos));
5167 }
5154 } 5168 }
5155 5169
5156 { 5170 {
5157 Lisp_Object head, position; 5171 Lisp_Object head, position;
5158 5172
5260 else if (area == 2) 5274 else if (area == 2)
5261 posn = Qvertical_line; 5275 posn = Qvertical_line;
5262 else if (area == 3) 5276 else if (area == 3)
5263 posn = Qheader_line; 5277 posn = Qheader_line;
5264 else 5278 else
5265 XSETINT (posn, buffer_posn_from_coords (w, &wx, &wy)); 5279 {
5280 Lisp_Object object;
5281 struct display_pos p;
5282 buffer_posn_from_coords (w, &wx, &wy, &object, &p);
5283 posn = make_number (CHARPOS (p.pos));
5284 }
5266 } 5285 }
5267 else if (frame != 0) 5286 else if (frame != 0)
5268 { 5287 {
5269 XSETFRAME (window, frame); 5288 XSETFRAME (window, frame);
5270 posn = Qnil; 5289 posn = Qnil;