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

	* image.c (cache_image): Check for size arithmetic overflow.

Paul Eggert's avatar
Paul Eggert committed
5 6
2011-06-22  Paul Eggert  <eggert@cs.ucla.edu>

7 8 9 10 11 12 13
	* lread.c: Integer overflow issues.
	(saved_doc_string_size, saved_doc_string_length)
	(prev_saved_doc_string_size, prev_saved_doc_string_length):
	Now ptrdiff_t, not int.
	(read1): Don't assume doc string length fits in int.  Check for
	out-of-range doc string lengths.
	(read_list): Don't assume file position fits in int.
14
	(read_escape): Check for hex character overflow.
15

16
	Fixes for GLYPH_DEBUG found by GCC 4.6.0 static checking.
Paul Eggert's avatar
Paul Eggert committed
17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
	The following patches are for when GLYPH_DEBUG && !XASSERT.
	* dispextern.h (trace_redisplay_p, dump_glyph_string):
	* dispnew.c (flush_stdout):
	* xdisp.c (dump_glyph_row, dump_glyph_matrix, dump_glyph):
	Mark as externally visible.
	* dispnew.c (check_window_matrix_pointers): Now static.
	* dispnew.c (window_to_frame_vpos):
	* xfns.c (unwind_create_frame):
	* xterm.c (x_check_font): Remove unused local.
	* scroll.c (CHECK_BOUNDS):
	* xfaces.c (cache_fache): Rename local to avoid shadowing.
	* xfns.c, w32fns.c (image_cache_refcount, dpyinfo_refcount): Now static.
	* xdisp.c (check_window_end): Now a no-op if !XASSERTS.
	(debug_first_unchanged_at_end_vpos, debug_last_unchanged_at_beg_vpos)
	(debug_dvpos, debug_dy, debug_delta, debug_delta_bytes, debug_end_vpos):
	Now static.
	(debug_method_add): Use va_list and vsprintf rather than relying
	on undefined behavior with wrong number of arguments.
	(dump_glyph, dump_glyph_row, Fdump_glyph_matrix):
	Don't assume ptrdiff_t and EMACS_INT are the same width as int.
	In this code, it's OK to assume C99 behavior for ptrdiff_t formats
	since we're not interested in debugging glyphs with old libraries.
	* xfaces.c (cache_face): Move debugging code earlier; this pacifies
	GCC 4.6.0's static checking.

42 43
2011-06-22  Paul Eggert  <eggert@cs.ucla.edu>

44 45 46
	Integer overflow and signedness fixes (Bug#8873).
	A few related buffer overrun fixes, too.

47 48
	* font.c (font_score): Use EMACS_INT, not int, to store XINT value.

49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
	* dispextern.h (struct face.stipple):
	* image.c (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
	(x_bitmap_mask, x_allocate_bitmap_record)
	(x_create_bitmap_from_data, x_create_bitmap_from_file)
	(x_destroy_bitmap, x_destroy_all_bitmaps, x_create_bitmap_mask)
	(x_create_bitmap_from_xpm_data):
	* nsterm.h (struct ns_display_info.bitmaps_size, .bitmaps_last):
	* w32term.h (struct w32_display_info.icon_bitmap_id, .bitmaps_size)
	(.bitmaps_last):
	* xfaces.c (load_pixmap):
	* xterm.c (x_bitmap_icon, x_wm_set_icon_pixmap):
	* xterm.h (struct x_display_info.icon_bitmap_id, .bitmaps_size)
	(.bitmaps_last, struct x_output.icon_bitmap):
	Use ptrdiff_t, not int, for bitmap indexes.
	(x_allocate_bitmap_record): Check for size overflow.
	* dispextern.h, lisp.h: Adjust to API changes elsewhere.

66 67 68 69 70 71
	Use ptrdiff_t, not int, for overlay counts.
	* buffer.h (overlays_at, sort_overlays, GET_OVERLAYS_AT):
	* editfns.c (overlays_around, get_pos_property):
	* textprop.c (get_char_property_and_overlay):
	* xdisp.c (next_overlay_change, note_mouse_highlight):
	* xfaces.c (face_at_buffer_position):
72 73 74 75
	* buffer.c (OVERLAY_COUNT_MAX): New macro.
	(overlays_at, overlays_in, sort_overlays, Foverlays_at)
	(Fnext_overlay_change, Fprevious_overlay_change)
	(mouse_face_overlay_overlaps, Foverlays_in):
76
	Use ptrdiff_t, not int, for sizes.
77
	(overlays_at, overlays_in): Check for size-calculation overflow.
78

79 80
	* xterm.c (xim_initialize, same_x_server): Strlen may not fit in int.

81 82 83
	* xsmfns.c (smc_save_yourself_CB, x_session_initialize): Avoid strlen.
	(x_session_initialize): Do not assume string length fits in int.

84 85 86
	* xsettings.c (apply_xft_settings): Fix potential buffer overrun.
	This is unlikely, but can occur if DPI is outlandish.

87
	* xsettings.c (Ffont_get_system_normal_font, Ffont_get_system_font):
88 89
	* xselect.c (Fx_get_atom_name): Avoid need for strlen.

90 91 92 93 94
	* xrdb.c: Don't assume strlen fits in int; avoid some strlens.
	* xrdb.c (magic_file_p, search_magic_path):
	Omit last arg SUFFIX; it was always 0.  All callers changed.
	(magic_file_p): Use ptrdiff_t, not int.  Check for size overflow.

95 96
	* xfont.c (xfont_match): Avoid need for strlen.

97 98 99
	* xfns.c: Don't assume strlen fits in int.
	(xic_create_fontsetname, x_window): Use ptrdiff_t, not int.

100 101 102 103
	* xdisp.c (message_log_check_duplicate): Return intmax_t,
	not unsigned long, as we prefer signed integers.  All callers changed.
	Detect integer overflow in repeat count.
	(message_dolog): Don't assume print length fits in 39 bytes.
104
	(display_mode_element): Don't assume strlen fits in int.
105

106 107 108 109
	* termcap.c: Don't assume sizes fit in int and never overflow.
	(struct termcap_buffer, tgetent): Use ptrdiff_t, not int, for sizes.
	(gobble_line): Check for size-calculation overflow.

110
	* minibuf.c (Fread_buffer):
111
	* lread.c (intern, intern_c_string):
112 113 114
	* image.c (xpm_scan) [HAVE_NS && !HAVE_XPM]:
	Don't assume string length fits in int.

115
	* keyboard.c (parse_tool_bar_item):
116 117
	* gtkutil.c (style_changed_cb): Avoid need for strlen.

118 119 120
	* font.c: Don't assume string length fits in int.
	(font_parse_xlfd, font_parse_fcname, font_unparse_fcname):
	Use ptrdiff_t, not int.
121 122 123
	(font_intern_prop): Don't assume string length fits in int.
	Don't assume integer property fits in fixnum.
	* font.h (font_intern_prop): 2nd arg is now ptrdiff_t, not int.
124

125
	* filelock.c: Fix some buffer overrun and integer overflow issues.
Paul Eggert's avatar
Paul Eggert committed
126
	(get_boot_time): Don't assume gzip command string fits in 100 bytes.
127 128 129 130 131 132 133 134 135 136 137
	Reformulate so as not to need the command string.
	Invoke gzip -cd rather than gunzip, as it's more portable.
	(lock_info_type, lock_file_1, lock_file):
	Don't assume pid_t and time_t fit in unsigned long.
	(LOCK_PID_MAX): Remove; we now use more-reliable bounds.
	(current_lock_owner): Prefer signed type for sizes.
	Use memcpy, not strncpy, where memcpy is what is really wanted.
	Don't assume (via atoi) that time_t and pid_t fit in int.
	Check for time_t and/or pid_t out of range, e.g., via a network share.
	Don't alloca where an auto var works fine.

138 139 140 141 142 143 144
	* fileio.c: Fix some integer overflow issues.
	(file_name_as_directory, Fexpand_file_name, Fsubstitute_in_file_name):
	Don't assume string length fits in int.
	(directory_file_name): Don't assume string length fits in long.
	(make_temp_name): Don't assume pid fits in int, or that its print
	length is less than 20.

145 146
	* data.c (Fsubr_name): Rewrite to avoid a strlen call.

147 148
	* coding.c (make_subsidiaries): Don't assume string length fits in int.

149 150
	* callproc.c (child_setup): Rewrite to avoid two strlen calls.

151 152 153
	* process.c (Fformat_network_address): Use EMACS_INT, not EMACS_UINT.
	We prefer signed integers, even for size calculations.

154 155 156 157
	* emacs.c: Don't assume string length fits in 'int'.
	(DEFINE_DUMMY_FUNCTION, sort_args): Use ptrdiff_t, not int.
	(main): Don't invoke strlen when not needed.

158 159 160
	* dbusbind.c (XD_ERROR): Don't arbitrarily truncate string.
	(XD_DEBUG_MESSAGE): Don't waste a byte.

161 162
	* callproc.c (getenv_internal_1, getenv_internal)
	(Fgetenv_internal):
163 164
	* buffer.c (init_buffer): Don't assume string length fits in 'int'.

165 166 167 168
	* lread.c (invalid_syntax): Omit length argument.
	All uses changed.  This doesn't fix a bug, but it simplifies the
	code away from its former Hollerith-constant appearance, and it's
	one less 'int' to worry about when looking at integer-overflow issues.
Paul Eggert's avatar
Paul Eggert committed
169
	(string_to_number): Simplify 2011-04-26 change by invoking xsignal1.
170

171 172 173 174
	* lisp.h (DEFUN): Remove bogus use of sizeof (struct Lisp_Subr).
	This didn't break anything, but it didn't help either.
	It's confusing to put a bogus integer in a place where the actual
	value does not matter.
175
	(LIST_END_P): Remove unused macro and its bogus comment.
176
	(make_fixnum_or_float): Remove unnecessary cast to EMACS_INT.
177

178 179 180
	* lisp.h (union Lisp_Object.i): EMACS_INT, not EMACS_UINT.
	This is for consistency with the ordinary, non-USE_LISP_UNION_TYPE,
	implementation.
181 182 183
	(struct Lisp_Bool_Vector.size): EMACS_INT, not EMACS_UINT.
	We prefer signed types, and the value cannot exceed the EMACS_INT
	range anyway (because otherwise the length would not be representable).
184 185 186
	(XSET) [USE_LISP_UNION_TYPE]: Use uintptr_t and intptr_t,
	not EMACS_UINT and EMACS_INT, when converting pointer to integer.
	This avoids a GCC warning when WIDE_EMACS_INT.
187

188 189 190
	* indent.c (sane_tab_width): New function.
	(current_column, scan_for_column, Findent_to, position_indentation)
	(compute_motion): Use it.  This is just for clarity.
191
	(Fcompute_motion): Don't assume hscroll and tab offset fit in int.
192

Paul Eggert's avatar
Paul Eggert committed
193
	* image.c (xbm_image_p): Don't assume stated width, height fit in int.
194

195 196 197 198
	* lisp.h (lint_assume): New macro.
	* composite.c (composition_gstring_put_cache):
	* ftfont.c (ftfont_shape_by_flt): Use it to pacify GCC 4.6.0.

199 200
	* editfns.c, insdel.c:
	Omit unnecessary forward decls, to simplify future changes.
201

202 203
	* ftfont.c (ftfont_shape_by_flt): Use signed integers for lengths.

204 205
	* font.c (Ffont_shape_gstring): Don't assume glyph len fits in 'int'.

206
	* fns.c (Ffillarray): Don't assume bool vector size fits in 'int'.
207
	Use much-faster test for byte-length change.
208
	Don't assume string byte-length fits in 'int'.
209
	Check that character arg fits in 'int'.
210
	(mapcar1): Declare byte as byte, for clarity.
211

212 213
	* alloc.c (Fmake_bool_vector): Avoid unnecessary multiplication.

214 215 216
	* fns.c (concat): Catch string overflow earlier.
	Do not rely on integer wraparound.

Paul Eggert's avatar
Paul Eggert committed
217 218
	* dispextern.h (struct it.overlay_strings_charpos)
	(struct it.selective): Now EMACS_INT, not int.
219 220 221 222 223
	* xdisp.c (forward_to_next_line_start)
	(back_to_previous_visible_line_start)
	(reseat_at_next_visible_line_start, next_element_from_buffer):
	Don't arbitrarily truncate the value of 'selective' to int.

224 225
	* xdisp.c (init_iterator): Use XINT, not XFASTINT; it might be < 0.

226 227 228
	* composite.c: Don't truncate sizes to 'int'.
	(composition_gstring_p, composition_reseat_it)
	(composition_adjust_point): Use EMACS_INT, not int.
229 230
	(get_composition_id, composition_gstring_put_cache): Use EMACS_INT,
	not EMACS_UINT, for indexes.
231

232 233
	* category.h (CATEGORY_SET_P): Remove unnecessary cast to EMACS_INT.

Paul Eggert's avatar
Paul Eggert committed
234 235
	* buffer.c: Include <verify.h>.
	(struct sortvec.priority, struct sortstr.priority):
236
	Now EMACS_INT, not int.
237
	(compare_overlays, cmp_for_strings): Avoid subtraction overflow.
238 239 240 241
	(struct sortstr.size, record_overlay_string)
	(struct sortstrlist.size, struct sortlist.used):
	Don't truncate size to int.
	(record_overlay_string): Check for size-calculation overflow.
Paul Eggert's avatar
Paul Eggert committed
242
	(init_buffer_once): Check at compile-time, not run-time.
243

244 245 246 247 248
2011-06-22  Jim Meyering  <meyering@redhat.com>

	don't leak an XBM-image-sized buffer
	* image.c (xbm_load): Free the image buffer after using it.

Paul Eggert's avatar
Paul Eggert committed
249 250 251 252 253 254 255 256 257
2011-06-21  Paul Eggert  <eggert@cs.ucla.edu>

	Port to Sun C.
	* composite.c (find_automatic_composition): Omit needless 'return 0;'
	that Sun C diagnosed.
	* fns.c (secure_hash): Fix pointer signedness issue.
	* intervals.c (static_offset_intervals): New function.
	(offset_intervals): Use it.

258 259 260 261 262 263 264 265 266 267 268
2011-06-21  Leo Liu  <sdl.web@gmail.com>

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

	* fns.c (secure_hash): Rename from crypto_hash_function and change
	the first arg to accept symbols.
	(Fsecure_hash): New primtive.
	(syms_of_fns): New symbols.

269 270 271 272 273
2011-06-20  Deniz Dogan  <deniz@dogan.se>

	* process.c (Fset_process_buffer): Clarify return value in
	docstring.

Chong Yidong's avatar
Chong Yidong committed
274 275 276 277 278 279 280 281 282 283 284 285 286 287
2011-06-18  Chong Yidong  <cyd@stupidchicken.com>

	* dispnew.c (add_window_display_history): Use BVAR.

	* xdisp.c (debug_method_add): Use BVAR.
	(check_window_end, dump_glyph_matrix, dump_glyph)
	(dump_glyph_row, dump_glyph_string): Convert arglist to ANSI C.

	* xfaces.c (check_lface_attrs, check_lface, dump_realized_face):
	Likewise.

	* xfns.c (Fx_create_frame, x_create_tip_frame): Delay image cache
	check till after the cache is created in init_frame_faces.

288 289 290 291
2011-06-17  Stefan Monnier  <monnier@iro.umontreal.ca>

	* fns.c (Fsafe_length): Yet another int/Lisp_Object mixup.

292 293
2011-06-16  Paul Eggert  <eggert@cs.ucla.edu>

294 295 296 297
	* 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".

298
	Improve buffer-overflow checking (Bug#8873).
299 300 301 302 303 304 305 306 307
	* 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.

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

312 313
	* insdel.c (replace_range): Fix buf overflow when insbytes < outgoing.

314 315 316 317 318 319
	* 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.

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

322 323
2011-06-15  Paul Eggert  <eggert@cs.ucla.edu>

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

326 327 328
	* ccl.c (ASCENDING_ORDER): New macro, to work around GCC bug 43772.
	(GET_CCL_RANGE, IN_INT_RANGE): Use it.

329 330 331 332 333
	* 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.

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

336 337 338 339 340 341 342 343 344
	* 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.
345
	(Fnthcdr, Fsort): Don't assume list length fits in int.
346
	(Fcopy_sequence): Don't assume vector length fits in int.
347

348 349 350 351 352 353 354
	* 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.

355 356 357 358 359 360
	* 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?

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

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

365 366 367 368
	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
369 370
	were being counted with int, which may truncate counts on 64-bit
	machines, or EMACS_INT, which may be unnecessarily wide.
371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387
	* 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.

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

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

393
	* xterm.c (x_alloc_nearest_color_1): Prefer int to long when int works.
394

Paul Eggert's avatar
Paul Eggert committed
395 396 397 398 399 400
	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.

401 402 403 404
	* 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.

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

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

409 410
	* xterm.c (handle_one_xevent): Omit unnecessary casts to unsigned.

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

413 414
	* lisp.h (CHAR_TABLE_SET): Omit now-redundant test.

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

417 418 419
	GLYPH_CODE_FACE returns EMACS_INT, not int.
	* dispextern.h (merge_faces):
	* xfaces.c (merge_faces):
Paul Eggert's avatar
Paul Eggert committed
420 421
	* xdisp.c (get_next_display_element, next_element_from_display_vector):
	Don't assume EMACS_INT fits in int.
422

423 424 425
	* character.h (CHAR_VALID_P): Remove unused parameter.
	* fontset.c, lisp.h, xdisp.c: All uses changed.

426 427
	* editfns.c (Ftranslate_region_internal): Omit redundant test.

428 429 430 431 432 433
	* 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.

434
	* floatfns.c (Fexpt):
435 436
	* fileio.c (make_temp_name): Omit unnecessary cast to unsigned.

437 438 439
	* editfns.c (Ftranslate_region_internal): Use int, not EMACS_INT
	for characters.

440 441
	* doc.c (get_doc_string): Omit (unsigned)c that mishandled negatives.

442 443 444 445 446
	* 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.

447 448 449 450
	* 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.

451 452 453 454 455 456
	* 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.

457 458 459 460 461 462 463 464
	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.

465
	* character.c (char_string): Remove unnecessary casts.
466 467 468 469 470 471 472 473 474 475

	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
476
	* editfns.c (Fchar_to_string, general_insert_function, Finsert_char)
477 478 479 480 481 482 483 484 485
	(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.

486 487 488 489 490
	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.

491 492 493 494
	* 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
495
	* character.h (ASCII_BYTE_P, CHAR_VALID_P)
496 497 498 499 500
	(SINGLE_BYTE_CHAR_P, CHAR_STRING):
	* composite.h (COMPOSITION_ENCODE_RULE_VALID):
	* dispextern.h (FACE_FROM_ID):
	* keyboard.c (read_char): Use UNSIGNED_CMP.

501 502 503
	* xmenu.c (dialog_selection_callback) [!USE_GTK]: Cast to intptr_t,
	not to EMACS_INT, to avoid GCC warning.

504 505
	* xfns.c (x_set_scroll_bar_default_width): Remove unused 'int' locals.

506 507 508
	* 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.
509

Paul Eggert's avatar
Paul Eggert committed
510 511
	* buffer.c (Fgenerate_new_buffer_name):
	Use EMACS_INT for count, not int.
512
	(advance_to_char_boundary): Return EMACS_INT, not int.
513 514 515

	* data.c (Qcompiled_function): Now static.

516 517
	* window.c (window_body_lines): Now static.

518 519
	* image.c (gif_load): Rename local to avoid shadowing.

520 521 522 523 524 525 526 527
	* 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.

528 529 530
	* 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
531 532
	(total_free_floats, total_floats, total_free_intervals)
	(total_intervals, total_strings, total_free_strings):
533 534 535 536
	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.
537 538 539 540
	(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.
541
	(nzombies, ngcs, max_live, max_zombies): Now EMACS_INT, not 'int'.
542 543 544
	(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.
545
	(allocate_pseudovector): Don't use EMACS_INT when int would do.
546

547
	* alloc.c (Fmake_bool_vector): Don't assume vector size fits in int.
548
	(allocate_vectorlike): Check for ptrdiff_t overflow.
549 550 551
	(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.
552

553 554 555 556 557 558 559 560 561 562
	* 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.
563

564 565 566 567
	* 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.

568 569
	* character.c (string_escape_byte8): Fix nbytes/nchars typo.

570 571
	* alloc.c (Fmake_string): Check for out-of-range init.

572 573 574 575
2011-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>

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

576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599
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.

600 601 602 603 604 605 606 607 608 609 610 611 612
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
613
2011-06-12  Paul Eggert  <eggert@cs.ucla.edu>
614

615
	Fix minor problems found by GCC 4.6.0 static checking.
616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642
	* 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.

643 644 645 646 647
2011-06-12  Juanma Barranquero  <lekktu@gmail.com>

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

648 649 650 651 652
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'.

653 654 655 656 657 658 659 660 661
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.

662 663
2011-06-11  Andreas Schwab  <schwab@linux-m68k.org>

664 665 666
	* image.c (imagemagick_load_image): Fix type mismatch.
	(Fimagemagick_types): Likewise.

667 668
	* window.h (replace_buffer_in_windows): Declare.

669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719
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
720 721 722 723 724 725 726 727 728 729
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.

730 731
2011-06-10  Paul Eggert  <eggert@cs.ucla.edu>

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

735 736
	Fix minor problems found by static checking.

737 738
	* image.c (PixelGetMagickColor): Declare if ImageMagick headers don't.

739 740 741 742 743 744 745
	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.

746 747
	* window.c (window_deletion_count, delete_deletable_window):
	Remove; unused.
748 749 750 751 752 753 754
	(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.

755
	* image.c (gif_load, svg_load_image): Rename locals to avoid shadowing.
756 757 758 759 760 761
	(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.
762
	(imagemagick_load_image): Don't use garbage pointer image_wand.
763

764 765
	* ftfont.c (ftfont_get_metrics, ftfont_drive_otf): Remove unused locals.

766 767 768 769 770
2011-06-10  Chong Yidong  <cyd@stupidchicken.com>

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

771 772 773 774 775 776 777 778
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.

779 780 781 782 783 784 785 786 787
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.

788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851
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.

852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870
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.

871 872
2011-06-08  Martin Rudalics  <rudalics@gmx.at>

873 874 875 876
	* 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
877
	(MIN_SAFE_WINDOW_WIDTH, MIN_SAFE_WINDOW_HEIGHT): Define here.
878

879 880
	* window.c (Fwindow_height, Fwindow_width, Fwindow_full_width_p):
	Remove.
881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900
	(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
901 902 903 904 905 906 907
	(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.
908

909 910 911 912 913 914 915 916
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.
917 918 919 920
	(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.
921 922 923
	(window_loop): Remove handling of GET_LRU_WINDOW and
	GET_LARGEST_WINDOW.
	(Fget_lru_window, Fget_largest_window): Move to window.el.
924 925

	* window.h: Extern window_body_cols instead of
926 927
	window_box_text_cols.  delete_all_subwindows now takes a
	Lisp_Object as argument.
928 929 930 931

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

932 933 934
	* frame.c (delete_frame): Call delete_all_subwindows with root
	window as argument.

935 936 937 938
2011-06-07  Daniel Colascione  <dan.colascione@gmail.com>

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

939 940 941 942
2011-06-06  Chong Yidong  <cyd@stupidchicken.com>

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

943
2011-06-06  Paul Eggert  <eggert@cs.ucla.edu>
944

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

947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976
	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.

977 978 979 980 981 982 983 984 985 986 987 988 989 990 991
	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.

992 993 994 995 996 997
	* 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).

998 999 1000
	* fileio.c (Fverify_visited_file_modtime): Avoid time overflow
	if b->modtime has its maximal value.

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

1003 1004 1005 1006 1007
	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.

1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021
	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.

1022 1023 1024 1025
2011-06-06  Stefan Monnier  <monnier@iro.umontreal.ca>

	* window.h (Fwindow_frame): Declare.

1026 1027 1028 1029 1030 1031 1032
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.

1033 1034
2011-06-06  Martin Rudalics  <rudalics@gmx.at>

1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049
	* 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.

1050 1051 1052
	* window.c (decode_window, decode_any_window): Move up in code.
	(Fwindowp, Fwindow_live_p): Rewrite doc-strings.
	(inhibit_frame_unsplittable): Remove unused variable.
1053 1054 1055
	(Fwindow_buffer): Move up and rewrite doc-string.
	(Fwindow_parent, Fwindow_vchild, Fwindow_hchild, Fwindow_next)
	(Fwindow_prev): New functions.
1056 1057 1058 1059 1060 1061 1062
	(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.
1063 1064
	(Fset_frame_selected_window): Move here from frame.c.
	Marginal rewrite.
1065 1066
	(Fselected_window, select_window, Fselect_window): Move up in
	code.  Minor doc-string fixes.
1067

1068 1069 1070 1071 1072 1073 1074 1075
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.

1076 1077
2011-06-05  Andreas Schwab  <schwab@linux-m68k.org>

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

1081 1082
	* gtkutil.c (xg_get_default_scrollbar_width): Avoid warning.

1083 1084 1085
	* xfns.c (x_set_scroll_bar_default_width): Move declarations
	before statements.

1086 1087 1088 1089 1090 1091 1092 1093 1094
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).

1095 1096 1097 1098
2011-06-05  Juanma Barranquero  <lekktu@gmail.com>

	* xdisp.c (single_display_spec_intangible_p): Remove declaration.

1099 1100 1101 1102
2011-06-04  Chong Yidong  <cyd@stupidchicken.com>

	* xselect.c (x_clipboard_manager_save): Remove redundant arg.
	(x_clipboard_manager_save): Add return value.
1103 1104
	(x_clipboard_manager_error_1, x_clipboard_manager_error_2):
	New error handlers.
1105 1106 1107 1108
	(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.
1109
	(x_get_foreign_selection): Reduce scope of x_catch_errors (Bug#8790).
1110

1111
2011-06-04  Dan Nicolaescu  <dann@ics.uci.edu>
1112 1113 1114

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

1115
2011-06-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
1116 1117 1118 1119

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

1120 1121 1122 1123
2011-06-04  Eli Zaretskii  <eliz@gnu.org>

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

1124 1125
2011-06-03  Eli Zaretskii  <eliz@gnu.org>

1126
	Support bidi reordering of text covered by display properties.
1127

1128 1129 1130 1131
	* 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)
1132 1133
	(bidi_level_of_next_char, bidi_move_to_visually_next):
	Support character positions inside a run of characters covered by a
1134 1135 1136 1137 1138 1139 1140 1141 1142 1143
	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.
1144 1145
	(bidi_resolve_explicit, bidi_resolve_weak):
	Use FETCH_MULTIBYTE_CHAR instead of FETCH_CHAR, as reordering of
1146 1147 1148 1149 1150 1151 1152 1153 1154 1155
	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.
1156

1157 1158 1159 1160 1161 1162
	* 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.
1163 1164
	Accept 3 additional arguments needed by handle_display_spec.
	This fixes incorrect cursor motion across display property with complex
1165 1166 1167 1168 1169
	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.
1170
	(handle_display_spec): New function, refactored from the
1171 1172 1173 1174 1175 1176 1177 1178 1179 1180
	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.
1181 1182
	(compute_display_string_pos, compute_display_string_end):
	New functions.
1183 1184 1185
	(push_it): Accept second argument POSITION, where pop_it should
	jump to continue iteration.
	(reseat_1): Initialize bidi_it.disp_pos.
1186

1187 1188
	* keyboard.c (adjust_point_for_property): Adjust the call to
	display_prop_intangible_p to its new signature.
1189 1190

	* dispextern.h (struct bidi_it): New member frame_window_p.
1191 1192
	(bidi_init_it): Update prototypes.
	(display_prop_intangible_p): Update prototype.
1193 1194
	(compute_display_string_pos, compute_display_string_end):
	Declare prototypes.
1195 1196
	(struct bidi_it): New members nchars and disp_pos.  ch_len is now
	EMACS_INT.
1197

1198
2011-06-02  Paul Eggert  <eggert@cs.ucla.edu>
1199

1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215
	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
1216
	Remove arbitrary limit of 2**31 entries in hash tables.  (Bug#8771)
1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234
	* 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):
1235
	* minibuf.c (Ftry_completion, Fall_completions, Ftest_completion):
1236 1237
	* print.c (print):  Use 'EMACS_UINT' and 'EMACS_INT'
	for hashes and hash indexes, instead of 'unsigned' and 'int'.
1238 1239 1240 1241
	* alloc.c (allocate_vectorlike):
	Check for overflow in vector size calculations.
	* ccl.c (ccl_driver):
	Check for overflow when converting EMACS_INT to int.
1242 1243
	* fns.c, image.c: Remove unnecessary static decls that would otherwise
	need to be updated by these changes.
1244 1245
	* fns.c (make_hash_table, maybe_resize_hash_table):
	Check for integer overflow with large hash tables.
1246 1247 1248 1249 1250 1251 1252 1253
	(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.
1254 1255
	(MOST_NEGATIVE_FIXNUM, MOST_POSITIVE_FIXNUM, INTMASK):
	Rewrite to use FIXNUM_BITS, as this simplifies things.
1256 1257 1258 1259 1260
	(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.

1261 1262 1263 1264 1265 1266
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.

1267 1268 1269 1270 1271
2011-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>

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

1272 1273 1274 1275 1276
2011-05-31  Juanma Barranquero  <lekktu@gmail.com>

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

1277 1278 1279 1280 1281
2011-05-31  Dan Nicolaescu  <dann@ics.uci.edu>

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

1282 1283 1284 1285 1286 1287 1288 1289
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.

1290 1291 1292 1293 1294
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
1295
2011-05-31  Paul Eggert  <eggert@cs.ucla.edu>
1296

Paul Eggert's avatar
Paul Eggert committed
1297
	Use 'inline', not 'INLINE'.
Paul Eggert's avatar
Paul Eggert committed
1298
	<http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00914.html>
Paul Eggert's avatar
Paul Eggert committed
1299 1300 1301 1302 1303 1304 1305
	* 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__.

1306 1307 1308 1309 1310 1311 1312 1313 1314
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.

1315 1316 1317 1318 1319 1320