aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/xterm.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 510b2a836ce..b5c9e6d6b30 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,7 @@
3 * xrdb.c (x_load_resources) [USE_MOTIF]: Although not strictly 3 * xrdb.c (x_load_resources) [USE_MOTIF]: Although not strictly
4 necessary, put horizontal scroll bar resources as well. See 4 necessary, put horizontal scroll bar resources as well. See
5 <http://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00430.html>. 5 <http://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00430.html>.
6 * xterm.c (x_sync_with_move): Really wait 0.5s, not 0.0005s.
6 7
72014-07-29 Dmitry Antipov <dmantipov@yandex.ru> 82014-07-29 Dmitry Antipov <dmantipov@yandex.ru>
8 9
diff --git a/src/xterm.c b/src/xterm.c
index b4eba7fcf82..e35d63c785f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9351,7 +9351,7 @@ x_sync_with_move (struct frame *f, int left, int top, int fuzzy)
9351 if (eabs (current_left - left) <= 10 9351 if (eabs (current_left - left) <= 10
9352 && eabs (current_top - top) <= 40) 9352 && eabs (current_top - top) <= 40)
9353 return; 9353 return;
9354 } 9354 }
9355 else if (current_left == left && current_top == top) 9355 else if (current_left == left && current_top == top)
9356 return; 9356 return;
9357 } 9357 }
@@ -9359,7 +9359,7 @@ x_sync_with_move (struct frame *f, int left, int top, int fuzzy)
9359 /* As a last resort, just wait 0.5 seconds and hope that XGetGeometry 9359 /* As a last resort, just wait 0.5 seconds and hope that XGetGeometry
9360 will then return up-to-date position info. */ 9360 will then return up-to-date position info. */
9361 9361
9362 wait_reading_process_output (0, 500000, 0, 0, Qnil, NULL, 0); 9362 wait_reading_process_output (0, 500000000, 0, 0, Qnil, NULL, 0);
9363} 9363}
9364 9364
9365 9365