diff options
| author | Dmitry Antipov | 2013-08-01 09:28:24 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-08-01 09:28:24 +0400 |
| commit | c791c18e2364d4cabb2ebd317c963541a4c3bd5a (patch) | |
| tree | 9d64cc4106f170c237229fa461b365ab71362306 /src | |
| parent | 23456a2c2e05a3ba44285fd4f16cb385c1868945 (diff) | |
| download | emacs-c791c18e2364d4cabb2ebd317c963541a4c3bd5a.tar.gz emacs-c791c18e2364d4cabb2ebd317c963541a4c3bd5a.zip | |
* xterm.c (last_mouse_press_frame): Remove the
leftover which is not really used any more.
(handle_one_xevent, syms_of_xterm): Adjust users.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/xterm.c | 10 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 76ef664ccd0..40a1d22887e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-08-01 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * xterm.c (last_mouse_press_frame): Remove the | ||
| 4 | leftover which is not really used any more. | ||
| 5 | (handle_one_xevent, syms_of_xterm): Adjust users. | ||
| 6 | |||
| 1 | 2013-07-31 Dmitry Antipov <dmantipov@yandex.ru> | 7 | 2013-07-31 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 8 | ||
| 3 | Drop unnecessary functions that deals with frame pixel size. | 9 | Drop unnecessary functions that deals with frame pixel size. |
diff --git a/src/xterm.c b/src/xterm.c index a2306935e4e..9f4261f025e 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -213,7 +213,6 @@ static unsigned long ignore_next_mouse_click_timeout; | |||
| 213 | 213 | ||
| 214 | static XRectangle last_mouse_glyph; | 214 | static XRectangle last_mouse_glyph; |
| 215 | static FRAME_PTR last_mouse_glyph_frame; | 215 | static FRAME_PTR last_mouse_glyph_frame; |
| 216 | static Lisp_Object last_mouse_press_frame; | ||
| 217 | 216 | ||
| 218 | /* The scroll bar in which the last X motion event occurred. | 217 | /* The scroll bar in which the last X motion event occurred. |
| 219 | 218 | ||
| @@ -6975,14 +6974,8 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr, | |||
| 6975 | && event.xbutton.same_screen) | 6974 | && event.xbutton.same_screen) |
| 6976 | { | 6975 | { |
| 6977 | SET_SAVED_BUTTON_EVENT; | 6976 | SET_SAVED_BUTTON_EVENT; |
| 6978 | XSETFRAME (last_mouse_press_frame, f); | ||
| 6979 | *finish = X_EVENT_DROP; | 6977 | *finish = X_EVENT_DROP; |
| 6980 | } | 6978 | } |
| 6981 | else if (event.type == ButtonPress) | ||
| 6982 | { | ||
| 6983 | last_mouse_press_frame = Qnil; | ||
| 6984 | goto OTHER; | ||
| 6985 | } | ||
| 6986 | else | 6979 | else |
| 6987 | goto OTHER; | 6980 | goto OTHER; |
| 6988 | #endif /* USE_X_TOOLKIT || USE_GTK */ | 6981 | #endif /* USE_X_TOOLKIT || USE_GTK */ |
| @@ -10728,9 +10721,6 @@ syms_of_xterm (void) | |||
| 10728 | DEFSYM (Qvendor_specific_keysyms, "vendor-specific-keysyms"); | 10721 | DEFSYM (Qvendor_specific_keysyms, "vendor-specific-keysyms"); |
| 10729 | DEFSYM (Qlatin_1, "latin-1"); | 10722 | DEFSYM (Qlatin_1, "latin-1"); |
| 10730 | 10723 | ||
| 10731 | staticpro (&last_mouse_press_frame); | ||
| 10732 | last_mouse_press_frame = Qnil; | ||
| 10733 | |||
| 10734 | #ifdef USE_GTK | 10724 | #ifdef USE_GTK |
| 10735 | xg_default_icon_file = build_pure_c_string ("icons/hicolor/scalable/apps/emacs.svg"); | 10725 | xg_default_icon_file = build_pure_c_string ("icons/hicolor/scalable/apps/emacs.svg"); |
| 10736 | staticpro (&xg_default_icon_file); | 10726 | staticpro (&xg_default_icon_file); |