ChangeLog 208 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
2011-07-02  Stefan Monnier  <monnier@iro.umontreal.ca>

	Add multiple inheritance to keymaps.
	* keymap.c (Fmake_composed_keymap): New function.
	(Fset_keymap_parent): Simplify.
	(fix_submap_inheritance): Remove.
	(access_keymap_1): New function extracted from access_keymap to handle
	embedded parents and handle lists of maps.
	(access_keymap): Use it.
	(Fkeymap_prompt, map_keymap_internal, map_keymap, store_in_keymap)
	(Fcopy_keymap): Handle embedded parents.
	(Fcommand_remapping, define_as_prefix): Simplify.
	(Fkey_binding): Simplify.
	(syms_of_keymap): Move minibuffer-local-completion-map,
	minibuffer-local-filename-completion-map,
	minibuffer-local-must-match-map, and
	minibuffer-local-filename-must-match-map to Elisp.
	(syms_of_keymap): Defsubr make-composed-keymap.
	* keyboard.c (menu_bar_items): Use map_keymap_canonical.
	(parse_menu_item): Trivial simplification.

22 23 24 25
2011-07-01  Glenn Morris  <rgm@gnu.org>

	* Makefile.in (SETTINGS_LIBS): Fix typo.

26 27 28 29 30
2011-07-01  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny patch)

	* coding.c (Fencode_coding_string): Record the last coding system
	used, as the function doc string says (bug#8738).

31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
2011-07-01  Jan Djärv  <jan.h.d@swipnet.se>

	* xsettings.c (store_monospaced_changed): Take new font as arg and
	check for change against current_mono_font.
	(EMACS_TYPE_SETTINGS): Remove this and related defines.
	(emacs_settings_constructor, emacs_settings_get_property)
	(emacs_settings_set_property, emacs_settings_class_init)
	(emacs_settings_init, gsettings_obj): Remove.
	(something_changedCB): New function for HAVE_GSETTINGS.
	(something_changedCB): HAVE_GCONF: Call store_monospaced_changed
	with value as argument.
	(init_gsettings): Check that GSETTINGS_SCHEMA exists before calling
	g_settings_new (Bug#8967).  Do not create gsettings_obj.
	Remove calls to g_settings_bind. Connect something_changedCB to
	"changed".

	* xgselect.c: Add defined (HAVE_GSETTINGS).
	(xgselect_initialize): Ditto.

	* process.c: Add defined (HAVE_GSETTINGS) for xgselect.h
	(wait_reading_process_output): Add defined (HAVE_GSETTINGS) for
	xg_select.

54 55 56 57 58 59 60 61 62 63
2011-07-01  Paul Eggert  <eggert@cs.ucla.edu>

	* eval.c (struct backtrace): Simplify and port the data structure.
	Do not assume that "int nargs : BITS_PER_INT - 2;" produces a
	signed bit field, as this assumption is not portable and it makes
	Emacs crash when compiled with Sun C 5.8 on sparc.  Do not use
	"char debug_on_exit : 1" as this is not portable either; instead,
	use the portable "unsigned int debug_on_exit : 1".  Remove unused
	member evalargs.  Remove obsolete comments about cc bombing out.

64 65
2011-06-30  Jan Djärv  <jan.h.d@swipnet.se>

Jan Djärv's avatar
Jan Djärv committed
66
	* xsettings.c: Include glib-object.h, gio/gio.h if HAVE_GSETTINGS.
67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84
	Let HAVE_GSETTINGS override HAVE_GCONF.
	(store_monospaced_changed): New function.
	(EMACS_SETTINGS): A new type derived from GObject to handle
	GSettings notifications.
	(emacs_settings_constructor, emacs_settings_get_property)
	(emacs_settings_set_property, emacs_settings_class_init):
	New functions.
	(gsettings_client, gsettings_obj): New variables.
	(GSETTINGS_SCHEMA): New define.
	(something_changedCB): Call store_monospaced_changed.
	(init_gsettings): New function.
	(xsettings_initialize): Call init_gsettings.
	(syms_of_xsettings): Initialize gsettings_client, gsettings_obj
	to NULL.

	* Makefile.in (SETTINGS_CFLAGS, SETTINGS_LIBS): Renamed from
	GCONF_CFLAGS/LIBS.

85 86 87 88 89 90 91
2011-06-29  Martin Rudalics  <rudalics@gmx.at>

	* window.c (resize_root_window, grow_mini_window)
	(shrink_mini_window): Rename Qresize_root_window to
	Qwindow_resize_root_window and Qresize_root_window_vertically to
	Qwindow_resize_root_window_vertically.

92 93 94 95
2011-06-28  Paul Eggert  <eggert@cs.ucla.edu>

	* gnutls.c (Qgnutls_bootprop_verify_error): Remove unused var.

96 97 98 99 100 101
2011-06-27  Juanma Barranquero  <lekktu@gmail.com>

	* makefile.w32-in: Redesign dependencies so they reflect more
	clearly which files are directly included by each source file,
	and not through other includes.

102 103 104 105 106 107 108
2011-06-27  Martin Rudalics  <rudalics@gmx.at>

	* buffer.c (Qclone_number): Declare static and DEFSYM it.
	(sort_overlays, overlay_strings): When an overlay's clone number
	matches the window's clone number process the overlay even if
	the overlay's window property doesn't match the current window.

109 110 111 112
	* window.c (Fwindow_vchild): Rename to Fwindow_top_child.
	(Fwindow_hchild): Rename to Fwindow_left_child.
	(Fwindow_next): Rename to Fwindow_next_sibling.
	(Fwindow_prev): Rename to Fwindow_prev_sibling.
113 114 115 116 117 118 119
	(resize_window_check): Rename to window_resize_check.
	(resize_window_apply): Rename to window_resize_apply.
	(Fresize_window_apply): Rename to Fwindow_resize_apply.
	(Fdelete_other_windows_internal, resize_frame_windows)
	(Fsplit_window_internal, Fdelete_window_internal)
	(grow_mini_window, shrink_mini_window)
	(Fresize_mini_window_internal): Fix callers accordingly.
120

121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143
2011-06-26  Jan Djärv  <jan.h.d@swipnet.se>

	* emacsgtkfixed.h: State that this is only used with Gtk+3.
	(emacs_fixed_set_min_size): Remove.
	(emacs_fixed_new): Take frame as argument.

	* emacsgtkfixed.c: State that this is only used with Gtk+3.
	(_EmacsFixedPrivate): Remove minwidth/height.
	Add struct frame *f.
	(emacs_fixed_init): Initialize priv->f.
	(get_parent_class, emacs_fixed_set_min_size): Remove.
	(emacs_fixed_new): Set priv->f to argument.
	(emacs_fixed_get_preferred_width)
	(emacs_fixed_get_preferred_height): Use min_width/height from
	frames size_hint to set minimum and natural (Bug#8919).
	(XSetWMSizeHints, XSetWMNormalHints): Override these functions
	and use min_width/height from frames size_hint to set
	min_width/height (Bug#8919).

	* gtkutil.c (xg_create_frame_widgets): Pass f to emacs_fixed_new.
	(x_wm_set_size_hint): Remove call to emacs_fixed_set_min_size. Fix
	indentation.

144 145 146 147 148 149
2011-06-26  Eli Zaretskii  <eliz@gnu.org>

	* bidi.c (bidi_paragraph_init): Test for ZV_BYTE before calling
	bidi_at_paragraph_end, since fast_looking_at doesn't like to be
	called at ZV.

150 151 152 153 154 155
2011-06-26  Chong Yidong  <cyd@stupidchicken.com>

	* process.c (wait_reading_process_output): Bypass select if
	waiting for a cell while ignoring keyboard input, and input is
	pending.  Suggested by Jan Djärv (Bug#8869).

156 157 158 159 160
2011-06-25  Paul Eggert  <eggert@cs.ucla.edu>

	Use gnulib's dup2 module instead of rolling our own.
	* sysdep.c (dup2) [!HAVE_DUP2]: Remove; gnulib now does this.

161
2011-06-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
162 163 164 165

	* dispnew.c (scrolling_window): Before scrolling, turn off a
	mouse-highlight in the window being scrolled.

166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221
2011-06-24  Juanma Barranquero  <lekktu@gmail.com>

	Move DEFSYM to lisp.h and use everywhere.

	* character.h (DEFSYM): Move declaration...
	* lisp.h (DEFSYM): ...here.

	* gnutls.c:
	* minibuf.c:
	* w32menu.c:
	* w32proc.c:
	* w32select.c: Don't include character.h.

	* alloc.c (syms_of_alloc):
	* buffer.c (syms_of_buffer):
	* bytecode.c (syms_of_bytecode):
	* callint.c (syms_of_callint):
	* casefiddle.c (syms_of_casefiddle):
	* casetab.c (init_casetab_once):
	* category.c (init_category_once, syms_of_category):
	* ccl.c (syms_of_ccl):
	* cmds.c (syms_of_cmds):
	* composite.c (syms_of_composite):
	* dbusbind.c (syms_of_dbusbind):
	* dired.c (syms_of_dired):
	* dispnew.c (syms_of_display):
	* doc.c (syms_of_doc):
	* editfns.c (syms_of_editfns):
	* emacs.c (syms_of_emacs):
	* eval.c (syms_of_eval):
	* fileio.c (syms_of_fileio):
	* fns.c (syms_of_fns):
	* frame.c (syms_of_frame):
	* fringe.c (syms_of_fringe):
	* insdel.c (syms_of_insdel):
	* keymap.c (syms_of_keymap):
	* lread.c (init_obarray, syms_of_lread):
	* macros.c (syms_of_macros):
	* msdos.c (syms_of_msdos):
	* print.c (syms_of_print):
	* process.c (syms_of_process):
	* search.c (syms_of_search):
	* sound.c (syms_of_sound):
	* syntax.c (init_syntax_once, syms_of_syntax):
	* terminal.c (syms_of_terminal):
	* textprop.c (syms_of_textprop):
	* undo.c (syms_of_undo):
	* w32.c (globals_of_w32):
	* window.c (syms_of_window):
	* xdisp.c (syms_of_xdisp):
	* xfaces.c (syms_of_xfaces):
	* xfns.c (syms_of_xfns):
	* xmenu.c (syms_of_xmenu):
	* xsettings.c (syms_of_xsettings):
	* xterm.c (syms_of_xterm): Use DEFSYM.

222 223
2011-06-24  Teodor Zlatanov  <tzz@lifelogs.com>

224
	* gnutls.c (syms_of_gnutls): Use the DEFSYM macro from character.h.
225

226 227
2011-06-23  Paul Eggert  <eggert@cs.ucla.edu>

Paul Eggert's avatar
Paul Eggert committed
228 229
	Integer and buffer overflow fixes (Bug#8873).

230 231 232 233
	* print.c (printchar, strout): Check for string overflow.
	(PRINTPREPARE, printchar, strout):
	Don't set size unless allocation succeeds.

234 235 236 237
	* minibuf.c (read_minibuf_noninteractive): Use ptrdiff_t, not int,
	for sizes.  Check for string overflow more accurately.
	Simplify newline removal at end; this suppresses a GCC 4.6.0 warning.

238 239 240 241 242 243 244 245
	* macros.c: Integer and buffer overflow fixes.
	* keyboard.h (struct keyboard.kbd_macro_bufsize):
	* macros.c (Fstart_kbd_macro, store_kbd_macro_char):
	Use ptrdiff_t, not int, for sizes.
	Don't increment bufsize until after realloc succeeds.
	Check for size-calculation overflow.
	(Fstart_kbd_macro): Use EMACS_INT, not int, for XINT result.

246 247
	* lisp.h (DEFVAR_KBOARD): Use offsetof instead of char * finagling.

248 249 250 251 252 253
	* lread.c: Integer overflow fixes.
	(read_integer): Radix is now EMACS_INT, not int,
	to improve quality of diagnostics for out-of-range radices.
	Calculate buffer size correctly for out-of-range radices.
	(read1): Check for integer overflow in radices, and in
	read-circle numbers.
254 255 256 257 258
	(read_escape): Avoid int overflow.
	(Fload, openp, read_buffer_size, read1)
	(substitute_object_recurse, read_vector, read_list, map_obarray):
	Use ptrdiff_t, not int, for sizes.
	(read1): Use EMACS_INT, not int, for sizes.
259
	Check for size overflow.
260

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

263 264 265 266 267 268 269
	* 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.
270
	(read_escape): Check for hex character overflow.
271

272 273 274 275 276
2011-06-22  Leo Liu  <sdl.web@gmail.com>

	* minibuf.c (Fcompleting_read_default, Vcompleting_read_function):
	Move to minibuffer.el.

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

279
	Fixes for GLYPH_DEBUG found by GCC 4.6.0 static checking.
Paul Eggert's avatar
Paul Eggert committed
280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304
	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.

305 306
2011-06-22  Paul Eggert  <eggert@cs.ucla.edu>

307 308 309
	Integer overflow and signedness fixes (Bug#8873).
	A few related buffer overrun fixes, too.

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

312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328
	* 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.

329 330 331 332 333 334
	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):
335 336 337 338
	* 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):
339
	Use ptrdiff_t, not int, for sizes.
340
	(overlays_at, overlays_in): Check for size-calculation overflow.
341

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

344 345 346
	* xsmfns.c (smc_save_yourself_CB, x_session_initialize): Avoid strlen.
	(x_session_initialize): Do not assume string length fits in int.

347 348 349
	* xsettings.c (apply_xft_settings): Fix potential buffer overrun.
	This is unlikely, but can occur if DPI is outlandish.

350
	* xsettings.c (Ffont_get_system_normal_font, Ffont_get_system_font):
351 352
	* xselect.c (Fx_get_atom_name): Avoid need for strlen.

353 354 355 356 357
	* 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.

358 359
	* xfont.c (xfont_match): Avoid need for strlen.

360 361 362
	* xfns.c: Don't assume strlen fits in int.
	(xic_create_fontsetname, x_window): Use ptrdiff_t, not int.

363 364 365 366
	* 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.
367
	(display_mode_element): Don't assume strlen fits in int.
368

369 370 371 372
	* 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.

373
	* minibuf.c (Fread_buffer):
374
	* lread.c (intern, intern_c_string):
375 376 377
	* image.c (xpm_scan) [HAVE_NS && !HAVE_XPM]:
	Don't assume string length fits in int.

378
	* keyboard.c (parse_tool_bar_item):
379 380
	* gtkutil.c (style_changed_cb): Avoid need for strlen.

381 382 383
	* font.c: Don't assume string length fits in int.
	(font_parse_xlfd, font_parse_fcname, font_unparse_fcname):
	Use ptrdiff_t, not int.
384 385 386
	(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.
387

388
	* filelock.c: Fix some buffer overrun and integer overflow issues.
Paul Eggert's avatar
Paul Eggert committed
389
	(get_boot_time): Don't assume gzip command string fits in 100 bytes.
390 391 392 393 394 395 396 397 398 399 400
	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.

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

408 409
	* data.c (Fsubr_name): Rewrite to avoid a strlen call.

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

412 413
	* callproc.c (child_setup): Rewrite to avoid two strlen calls.

414 415 416
	* process.c (Fformat_network_address): Use EMACS_INT, not EMACS_UINT.
	We prefer signed integers, even for size calculations.

417 418 419 420
	* 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.

421 422 423
	* dbusbind.c (XD_ERROR): Don't arbitrarily truncate string.
	(XD_DEBUG_MESSAGE): Don't waste a byte.

424 425
	* callproc.c (getenv_internal_1, getenv_internal)
	(Fgetenv_internal):
426 427
	* buffer.c (init_buffer): Don't assume string length fits in 'int'.

428 429 430 431
	* 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
432
	(string_to_number): Simplify 2011-04-26 change by invoking xsignal1.
433

434 435 436 437
	* 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.
438
	(LIST_END_P): Remove unused macro and its bogus comment.
439
	(make_fixnum_or_float): Remove unnecessary cast to EMACS_INT.
440

441 442 443
	* lisp.h (union Lisp_Object.i): EMACS_INT, not EMACS_UINT.
	This is for consistency with the ordinary, non-USE_LISP_UNION_TYPE,
	implementation.
444 445 446
	(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).
447 448 449
	(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.
450

451 452 453
	* 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.
454
	(Fcompute_motion): Don't assume hscroll and tab offset fit in int.
455

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

458 459 460 461
	* 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.

462 463
	* editfns.c, insdel.c:
	Omit unnecessary forward decls, to simplify future changes.
464

465 466
	* ftfont.c (ftfont_shape_by_flt): Use signed integers for lengths.

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

469
	* fns.c (Ffillarray): Don't assume bool vector size fits in 'int'.
470
	Use much-faster test for byte-length change.
471
	Don't assume string byte-length fits in 'int'.
472
	Check that character arg fits in 'int'.
473
	(mapcar1): Declare byte as byte, for clarity.
474

475 476
	* alloc.c (Fmake_bool_vector): Avoid unnecessary multiplication.

477 478 479
	* fns.c (concat): Catch string overflow earlier.
	Do not rely on integer wraparound.

Paul Eggert's avatar
Paul Eggert committed
480 481
	* dispextern.h (struct it.overlay_strings_charpos)
	(struct it.selective): Now EMACS_INT, not int.
482 483 484 485 486
	* 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.

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

489 490 491
	* composite.c: Don't truncate sizes to 'int'.
	(composition_gstring_p, composition_reseat_it)
	(composition_adjust_point): Use EMACS_INT, not int.
492 493
	(get_composition_id, composition_gstring_put_cache): Use EMACS_INT,
	not EMACS_UINT, for indexes.
494

495 496
	* category.h (CATEGORY_SET_P): Remove unnecessary cast to EMACS_INT.

Paul Eggert's avatar
Paul Eggert committed
497 498
	* buffer.c: Include <verify.h>.
	(struct sortvec.priority, struct sortstr.priority):
499
	Now EMACS_INT, not int.
500
	(compare_overlays, cmp_for_strings): Avoid subtraction overflow.
501 502 503 504
	(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
505
	(init_buffer_once): Check at compile-time, not run-time.
506

507 508
2011-06-22  Jim Meyering  <meyering@redhat.com>

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

Paul Eggert's avatar
Paul Eggert committed
512 513 514 515 516 517 518 519 520
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.

521 522 523 524 525 526 527 528
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.
Glenn Morris's avatar
Glenn Morris committed
529
	(Fsecure_hash): New primitive.
530 531
	(syms_of_fns): New symbols.

532 533 534 535 536
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
537 538 539 540 541 542 543 544 545 546 547 548 549 550
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.

551 552 553 554
2011-06-17  Stefan Monnier  <monnier@iro.umontreal.ca>

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

555 556
2011-06-16  Paul Eggert  <eggert@cs.ucla.edu>

557 558 559 560
	* 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".

561
	Improve buffer-overflow checking (Bug#8873).
562 563 564 565 566 567 568 569 570
	* 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.

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

575 576
	* insdel.c (replace_range): Fix buf overflow when insbytes < outgoing.

577 578 579 580 581 582
	* 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.

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

585 586
2011-06-15  Paul Eggert  <eggert@cs.ucla.edu>

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

589 590 591
	* ccl.c (ASCENDING_ORDER): New macro, to work around GCC bug 43772.
	(GET_CCL_RANGE, IN_INT_RANGE): Use it.

592 593 594 595 596
	* 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.

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

599 600 601 602 603 604 605 606 607
	* 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.
608
	(Fnthcdr, Fsort): Don't assume list length fits in int.
609
	(Fcopy_sequence): Don't assume vector length fits in int.
610

611 612 613 614 615 616 617
	* 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.

618 619 620 621 622 623
	* 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?

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

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

628 629 630 631
	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
632 633
	were being counted with int, which may truncate counts on 64-bit
	machines, or EMACS_INT, which may be unnecessarily wide.
634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650
	* 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.

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

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

656
	* xterm.c (x_alloc_nearest_color_1): Prefer int to long when int works.
657

Paul Eggert's avatar
Paul Eggert committed
658 659 660 661 662 663
	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.

664 665 666 667
	* 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.

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

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

672 673
	* xterm.c (handle_one_xevent): Omit unnecessary casts to unsigned.

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

676 677
	* lisp.h (CHAR_TABLE_SET): Omit now-redundant test.

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

680 681 682
	GLYPH_CODE_FACE returns EMACS_INT, not int.
	* dispextern.h (merge_faces):
	* xfaces.c (merge_faces):
Paul Eggert's avatar
Paul Eggert committed
683 684
	* xdisp.c (get_next_display_element, next_element_from_display_vector):
	Don't assume EMACS_INT fits in int.
685

686 687 688
	* character.h (CHAR_VALID_P): Remove unused parameter.
	* fontset.c, lisp.h, xdisp.c: All uses changed.

689 690
	* editfns.c (Ftranslate_region_internal): Omit redundant test.

691 692 693 694 695 696
	* 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.

697
	* floatfns.c (Fexpt):
698 699
	* fileio.c (make_temp_name): Omit unnecessary cast to unsigned.

700 701 702
	* editfns.c (Ftranslate_region_internal): Use int, not EMACS_INT
	for characters.

703 704
	* doc.c (get_doc_string): Omit (unsigned)c that mishandled negatives.

705 706 707 708 709
	* 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.

710 711 712 713
	* 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.

714 715 716 717 718 719
	* 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.

720 721 722 723 724 725 726 727
	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.

728
	* character.c (char_string): Remove unnecessary casts.
729 730 731 732 733 734 735 736 737 738

	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
739
	* editfns.c (Fchar_to_string, general_insert_function, Finsert_char)
740 741 742 743 744 745 746 747 748
	(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.

749 750 751 752 753
	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.

754 755 756 757
	* 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
758
	* character.h (ASCII_BYTE_P, CHAR_VALID_P)
759 760 761 762 763
	(SINGLE_BYTE_CHAR_P, CHAR_STRING):
	* composite.h (COMPOSITION_ENCODE_RULE_VALID):
	* dispextern.h (FACE_FROM_ID):
	* keyboard.c (read_char): Use UNSIGNED_CMP.

764 765 766
	* xmenu.c (dialog_selection_callback) [!USE_GTK]: Cast to intptr_t,
	not to EMACS_INT, to avoid GCC warning.

767 768
	* xfns.c (x_set_scroll_bar_default_width): Remove unused 'int' locals.

769 770 771
	* 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.
772

Paul Eggert's avatar
Paul Eggert committed
773 774
	* buffer.c (Fgenerate_new_buffer_name):
	Use EMACS_INT for count, not int.
775
	(advance_to_char_boundary): Return EMACS_INT, not int.
776 777 778

	* data.c (Qcompiled_function): Now static.

779 780
	* window.c (window_body_lines): Now static.

781 782
	* image.c (gif_load): Rename local to avoid shadowing.

783 784 785 786 787 788 789 790
	* 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.

791 792 793
	* 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
794 795
	(total_free_floats, total_floats, total_free_intervals)
	(total_intervals, total_strings, total_free_strings):
796 797 798 799
	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.
800 801 802 803
	(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.
804
	(nzombies, ngcs, max_live, max_zombies): Now EMACS_INT, not 'int'.
805 806 807
	(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.
808
	(allocate_pseudovector): Don't use EMACS_INT when int would do.
809

810
	* alloc.c (Fmake_bool_vector): Don't assume vector size fits in int.
811
	(allocate_vectorlike): Check for ptrdiff_t overflow.
812 813 814
	(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.
815

816 817 818 819 820 821 822 823 824 825
	* 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.
826

827 828 829 830
	* 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.

831 832
	* character.c (string_escape_byte8): Fix nbytes/nchars typo.

833 834
	* alloc.c (Fmake_string): Check for out-of-range init.

835 836 837 838
2011-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>

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

839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862
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.

863 864 865 866 867 868 869 870 871 872 873 874 875
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
876
2011-06-12  Paul Eggert  <eggert@cs.ucla.edu>
877

878
	Fix minor problems found by GCC 4.6.0 static checking.
879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905
	* 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.

906 907 908 909 910
2011-06-12  Juanma Barranquero  <lekktu@gmail.com>

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

911 912 913 914 915
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'.

916 917 918 919 920 921 922 923 924
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.

925 926
2011-06-11  Andreas Schwab  <schwab@linux-m68k.org>

927 928 929
	* image.c (imagemagick_load_image): Fix type mismatch.
	(Fimagemagick_types): Likewise.

930 931
	* window.h (replace_buffer_in_windows): Declare.

932 933 934 935 936 937 938 939 940 941 942 943 944 945 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 977 978 979 980 981 982
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
983 984 985 986 987 988 989 990 991 992
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.

993 994
2011-06-10  Paul Eggert  <eggert@cs.ucla.edu>

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

998 999
	Fix minor problems found by static checking.

1000 1001
	* image.c (PixelGetMagickColor): Declare if ImageMagick headers don't.

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

1009 1010
	* window.c (window_deletion_count, delete_deletable_window):
	Remove; unused.
1011 1012 1013 1014 1015 1016 1017
	(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.

1018
	* image.c (gif_load, svg_load_image): Rename locals to avoid shadowing.
1019 1020 1021 1022 1023 1024
	(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.
1025
	(imagemagick_load_image): Don't use garbage pointer image_wand.
1026

1027 1028
	* ftfont.c (ftfont_get_metrics, ftfont_drive_otf): Remove unused locals.

1029 1030 1031 1032 1033
2011-06-10  Chong Yidong  <cyd@stupidchicken.com>

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

1034 1035 1036 1037 1038 1039 1040 1041
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.

1042 1043 1044 1045 1046 1047 1048 1049 1050
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.

1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 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 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114
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.

1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133
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.

1134 1135
2011-06-08  Martin Rudalics  <rudalics@gmx.at>

1136 1137 1138 1139
	* 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
1140
	(MIN_SAFE_WINDOW_WIDTH, MIN_SAFE_WINDOW_HEIGHT): Define here.
1141

1142 1143
	* window.c (Fwindow_height, Fwindow_width, Fwindow_full_width_p):
	Remove.
1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163
	(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
1164 1165 1166 1167 1168 1169 1170
	(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.
1171

1172 1173 1174 1175 1176 1177 1178 1179
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.
1180 1181 1182 1183
	(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.
1184 1185 1186
	(window_loop): Remove handling of GET_LRU_WINDOW and
	GET_LARGEST_WINDOW.
	(Fget_lru_window, Fget_largest_window): Move to window.el.
1187 1188

	* window.h: Extern window_body_cols instead of
1189 1190
	window_box_text_cols.  delete_all_subwindows now takes a
	Lisp_Object as argument.
1191 1192 1193 1194

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

1195 1196 1197
	* frame.c (delete_frame): Call delete_all_subwindows with root
	window as argument.

1198 1199 1200 1201
2011-06-07  Daniel Colascione  <dan.colascione@gmail.com>

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

1202 1203 1204 1205
2011-06-06  Chong Yidong  <cyd@stupidchicken.com>

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

1206
2011-06-06  Paul Eggert  <eggert@cs.ucla.edu>
1207

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

1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239
	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.

1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254
	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.

1255 1256 1257 1258 1259 1260
	* 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).

1261 1262 1263
	* fileio.c (Fverify_visited_file_modtime): Avoid time overflow
	if b->modtime has its maximal value.

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

1266 1267 1268 1269 1270
	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.

1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284
	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.

1285 1286 1287 1288
2011-06-06  Stefan Monnier  <monnier@iro.umontreal.ca>

	* window.h (Fwindow_frame): Declare.

1289 1290 1291 1292 1293 1294 1295
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.

1296 1297
2011-06-06  Martin Rudalics  <rudalics@gmx.at>

1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312
	* 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.

1313 1314 1315
	* window.c (decode_window, decode_any_window): Move up in code.
	(Fwindowp, Fwindow_live_p): Rewrite doc-strings.
	(inhibit_frame_unsplittable): Remove unused variable.
1316 1317 1318
	(Fwindow_buffer): Move up and rewrite doc-string.
	(Fwindow_parent, Fwindow_vchild, Fwindow_hchild, Fwindow_next)
	(Fwindow_prev): New functions.
1319 1320 1321 1322 1323 1324 1325
	(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.
1326 1327
	(Fset_frame_selected_window): Move here from frame.c.
	Marginal rewrite.
1328 1329
	(Fselected_window, select_window, Fselect_window): Move up in
	code.  Minor doc-string fixes.
1330

1331 1332 1333 1334 1335 1336 1337 1338
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.

1339 1340
2011-06-05  Andreas Schwab  <schwab@linux-m68k.org>

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

1344 1345
	* gtkutil.c (xg_get_default_scrollbar_width): Avoid warning.

1346 1347 1348
	* xfns.c (x_set_scroll_bar_default_width): Move declarations
	before statements.

1349 1350 1351 1352 1353 1354 1355 1356 1357
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).

1358 1359 1360 1361
2011-06-05  Juanma Barranquero  <lekktu@gmail.com>

	* xdisp.c (single_display_spec_intangible_p): Remove declaration.

1362 1363 1364 1365
2011-06-04  Chong Yidong  <cyd@stupidchicken.com>

	* xselect.c (x_clipboard_manager_save): Remove redundant arg.
	(x_clipboard_manager_save): Add return value.
1366 1367
	(x_clipboard_manager_error_1, x_clipboard_manager_error_2):
	New error handlers.
1368 1369 1370 1371
	(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.
1372
	(x_get_foreign_selection): Reduce scope of x_catch_errors (Bug#8790).
1373

1374
2011-06-04  Dan Nicolaescu  <dann@ics.uci.edu>
1375 1376 1377

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

1378
2011-06-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
1379 1380 1381 1382

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

1383 1384 1385 1386
2011-06-04  Eli Zaretskii  <eliz@gnu.org>

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

1387 1388
2011-06-03  Eli Zaretskii  <eliz@gnu.org>

1389
	Support bidi reordering of text covered by display properties.
1390

1391 1392 1393 1394
	* 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)
1395 1396
	(bidi_level_of_next_char, bidi_move_to_visually_next):
	Support character positions inside a run of characters covered by a
1397 1398 1399 1400 1401 1402 1403 1404 1405 1406
	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.
1407 1408
	(bidi_resolve_explicit, bidi_resolve_weak):
	Use FETCH_MULTIBYTE_CHAR instead of FETCH_CHAR, as reordering of
1409 1410 1411 1412 1413 1414 1415 1416 1417 1418
	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.
1419

1420 1421 1422 1423 1424 1425
	* 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.
1426 1427
	Accept 3 additional arguments needed by handle_display_spec.
	This fixes incorrect cursor motion across display property with complex
1428 1429 1430 1431 1432
	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.
1433
	(handle_display_spec): New function, refactored from the
1434 1435 1436 1437 1438 1439 1440 1441 1442 1443
	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.
1444 1445
	(compute_display_string_pos, compute_display_string_end):
	New functions.
1446 1447 1448
	(push_it): Accept second argument POSITION, where pop_it should
	jump to continue iteration.
	(reseat_1): Initialize bidi_it.disp_pos.
Eli Zaretskii's avatar