ChangeLog 187 KB
Newer Older
1 2 3 4
2011-06-17  Paul Eggert  <eggert@cs.ucla.edu>

	* buffer.c (struct sortvec.priority): Now EMACS_INT, not int.

5 6
2011-06-16  Paul Eggert  <eggert@cs.ucla.edu>

7 8 9 10
	* lisp.h: Include <limits.h>, for INT_MAX, LONG_MAX, LLONG_MAX.
	Without this, prin1 mishandles Lisp_Misc_Save_Value printing on
	hosts with pre-C99 libraries, because pD is wrongly defined to "t".

11
	Improve buffer-overflow checking (Bug#8873).
12 13 14 15 16 17 18 19 20
	* fileio.c (Finsert_file_contents):
	* insdel.c (insert_from_buffer_1, replace_range, replace_range_2):
	Remove the old (too-loose) buffer overflow checks.
	They weren't needed, since make_gap checks for buffer overflow.
	* insdel.c (make_gap_larger): Catch buffer overflows that were missed.
	The old code merely checked for Emacs fixnum overflow, and relied
	on undefined (wraparound) behavior.  The new code avoids undefined
	behavior, and also checks for ptrdiff_t and/or size_t overflow.

21
	* editfns.c (Finsert_char): Don't dump core with very negative counts.
22 23
	Tune.  Don't use wider integers than needed.  Don't use alloca.
	Use a bigger 'string' buffer.  Rewrite to avoid 'n > 0' test.
24

25 26
	* insdel.c (replace_range): Fix buf overflow when insbytes < outgoing.

27 28 29 30 31 32
	* insdel.c, lisp.h (buffer_overflow): New function.
	(insert_from_buffer_1, replace_range, replace_range_2):
	* insdel.c (make_gap_larger):
	* editfns.c (Finsert_char):
	* fileio.c (Finsert_file_contents): Use it, to normalize wording.

33 34
	* buffer.h (BUF_BYTES_MAX): Cast to ptrdiff_t so that it's signed.

35 36
2011-06-15  Paul Eggert  <eggert@cs.ucla.edu>

37
	Integer overflow and signedness fixes (Bug#8873).
Paul Eggert's avatar
Paul Eggert committed
38

39 40 41
	* ccl.c (ASCENDING_ORDER): New macro, to work around GCC bug 43772.
	(GET_CCL_RANGE, IN_INT_RANGE): Use it.

42 43 44 45 46
	* fileio.c: Don't assume EMACS_INT fits in off_t.
	(emacs_lseek): New static function.
	(Finsert_file_contents, Fwrite_region): Use it.
	Use SEEK_SET, SEEK_CUR, SEEK_END as appropriate.

47 48
	* fns.c (Fload_average): Don't assume 100 * load average fits in int.

49 50 51 52 53 54 55 56 57
	* fns.c: Don't overflow int when computing a list length.
	* fns.c (QUIT_COUNT_HEURISTIC): New constant.
	(Flength, Fsafe_length): Use EMACS_INT, not int, to avoid unwanted
	truncation on 64-bit hosts.  Check for QUIT every
	QUIT_COUNT_HEURISTIC entries rather than every other entry; that's
	faster and is responsive enough.
	(Flength): Report an error instead of overflowing an integer.
	(Fsafe_length): Return a float if the value is not representable
	as a fixnum.  This shouldn't happen except in contrived situations.
58
	(Fnthcdr, Fsort): Don't assume list length fits in int.
59
	(Fcopy_sequence): Don't assume vector length fits in int.
60

61 62 63 64 65 66 67
	* alloc.c: Check that resized vectors' lengths fit in fixnums.
	(header_size, word_size): New constants.
	(allocate_vectorlike): Don't check size overflow here.
	(allocate_vector): Check it here instead, since this is the only
	caller of allocate_vectorlike that could cause overflow.
	Check that the new vector's length is representable as a fixnum.

68 69 70 71 72 73
	* fns.c (next_almost_prime): Don't return a multiple of 3 or 5.
	The previous code was bogus.  For example, next_almost_prime (32)
	returned 39, which is undesirable as it is a multiple of 3; and
	next_almost_prime (24) returned 25, which is a multiple of 5 so
	why was the code bothering to check for multiples of 7?

74 75
	* bytecode.c (exec_byte_code): Use ptrdiff_t, not int, for vector length.

76 77
	* eval.c, doprnt.c (SIZE_MAX): Remove; inttypes.h defines this now.

78 79 80 81
	Variadic C functions now count arguments with ptrdiff_t.
	This partly undoes my 2011-03-30 change, which replaced int with size_t.
	Back then I didn't know that the Emacs coding style prefers signed int.
	Also, in the meantime I found a few more instances where arguments
82 83
	were being counted with int, which may truncate counts on 64-bit
	machines, or EMACS_INT, which may be unnecessarily wide.
84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100
	* lisp.h (struct Lisp_Subr.function.aMANY)
	(DEFUN_ARGS_MANY, internal_condition_case_n, safe_call):
	Arg counts are now ptrdiff_t, not size_t.
	All variadic functions and their callers changed accordingly.
	(struct gcpro.nvars): Now size_t, not size_t.  All uses changed.
	* bytecode.c (exec_byte_code): Check maxdepth for overflow,
	to avoid potential buffer overrun.  Don't assume arg counts fit in 'int'.
	* callint.c (Fcall_interactively): Check arg count for overflow,
	to avoid potential buffer overrun.  Use signed char, not 'int',
	for 'varies' array, so that we needn't bother to check its size
	calculation for overflow.
	* editfns.c (Fformat): Use ptrdiff_t, not EMACS_INT, to count args.
	* eval.c (apply_lambda):
	* fns.c (Fmapconcat): Use XFASTINT, not XINT, to get args length.
	(struct textprop_rec.argnum): Now ptrdiff_t, not int.  All uses changed.
	(mapconcat): Use ptrdiff_t, not int and EMACS_INT, to count args.

101 102
	* callint.c (Fcall_interactively): Don't use index var as event count.

103 104 105
	* vm-limit.c (check_memory_limits): Fix incorrect extern function decls.
	* mem-limits.h (SIZE): Remove; no longer used.

106
	* xterm.c (x_alloc_nearest_color_1): Prefer int to long when int works.
107

Paul Eggert's avatar
Paul Eggert committed
108 109 110 111 112 113
	Remove unnecessary casts.
	* xterm.c (x_term_init):
	* xfns.c (x_set_border_pixel):
	* widget.c (create_frame_gcs): Remove casts to unsigned long etc.
	These aren't needed now that we assume ANSI C.

114 115 116 117
	* sound.c (Fplay_sound_internal): Remove cast to unsigned long.
	It's more likely to cause problems (due to unsigned overflow)
	than to cure them.

118 119
	* dired.c (Ffile_attributes): Don't use 32-bit hack on 64-bit hosts.

120 121
	* unexelf.c (unexec): Don't assume BSS addr fits in unsigned.

122 123
	* xterm.c (handle_one_xevent): Omit unnecessary casts to unsigned.

124 125
	* keyboard.c (modify_event_symbol): Don't limit alist len to UINT_MAX.

126 127
	* lisp.h (CHAR_TABLE_SET): Omit now-redundant test.

128 129
	* lread.c (Fload): Don't compare a possibly-garbage time_t value.

130 131 132
	GLYPH_CODE_FACE returns EMACS_INT, not int.
	* dispextern.h (merge_faces):
	* xfaces.c (merge_faces):
Paul Eggert's avatar
Paul Eggert committed
133 134
	* xdisp.c (get_next_display_element, next_element_from_display_vector):
	Don't assume EMACS_INT fits in int.
135

136 137 138
	* character.h (CHAR_VALID_P): Remove unused parameter.
	* fontset.c, lisp.h, xdisp.c: All uses changed.

139 140
	* editfns.c (Ftranslate_region_internal): Omit redundant test.

141 142 143 144 145 146
	* fns.c (concat): Minor tuning based on overflow analysis.
	This doesn't fix any bugs.  Use int to hold character, instead
	of constantly refetching from Emacs object.  Use XFASTINT, not
	XINT, for value known to be a character.  Don't bother comparing
	a single byte to 0400, as it's always less.

147
	* floatfns.c (Fexpt):
148 149
	* fileio.c (make_temp_name): Omit unnecessary cast to unsigned.

150 151 152
	* editfns.c (Ftranslate_region_internal): Use int, not EMACS_INT
	for characters.

153 154
	* doc.c (get_doc_string): Omit (unsigned)c that mishandled negatives.

155 156 157 158 159
	* data.c (Faset): If ARRAY is a string, check that NEWELT is a char.
	Without this fix, on a 64-bit host (aset S 0 4294967386) would
	incorrectly succeed when S was a string, because 4294967386 was
	truncated before it was used.

160 161 162 163
	* chartab.c (Fchar_table_range): Use CHARACTERP to check range.
	Otherwise, an out-of-range integer could cause undefined behavior
	on a 64-bit host.

164 165 166 167 168 169
	* composite.c: Use int, not EMACS_INT, for characters.
	(fill_gstring_body, composition_compute_stop_pos): Use int, not
	EMACS_INT, for values that are known to be in character range.
	This doesn't fix any bugs but is the usual style inside Emacs and
	may generate better code on 32-bit machines.

170 171 172 173 174 175 176 177
	Make sure a 64-bit char is never passed to ENCODE_CHAR.
	This is for reasons similar to the recent CHAR_STRING fix.
	* charset.c (Fencode_char): Check that character arg is actually
	a character.  Pass an int to ENCODE_CHAR.
	* charset.h (ENCODE_CHAR): Verify that the character argument is no
	wider than 'int', as a compile-time check to prevent future regressions
	in this area.

178
	* character.c (char_string): Remove unnecessary casts.
179 180 181 182 183 184 185 186 187 188

	Make sure a 64-bit char is never passed to CHAR_STRING.
	Otherwise, CHAR_STRING would do the wrong thing on a 64-bit platform,
	by silently ignoring the top 32 bits, allowing some values
	that were far too large to be valid characters.
	* character.h: Include <verify.h>.
	(CHAR_STRING, CHAR_STRING_ADVANCE): Verify that the character
	arguments are no wider than unsigned, as a compile-time check
	to prevent future regressions in this area.
	* data.c (Faset):
Paul Eggert's avatar
Paul Eggert committed
189
	* editfns.c (Fchar_to_string, general_insert_function, Finsert_char)
190 191 192 193 194 195 196 197 198
	(Fsubst_char_in_region):
	* fns.c (concat):
	* xdisp.c (decode_mode_spec_coding):
	Adjust to CHAR_STRING's new requirement.
	* editfns.c (Finsert_char, Fsubst_char_in_region):
	* fns.c (concat): Check that character args are actually
	characters.  Without this test, these functions did the wrong
	thing with wildly out-of-range values on 64-bit hosts.

199 200 201 202 203
	Remove incorrect casts to 'unsigned' that lose info on 64-bit hosts.
	These casts should not be needed on 32-bit hosts, either.
	* keyboard.c (read_char):
	* lread.c (Fload): Remove casts to unsigned.

204 205 206 207
	* lisp.h (UNSIGNED_CMP): New macro.
	This fixes comparison bugs on 64-bit hosts.
	(ASCII_CHAR_P): Use it.
	* casefiddle.c (casify_object):
Paul Eggert's avatar
Paul Eggert committed
208
	* character.h (ASCII_BYTE_P, CHAR_VALID_P)
209 210 211 212 213
	(SINGLE_BYTE_CHAR_P, CHAR_STRING):
	* composite.h (COMPOSITION_ENCODE_RULE_VALID):
	* dispextern.h (FACE_FROM_ID):
	* keyboard.c (read_char): Use UNSIGNED_CMP.

214 215 216
	* xmenu.c (dialog_selection_callback) [!USE_GTK]: Cast to intptr_t,
	not to EMACS_INT, to avoid GCC warning.

217 218
	* xfns.c (x_set_scroll_bar_default_width): Remove unused 'int' locals.

219 220 221
	* buffer.h (PTR_BYTE_POS, BUF_PTR_BYTE_POS): Remove harmful cast.
	The cast incorrectly truncated 64-bit byte offsets to 32 bits, and
	isn't needed on 32-bit machines.
222

Paul Eggert's avatar
Paul Eggert committed
223 224
	* buffer.c (Fgenerate_new_buffer_name):
	Use EMACS_INT for count, not int.
225
	(advance_to_char_boundary): Return EMACS_INT, not int.
226 227 228

	* data.c (Qcompiled_function): Now static.

229 230
	* window.c (window_body_lines): Now static.

231 232
	* image.c (gif_load): Rename local to avoid shadowing.

233 234 235 236 237 238 239 240
	* lisp.h (SAFE_ALLOCA_LISP): Check for integer overflow.
	(struct Lisp_Save_Value): Use ptrdiff_t, not int, for 'integer' member.
	* alloc.c (make_save_value): Integer argument is now of type
	ptrdiff_t, not int.
	(mark_object): Use ptrdiff_t, not int.
	* lisp.h (pD): New macro.
	* print.c (print_object): Use it.

241 242 243
	* alloc.c: Use EMACS_INT, not int, to count objects.
	(total_conses, total_markers, total_symbols, total_vector_size)
	(total_free_conses, total_free_markers, total_free_symbols)
Paul Eggert's avatar
Paul Eggert committed
244 245
	(total_free_floats, total_floats, total_free_intervals)
	(total_intervals, total_strings, total_free_strings):
246 247 248 249
	Now EMACS_INT, not int.  All uses changed.
	(Fgarbage_collect): Compute overall total using a double, so that
	integer overflow is less likely to be a problem.  Check for overflow
	when converting back to an integer.
250 251 252 253
	(n_interval_blocks, n_string_blocks, n_float_blocks, n_cons_blocks)
	(n_vectors, n_symbol_blocks, n_marker_blocks): Remove.
	These were 'int' variables that could overflow on 64-bit hosts;
	they were never used, so remove them instead of repairing them.
254
	(nzombies, ngcs, max_live, max_zombies): Now EMACS_INT, not 'int'.
255 256 257
	(inhibit_garbage_collection): Set gc_cons_threshold to max value.
	Previously, this ceilinged at INT_MAX, but that doesn't work on
	64-bit machines.
258
	(allocate_pseudovector): Don't use EMACS_INT when int would do.
259

260
	* alloc.c (Fmake_bool_vector): Don't assume vector size fits in int.
261
	(allocate_vectorlike): Check for ptrdiff_t overflow.
262 263 264
	(mark_vectorlike, mark_char_table, mark_object): Avoid EMACS_UINT
	when a (possibly-narrower) signed value would do just as well.
	We prefer using signed arithmetic, to avoid comparison confusion.
265

266 267 268 269 270 271 272 273 274 275
	* alloc.c: Catch some string size overflows that we were missing.
	(XMALLOC_OVERRUN_CHECK_SIZE) [!XMALLOC_OVERRUN_CHECK]: Define to 0,
	for convenience in STRING_BYTES_MAX.
	(STRING_BYTES_MAX): New macro, superseding the old one in lisp.h.
	The definition here is exact; the one in lisp.h was approximate.
	(allocate_string_data): Check for string overflow.  This catches
	some instances we weren't catching before.  Also, it catches
	size_t overflow on (unusual) hosts where SIZE_MAX <= min
	(PTRDIFF_MAX, MOST_POSITIVE_FIXNUM), e.g., when size_t is 32 bits
	and ptrdiff_t and EMACS_INT are both 64 bits.
276

277 278 279 280
	* character.c, coding.c, doprnt.c, editfns.c, eval.c:
	All uses of STRING_BYTES_MAX replaced by STRING_BYTES_BOUND.
	* lisp.h (STRING_BYTES_BOUND): Renamed from STRING_BYTES_MAX.

281 282
	* character.c (string_escape_byte8): Fix nbytes/nchars typo.

283 284
	* alloc.c (Fmake_string): Check for out-of-range init.

285 286 287 288
2011-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>

	* eval.c (Fdefvaralias): Also mark the target as variable-special-p.

289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312
2011-06-14  Jan Djärv  <jan.h.d@swipnet.se>

	* xfns.c (x_set_scroll_bar_default_width): Remove argument to
	xg_get_default_scrollbar_width.

	* gtkutil.c: Include emacsgtkfixed.h if HAVE_GTK3.
	(int_gtk_range_get_value): Move to the scroll bar part of the file.
	(style_changed_cb): Call update_theme_scrollbar_width and call
	x_set_scroll_bar_default_width and xg_frame_set_char_size for
	all frames (Bug#8505).
	(xg_create_frame_widgets): Call emacs_fixed_new if HAVE_GTK3 (Bug#8505).
	Call gtk_window_set_resizable if HAVE_GTK3.
	(x_wm_set_size_hint): Call emacs_fixed_set_min_size with min width
	and height if HAVE_GTK3 (Bug#8505).
	(scroll_bar_width_for_theme): New variable.
	(update_theme_scrollbar_width): New function.
	(xg_get_default_scrollbar_width): Move code to
	update_theme_scrollbar_width, just return scroll_bar_width_for_theme.
	(xg_initialize): Call update_theme_scrollbar_width.

	* gtkutil.h (xg_get_default_scrollbar_width): Remove argument.

	* emacsgtkfixed.c, emacsgtkfixed.h: New files.

313 314 315 316 317 318 319 320 321 322 323 324 325
2011-06-12  Martin Rudalics  <rudalics@gmx.at>

	* frame.c (make_frame): Call other_buffer_safely instead of
	other_buffer.

	* window.c (temp_output_buffer_show): Call display_buffer with
	second argument Vtemp_buffer_show_specifiers and reset latter
	immediately after the call.
	(Vtemp_buffer_show_specifiers): New variable.
	(auto_window_vscroll_p, next_screen_context_lines)
	(Vscroll_preserve_screen_position): Remove leading asterisks from
	doc-strings.

Paul Eggert's avatar
Paul Eggert committed
326
2011-06-12  Paul Eggert  <eggert@cs.ucla.edu>
327

328
	Fix minor problems found by GCC 4.6.0 static checking.
329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355
	* buffer.c (Qclone_number): Remove for now, as it's unused.
	(record_buffer, Funrecord_buffer): Rename local to avoid shadowing.
	(record_buffer): Remove unused local.
	* frame.c (other_visible_frames, frame_buffer_list): Now static.
	(set_frame_buffer_list): Remove; unused.
	* frame.h (other_visible_frames): Remove decl.
	* keyboard.h (menu_items_inuse): Declare only if USE_GTK || USE_MOTIF.
	* lisp.h (frame_buffer_list, set_frame_buffer_list): Remove decls.
	(add_gpm_wait_descriptor, delete_gpm_wait_descriptor): Declare only
	if HAVE_GPM.
	* menu.c (menu_items_inuse): Now static unless USE_GTK || USE_MOTIF.
	* process.c (add_gpm_wait_descriptor, delete_gpm_wait_descriptor):
	Define only if HAVE_GPM.
	* widget.c (EmacsFrameResize, emacsFrameClassRec): Now static.
	(update_hints_inhibit): Remove; never set.  All uses removed.
	* widgetprv.h (emacsFrameClassRec): Remove decl.
	* window.c (delete_deletable_window): Now returns void, since it
	wasn't returning anything.
	(compare_window_configurations): Remove unused locals.
	* xfns.c (x_set_scroll_bar_default_width): Remove unused locals.
	* xmenu.c (x_menu_set_in_use): Define only if USE_GTK || USE_MOTIF.
	(dialog_selection_callback) [!USE_GTK]: Prefer intptr_t for integers
	the same widths as pointers.  This follows up on the 2011-05-06 patch.
	* xterm.c (x_alloc_lighter_color_for_widget): Define only if USE_LUCID.
	* xterm.h: Likewise.
	(x_menu_set_in_use): Declare only if USE_GTK || USE_MOTIF.

356 357 358 359 360
2011-06-12  Juanma Barranquero  <lekktu@gmail.com>

	* makefile.w32-in: Update dependencies.
	(LISP_H): Add lib/intprops.h.

361 362 363 364 365
2011-06-11  Chong Yidong  <cyd@stupidchicken.com>

	* image.c (gif_load): Add animation frame delay to the metadata.
	(syms_of_image): Use DEFSYM.  New symbol `delay'.

366 367 368 369 370 371 372 373 374
2011-06-11  Martin Rudalics  <rudalics@gmx.at>

	* window.c (delete_deletable_window): Re-add.
	(Fset_window_configuration): Rewrite to handle dead buffers and
	consequently deletable windows.
	(window_tree, Fwindow_tree): Remove.  Supply functionality in
	window.el.
	(compare_window_configurations): Simplify code.

375 376
2011-06-11  Andreas Schwab  <schwab@linux-m68k.org>

377 378 379
	* image.c (imagemagick_load_image): Fix type mismatch.
	(Fimagemagick_types): Likewise.

380 381
	* window.h (replace_buffer_in_windows): Declare.

382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432
2011-06-11  Martin Rudalics  <rudalics@gmx.at>

	* buffer.c: New Lisp objects Qbuffer_list_update_hook and
	Qclone_number.  Remove external declaration of Qdelete_window.
	(Fbuffer_list): Rewrite doc-string.  Minor restructuring of
	code.
	(Fget_buffer_create, Fmake_indirect_buffer, Frename_buffer): Run
	Qbuffer_list_update_hook if allowed.
	(Fother_buffer): Rewrite doc-string.  Major rewrite for new
	buffer list implementation.
	(other_buffer_safely): New function.
	(Fkill_buffer): Replace call to replace_buffer_in_all_windows by
	calls to replace_buffer_in_windows and
	replace_buffer_in_windows_safely.  Run Qbuffer_list_update_hook
	if allowed.
	(record_buffer): Inhibit quitting and rewrite using quittable
	functions.  Run Qbuffer_list_update_hook if allowed.
	(Frecord_buffer, Funrecord_buffer): New functions.
	(switch_to_buffer_1, Fswitch_to_buffer): Remove.  Move
	switch-to-buffer to window.el.
	(bury-buffer): Move to window.el.
	(Vbuffer_list_update_hook): New variable.

	* lisp.h (other_buffer_safely): Add prototype in buffer.c
	section.

	* window.h (resize_frame_windows): Move up in code.
	(Fwindow_frame): Remove EXFUN.
	(replace_buffer_in_all_windows): Remove prototype.
	(replace_buffer_in_windows_safely): Add prototype.

	* window.c: Declare Qdelete_window static again.  Move down
	declaration of select_count.
	(Fnext_window, Fprevious_window): Rewrite doc-strings.
	(Fother_window): Move to window.el.
	(window_loop): Remove DELETE_BUFFER_WINDOWS and UNSHOW_BUFFER
	cases.  Add REPLACE_BUFFER_IN_WINDOWS_SAFELY case.
	(Fdelete_windows_on, Freplace_buffer_in_windows): Move to
	window.el.
	(replace_buffer_in_windows): Implement by calling
	Qreplace_buffer_in_windows.
	(replace_buffer_in_all_windows): Remove with some functionality
	moved into replace_buffer_in_windows_safely.
	(replace_buffer_in_windows_safely): New function.
	(select_window_norecord, select_frame_norecord): Move in front
	of run_window_configuration_change_hook.  Remove now obsolete
	declarations.
	(Fset_window_buffer): Rewrite doc-string.  Call
	Qrecord_window_buffer.
	(keys_of_window): Move binding for other-window to window.el.

Chong Yidong's avatar
Chong Yidong committed
433 434 435 436 437 438 439 440 441 442
2011-06-11  Chong Yidong  <cyd@stupidchicken.com>

	* dispextern.h (struct image): Replace data member, whose int_val
	and ptr_val fields were not used by anything, with a single
	lisp_val object.

	* image.c (Fimage_metadata, make_image, mark_image, tiff_load)
	(gif_clear_image, gif_load, imagemagick_load_image)
	(gs_clear_image, gs_load): Callers changed.

443 444
2011-06-10  Paul Eggert  <eggert@cs.ucla.edu>

445 446 447
	* buffer.h: Include <time.h>, for time_t.
	Needed to build on FreeBSD 8.2.  Problem reported by Herbert J. Skuhra.

448 449
	Fix minor problems found by static checking.

450 451
	* image.c (PixelGetMagickColor): Declare if ImageMagick headers don't.

452 453 454 455 456 457 458
	Make identifiers static if they are not used in other modules.
	* data.c (Qcompiled_function, Qframe, Qvector):
	* image.c (QimageMagick, Qsvg):
	* minibuf.c (Qmetadata):
	* window.c (resize_window_check, resize_root_window): Now static.
	* window.h (resize_window_check, resize_root_window): Remove decls.

459 460
	* window.c (window_deletion_count, delete_deletable_window):
	Remove; unused.
461 462 463 464 465 466 467
	(window_body_lines): Now static.
	(Fdelete_other_windows_internal): Mark vars as initialized.
	Make sure 'resize_failed' is initialized.
	(run_window_configuration_change_hook): Rename local to avoid shadowing.
	(resize_window_apply): Remove unused local.
	* window.h (delete_deletable_window): Remove decl.

468
	* image.c (gif_load, svg_load_image): Rename locals to avoid shadowing.
469 470 471 472 473 474
	(imagemagick_load_image): Fix pointer signedness problem by changing
	last arg from unsigned char * to char *.  All uses changed.
	Also, fix a local for similar reasons.
	Remove unused locals.  Remove locals to avoid shadowing.
	(fn_rsvg_handle_free): Remove; unused.
	(svg_load, svg_load_image): Fix pointer signedness problem.
475
	(imagemagick_load_image): Don't use garbage pointer image_wand.
476

477 478
	* ftfont.c (ftfont_get_metrics, ftfont_drive_otf): Remove unused locals.

479 480 481 482 483
2011-06-10  Chong Yidong  <cyd@stupidchicken.com>

	* image.c (gif_load): Fix omitted cast error introduced by
	2011-06-06 change.

484 485 486 487 488 489 490 491
2011-06-10  Martin Rudalics  <rudalics@gmx.at>

	* window.h (resize_proportionally, orig_total_lines)
	(orig_top_line): Remove from window structure.
	(set_window_height, set_window_width, change_window_heights)
	(Fdelete_window): Remove prototypes.
	(resize_frame_windows): Remove duplicate declaration.

492 493 494 495 496 497 498 499 500
2011-06-10  Eli Zaretskii  <eliz@gnu.org>

	* window.h (resize_frame_windows, resize_window_check)
	(delete_deletable_window, resize_root_window)
	(resize_frame_windows): Declare prototypes.

	* window.c (resize_window_apply): Make definition be "static" to
	match the prototype.

501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564
2011-06-10  Martin Rudalics  <rudalics@gmx.at>

	* window.c: Remove declarations of Qwindow_size_fixed,
	window_min_size_1, window_min_size_2, window_min_size,
	size_window, window_fixed_size_p, enlarge_window, delete_window.
	Remove static from declaration of Qdelete_window, it's
	temporarily needed by Fbury_buffer.
	(replace_window): Don't assign orig_top_line and
	orig_total_lines.
	(Fdelete_window, delete_window): Remove.  Window deletion is
	handled by window.el.
	(window_loop): Remove DELETE_OTHER_WINDOWS case.  Replace
	Fdelete_window calls with calls to Qdelete_window.
	(Fdelete_other_windows): Remove.  Deleting other windows is
	handled by window.el.
	(window_fixed_size_p): Remove.  Fixed-sizeness of windows is
	handled in window.el.
	(window_min_size_2, window_min_size_1, window_min_size): Remove.
	Window minimum sizes are handled in window.el.
	(shrink_windows, size_window, set_window_height)
	(set_window_width, change_window_heights, window_height)
	(window_width, CURBEG, CURSIZE, enlarge_window)
	(adjust_window_trailing_edge, Fadjust_window_trailing_edge)
	(Fenlarge_window, Fshrink_window): Remove.  Window resizing is
	handled in window.el.
	(make_dummy_parent): Rename to make_parent_window and give it a
	second argument horflag.
	(make_window): Don't set resize_proportionally any more.
	(Fsplit_window): Remove.  Windows are split in window.el.
	(save_restore_action, save_restore_orig_size)
	(shrink_window_lowest_first, save_restore_orig_size): Remove.
	Resize mini windows in window.el.
	(grow_mini_window, shrink_mini_window): Implement by calling
	Qresize_root_window_vertically, resize_window_check and
	resize_window_apply.
	(saved_window, Fset_window_configuration, save_window_save): Do
	not handle orig_top_line, orig_total_lines, and
	resize_proportionally.
	(window_min_height, window_min_width): Move to window.el.
	(keys_of_window): Move bindings for delete-other-windows,
	split-window, delete-window and enlarge-window to window.el.

	* buffer.c: Temporarily extern Qdelete_window.
	(Fbury_buffer): Temporarily call Qdelete_window instead of
	Fdelete_window (Fbury_buffer will move to window.el soon).

	* frame.c (set_menu_bar_lines_1): Remove code handling
	orig_top_line and orig_total_lines.

	* dispnew.c (adjust_frame_glyphs_initially): Don't use
	set_window_height but set heights directly.
	(change_frame_size_1): Use resize_frame_windows.

	* xdisp.c (init_xdisp): Don't use set_window_height but set
	heights directly.

	* xfns.c (x_set_menu_bar_lines, x_set_tool_bar_lines): Use
	resize_frame_windows instead of change_window_heights and run
	run_window_configuration_change_hook.

	* w32fns.c (x_set_tool_bar_lines): Use resize_frame_windows
	instead of change_window_heights and run
	run_window_configuration_change_hook.

565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583
2011-06-09  Martin Rudalics  <rudalics@gmx.at>

	* window.c (replace_window): Rename second argument REPLACEMENT to
	NEW.  New third argument SETFLAG.  Rewrite.
	(delete_window, make_dummy_parent): Call replace_window with
	third argument 1.
	(window_list_1): Move down in code.
	(run_window_configuration_change_hook): Move set_buffer part
	before select_frame_norecord part in order to unwind correctly.
	Rename count1 to count.
	(recombine_windows, delete_deletable_window, resize_root_window)
	(Fdelete_other_windows_internal)
	(Frun_window_configuration_change_hook, make_parent_window)
	(resize_window_check, resize_window_apply, Fresize_window_apply)
	(resize_frame_windows, Fsplit_window_internal)
	(Fdelete_window_internal, Fresize_mini_window_internal): New
	functions.
	(syms_of_window): New variables Vwindow_splits and Vwindow_nest.

584 585
2011-06-08  Martin Rudalics  <rudalics@gmx.at>

586 587 588 589
	* window.h (window): Add some new members to window structure -
	normal_lines, normal_cols, new_total, new_normal, clone_number,
	splits, nest, prev_buffers, next_buffers.
	(WINDOW_TOTAL_SIZE): Move here from window.c.
Martin Rudalics's avatar
Martin Rudalics committed
590
	(MIN_SAFE_WINDOW_WIDTH, MIN_SAFE_WINDOW_HEIGHT): Define here.
591

592 593
	* window.c (Fwindow_height, Fwindow_width, Fwindow_full_width_p):
	Remove.
594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613
	(make_dummy_parent): Set new members of windows structure.
	(make_window): Move down in code.  Handle new members of window
	structure.
	(Fwindow_clone_number, Fwindow_splits, Fset_window_splits)
	(Fwindow_nest, Fset_window_nest, Fwindow_new_total)
	(Fwindow_normal_size, Fwindow_new_normal, Fwindow_prev_buffers)
	(Fset_window_prev_buffers, Fwindow_next_buffers)
	(Fset_window_next_buffers, Fset_window_clone_number): New
	functions.
	(Fwindow_hscroll, Fwindow_at, Fwindow_point, Fwindow_start)
	(Fwindow_end, Fwindow_line_height, Fset_window_dedicated_p):
	Doc-string fixes.
	(Fwindow_parameters, Fwindow_parameter, Fset_window_parameter):
	Argument WINDOW can be now internal window too.
	(Fwindow_use_time): Move up in code.
	(Fget_buffer_window): Rename argument FRAME to ALL-FRAMES.
	Rewrite doc-string.
	(Fset_window_configuration, saved_window)
	(Fcurrent_window_configuration, save_window_save): Handle new
	members of window structure.
Martin Rudalics's avatar
Martin Rudalics committed
614 615 616 617 618 619 620
	(WINDOW_TOTAL_SIZE, MIN_SAFE_WINDOW_WIDTH)
	(MIN_SAFE_WINDOW_HEIGHT): Move to window.h.
	(syms_of_window): New Lisp objects Qrecord_window_buffer,
	Qwindow_deletable_p, Qdelete_window, Qreplace_buffer_in_windows,
	Qget_mru_window, Qresize_root_window,
	Qresize_root_window_vertically, Qsafe, Qabove, Qbelow,
	Qauto_buffer_name; staticpro them.
621

622 623 624 625 626 627 628 629
2011-06-07  Martin Rudalics  <rudalics@gmx.at>

	* window.c (Fwindow_total_size, Fwindow_left_column)
	(Fwindow_top_line, window_body_lines, Fwindow_body_size)
	(Fwindow_list_1): New functions.
	(window_box_text_cols): Replace with window_body_cols.
	(Fwindow_width, Fscroll_left, Fscroll_right): Use
	window_body_cols instead of window_box_text_cols.
630 631 632 633
	(delete_window, Fset_window_configuration): Call
	delete_all_subwindows with window as argument.
	(delete_all_subwindows): Take a window as argument and not a
	structure.  Rewrite.
634 635 636
	(window_loop): Remove handling of GET_LRU_WINDOW and
	GET_LARGEST_WINDOW.
	(Fget_lru_window, Fget_largest_window): Move to window.el.
637 638

	* window.h: Extern window_body_cols instead of
639 640
	window_box_text_cols.  delete_all_subwindows now takes a
	Lisp_Object as argument.
641 642 643 644

	* indent.c (compute_motion, Fcompute_motion): Use
	window_body_cols instead of window_box_text_cols.

645 646 647
	* frame.c (delete_frame): Call delete_all_subwindows with root
	window as argument.

648 649 650 651
2011-06-07  Daniel Colascione  <dan.colascione@gmail.com>

	* fns.c (Fputhash): Document return value.

652 653 654 655
2011-06-06  Chong Yidong  <cyd@stupidchicken.com>

	* image.c (gif_load): Implement gif89a spec "no disposal" method.

656
2011-06-06  Paul Eggert  <eggert@cs.ucla.edu>
657

Paul Eggert's avatar
Paul Eggert committed
658
	Cons<->int and similar integer overflow fixes (Bug#8794).
Paul Eggert's avatar
Paul Eggert committed
659

660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689
	Check for overflow when converting integer to cons and back.
	* charset.c (Fdefine_charset_internal, Fdecode_char):
	Use cons_to_unsigned to catch overflow.
	(Fencode_char): Use INTEGER_TO_CONS.
	* composite.h (LGLYPH_CODE): Use cons_to_unsigned.
	(LGLYPH_SET_CODE): Use INTEGER_TO_CONS.
	* data.c (long_to_cons, cons_to_long): Remove.
	(cons_to_unsigned, cons_to_signed): New functions.
	These signal an error for invalid or out-of-range values.
	* dired.c (Ffile_attributes): Use INTEGER_TO_CONS.
	* fileio.c (Fset_visited_file_modtime): Use CONS_TO_INTEGER.
	* font.c (Ffont_variation_glyphs):
	* fontset.c (Finternal_char_font): Use INTEGER_TO_CONS.
	* lisp.h: Include <intprops.h>.
	(INTEGER_TO_CONS, CONS_TO_INTEGER): New macros.
	(cons_to_signed, cons_to_unsigned): New decls.
	(long_to_cons, cons_to_long): Remove decls.
	* undo.c (record_first_change): Use INTEGER_TO_CONS.
	(Fprimitive_undo): Use CONS_TO_INTEGER.
	* xfns.c (Fx_window_property): Likewise.
	* xselect.c: Include <limits.h>.
	(x_own_selection, selection_data_to_lisp_data):
	Use INTEGER_TO_CONS.
	(x_handle_selection_request, x_handle_selection_clear)
	(x_get_foreign_selection, Fx_disown_selection_internal)
	(Fx_get_atom_name, x_send_client_event): Use CONS_TO_INTEGER.
	(lisp_data_to_selection_data): Use cons_to_unsigned.
	(x_fill_property_data): Use cons_to_signed.
	Report values out of range.

690 691 692 693 694 695 696 697 698 699 700 701 702 703 704
	Check for buffer and string overflow more precisely.
	* buffer.h (BUF_BYTES_MAX): New macro.
	* lisp.h (STRING_BYTES_MAX): New macro.
	* alloc.c (Fmake_string):
	* character.c (string_escape_byte8):
	* coding.c (coding_alloc_by_realloc):
	* doprnt.c (doprnt):
	* editfns.c (Fformat):
	* eval.c (verror):
	Use STRING_BYTES_MAX, not MOST_POSITIVE_FIXNUM,
	since they may not be the same number.
	* editfns.c (Finsert_char):
	* fileio.c (Finsert_file_contents):
	Likewise for BUF_BYTES_MAX.

705 706 707 708 709 710
	* image.c: Use ptrdiff_t, not int, for sizes.
	(slurp_file): Switch from int to ptrdiff_t.
	All uses changed.
	(slurp_file): Check that file size fits in both size_t (for
	malloc) and ptrdiff_t (for sanity and safety).

711 712 713
	* fileio.c (Fverify_visited_file_modtime): Avoid time overflow
	if b->modtime has its maximal value.

714 715
	* dired.c (Ffile_attributes): Don't assume EMACS_INT has >32 bits.

716 717 718 719 720
	Don't assume time_t can fit into int.
	* buffer.h (struct buffer.modtime): Now time_t, not int.
	* fileio.c (Fvisited_file_modtime): No need for time_t cast now.
	* undo.c (Fprimitive_undo): Use time_t, not int, for time_t value.

721 722 723 724 725 726 727 728 729 730 731 732 733 734
	Minor fixes for signed vs unsigned integers.
	* character.h (MAYBE_UNIFY_CHAR):
	* charset.c (maybe_unify_char):
	* keyboard.c (read_char, reorder_modifiers):
	XINT -> XFASTINT, since the integer must be nonnegative.
	* ftfont.c (ftfont_spec_pattern):
	* keymap.c (access_keymap, silly_event_symbol_error):
	XUINT -> XFASTINT, since the integer must be nonnegative.
	(Fsingle_key_description, preferred_sequence_p): XUINT -> XINT,
	since it makes no difference and we prefer signed.
	* keyboard.c (record_char): Use XUINT when all the neighbors do.
	(access_keymap): NATNUMP -> INTEGERP, since the integer must be
	nonnegative.

735 736 737 738
2011-06-06  Stefan Monnier  <monnier@iro.umontreal.ca>

	* window.h (Fwindow_frame): Declare.

739 740 741 742 743 744 745
2011-06-06  Paul Eggert  <eggert@cs.ucla.edu>

	* alloc.c: Simplify handling of large-request failures (Bug#8800).
	(SPARE_MEMORY): Always define.
	(LARGE_REQUEST): Remove.
	(memory_full): Use SPARE_MEMORY rather than LARGE_REQUEST.

746 747
2011-06-06  Martin Rudalics  <rudalics@gmx.at>

748 749 750 751 752 753 754 755 756 757 758 759 760 761 762
	* lisp.h: Move EXFUNS for Fframe_root_window,
	Fframe_first_window and Fset_frame_selected_window to window.h.

	* window.h: Move EXFUNS for Fframe_root_window,
	Fframe_first_window and Fset_frame_selected_window here from
	lisp.h.

	* frame.c (Fwindow_frame, Fframe_first_window)
	(Fframe_root_window, Fframe_selected_window)
	(Fset_frame_selected_window): Move to window.c.
	(Factive_minibuffer_window): Move to minibuf.c.
	(Fother_visible_frames_p): New function.

	* minibuf.c (Factive_minibuffer_window): Move here from frame.c.

763 764 765
	* window.c (decode_window, decode_any_window): Move up in code.
	(Fwindowp, Fwindow_live_p): Rewrite doc-strings.
	(inhibit_frame_unsplittable): Remove unused variable.
766 767 768
	(Fwindow_buffer): Move up and rewrite doc-string.
	(Fwindow_parent, Fwindow_vchild, Fwindow_hchild, Fwindow_next)
	(Fwindow_prev): New functions.
769 770 771 772 773 774 775
	(Fwindow_frame): Move here from frame.c.  Accept any window as
	argument.
	(Fframe_root_window, Fframe_first_window)
	(Fframe_selected_window): Move here from frame.c.  Accept frame
	or arbitrary window as argument.  Update doc-strings.
	(Fminibuffer_window): Move up in code.
	(Fwindow_minibuffer_p): Move up in code and simplify.
776 777
	(Fset_frame_selected_window): Move here from frame.c.
	Marginal rewrite.
778 779
	(Fselected_window, select_window, Fselect_window): Move up in
	code.  Minor doc-string fixes.
780

781 782 783 784 785 786 787 788
2011-06-06  Paul Eggert  <eggert@cs.ucla.edu>

	* alloc.c (memory_full) [SYSTEM_MALLOC]: Port to MacOS (Bug#8800).
	Do not assume that spare memory exists; that assumption is valid
	only if SYSTEM_MALLOC.
	(LARGE_REQUEST): New macro, so that the issue of large requests
	is separated from the issue of spare memory.

789 790
2011-06-05  Andreas Schwab  <schwab@linux-m68k.org>

Andreas Schwab's avatar
Andreas Schwab committed
791 792 793
	* editfns.c (Fformat): Correctly handle zero flag with hexadecimal
	format.  (Bug#8806)

794 795
	* gtkutil.c (xg_get_default_scrollbar_width): Avoid warning.

796 797 798
	* xfns.c (x_set_scroll_bar_default_width): Move declarations
	before statements.

799 800 801 802 803 804 805 806 807
2011-06-05  Jan Djärv  <jan.h.d@swipnet.se>

	* gtkutil.c (xg_get_default_scrollbar_width): New function.

	* gtkutil.h: Declare xg_get_default_scrollbar_width.

	* xfns.c (x_set_scroll_bar_default_width): If USE_GTK, get
	min width by calling x_set_scroll_bar_default_width (Bug#8505).

808 809 810 811
2011-06-05  Juanma Barranquero  <lekktu@gmail.com>

	* xdisp.c (single_display_spec_intangible_p): Remove declaration.

812 813 814 815
2011-06-04  Chong Yidong  <cyd@stupidchicken.com>

	* xselect.c (x_clipboard_manager_save): Remove redundant arg.
	(x_clipboard_manager_save): Add return value.
816 817
	(x_clipboard_manager_error_1, x_clipboard_manager_error_2):
	New error handlers.
818 819 820 821
	(x_clipboard_manager_save_frame, x_clipboard_manager_save_all):
	Obey Vx_select_enable_clipboard_manager.  Catch errors in
	x_clipboard_manager_save (Bug#8779).
	(Vx_select_enable_clipboard_manager): New variable.
822
	(x_get_foreign_selection): Reduce scope of x_catch_errors (Bug#8790).
823

824
2011-06-04  Dan Nicolaescu  <dann@ics.uci.edu>
825 826 827

	* emacs.c (main): Warn when starting a GTK emacs in daemon mode.

828
2011-06-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
829 830 831 832

	* fringe.c (update_window_fringes): Don't update overlay arrow bitmap
	in the current matrix if keep_current_p is non-zero.

833 834 835 836
2011-06-04  Eli Zaretskii  <eliz@gnu.org>

	* bidi.c (bidi_level_of_next_char): Fix last change.

837 838
2011-06-03  Eli Zaretskii  <eliz@gnu.org>

839
	Support bidi reordering of text covered by display properties.
840

841 842 843 844
	* bidi.c (bidi_copy_it): Use offsetof instead of emulating it.
	(bidi_fetch_char, bidi_fetch_char_advance): New functions.
	(bidi_cache_search, bidi_cache_iterator_state)
	(bidi_paragraph_init, bidi_resolve_explicit, bidi_resolve_weak)
845 846
	(bidi_level_of_next_char, bidi_move_to_visually_next):
	Support character positions inside a run of characters covered by a
847 848 849 850 851 852 853 854 855 856
	display string.
	(bidi_paragraph_init, bidi_resolve_explicit_1)
	(bidi_level_of_next_char): Call bidi_fetch_char and
	bidi_fetch_char_advance instead of FETCH_CHAR and
	FETCH_CHAR_ADVANCE.
	(bidi_init_it): Initialize new members.
	(LRE_CHAR, RLE_CHAR, PDF_CHAR, LRO_CHAR, RLO_CHAR): Remove macro
	definitions.
	(bidi_explicit_dir_char): Lookup character type in bidi_type_table,
	instead of using explicit *_CHAR codes.
857 858
	(bidi_resolve_explicit, bidi_resolve_weak):
	Use FETCH_MULTIBYTE_CHAR instead of FETCH_CHAR, as reordering of
859 860 861 862 863 864 865 866 867 868
	bidirectional text is supported only in multibyte buffers.
	(bidi_init_it): Accept additional argument FRAME_WINDOW_P and use
	it to initialize the frame_window_p member of struct bidi_it.
	(bidi_cache_iterator_state, bidi_resolve_explicit_1)
	(bidi_resolve_explicit, bidi_resolve_weak)
	(bidi_level_of_next_char, bidi_move_to_visually_next): Abort if
	bidi_it->nchars is non-positive.
	(bidi_level_of_next_char): Don't try to lookup the cache for the
	next/previous character if nothing is cached there yet, or if we
	were just reseat()'ed to a new position.
869

870 871 872 873 874 875
	* xdisp.c (set_cursor_from_row): Set start and stop points
	according to the row's direction when priming the loop that looks
	for the glyph on which to display cursor.
	(single_display_spec_intangible_p): Function deleted.
	(display_prop_intangible_p): Reimplement to call
	handle_display_spec instead of single_display_spec_intangible_p.
876 877
	Accept 3 additional arguments needed by handle_display_spec.
	This fixes incorrect cursor motion across display property with complex
878 879 880 881 882
	values: lists, `(when COND...)' forms, etc.
	(single_display_spec_string_p): Support property values that are
	lists with the argument STRING its top-level element.
	(display_prop_string_p): Fix the condition for processing a
	property that is a list to be consistent with handle_display_spec.
883
	(handle_display_spec): New function, refactored from the
884 885 886 887 888 889 890 891 892 893
	last portion of handle_display_prop.
	(compute_display_string_pos): Accept additional argument
	FRAME_WINDOW_P.  Call handle_display_spec to determine whether the
	value of a `display' property is a "replacing spec".
	(handle_single_display_spec): Accept 2 additional arguments BUFPOS
	and FRAME_WINDOW_P.  If IT is NULL, don't set up the iterator from
	the display property, but just return a value indicating whether
	the display property will replace the characters it covers.
	(Fcurrent_bidi_paragraph_direction): Initialize the nchars and
	frame_window_p members of struct bidi_it.
894 895
	(compute_display_string_pos, compute_display_string_end):
	New functions.
896 897 898
	(push_it): Accept second argument POSITION, where pop_it should
	jump to continue iteration.
	(reseat_1): Initialize bidi_it.disp_pos.
899

900 901
	* keyboard.c (adjust_point_for_property): Adjust the call to
	display_prop_intangible_p to its new signature.
902 903

	* dispextern.h (struct bidi_it): New member frame_window_p.
904 905
	(bidi_init_it): Update prototypes.
	(display_prop_intangible_p): Update prototype.
906 907
	(compute_display_string_pos, compute_display_string_end):
	Declare prototypes.
908 909
	(struct bidi_it): New members nchars and disp_pos.  ch_len is now
	EMACS_INT.
910

911
2011-06-02  Paul Eggert  <eggert@cs.ucla.edu>
912

913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928
	Malloc failure behavior now depends on size of allocation.
	* alloc.c (buffer_memory_full, memory_full): New arg NBYTES.
	* lisp.h: Change signatures accordingly.
	* alloc.c, buffer.c, editfns.c, menu.c, minibuf.c, xterm.c:
	All callers changed.  (Bug#8762)

	* gnutls.c: Use Emacs's memory allocators.
	Without this change, the gnutls library would invoke malloc etc.
	directly, which causes problems on non-SYNC_INPUT hosts, and which
	runs afoul of improving memory_full behavior.  (Bug#8761)
	(fn_gnutls_global_set_mem_functions): New macro or function pointer.
	(emacs_gnutls_global_init): Use it to specify xmalloc, xrealloc,
	xfree instead of the default malloc, realloc, free.
	(Fgnutls_boot): No need to check for memory allocation failure,
	since xmalloc does that for us.

Paul Eggert's avatar
Paul Eggert committed
929
	Remove arbitrary limit of 2**31 entries in hash tables.  (Bug#8771)
930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947
	* category.c (hash_get_category_set):
	* ccl.c (ccl_driver):
	* charset.c (Fdefine_charset_internal):
	* charset.h (struct charset.hash_index):
	* composite.c (get_composition_id, gstring_lookup_cache)
	(composition_gstring_put_cache):
	* composite.h (struct composition.hash_index):
	* dispextern.h (struct image.hash):
	* fns.c (next_almost_prime, larger_vector, cmpfn_eql)
	(cmpfn_equal, cmpfn_user_defined, hashfn_eq, hashfn_eql)
	(hashfn_equal, hashfn_user_defined, make_hash_table)
	(maybe_resize_hash_table, hash_lookup, hash_put)
	(hash_remove_from_table, hash_clear, sweep_weak_table, SXHASH_COMBINE)
	(sxhash_string, sxhash_list, sxhash_vector, sxhash_bool_vector)
	(Fsxhash, Fgethash, Fputhash, Fmaphash):
	* image.c (make_image, search_image_cache, lookup_image)
	(xpm_put_color_table_h):
	* lisp.h (struct Lisp_Hash_Table):
948
	* minibuf.c (Ftry_completion, Fall_completions, Ftest_completion):
949 950
	* print.c (print):  Use 'EMACS_UINT' and 'EMACS_INT'
	for hashes and hash indexes, instead of 'unsigned' and 'int'.
951 952 953 954
	* alloc.c (allocate_vectorlike):
	Check for overflow in vector size calculations.
	* ccl.c (ccl_driver):
	Check for overflow when converting EMACS_INT to int.
955 956
	* fns.c, image.c: Remove unnecessary static decls that would otherwise
	need to be updated by these changes.
957 958
	* fns.c (make_hash_table, maybe_resize_hash_table):
	Check for integer overflow with large hash tables.
959 960 961 962 963 964 965 966
	(make_hash_table, maybe_resize_hash_table, Fmake_hash_table):
	Prefer the faster XFLOAT_DATA to XFLOATINT where either will do.
	(SXHASH_REDUCE): New macro.
	(sxhash_string, sxhash_list, sxhash_vector, sxhash_bool_vector):
	Use it instead of discarding useful hash info with large hash values.
	(sxhash_float): New function.
	(sxhash): Use it.  No more need for "& INTMASK" due to above changes.
	* lisp.h (FIXNUM_BITS): New macro, useful for SXHASH_REDUCE etc.
967 968
	(MOST_NEGATIVE_FIXNUM, MOST_POSITIVE_FIXNUM, INTMASK):
	Rewrite to use FIXNUM_BITS, as this simplifies things.
969 970 971 972 973
	(next_almost_prime, larger_vector, sxhash, hash_lookup, hash_put):
	Adjust signatures to match updated version of code.
	(consing_since_gc): Now EMACS_INT, since a single hash table can
	use more than INT_MAX bytes.

974 975 976 977 978 979
2011-06-01  Dan Nicolaescu  <dann@ics.uci.edu>

	Make it possible to build with GCC-4.6+ -O2 -flto.

	* emacs.c (__malloc_initialize_hook): Mark as EXTERNALLY_VISIBLE.

980 981 982 983 984
2011-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>

	* minibuf.c (get_minibuffer, read_minibuf_unwind):
	Call minibuffer-inactive-mode.

985 986 987 988 989
2011-05-31  Juanma Barranquero  <lekktu@gmail.com>

	* makefile.w32-in ($(BLD)/data.$(O), $(BLD)/editfns.$(O)):
	Update dependencies.

990 991 992 993 994
2011-05-31  Dan Nicolaescu  <dann@ics.uci.edu>

	* data.c (init_data): Remove code for UTS, this system is not
	supported anymore.

995 996 997 998 999 1000 1001 1002
2011-05-31  Dan Nicolaescu  <dann@ics.uci.edu>

	Don't force ./temacs to start in terminal mode.

	* frame.c (make_initial_frame): Initialize faces in all cases, not
	only when CANNOT_DUMP is defined.
	* dispnew.c (init_display): Remove CANNOT_DUMP condition.

1003 1004 1005 1006 1007
2011-05-31  Dan Nicolaescu  <dann@ics.uci.edu>

	* dispnew.c (add_window_display_history): Use const for the string
	pointer.  Remove declaration, not needed.

Paul Eggert's avatar
Paul Eggert committed
1008
2011-05-31  Paul Eggert  <eggert@cs.ucla.edu>
1009

Paul Eggert's avatar
Paul Eggert committed
1010
	Use 'inline', not 'INLINE'.
Paul Eggert's avatar
Paul Eggert committed
1011
	<http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00914.html>
Paul Eggert's avatar
Paul Eggert committed
1012 1013 1014 1015 1016 1017 1018
	* alloc.c, fontset.c (INLINE): Remove.
	* alloc.c, bidi.c, charset.c, coding.c, dispnew.c, fns.c, image.c:
	* intervals.c, keyboard.c, process.c, syntax.c, textprop.c, w32term.c:
	* xdisp.c, xfaces.c, xterm.c: Replace all uses of INLINE with inline.
	* gmalloc.c (register_heapinfo): Use inline unconditionally.
	* lisp.h (LISP_MAKE_RVALUE): Use inline, not __inline__.

1019 1020 1021 1022 1023 1024 1025 1026 1027
2011-05-31  Dan Nicolaescu  <dann@ics.uci.edu>

	Make it possible to run ./temacs.

	* callproc.c (set_initial_environment): Remove CANNOT_DUMP code,
	syms_of_callproc does the same thing.  Remove test for
	"initialized", do it in the caller.
	* emacs.c (main): Avoid calling set_initial_environment when dumping.

1028 1029 1030 1031 1032 1033 1034 1035 1036
2011-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>

	* minibuf.c (Finternal_complete_buffer): Return `category' metadata.
	(read_minibuf): Use get_minibuffer.
	(syms_of_minibuf): Use DEFSYM.
	(Qmetadata): New var.
	* data.c (Qbuffer): Don't make it static.
	(syms_of_data): Use DEFSYM.

1037 1038 1039 1040 1041
2011-05-31  Paul Eggert  <eggert@cs.ucla.edu>

	* ccl.c (CCL_CODE_RANGE): Allow negative numbers.  (Bug#8751)
	(CCL_CODE_MIN): New macro.

Paul Eggert's avatar
Paul Eggert committed
1042 1043
2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>

1044 1045
	* alloc.c (lisp_align_malloc): Omit unnecessary val==NULL tests.

Paul Eggert's avatar
Paul Eggert committed
1046 1047 1048 1049 1050
	* eval.c (Qdebug): Now static.
	* lisp.h (Qdebug): Remove decl.  This reverts a part of the
	2011-04-26T11:26:05Z!dan.colascione@gmail.com that inadvertently undid part of
	2011-04-14T06:48:41Z!eggert@cs.ucla.edu.

1051 1052 1053 1054 1055
2011-05-29  Chong Yidong  <cyd@stupidchicken.com>

	* image.c: Various fixes to ImageMagick code comments.
	(Fimagemagick_types): Doc fix.

1056 1057
2011-05-29  Paul Eggert  <eggert@cs.ucla.edu>

1058 1059 1060 1061
	Minor fixes prompted by GCC 4.6.0 warnings.

	* xselect.c (converted_selections, conversion_fail_tag): Now static.

1062 1063 1064 1065
	* emacs.c [HAVE_X_WINDOWS]: Include "xterm.h".
	(x_clipboard_manager_save_all): Move extern decl to ...
	* xterm.h: ... here, so that it can be checked for consistency.

1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076
2011-05-29  Chong Yidong  <cyd@stupidchicken.com>

	* xselect.c (x_clipboard_manager_save_frame)
	(x_clipboard_manager_save_all): New functions.
	(Fx_clipboard_manager_save): Lisp function deleted.

	* emacs.c (Fkill_emacs): Call x_clipboard_manager_save_all.
	* frame.c (delete_frame): Call x_clipboard_manager_save_frame.

	* xterm.h: Update prototype.

1077 1078 1079 1080 1081
2011-05-28  William Xu  <william.xwl@gmail.com>

	* nsterm.m (ns_term_shutdown): Synchronize user defaults before
	exiting (Bug#8239).

1082 1083
2011-05-28  Jim Meyering  <meyering@redhat.com>

Eli Zaretskii's avatar
Eli Zaretskii committed
1084
	Avoid a sign-extension bug in crypto_hash_function.
1085 1086 1087 1088 1089 1090
	* fns.c (to_uchar): Define.
	(crypto_hash_function): Use it to convert some newly-signed
	variables to unsigned, to avoid sign-extension bugs.  For example,
	without this change, (md5 "truc") would evaluate to
	45723a2aff78ff4fff7fff1114760e62 rather than the expected
	45723a2af3788c4ff17f8d1114760e62.  Reported by Antoine Levitt in
Eli Zaretskii's avatar
Eli Zaretskii committed
1091
	https://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00883.html.
1092

Paul Eggert's avatar
Paul Eggert committed
1093 1094 1095
2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>

	Integer overflow fixes.
1096

1097 1098 1099 1100 1101 1102
	* dbusbind.c: Serial number integer overflow fixes.
	(CHECK_DBUS_SERIAL_GET_SERIAL): New macro.
	(Fdbus_call_method_asynchronously, xd_read_message_1): Use a float
	to hold a serial number that is too large for a fixnum.
	(Fdbus_method_return_internal, Fdbus_method_error_internal):
	Check for serial numbers out of range.  Decode any serial number
Paul Eggert's avatar
Paul Eggert committed
1103
	that was so large that it became a float.  (Bug#8722)
1104

1105 1106 1107 1108 1109 1110
	* dbusbind.c: Use XFASTINT rather than XUINT, and check for nonneg.
	(Fdbus_call_method, Fdbus_call_method_asynchronously):
	Use XFASTINT rather than XUINT when numbers are nonnegative.
	(xd_append_arg, Fdbus_method_return_internal):
	(Fdbus_method_error_internal): Likewise.  Also, for unsigned
	arguments, check that Lisp number is nonnegative, rather than
Paul Eggert's avatar
Paul Eggert committed
1111
	silently wrapping negative numbers around.  (Bug#8722)
1112
	(xd_read_message_1): Don't assume dbus_uint32_t can fit in int.
Paul Eggert's avatar
Paul Eggert committed
1113
	(Bug#8722)
1114

1115 1116
	* data.c (arith_driver, Flsh): Avoid unnecessary casts to EMACS_UINT.

1117 1118
	* ccl.c (ccl_driver): Redo slightly to avoid the need for 'unsigned'.

Paul Eggert's avatar
Paul Eggert committed
1119 1120 1121 1122 1123 1124 1125
	ccl: add integer overflow checks
	* ccl.c (CCL_CODE_MAX, GET_CCL_RANGE, GET_CCL_CODE, GET_CCL_INT):
	(IN_INT_RANGE): New macros.
	(ccl_driver): Use them to check for integer overflow when
	decoding a CCL program.  Many of the new checks are whether XINT (x)
	fits in int; it doesn't always, on 64-bit hosts.  The new version
	doesn't catch all possible integer overflows, but it's an
Paul Eggert's avatar
Paul Eggert committed
1126
	improvement.  (Bug#8719)
Paul Eggert's avatar
Paul Eggert committed
1127

1128 1129 1130
	* alloc.c (make_event_array): Use XINT, not XUINT.
	There's no need for unsigned here.

1131 1132 1133 1134
	* mem-limits.h (EXCEEDS_LISP_PTR) [!USE_LSB_TAG]: EMACS_UINT -> uintptr_t
	This follows up to the 2011-05-06 change that substituted uintptr_t
	for EMACS_INT.  This case wasn't caught back then.

1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154
	Rework Fformat to avoid integer overflow issues.
	* editfns.c: Include <float.h> unconditionally, as it's everywhere
	now (part of C89).  Include <verify.h>.
	(MAX_10_EXP, CONVERTED_BYTE_SIZE): Remove; no longer needed.
	(pWIDE, pWIDElen, signed_wide, unsigned_wide): New defns.
	(Fformat): Avoid the prepass trying to compute sizes; it was only
	approximate and thus did not catch overflow reliably.  Instead, walk
	through the format just once, formatting and computing sizes as we go,
	checking for integer overflow at every step, and allocating a larger
	buffer as needed.  Keep track separately whether the format is
	multibyte.  Keep only the most-recently calculated precision, rather
	than them all.  Record whether each argument has been converted to
	string.  Use EMACS_INT, not int, for byte and char and arg counts.
	Support field widths and precisions larger than INT_MAX.  Avoid
	sprintf's undefined behavior with conversion specifications such as %#d
	and %.0c.  Fix bug with strchr succeeding on '\0' when looking for
	flags.  Fix bug with (format "%c" 256.0).  Avoid integer overflow when
	formatting out-of-range floating point numbers with int
	formats. (Bug#8668)

1155 1156
	* lisp.h (FIXNUM_OVERFLOW_P): Work even if arg is a NaN.

1157 1158 1159 1160 1161 1162 1163 1164 1165
	* data.c: Avoid integer truncation in expressions involving floats.
	* data.c: Include <intprops.h>.
	(arith_driver): When there's an integer overflow in an expression
	involving floating point, convert the integers to floating point
	so that the resulting value does not suffer from catastrophic
	integer truncation.  For example, on a 64-bit host (* 4
	most-negative-fixnum 0.5) should yield about -4.6e+18, not zero.
	Do not rely on undefined behavior after integer overflow.

1166 1167
	merge count_size_as_multibyte, parse_str_to_multibyte
	* character.c, character.h (count_size_as_multibyte):
1168
	Rename from parse_str_to_multibyte; all uses changed.
1169 1170 1171 1172 1173 1174
	Check for integer overflow.
	* insdel.c, lisp.h (count_size_as_multibyte): Remove,
	since it's now a duplicate of the other.  This is more of
	a character than a buffer op, so better that it's in character.c.
	* fns.c, print.c: Adjust to above changes.

1175 1176 1177 1178
2011-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>

	* xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup.

1179 1180
2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>

1181 1182 1183 1184 1185
	* xselect.c: Fix minor problems prompted by GCC 4.6.0 warnings.
	(x_handle_selection_request, frame_for_x_selection): Remove unused vars.
	(x_clipboard_manager_save): Now static.
	(Fx_clipboard_manager_save): Rename local to avoid shadowing.

1186 1187 1188 1189
	* fns.c: Fix minor problems prompted by GCC 4.6.0 warnings.
	(crypto_hash_function): Now static.
	Fix pointer signedness problems.  Avoid unnecessary initializations.

Chong Yidong's avatar
Chong Yidong committed
1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202
2011-05-27  Chong Yidong  <cyd@stupidchicken.com>

	* termhooks.h (Vselection_alist): Make it terminal-local.

	* terminal.c (create_terminal): Initialize it.

	* xselect.c: Support for clipboard managers.
	(Vselection_alist): Move to termhooks.h as terminal-local var.
	(LOCAL_SELECTION): New macro.
	(x_atom_to_symbol): Handle x_display_info_for_display fail case.
	(symbol_to_x_atom): Remove gratuitous arg.
	(x_handle_selection_request, lisp_data_to_selection_data)
	(x_get_foreign_selection, Fx_register_dnd_atom): Callers changed.
1203 1204
	(x_own_selection, x_get_local_selection, x_convert_selection):
	New arg, specifying work frame.  Use terminal-local Vselection_alist.
Chong Yidong's avatar
Chong Yidong committed
1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217
	(some_frame_on_display): Delete unused function.
	(Fx_own_selection_internal, Fx_get_selection_internal)
	(Fx_disown_selection_internal, Fx_selection_owner_p)
	(Fx_selection_exists_p): New optional frame arg.
	(frame_for_x_selection, Fx_clipboard_manager_save): New functions.
	(x_handle_selection_clear): Don't treat other terminals with the
	same keyboard specially.  Use the terminal-local Vselection_alist.
	(x_clear_frame_selections): Use Frun_hook_with_args.

	* xterm.c (x_term_init): Intern ATOM and CLIPBOARD_MANAGER atoms.

	* xterm.h: Add support for those atoms.

1218 1219 1220 1221 1222 1223 1224
2011-05-26  Chong Yidong  <cyd@stupidchicken.com>

	* xselect.c: ICCCM-compliant handling of MULTIPLE targets.
	(converted_selections, conversion_fail_tag): New global variables.
	(x_selection_request_lisp_error): Free the above.
	(x_get_local_selection): Remove unnecessary code.
	(x_reply_selection_request): Args changed; handle arbitrary array
1225 1226
	of converted selections stored in converted_selections.
	Separate the XChangeProperty and SelectionNotify steps.
1227 1228 1229 1230 1231 1232 1233 1234 1235
	(x_handle_selection_request): Rewrite to handle MULTIPLE target.
	(x_convert_selection): New function.
	(x_handle_selection_event): Simplify.
	(x_get_foreign_selection): Don't ignore incoming requests while
	waiting for an answer; this will fail when we implement
	SAVE_TARGETS, and seems unnecessary anyway.
	(selection_data_to_lisp_data): Recognize ATOM_PAIR type.
	(Vx_sent_selection_functions): Doc fix.

1236 1237 1238 1239
2011-05-26  Leo Liu  <sdl.web@gmail.com>

	* editfns.c (Ftranspose_regions): Allow empty regions.  (Bug#8699)

1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256
2011-05-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>

	* dispextern.h (struct glyph_row): New member fringe_bitmap_periodic_p.

	* dispnew.c (shift_glyph_matrix, scrolling_window): Mark scrolled row
	for fringe update if it has periodic bitmap.
	(row_equal_p): Also compare left_fringe_offset,	right_fringe_offset,
	and fringe_bitmap_periodic_p.

	* fringe.c (get_fringe_bitmap_data): New function.
	(draw_fringe_bitmap_1, update_window_fringes): Use it.
	(update_window_fringes): Record periodicity of fringe bitmap in glyph
	row.  Mark glyph row for fringe update if periodicity changed.

	* xdisp.c (try_window_reusing_current_matrix): Don't mark scrolled row
	for fringe update unless it has periodic bitmap.

1257 1258 1259 1260 1261
2011-05-25  Kenichi Handa  <handa@m17n.org>

	* xdisp.c (get_next_display_element): Set correct it->face_id for
	a static composition.

1262 1263 1264 1265 1266 1267 1268 1269 1270
2011-05-24  Leo Liu  <sdl.web@gmail.com>

	* deps.mk (fns.o):
	* makefile.w32-in ($(BLD)/fns.$(O)): Include sha1.h.

	* fns.c (crypto_hash_function, Fsha1): New function.
	(Fmd5): Use crypto_hash_function.
	(syms_of_fns): Add Ssha1.

1271 1272 1273 1274 1275 1276 1277 1278
2011-05-22  Paul Eggert  <eggert@cs.ucla.edu>

	* gnutls.c: Remove unused macros.
	(fn_gnutls_transport_set_lowat, fn_gnutls_transport_set_pull_function):
	(fn_gnutls_transport_set_push_function) [!WINDOWSNT]:
	Remove macros that are defined and never used.
	Caught by gcc -Wunused-macros (GCC 4.6.0, Fedora 14).

1279 1280 1281 1282 1283 1284 1285
2011-05-22  Chong Yidong  <cyd@stupidchicken.com>

	* xselect.c (syms_of_xselect): Remove unused symbol SAVE_TARGETS.
	(Fx_get_selection_internal): Minor cleanup.
	(Fx_own_selection_internal): Rename arguments for consistency with
	select.el.

1286 1287 1288 1289
2011-05-22  Paul Eggert  <eggert@cs.ucla.edu>

	* xselect.c (QSAVE_TARGETS): New static var, to fix build failure.

1290 1291 1292 1293
2011-05-22  Chong Yidong  <cyd@stupidchicken.com>

	* xselect.c (syms_of_xselect): Include character.h; use DEFSYM.

1294 1295 1296 1297 1298
2011-05-21  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>

	* dispnew.c (scrolling_window): Don't exclude the case that the
	last enabled row in the desired matrix touches the bottom boundary.

1299 1300 1301
2011-05-21  Glenn Morris  <rgm@gnu.org>

	* Makefile.in ($(etc)/DOC): Make second command line even shorter.
1302 1303
	(SOME_MACHINE_OBJECTS): Replace FONT_OBJ by its maximal expansion,
	and add some more files.
1304

1305 1306 1307 1308 1309
2011-05-20  Eli Zaretskii  <eliz@gnu.org>

	* callproc.c (Fcall_process) [MSDOS]: Fix arguments to
	report_file_error introduced by the change from 2011-05-07.

1310 1311 1312 1313 1314 1315 1316
2011-05-20  Paul Eggert  <eggert@cs.ucla.edu>

	* systime.h (Time): Define only if emacs is defined.
	This is to allow ../lib-src/profile.c to be compiled on FreeBSD,
	where the include path doesn't have X11/X.h by default.  See
	<http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00561.html>.

Kenichi Handa's avatar
Kenichi Handa committed
1317
2011-05-20 Kenichi Handa  <handa@m17n.org>
1318 1319 1320

	* composite.c (find_automatic_composition): Fix previous change.

1321 1322 1323 1324 1325 1326 1327
2011-05-20  Glenn Morris  <rgm@gnu.org>

	* lisp.mk: New file, split from Makefile.in.
	* Makefile.in (lisp): Move to separate file, inserted by @lisp_frag@.
	(shortlisp): Remove.
	($(etc)/DOC): Edit lisp.mk rather than using $shortlisp.

1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338
2011-05-19  Glenn Morris  <rgm@gnu.org>

	* Makefile.in (MSDOS_SUPPORT_REAL, MSDOS_SUPPORT, NS_SUPPORT)
	(REAL_MOUSE_SUPPORT, GPM_MOUSE_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT)
	(BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT, WINDOW_SUPPORT): Remove.
	(lisp): Set the order to that of loadup.el.
	(shortlisp): Make it a copy of $lisp.
	(SOME_MACHINE_LISP): Remove.
	($(etc)/DOC): Depend just on $lisp, not $SOME_MACHINE_LISP too.
	Use just $shortlisp, not $SOME_MACHINE_LISP too.

1339 1340 1341 1342 1343 1344
2011-05-18  Kenichi Handa  <handa@m17n.org>

	* composite.c (CHAR_COMPOSABLE_P): Add more check for efficiency.
	(BACKWARD_CHAR): Wrap the arg STOP by parenthesis.
	(find_automatic_composition): Mostly rewrite for efficiency.

1345 1346 1347 1348
2011-05-18  Juanma Barranquero  <lekktu@gmail.com>

	* makefile.w32-in: Update dependencies.

1349 1350 1351
2011-05-18  Christoph Scholtes  <cschol2112@googlemail.com>

	* menu.c: Include limits.h (fixes the MS-Windows build broken by
1352
	2011-06-18T18:49:19Z!cyd@stupidchicken.com).
1353

Paul Eggert's avatar
Paul Eggert committed
1354
2011-05-18  Paul Eggert  <eggert@cs.ucla.edu>
1355

1356 1357
	Fix some integer overflow issues, such as string length overflow.

1358 1359
	* insdel.c (count_size_as_multibyte): Check for string overflow.

1360 1361 1362 1363 1364 1365 1366 1367 1368
	* character.c (lisp_string_width): Check for string overflow.
	Use EMACS_INT, not int, for string indexes and lengths; in
	particular, 2nd arg is now EMACS_INT, not int.  Do not crash if
	the resulting string length overflows an EMACS_INT; instead,
	report a string overflow if no precision given.  When checking for
	precision exhaustion, use a check that cannot possibly have
	integer overflow.  (Bug#8675)
	* character.h (lisp_string_width): Adjust to new signature.

1369 1370 1371 1372 1373 1374
	* alloc.c (string_overflow): New function.
	(Fmake_string): Use it.  This doesn't change behavior, but saves
	a few bytes and will simplify future changes.
	* character.c (string_escape_byte8): Likewise.
	* lisp.h (string_overflow): New decl.

1375 1376 1377
	Fixups, following up to the user-interface timestamp change.
	* nsterm.m (last_mouse_movement_time, ns_mouse_position): Use Time
	for UI timestamps, instead of unsigned long.
1378 1379
	* msdos.c (mouse_get_pos): Likewise.
	* w32inevt.c (movement_time, w32_console_mouse_position): Likewise.
1380 1381 1382
	* w32gui.h (Time): Define by including "systime.h" rather than by
	declaring it ourselves.  (Bug#8664)

1383 1384 1385
	* dispextern.h (struct image): Don't assume time_t <= unsigned long.
	* image.c (clear_image_cache): Likewise.

1386 1387
	* term.c (term_mouse_position): Don't assume time_t wraparound.

1388 1389
	Be more systematic about user-interface timestamps.
	Before, the code sometimes used 'Time', sometimes 'unsigned long',
1390 1391
	and sometimes 'EMACS_UINT', to represent these timestamps.
	This change causes it to use 'Time' uniformly, as that's what X uses.
1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410
	This makes the code easier to follow, and makes it easier to catch
	integer overflow bugs such as Bug#8664.
	* frame.c (Fmouse_position, Fmouse_pixel_position):
	Use Time, not unsigned long, for user-interface timestamps.
	* keyboard.c (last_event_timestamp, kbd_buffer_get_event): Likewise.
	(button_down_time, make_lispy_position, make_lispy_movement): Likewise.
	* keyboard.h (last_event_timestamp): Likewise.
	* menu.c (Fx_popup_menu) [!HAVE_X_WINDOWS]: Likewise.
	* menu.h (xmenu_show): Likewise.
	* term.c (term_mouse_position): Likewise.
	* termhooks.h (struct input_event.timestamp): Likewise.
	(struct terminal.mouse_position_hook): Likewise.
	* xmenu.c (create_and_show_popup_menu, xmenu_show): Likewise.
	* xterm.c (XTmouse_position, x_scroll_bar_report_motion): Likewise.
	* systime.h (Time): New decl.  Pull it in from <X11/X.h> if
	HAVE_X_WINDOWS, otherwise define it as unsigned long, which is
	what it was before.
	* menu.h, termhooks.h: Include "systime.h", for Time.

1411 1412 1413 1414 1415 1416 1417
	* keyboard.c (make_lispy_event): Fix problem in integer overflow.
	Don't assume that the difference between two unsigned long values
	can fit into an integer.  At this point, we know button_down_time
	<= event->timestamp, so the difference must be nonnegative, so
	there's no need to cast the result if double-click-time is
	nonnegative, as it should be; check that it's nonnegative, just in
	case.  This bug is triggered when events are more than 2**31 ms
Paul Eggert's avatar
Paul Eggert committed
1418
	apart (about 25 days).  (Bug#8664)
1419

1420
	* xselect.c (last_event_timestamp): Remove duplicate decl.
1421
	(x_own_selection): Remove needless cast to unsigned long.
1422

1423 1424 1425
	* xmenu.c (set_frame_menubar): Use int, not EMACS_UINT, for indexes
	that always fit in int.  Use a sentinel instead of a counter, to
	avoid a temp and to allay GCC's concerns about possible int overflow.
1426 1427
	* frame.h (struct frame): Use int for menu_bar_items_used
	instead of EMACS_INT, since it always fits in int.
1428

1429 1430
	* menu.c (grow_menu_items): Check for int overflow.

1431 1432
	* xmenu.c (set_frame_menubar): Don't mishandle vectors with no nils.

1433 1434 1435 1436 1437 1438 1439 1440 1441
	* xterm.c: Use EMACS_INT for Emacs modifiers, and int for X modifiers.
	Before, the code was not consistent.  These values cannot exceed
	2**31 - 1 so there's no need to make them unsigned.
	(x_x_to_emacs_modifiers): Accept int and return EMACS_INT.
	(x_emacs_to_x_modifiers): Accept EMACS_INT and return int.
	(x_x_to_emacs_modifiers, x_emacs_to_x_modifiers): Reject non-integers
	as modifiers.
	* xterm.h (x_x_to_emacs_modifiers): Adjust to signature change.

1442 1443 1444 1445 1446
	* lisp.h (XINT) [USE_LISP_UNION_TYPE]: Cast to EMACS_INT.
	(XUINT) [USE_LISP_UNION_TYPE]: Cast to EMACS_UINT.
	Otherwise, GCC 4.6.0 warns about printf (pI, XINT (...)),
	presumably because the widths might not match.

1447 1448
	* window.c (size_window): Avoid needless test at loop start.

1449 1450 1451 1452
2011-05-18  Courtney Bane  <emacs-bugs-7626@cbane.org>  (tiny change)

	* term.c (Fresume_tty): Restore hooks before reinitializing (bug#8687).