aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-08 18:15:18 -0800
committerPaul Eggert2011-03-08 18:15:18 -0800
commit7f3f1250d4f74203c828e7ba03b721b1f269a0d7 (patch)
tree5442dca0411987db2811c68f9f28b7cdd8d3fbaf /src
parentfbceeba21b3b5aeb2a0f98d4ca937cabbe07fab0 (diff)
downloademacs-7f3f1250d4f74203c828e7ba03b721b1f269a0d7.tar.gz
emacs-7f3f1250d4f74203c828e7ba03b721b1f269a0d7.zip
* term.c (term_mouse_position): Rename local to avoid shadowing.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/term.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a8594fb3fc6..a3695bda635 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -108,6 +108,8 @@
108 * termchar.h (struct tty_display_info): Likewise. 108 * termchar.h (struct tty_display_info): Likewise.
109 * term.c (tgetflag, tgetnum, tgetstr): Redefine to use const pointers. 109 * term.c (tgetflag, tgetnum, tgetstr): Redefine to use const pointers.
110 110
111 * term.c (term_mouse_position): Rename local to avoid shadowing.
112
1112011-03-06 Chong Yidong <cyd@stupidchicken.com> 1132011-03-06 Chong Yidong <cyd@stupidchicken.com>
112 114
113 * xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06 115 * xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06
diff --git a/src/term.c b/src/term.c
index 6986cfb9e03..9531cce5f9f 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2700,14 +2700,14 @@ term_mouse_movement (FRAME_PTR frame, Gpm_Event *event)
2700 Set *bar_window to Qnil, and *x and *y to the column and 2700 Set *bar_window to Qnil, and *x and *y to the column and
2701 row of the character cell the mouse is over. 2701 row of the character cell the mouse is over.
2702 2702
2703 Set *time to the time the mouse was at the returned position. 2703 Set *timeptr to the time the mouse was at the returned position.
2704 2704
2705 This clears mouse_moved until the next motion 2705 This clears mouse_moved until the next motion
2706 event arrives. */ 2706 event arrives. */
2707static void 2707static void
2708term_mouse_position (FRAME_PTR *fp, int insist, Lisp_Object *bar_window, 2708term_mouse_position (FRAME_PTR *fp, int insist, Lisp_Object *bar_window,
2709 enum scroll_bar_part *part, Lisp_Object *x, 2709 enum scroll_bar_part *part, Lisp_Object *x,
2710 Lisp_Object *y, unsigned long *time) 2710 Lisp_Object *y, unsigned long *timeptr)
2711{ 2711{
2712 struct timeval now; 2712 struct timeval now;
2713 2713
@@ -2720,7 +2720,7 @@ term_mouse_position (FRAME_PTR *fp, int insist, Lisp_Object *bar_window,
2720 XSETINT (*x, last_mouse_x); 2720 XSETINT (*x, last_mouse_x);
2721 XSETINT (*y, last_mouse_y); 2721 XSETINT (*y, last_mouse_y);
2722 gettimeofday(&now, 0); 2722 gettimeofday(&now, 0);
2723 *time = (now.tv_sec * 1000) + (now.tv_usec / 1000); 2723 *timeptr = (now.tv_sec * 1000) + (now.tv_usec / 1000);
2724} 2724}
2725 2725
2726/* Prepare a mouse-event in *RESULT for placement in the input queue. 2726/* Prepare a mouse-event in *RESULT for placement in the input queue.