ChangeLog 165 KB
Newer Older
1 2
2011-06-08  Paul Eggert  <eggert@cs.ucla.edu>

3 4
	* image.c (gif_load): Rename local to avoid shadowing.

5 6 7 8 9 10 11 12
	* 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.

13 14 15 16 17 18 19 20 21
	* 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)
	(total_free_floats, total_floats, total_free_intervals, total_intervals)
	(total_strings, total_free_strings):
	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.
22 23 24 25
	(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.
26
	(nzombies, ngcs, max_live, max_zombies): Now EMACS_INT, not 'int'.
27 28 29
	(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.
30
	(allocate_pseudovector): Don't use EMACS_INT when int would do.
31

32
	* alloc.c (Fmake_bool_vector): Don't assume vector size fits in int.
33
	(allocate_vectorlike): Check for ptrdiff_t overflow.
34 35 36
	(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.
37

38 39 40 41 42 43 44 45 46 47
	* 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.
48

49 50 51 52
	* 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.

53 54
	* character.c (string_escape_byte8): Fix nbytes/nchars typo.

55 56
	* alloc.c (Fmake_string): Check for out-of-range init.

57 58
2011-06-08  Martin Rudalics  <rudalics@gmx.at>

59 60 61 62
	* 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
63
	(MIN_SAFE_WINDOW_WIDTH, MIN_SAFE_WINDOW_HEIGHT): Define here.
64

65 66
	* window.c (Fwindow_height, Fwindow_width, Fwindow_full_width_p):
	Remove.
67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86
	(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
87 88 89 90 91 92 93
	(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.
94

95 96 97 98 99 100 101 102
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.
103 104 105 106
	(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.
107 108 109
	(window_loop): Remove handling of GET_LRU_WINDOW and
	GET_LARGEST_WINDOW.
	(Fget_lru_window, Fget_largest_window): Move to window.el.
110 111

	* window.h: Extern window_body_cols instead of
112 113
	window_box_text_cols.  delete_all_subwindows now takes a
	Lisp_Object as argument.
114 115 116 117

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

118 119 120
	* frame.c (delete_frame): Call delete_all_subwindows with root
	window as argument.

121 122 123 124
2011-06-07  Daniel Colascione  <dan.colascione@gmail.com>

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

125 126 127 128
2011-06-06  Chong Yidong  <cyd@stupidchicken.com>

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

129
2011-06-06  Paul Eggert  <eggert@cs.ucla.edu>
130

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

133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162
	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.

163 164 165 166 167 168 169 170 171 172 173 174 175 176 177
	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.

178 179 180 181 182 183
	* 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).

184 185 186
	* fileio.c (Fverify_visited_file_modtime): Avoid time overflow
	if b->modtime has its maximal value.

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

189 190 191 192 193
	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.

194 195 196 197 198 199 200 201 202 203 204 205 206 207
	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.

208 209 210 211
2011-06-06  Stefan Monnier  <monnier@iro.umontreal.ca>

	* window.h (Fwindow_frame): Declare.

212 213 214 215 216 217 218
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.

219 220
2011-06-06  Martin Rudalics  <rudalics@gmx.at>

221 222 223 224 225 226 227 228 229 230 231 232 233 234 235
	* 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.

236 237 238
	* window.c (decode_window, decode_any_window): Move up in code.
	(Fwindowp, Fwindow_live_p): Rewrite doc-strings.
	(inhibit_frame_unsplittable): Remove unused variable.
239 240 241
	(Fwindow_buffer): Move up and rewrite doc-string.
	(Fwindow_parent, Fwindow_vchild, Fwindow_hchild, Fwindow_next)
	(Fwindow_prev): New functions.
242 243 244 245 246 247 248
	(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.
249 250
	(Fset_frame_selected_window): Move here from frame.c.
	Marginal rewrite.
251 252
	(Fselected_window, select_window, Fselect_window): Move up in
	code.  Minor doc-string fixes.
253

254 255 256 257 258 259 260 261
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.

262 263
2011-06-05  Andreas Schwab  <schwab@linux-m68k.org>

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

267 268
	* gtkutil.c (xg_get_default_scrollbar_width): Avoid warning.

269 270 271
	* xfns.c (x_set_scroll_bar_default_width): Move declarations
	before statements.

272 273 274 275 276 277 278 279 280
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).

281 282 283 284
2011-06-05  Juanma Barranquero  <lekktu@gmail.com>

	* xdisp.c (single_display_spec_intangible_p): Remove declaration.

285 286 287 288
2011-06-04  Chong Yidong  <cyd@stupidchicken.com>

	* xselect.c (x_clipboard_manager_save): Remove redundant arg.
	(x_clipboard_manager_save): Add return value.
289 290
	(x_clipboard_manager_error_1, x_clipboard_manager_error_2):
	New error handlers.
291 292 293 294
	(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.
295
	(x_get_foreign_selection): Reduce scope of x_catch_errors (Bug#8790).
296

297
2011-06-04  Dan Nicolaescu  <dann@ics.uci.edu>
298 299 300

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

301
2011-06-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
302 303 304 305

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

306 307 308 309
2011-06-04  Eli Zaretskii  <eliz@gnu.org>

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

310 311
2011-06-03  Eli Zaretskii  <eliz@gnu.org>

312
	Support bidi reordering of text covered by display properties.
313

314 315 316 317
	* 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)
318 319
	(bidi_level_of_next_char, bidi_move_to_visually_next):
	Support character positions inside a run of characters covered by a
320 321 322 323 324 325 326 327 328 329
	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.
330 331
	(bidi_resolve_explicit, bidi_resolve_weak):
	Use FETCH_MULTIBYTE_CHAR instead of FETCH_CHAR, as reordering of
332 333 334 335 336 337 338 339 340 341
	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.
342

343 344 345 346 347 348
	* 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.
349 350
	Accept 3 additional arguments needed by handle_display_spec.
	This fixes incorrect cursor motion across display property with complex
351 352 353 354 355
	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.
356
	(handle_display_spec): New function, refactored from the
357 358 359 360 361 362 363 364 365 366
	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.
367 368
	(compute_display_string_pos, compute_display_string_end):
	New functions.
369 370 371
	(push_it): Accept second argument POSITION, where pop_it should
	jump to continue iteration.
	(reseat_1): Initialize bidi_it.disp_pos.
372

373 374
	* keyboard.c (adjust_point_for_property): Adjust the call to
	display_prop_intangible_p to its new signature.
375 376

	* dispextern.h (struct bidi_it): New member frame_window_p.
377 378
	(bidi_init_it): Update prototypes.
	(display_prop_intangible_p): Update prototype.
379 380
	(compute_display_string_pos, compute_display_string_end):
	Declare prototypes.
381 382
	(struct bidi_it): New members nchars and disp_pos.  ch_len is now
	EMACS_INT.
383

384
2011-06-02  Paul Eggert  <eggert@cs.ucla.edu>
385

386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401
	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
402
	Remove arbitrary limit of 2**31 entries in hash tables.  (Bug#8771)
403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420
	* 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):
421
	* minibuf.c (Ftry_completion, Fall_completions, Ftest_completion):
422 423
	* print.c (print):  Use 'EMACS_UINT' and 'EMACS_INT'
	for hashes and hash indexes, instead of 'unsigned' and 'int'.
424 425 426 427
	* alloc.c (allocate_vectorlike):
	Check for overflow in vector size calculations.
	* ccl.c (ccl_driver):
	Check for overflow when converting EMACS_INT to int.
428 429
	* fns.c, image.c: Remove unnecessary static decls that would otherwise
	need to be updated by these changes.
430 431
	* fns.c (make_hash_table, maybe_resize_hash_table):
	Check for integer overflow with large hash tables.
432 433 434 435 436 437 438 439
	(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.
440 441
	(MOST_NEGATIVE_FIXNUM, MOST_POSITIVE_FIXNUM, INTMASK):
	Rewrite to use FIXNUM_BITS, as this simplifies things.
442 443 444 445 446
	(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.

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

453 454 455 456 457
2011-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>

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

458 459 460 461 462
2011-05-31  Juanma Barranquero  <lekktu@gmail.com>

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

463 464 465 466 467
2011-05-31  Dan Nicolaescu  <dann@ics.uci.edu>

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

468 469 470 471 472 473 474 475
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.

476 477 478 479 480
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
481
2011-05-31  Paul Eggert  <eggert@cs.ucla.edu>
482

Paul Eggert's avatar
Paul Eggert committed
483
	Use 'inline', not 'INLINE'.
Paul Eggert's avatar
Paul Eggert committed
484
	<http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00914.html>
Paul Eggert's avatar
Paul Eggert committed
485 486 487 488 489 490 491
	* 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__.

492 493 494 495 496 497 498 499 500
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.

501 502 503 504 505 506 507 508 509
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.

510 511 512 513 514
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
515 516
2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>

517 518
	* alloc.c (lisp_align_malloc): Omit unnecessary val==NULL tests.

Paul Eggert's avatar
Paul Eggert committed
519 520 521 522 523
	* 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.

524 525 526 527 528
2011-05-29  Chong Yidong  <cyd@stupidchicken.com>

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

529 530
2011-05-29  Paul Eggert  <eggert@cs.ucla.edu>

531 532 533 534
	Minor fixes prompted by GCC 4.6.0 warnings.

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

535 536 537 538
	* 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.

539 540 541 542 543 544 545 546 547 548 549
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.

550 551 552 553 554
2011-05-28  William Xu  <william.xwl@gmail.com>

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

555 556
2011-05-28  Jim Meyering  <meyering@redhat.com>

Eli Zaretskii's avatar
Eli Zaretskii committed
557
	Avoid a sign-extension bug in crypto_hash_function.
558 559 560 561 562 563
	* 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
564
	https://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00883.html.
565

Paul Eggert's avatar
Paul Eggert committed
566 567 568
2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>

	Integer overflow fixes.
569

570 571 572 573 574 575
	* 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
576
	that was so large that it became a float.  (Bug#8722)
577

578 579 580 581 582 583
	* 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
584
	silently wrapping negative numbers around.  (Bug#8722)
585
	(xd_read_message_1): Don't assume dbus_uint32_t can fit in int.
Paul Eggert's avatar
Paul Eggert committed
586
	(Bug#8722)
587

588 589
	* data.c (arith_driver, Flsh): Avoid unnecessary casts to EMACS_UINT.

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

Paul Eggert's avatar
Paul Eggert committed
592 593 594 595 596 597 598
	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
599
	improvement.  (Bug#8719)
Paul Eggert's avatar
Paul Eggert committed
600

601 602 603
	* alloc.c (make_event_array): Use XINT, not XUINT.
	There's no need for unsigned here.

604 605 606 607
	* 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.

608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627
	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)

628 629
	* lisp.h (FIXNUM_OVERFLOW_P): Work even if arg is a NaN.

630 631 632 633 634 635 636 637 638
	* 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.

639 640
	merge count_size_as_multibyte, parse_str_to_multibyte
	* character.c, character.h (count_size_as_multibyte):
641
	Rename from parse_str_to_multibyte; all uses changed.
642 643 644 645 646 647
	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.

648 649 650 651
2011-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>

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

652 653
2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>

654 655 656 657 658
	* 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.

659 660 661 662
	* 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
663 664 665 666 667 668 669 670 671 672 673 674 675
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.
676 677
	(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
678 679 680 681 682 683 684 685 686 687 688 689 690
	(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.

691 692 693 694 695 696 697
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
698 699
	of converted selections stored in converted_selections.
	Separate the XChangeProperty and SelectionNotify steps.
700 701 702 703 704 705 706 707 708
	(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.

709 710 711 712
2011-05-26  Leo Liu  <sdl.web@gmail.com>

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

713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729
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.

730 731 732 733 734
2011-05-25  Kenichi Handa  <handa@m17n.org>

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

735 736 737 738 739 740 741 742 743
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.

744 745 746 747 748 749 750 751
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).

752 753 754 755 756 757 758
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.

759 760 761 762
2011-05-22  Paul Eggert  <eggert@cs.ucla.edu>

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

763 764 765 766
2011-05-22  Chong Yidong  <cyd@stupidchicken.com>

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

767 768 769 770 771
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.

772 773 774
2011-05-21  Glenn Morris  <rgm@gnu.org>

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

778 779 780 781 782
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.

783 784 785 786 787 788 789
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
790
2011-05-20 Kenichi Handa  <handa@m17n.org>
791 792 793

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

794 795 796 797 798 799 800
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.

801 802 803 804 805 806 807 808 809 810 811
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.

812 813 814 815 816 817
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.

818 819 820 821
2011-05-18  Juanma Barranquero  <lekktu@gmail.com>

	* makefile.w32-in: Update dependencies.

822 823 824 825 826
2011-05-18  Christoph Scholtes  <cschol2112@googlemail.com>

	* menu.c: Include limits.h (fixes the MS-Windows build broken by
	revision 104625).

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

829 830
	Fix some integer overflow issues, such as string length overflow.

831 832
	* insdel.c (count_size_as_multibyte): Check for string overflow.

833 834 835 836 837 838 839 840 841
	* 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.

842 843 844 845 846 847
	* 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.

848 849 850
	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.
851 852
	* msdos.c (mouse_get_pos): Likewise.
	* w32inevt.c (movement_time, w32_console_mouse_position): Likewise.
853 854 855
	* w32gui.h (Time): Define by including "systime.h" rather than by
	declaring it ourselves.  (Bug#8664)

856 857 858
	* dispextern.h (struct image): Don't assume time_t <= unsigned long.
	* image.c (clear_image_cache): Likewise.

859 860
	* term.c (term_mouse_position): Don't assume time_t wraparound.

861 862
	Be more systematic about user-interface timestamps.
	Before, the code sometimes used 'Time', sometimes 'unsigned long',
863 864
	and sometimes 'EMACS_UINT', to represent these timestamps.
	This change causes it to use 'Time' uniformly, as that's what X uses.
865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883
	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.

884 885 886 887 888 889 890
	* 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
891
	apart (about 25 days).  (Bug#8664)
892

893
	* xselect.c (last_event_timestamp): Remove duplicate decl.
894
	(x_own_selection): Remove needless cast to unsigned long.
895

896 897 898
	* 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.
899 900
	* frame.h (struct frame): Use int for menu_bar_items_used
	instead of EMACS_INT, since it always fits in int.
901

902 903
	* menu.c (grow_menu_items): Check for int overflow.

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

906 907 908 909 910 911 912 913 914
	* 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.

915 916 917 918 919
	* 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.

920 921
	* window.c (size_window): Avoid needless test at loop start.

922 923 924 925
2011-05-18  Courtney Bane  <emacs-bugs-7626@cbane.org>  (tiny change)

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

926
2011-05-12  Drew Adams  <drew.adams@oracle.com>
927 928 929

	* textprop.c (Fprevious_single_char_property_change): Doc fix (bug#8655).

930
2011-05-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
931 932 933 934 935

	* w32term.c (w32_draw_fringe_bitmap): Rename local vars `left' and
	`width' to `bar_area_x' and `bar_area_width', respectively.
	(x_scroll_run): Take account of fringe background extension.

936 937
	* xterm.c (x_draw_fringe_bitmap) [USE_TOOLKIT_SCROLL_BARS]:
	Rename local vars `left' and `width' to `bar_area_x' and
938 939 940 941
	`bar_area_width', respectively.
	(x_scroll_run) [USE_TOOLKIT_SCROLL_BARS]: Take account of fringe
	background extension.

942 943 944 945
2011-05-10  Jim Meyering  <meyering@redhat.com>

	* xdisp.c (x_intersect_rectangles): Fix typo "the the -> the".

946 947 948 949 950
2011-05-10  Juanma Barranquero  <lekktu@gmail.com>

	* image.c (Finit_image_library): Return t for built-in image types,
	like pbm and xbm.  (Bug#8640)

951 952 953 954
2011-05-09  Andreas Schwab  <schwab@linux-m68k.org>

	* w32menu.c (set_frame_menubar): Fix submenu allocation.

955 956
2011-05-07  Eli Zaretskii  <eliz@gnu.org>

957 958 959 960
	* w32console.c (Fset_screen_color): Doc fix.
	(Fget_screen_color): New function.
	(syms_of_ntterm): Defsubr it.

961 962 963 964 965
	* callproc.c (call_process_cleanup) [MSDOS]: Don't close and
	unlink the temporary file if Fcall_process didn't create it in the
	first place.
	(Fcall_process) [MSDOS]: Don't create tempfile if stdout of the
	child process will be redirected to a file specified with `:file'.
966 967 968
	Don't try to re-open tempfile in that case, and set fd[0] to -1 as
	cue to call_process_cleanup not to close that handle.

969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985
2011-05-07  Ben Key  <bkey76@gmail.com>

	* makefile.w32-in: The bootstrap-temacs rule now makes use of
	one of two shell specific rules, either bootstrap-temacs-CMD or
	bootstrap-temacs-SH.  The bootstrap-temacs-SH rule is identical
	to the previous implementation of the bootstrap-temacs rule.
	The bootstrap-temacs-CMD rule is similar to the previous
	implementation of the bootstrap-temacs rule except that it
	makes use of the ESC_CFLAGS variable instead of the CFLAGS
	variable.

	These changes, along with some changes to nt/configure.bat,
	nt/gmake.defs, and nt/nmake.defs, are required to extend my
	earlier fix to add support for --cflags and --ldflags options
	that include quotes so that it works whether make uses cmd or
	sh as the shell.

986 987 988 989 990 991 992 993 994 995
2011-05-06  Michael Albinus  <michael.albinus@gmx.de>

	* dbusbind.c (QCdbus_type_unix_fd): Declare static.
	(xd_remove_watch): Don't check QCdbus_type_unix_fd for SYMBOLP, it
	is a constant.
	(Fdbus_init_bus, xd_read_queued_messages): Bus can be a symbol or
	a string.  Handle both cases.
	(Fdbus_call_method_asynchronously, Fdbus_register_signal)
	(Fdbus_register_method): Use Qinvalid_function.

996 997 998 999 1000 1001
2011-05-06  Juanma Barranquero  <lekktu@gmail.com>

	* makefile.w32-in: Update dependencies.
	(LISP_H): Add inttypes.h and stdin.h.
	(PROCESS_H): Add unistd.h.

1002 1003 1004 1005 1006
2011-05-06  Eli Zaretskii  <eliz@gnu.org>

	* lread.c: Include limits.h (fixes the MS-Windows build broken by
	2011-05-06T07:13:19Z!eggert@cs.ucla.edu).

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

1009 1010
	* image.c (Finit_image_library) [!HAVE_NTGUI]: Omit unused local.

1011 1012 1013
	* term.c (vfatal): Remove stray call to va_end.
	It's not needed and the C Standard doesn't allow it here anyway.

1014 1015 1016
	Use C99's va_copy to avoid undefined behavior on x86-64 GNU/Linux.
	* eval.c (verror): doprnt a copy of ap, not the original.  (Bug#8545)

1017 1018 1019
	* eval.c (verror): OK to create a string of up to MOST_POSITIVE_FIXNUM
	bytes.

1020 1021
	* term.c: Don't include <stdarg.h>, as <lisp.h> does that.

1022 1023
	* callproc.c (Fcall_process): Use 'volatile' to avoid vfork clobbering.

1024 1025
	* process.c (Fformat_network_address): Fix typo: args2 -> *args2.

1026 1027
	* xmenu.c (set_frame_menubar): Fix typo: int * -> int (3 times).

1028 1029
	* coding.c (detect_coding_charset): Fix typo: * 2 -> *4 (Bug#8601).

1030 1031 1032
	* charset.h (struct charset.code_space): Now has 15 elements, not 16.
	* charset.c (Fdefine_charset_internal): Don't initialize
	charset.code_space[15].  The value was garbage, on hosts with
Paul Eggert's avatar
Paul Eggert committed
1033
	32-bit int (Bug#8600).
1034 1035 1036 1037 1038 1039 1040

	* lread.c (read_integer): Be more consistent with string-to-number.
	Use string_to_number to do the actual conversion; this avoids
	rounding errors and fixes some other screwups.  Without this fix,
	for example, #x1fffffffffffffff was misread as -2305843009213693952.
	(digit_to_number): Move earlier, for benefit of read_integer.
	Return -1 if the digit is out of range for the base, -2 if it is
Paul Eggert's avatar
Paul Eggert committed
1041
	not a digit in any supported base.  (Bug#8602)
1042

1043 1044
	* doprnt.c (doprnt): Support arbitrary pI values, such as "I64".

1045 1046 1047 1048
	* dispnew.c (scrolling_window): Return 1 if we scrolled,
	to match comment at start of function.  This also removes a
	GCC warning about overflow in a 32+64-bit port.

1049 1050
	* lisp.h (EMACS_INT, EMACS_UINT, BITS_PER_EMACS_INT, pI): Simplify.

1051 1052 1053
	* dbusbind.c: Do not use XPNTR on a value that may be an integer.
	Reported by Stefan Monnier in
	<http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00919.html>.
1054 1055
	(xd_remove_watch, Fdbus_init_bus, xd_read_queued_messages):
	Use SYMBOLP-guarded XSYMBOL, not XPNTR.
1056

1057 1058 1059
	* lisp.h (EMACS_INTPTR): Remove.  All uses changed to intptr_t.
	(EMACS_UINTPTR): Likewise, with uintptr_t.

1060 1061 1062 1063
	* lisp.h: Prefer 64-bit EMACS_INT if available.
	(EMACS_INT, EMACS_UINT, BITS_PER_EMACS_INT, pI): Define to 64-bit
	on 32-bit hosts that have 64-bit int, so that they can access
	large files.
1064 1065
	However, temporarily disable this change unless the temporary
	symbol WIDE_EMACS_INT is defined.
1066

1067 1068
	* lread.c, process.c: Do not include <inttypes.h>; lisp.h does it now.

1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098
	Prefer intptr_t/uintptr_t for integers the same widths as pointers.
	This removes an assumption that EMACS_INT and long are the same
	width as pointers.  The assumption is true for Emacs porting targets
	now, but we want to make other targets possible.
	* lisp.h: Include <inttypes.h>, for INTPTR_MAX, UINTPTR_MAX.
	(EMACS_INTPTR, EMACS_UINTPTR): New macros.
	In the rest of the code, change types of integers that hold casted
	pointers to EMACS_INTPTR and EMACS_UINTPTR, systematically
	replacing EMACS_INT, long, EMACS_UINT, and unsigned long.
	(XTYPE): Don't cast arg to EMACS_UINT; normally is not needed.
	(XSET): Cast type of XTYPE arg to EMACS_INTPTR; it is needed here.
	No need to cast type when ORing.
	(XPNTR): Return a value of type EMACS_INTPTR or EMACS_UINTPTR.
	* alloc.c (lisp_align_malloc): Remove a no-longer-needed cast.
	* doc.c (store_function_docstring): Use EMACS_INTPTR, so as not to
	assume EMACS_INT is the same width as char *.
	* gtkutil.c (xg_gtk_scroll_destroy, xg_tool_bar_button_cb):
	(xg_tool_bar_callback, xg_tool_bar_help_callback, xg_make_tool_item):
	Remove no-longer-needed casts.
	(xg_create_scroll_bar, xg_tool_bar_button_cb, xg_tool_bar_callback):
	(xg_tool_bar_help_callback, xg_make_tool_item):
	Use EMACS_INTPTR to hold an integer
	that will be cast to void *; this can avoid a GCC warning
	if EMACS_INT is not the same width as void *.
	* menu.c (find_and_call_menu_selection): Remove no-longer-needed cast.
	* xdisp.c (display_echo_area_1, resize_mini_window_1):
	(current_message_1, set_message_1):
	Use a local to convert to proper width without a cast.
	* xmenu.c (dialog_selection_callback): Likewise.

1099 1100 1101 1102 1103 1104
	* sysdep.c (get_random): Don't assume EMACS_INT is no wider than long.
	Also, don't assume VALBITS / RAND_BITS is less than 5,
	and don't rely on undefined behavior when shifting a 1 left into
	the sign bit.
	* lisp.h (get_random): Change signature to match.

1105 1106 1107 1108 1109 1110 1111 1112
	* lread.c (hash_string): Use size_t, not int, for hash computation.
	Normally we prefer signed values; but hashing is special, because
	it's better to use unsigned division on hash table sizes so that
	the remainder is nonnegative.  Also, size_t is the natural width
	for hashing into memory.  The previous code used 'int', which doesn't
	retain enough info to hash well into very large tables.
	(oblookup, oblookup_last_bucket_number, Funintern): Likewise.

1113 1114 1115 1116 1117
	* dbusbind.c: Don't possibly lose pointer info when converting.
	(xd_remove_watch, Fdbus_init_bus, xd_read_queued_messages):
	Use XPNTR rather than XHASH, so that the high-order bits of
	the pointer aren't lost when converting through void *.

1118 1119
	* eval.c (Fautoload): Don't double-shift a pointer.

1120 1121
	* fns.c (Frandom): Let EMACS_UINT be wider than unsigned long.

1122 1123 1124 1125 1126
2011-05-06  Juanma Barranquero  <lekktu@gmail.com>

	* gnutls.c (DEF_GNUTLS_FN):
	* image.c (DEF_IMGLIB_FN): Make function pointers static.

1127 1128 1129 1130 1131
2011-05-05  Andreas Schwab  <schwab@linux-m68k.org>

	* lread.c (lisp_file_lexically_bound_p): Stop scanning at end
	marker.  (Bug#8610)

1132
2011-05-05 Eli Zaretskii  <eliz@gnu.org>
1133 1134 1135 1136

	* w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]:
	New version that can reserve upto 2GB of heap space.

1137
2011-05-05  Chong Yidong  <cyd@stupidchicken.com>
1138 1139 1140

	* nsfns.m (Fns_read_file_name): Doc fix (Bug#8534).

1141 1142 1143 1144 1145
2011-05-05  Teodor Zlatanov  <tzz@lifelogs.com>

	* gnutls.c (fn_gnutls_certificate_set_x509_key_file): Add alias to
	`gnutls_certificate_set_x509_key_file'.

1146 1147 1148 1149 1150
2011-05-05  Juanma Barranquero  <lekktu@gmail.com>

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

1151 1152 1153 1154 1155 1156 1157
2011-05-04  Juanma Barranquero  <lekktu@gmail.com>

	* gnutls.h (emacs_gnutls_write, emacs_gnutls_read):
	* gnutls.c (emacs_gnutls_write, emacs_gnutls_read):
	Remove unused parameter `fildes'.
	* process.c (read_process_output, send_process): Don't pass it.

1158 1159 1160 1161 1162 1163
2011-05-04  Juanma Barranquero  <lekktu@gmail.com>

	Fix previous change: the library cache is defined in w32.c.
	* image.c (CACHE_IMAGE_TYPE) [!HAVE_NTGUI]: Define to noop.
	(Finit_image_library): Wrap Vlibrary_cache on "#ifdef HAVE_NTGUI".

1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208
2011-05-04  Juanma Barranquero  <lekktu@gmail.com>

	Implement dynamic loading of GnuTLS on Windows.

	* gnutls.h (GNUTLS_EMACS_ERROR_NOT_LOADED): New macro.
	(emacs_gnutls_write, emacs_gnutls_read): Mark as extern.
	(emacs_gnutls_record_check_pending, emacs_gnutls_transport_set_errno):
	Declare.

	* gnutls.c (Qgnutls_dll): Define.
	(DEF_GNUTLS_FN, LOAD_GNUTLS_FN): New macros.
	(gnutls_*): Declare function pointers.
	(init_gnutls_functions): New function to initialize function pointers.
	(emacs_gnutls_handshake, Fgnutls_error_string, Fgnutls_deinit)
	(emacs_gnutls_global_init, Fgnutls_bye): Use function pointers.
	(emacs_gnutls_record_check_pending, emacs_gnutls_transport_set_errno):
	Wrappers for gnutls_record_check_pending and gnutls_transport_set_errno.
	(emacs_gnutls_write, emacs_gnutls_read)
	(emacs_gnutls_handle_error, Fgnutls_error_fatalp)
	(Fgnutls_available_p): New function.
	(Fgnutls_boot): Call Fgnutls_available_p.  Use function pointers.
	(syms_of_gnutls) <Qgnutls_dll>: Initialize and staticpro it.
	(syms_of_gnutls) <Sgnutls_available_p>: defsubr it.

	* image.c: Include w32.h.
	(Vimage_type_cache): Delete.
	(syms_of_image) <Vimage_type_cache>: Don't initialize and staticpro it.
	(CACHE_IMAGE_TYPE, Finit_image_library): Use Vlibrary_cache instead.
	(w32_delayed_load): Move to w32.c.

	* w32.h (VlibraryCache, QCloaded_from, w32_delayed_load): Declare.

	* w32.c (QCloaded_from, Vlibrary_cache): Define.
	(w32_delayed_load): Move from image.c.  When loading a library, record
	its filename in the :loaded-from property of the library id.
	(globals_of_w32) <QCloaded_from, Vlibrary_cache>:
	Initialize and staticpro them.
	(emacs_gnutls_pull, emacs_gnutls_push): Call emacs_gnutls_* functions.

	* process.c: Include lisp.h before w32.h, not after.
	(wait_reading_process_output): Call emacs_gnutls_record_check_pending
	instead of gnutls_record_check_pending.

	* callproc.c, emacs.c: Include lisp.h before w32.h, not after.

1209 1210 1211 1212 1213 1214
2011-05-04  Teodor Zlatanov  <tzz@lifelogs.com>

	* gnutls.c (Fgnutls_boot): Support :keylist and :crlfiles options
	instead of :keyfiles.  Give GnuTLS the keylist and the CRL lists
	as passed in.

1215 1216 1217 1218 1219
2011-05-03  Jan Djärv  <jan.h.d@swipnet.se>

	* xterm.c (x_set_frame_alpha): Do not set property on anything
	else than FRAME_X_OUTER_WINDOW (Bug#8608).

1220 1221 1222 1223
2011-05-02  Juanma Barranquero  <lekktu@gmail.com>

	* sysdep.c (get_tty_size) [WINDOWSNT]: Implement.  (Bug#8596)

1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235
2011-05-02  Juanma Barranquero  <lekktu@gmail.com>

	* gnutls.c (Qgnutls_log_level, Qgnutls_code, Qgnutls_anon)
	(Qgnutls_x509pki, Qgnutls_e_interrupted, Qgnutls_e_again)
	(Qgnutls_e_invalid_session, Qgnutls_e_not_ready_for_handshake)
	(gnutls_global_initialized, Qgnutls_bootprop_priority)
	(Qgnutls_bootprop_trustfiles, Qgnutls_bootprop_keyfiles)
	(Qgnutls_bootprop_callbacks, Qgnutls_bootprop_loglevel)
	(Qgnutls_bootprop_hostname, Qgnutls_bootprop_verify_flags)
	(Qgnutls_bootprop_verify_error, Qgnutls_bootprop_verify_hostname_error)
	(Qgnutls_bootprop_callbacks_verify): Make static.

1236 1237
2011-05-01  Andreas Schwab  <schwab@linux-m68k.org>

1238 1239
	* callproc.c: Indentation fixup.

1240
	* sysdep.c (wait_for_termination_1): Make static.
1241 1242
	(wait_for_termination, interruptible_wait_for_termination):
	Move after wait_for_termination_1.
1243

1244 1245 1246 1247 1248 1249 1250 1251 1252 1253
2011-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>

	* sysdep.c (interruptible_wait_for_termination): New function
	which is like wait_for_termination, but allows keyboard
	interruptions.

	* callproc.c (Fcall_process): Add (:file "file") as an option for
	the STDOUT buffer.
	(Fcall_process_region): Ditto.

1254 1255
2011-04-30  Eli Zaretskii  <eliz@gnu.org>

1256 1257 1258
	* dosfns.c (Fint86, Fdos_memget, Fdos_memput): Use `ASIZE (FOO)'
	rather than `XVECTOR (FOO)->size'.

1259 1260 1261 1262
	* process.c: Remove HAVE_INTTYPES_H condition from inclusion of
	inttypes.h, as a gnulib replacement is used if it not available in
	system headers.

1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277
2011-04-21  Eli Zaretskii  <eliz@gnu.org>

	Lift the MOST_POSITIVE_FIXNUM/4 limitation on visited files.
	* fileio.c (Finsert_file_contents): Don't limit file size to 1/4
	of MOST_POSITIVE_FIXNUM.  (Bug#8528)

	* coding.c (coding_alloc_by_realloc): Error out if destination
	will grow beyond MOST_POSITIVE_FIXNUM.
	(decode_coding_emacs_mule): Abort if there isn't enough place in
	charbuf for the composition carryover bytes.  Reserve an extra
	space for up to 2 characters produced in a loop.
	(decode_coding_iso_2022): Abort if there isn't enough place in
	charbuf for the composition carryover bytes.

2011-04-21  Eli Zaretskii  <eliz@gnu.org>
1278

1279 1280 1281 1282 1283
	* doprnt.c (doprnt) [!HAVE_LONG_LONG_INT]: Error out instead of
	aborting when %lld or %lll format is passed.
	[!HAVE_UNSIGNED_LONG_LONG_INT]: Error out instead of aborting when
	%llo or %llx format is passed.  (Bug#8545)

1284 1285 1286
	* window.c (window_scroll_line_based): Use a marker instead of
	simple variables to record original value of point.  (Bug#7952)

1287 1288 1289
	* doprnt.c (doprnt): Fix the case where a multibyte sequence
	produced by %s or %c overflows available buffer space.  (Bug#8545)

1290 1291 1292
2011-04-28  Paul Eggert  <eggert@cs.ucla.edu>

	* doprnt.c (doprnt): Omit useless test; int overflow check (Bug#8545).
1293
	(SIZE_MAX): Move defn after all includes, as they might #define it.
1294

1295 1296 1297 1298
2011-04-28  Juanma Barranquero  <lekktu@gmail.com>

	* w32.c (init_environment): Warn about defaulting HOME to C:\.

1299 1300 1301 1302 1303 1304 1305 1306
2011-04-28  Juanma Barranquero  <lekktu@gmail.com>

	* keyboard.c (Qdelayed_warnings_hook): Define.
	(command_loop_1): Run `delayed-warnings-hook'
	if Vdelayed_warnings_list is non-nil.
	(syms_of_keyboard) <delayed-warnings-hook>: DEFSYM it.
	(syms_of_keyboard) <delayed-warnings-list>: DEFVAR_LISP it.

1307 1308 1309 1310 1311
2011-04-28  Eli Zaretskii  <eliz@gnu.org>

	* doprnt.c (doprnt): Don't return value smaller than the buffer
	size if the message was truncated.  (Bug#8545).

1312 1313 1314 1315 1316
2011-04-28  Juanma Barranquero  <lekktu@gmail.com>

	* w32fns.c (Fx_change_window_property, Fx_delete_window_property)
	(Fx_window_property): #if-0 the whole functions, not just the bodies.

1317 1318 1319 1320
2011-04-27  Paul Eggert  <eggert@cs.ucla.edu>

	* doprnt.c (doprnt): Support "ll" length modifier, for long long.

1321 1322 1323 1324
2011-04-27  Juanma Barranquero  <lekktu@gmail.com>

	* makefile.w32-in: Update dependencies.

1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337
2011-04-27  Eli Zaretskii  <eliz@gnu.org>

	Improve `doprnt' and its usage.  (Bug#8545)
	* doprnt.c (doprnt): Make sure `format' is never accessed beyond
	`format_end'.  Remove support for %l as a conversion specifier.
	Don't use xrealloc.  Improve diagnostics when the %l size modifier
	is used.  Update the commentary.

	* eval.c (verror): Simplify calculation of size_t.

	* coding.c (Ffind_operation_coding_system): Fix diagnostic error
	messages.

1338 1339 1340 1341 1342
2011-04-27  Yoshiaki Kasahara  <kasahara@nc.kyushu-u.ac.jp>  (tiny change)

	* buffer.c (init_buffer) [USE_MMAP_FOR_BUFFERS]: Adjust to aliasing
	change.

1343 1344 1345 1346 1347
2011-04-27  Paul Eggert  <eggert@cs.ucla.edu>

	* nsmenu.m: Replace all uses of XVECTOR with ASIZE and AREF.
	This makes this file independent of the recent pseudovector change.

Paul Eggert's avatar
Paul Eggert committed
1348
2011-04-26  Paul Eggert  <eggert@cs.ucla.edu>