From: Glenn Morris <rgm@gnu.org>
Date: Sun, 3 Aug 2014 20:34:33 +0000 (-0400)
Subject: Merge from emacs-24; up to 2014-06-27T16:27:08Z!rgm@gnu.org
X-Git-Tag: emacs-25.0.90~2635^2~679^2~533
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3cc0c06094c8731c9e15536fefd3382d8ca1eba0;p=emacs.git

Merge from emacs-24; up to 2014-06-27T16:27:08Z!rgm@gnu.org
---

3cc0c06094c8731c9e15536fefd3382d8ca1eba0
diff --cc src/ChangeLog
index b0768dd5489,3f9b4577460..da3d197d6f3
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,41 -1,24 +1,52 @@@
 -2014-08-03  Dmitry Antipov  <dmantipov@yandex.ru>
 -
 -	Fix bug with an attempt to select uninitialized frame (Bug#18161).
 -	* xfns.c (Fx_create_frame): Move call to change_frame_size to
 -	a section where Lisp evaluation is disabled.  This way a pointer
 -	to uninitialized frame is not accessible from Lisp, which becomes
 -	critical if following call to x_figure_window_size throws an error.
 -
 -2014-08-02  Paul Eggert  <eggert@cs.ucla.edu>
 +2014-08-03  Paul Eggert  <eggert@cs.ucla.edu>
  
+ 	Fix bug with clang + directory_files_internal + GC (Bug#16986).
+ 	* dired.c (directory_files_internal): Use a volatile variable
+ 	to prevent the compiler from optimizing away all copies of a local.
+ 	I wonder how many other GC-related bugs like this lurk elsewhere?
+ 
+ 	Avoid 100% CPU utilization on ssh session exit (Bug#17691).
+ 	* xterm.h (struct x_display_info): New member 'connection'.
+ 	* xterm.c (x_term_init, x_delete_terminal): Set and use it,
+ 	so that x_delete_terminal has a file descriptor to pass to
+ 	delete_keyboard_wait_descriptor.
+ 
 +	Don't mishandle year-9999 dates (Bug#18176).
 +	* editfns.c (decode_time_components): Store an invalid timespec
 +	on overflow, instead of returning false, so that the caller can
 +	distinguish overflow from other errors.
 +	(lisp_time_argument, lisp_seconds_argument): If the time is out
 +	of range, signal a time overflow instead of an invalid time spec.
 +	* keyboard.c (decode_timer): Treat time overflow like other
 +	timespec errors.
 +
 +	Avoid undefined behavior with signed left shift.
 +	Caught by 'gcc -fsanitize=undefined'.
 +	* dispextern.h, scroll.c (scrolling_max_lines_saved, scrolling_1):
 +	* dispnew.c (line_hash_code, scrolling):
 +	* scroll.c (calculate_scrolling, calculate_direct_scrolling):
 +	Use 'unsigned', not 'int', for line hashes.
 +	(scrolling_max_lines_saved): Avoid mystery constants for hash sizes.
 +
 +2014-08-02  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	Make compare-strings more compatible with old behavior (Bug#17903).
 +	* fns.c (Fcompare_strings): Silently bring too-large ends into range.
 +
 +2014-08-02  Jan Djärv  <jan.h.d@swipnet.se>
 +
 +	* gtkutil.c (create_dialog): Force min spacing 10 between buttons.
 +	Don't add label between left and right buttons (Bug#18129).
 +
 +2014-08-01  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	Make functions static that no longer need to be extern.
 +	* frame.c, frame.h (set_menu_bar_lines):
 +	* keyboard.c (Qleftmost, Qrightmost):
 +	* xfns.c, frame.h, menu.h (x_set_menu_bar_lines, x_set_tool_bar_lines)
 +	(x_set_internal_border_width):
 +	Now static.
 +
  2014-08-01  Eli Zaretskii  <eliz@gnu.org>
  
  	Fix display of R2L lines when the last character fits only partially.