GitLab

* lisp.h (pI): New macro, generalizing old pEd macro to other
conversion specifiers.  For example, use "...%"pI"d..." rather
than "...%"pEd"...".
(pEd): Remove.  All uses replaced with similar uses of pI.
* src/m/amdx86-64.h, src/m/ia64.h, src/m/ibms390x.h: Likewise.
* alloc.c (check_pure_size): Don't overflow by converting size to int.
* bidi.c (bidi_dump_cached_states): Use pI to avoid cast.
* data.c (Fnumber_to_string): Use pI instead of if-then-else-abort.
* dbusbind.c (xd_append_arg): Use pI to avoid cast.
(Fdbus_method_return_internal, Fdbus_method_error_internal): Likewise.
* font.c (font_unparse_xlfd): Avoid potential buffer overrun on
64-bit hosts.
(font_unparse_xlfd, font_unparse_fcname): Use pI to avoid casts.
* keyboard.c (record_char, modify_event_symbol): Use pI to avoid casts.
* print.c (safe_debug_print, print_object): Likewise.
(print_object): Don't overflow by converting EMACS_INT or EMACS_UINT
to int.
Use pI instead of if-then-else-abort.  Use %p to avoid casts.
* process.c (Fmake_network_process): Use pI to avoid cast.
* region-cache.c (pp_cache): Likewise.
* xdisp.c (decode_mode_spec): Likewise.
* xrdb.c (x_load_resources) [USE_MOTIF]: Use pI to avoid undefined
behavior on 64-bit hosts with printf arg.
* xselect.c (x_queue_event): Use %p to avoid casts.
(x_stop_queuing_selection_requests): Likewise.
(x_get_window_property): Don't truncate byte count to an 'int'
when tracing.

so that it's not optimized away.
(bidi_ignore_explicit_marks_for_paragraph_level): Likewise.
* dispextern.h (bidi_dump_cached_states): Remove, since it's
exported only to the debugger.

* src/xfont.c:
* src/w32term.c:
* src/w32reg.c:
* src/w32inevt.c:
* src/w32heap.c:
* src/w32console.c:
* src/w16select.c:
* src/unexsol.c:
* src/term.c:
* src/sound.c:
* src/scroll.c (m):
* src/gtkutil.c:
* src/font.c:
* src/filelock.c:
* src/fileio.c:
* src/dosfns.c:
* src/dbusbind.c:
* src/bidi.c:
* src/callproc.c:
* src/process.c:
* src/msdos.c:
* src/charset.c: Do not include stdlib.h and string.h, config.h does it.

* configure.in: Include stdlib.h and string.h unconditionally.

 bidi.c (struct bidi_paragraph_info): Use EMACS_INT for buffer positions.
 (bidi_cache_search, bidi_cache_find): Use EMACS_INT for buffer positions.

 xdisp.c (Fcurrent_bidi_paragraph_direction): Call
 bidi_paragraph_init with NO_DEFAULT_P non-zero.
 bidi.c (bidi_paragraph_init): Accept an additional argument
 NO_DEFAULT_P; all callers changed.  If NO_DEFAULT_P is non-zero,
 search back until a paragraph with a strong directional character
 is found, and use that to determine paragraph's base direction.
 dispextern.h (bidi_paragraph_init): Update prototype.

 xdisp.c (Fcurrent_bidi_paragraph_direction): Fix paragraph
 direction when point is inside a run of whitespace characters.
 bidi.c (bidi_at_paragraph_end): Remove obsolete comment.

* configure.in: Check for util.h.

* src/bidi.c (bidi_dump_cached_states): Fix fprintf warning.

* src/emacs.c: Include src/nsterm.h if HAVE_NS.

* src/image.c (xpm_scan, xpm_make_color_table_v)
(xpm_put_color_table_v, xpm_get_color_table_v)
(xpm_make_color_table_h, xpm_put_color_table_h)
(xpm_get_color_table_h, xpm_str_to_color_key, xpm_load_image)
(xpm_load): Convert to ANSI C prototypes.

* src/lisp.h (fmod_float): Declare.

* src/menu.h (x_set_menu_bar_line): Declare.
(free_menubar_widget_value_tree et.al): Add HAVE_NS for these functions.

* src/window.c: Include menu.h.

* src/nsfns.m (have_menus_p, ns_display_info_for_name)
(x_set_cursor_type, ns_appkit_version_str)
(ns_appkit_version_int, ns_do_applescript)
(x_set_scroll_bar_default_width, x_sync, compute_tip_xy)
(syms_of_nsfns): Convert to ANSI C prototypes.

* src/nsfont.m (ns_fallback_entity, syms_of_nsfont): Convert to ANSI C
prototypes.

* src/nsimage.m (ns_load_image): Move NSTRACE after declarations.

* src/nsmenu.m (popup_activated, name_is_separator)
(syms_of_nsmenu): Convert to ANSI C prototypes.
(runMenuAt): Prototypes and move declarations before code.

* src/nsterm.h : Include sysselect.h.
(x_sync, x_get_focus_frame, x_set_mouse_position)
(x_set_mouse_pixel_position, x_make_frame_visible)
(x_make_frame_invisible, x_iconify_frame, x_char_width, x_char_height)
(x_pixel_width, x_pixel_height, x_set_frame_alpha, x_set_tool_bar_lines)
(x_activate_menubar, free_frame_menubar, ns_init_paths, ns_select)
(syms_of_nsterm, syms_of_nsfns, syms_of_nsmenu, syms_of_nsselect):
Declare

* src/process.c: Check HAVE_UTIL_H. Include src/nsterm.h if HAVE_NS.

* src/nsterm.m (ns_init_paths, ns_alloc_autorelease_pool)
(ns_ring_bell, ns_defined_color, hide_hourglass)
(x_display_pixel_height, x_display_pixel_width, syms_of_nsterm):
Convert to ANSI C prototypes.
(x_set_window_size, ns_draw_fringe_bitmap, judge): Move declarations
before code.

* src/sysdep.c: Check HAVE_TERM_H

* src/term.c: Check HAVE_SYS_IOCTL_H.

* src/unexmacosx.c (print_region_list, print_regions)
(build_region_list, find_emacs_zone_regions)
(unexec_regions_merge, read_load_commands, dump_it)
(unexec_init_emacs_zone): Convert to ANSI C prototypes.

* src/xfaces.c (x_create_gc, x_free_gc): Convert to ANSI C prototypes.

* src/tparam.c: Remove include guards for config.h, string.h and code
that assumes #ifndef emacs.
* src/termcap.c:
* src/unexalpha.c:
* src/sysdep.c:
* src/filemode.c:
* src/filelock.c:
* src/bidi.c: Likewise.

* src/alloc.c: Convert function definitions to standard C.
* src/atimer.c:
* src/bidi.c:
* src/bytecode.c:
* src/callint.c:
* src/callproc.c:
* src/casefiddle.c:
* src/casetab.c:
* src/category.c:
* src/ccl.c:
* src/character.c:
* src/charset.c:
* src/chartab.c:
* src/cmds.c:
* src/coding.c:
* src/composite.c:
* src/data.c:
* src/dbusbind.c:
* src/dired.c:
* src/dispnew.c:
* src/doc.c:
* src/doprnt.c:
* src/ecrt0.c:
* src/editfns.c:
* src/fileio.c:
* src/filelock.c:
* src/filemode.c:
* src/fns.c:
* src/font.c:
* src/fontset.c:
* src/frame.c:
* src/fringe.c:
* src/ftfont.c:
* src/ftxfont.c:
* src/gtkutil.c:
* src/indent.c:
* src/insdel.c:
* src/intervals.c:
* src/keymap.c:
* src/lread.c:
* src/macros.c:
* src/marker.c:
* src/md5.c:
* src/menu.c:
* src/minibuf.c:
* src/prefix-args.c:
* src/print.c:
* src/ralloc.c:
* src/regex.c:
* src/region-cache.c:
* src/scroll.c:
* src/search.c:
* src/sound.c:
* src/strftime.c:
* src/syntax.c:
* src/sysdep.c:
* src/termcap.c:
* src/terminal.c:
* src/terminfo.c:
* src/textprop.c:
* src/tparam.c:
* src/undo.c:
* src/unexelf.c:
* src/window.c:
* src/xfaces.c:
* src/xfns.c:
* src/xfont.c:
* src/xftfont.c:
* src/xgselect.c:
* src/xmenu.c:
* src/xrdb.c:
* src/xselect.c:
* src/xsettings.c:
* src/xsmfns.c:
* src/xterm.c: Likewise.

 admin/unidata/bidimirror.awk: New file.
 admin/unidata/BidiMirroring.txt: New file from
 http://www.unicode.org/Public/6.0.0/ucd/BidiMirroring-6.0.0d1.txt.
 admin/unidata/Makefile.in: (../../src/bidimirror.h): New target.
 (all): Depend on ../../src/biditype.h and ../../src/bidimirror.h.
 admin/unidata/makefile.w32-in (../../src/bidimirror.h): New target.
 (all): Depend on ../../src/biditype.h and ../../src/bidimirror.h.
 src/makefile.w32-in ($(BLD)/bidi.$(O)): Depend on biditype.h and
 bidimirror.h.
 src/deps.mk (bidi.o): Depend on biditype.h and bidimirror.h.
 src/bidi.c (bidi_initialize): Initialize bidi_mirror_table.
 (bidi_mirror_char): Use bidi_mirror_table.

 src/bidi.c (bidi_initialize): Remove explicit initialization of
 bidi_type_table; include biditype.h instead.  Don't support
 entries whose second codepoint is zero.
 src/biditype.h: New file.
 admin/unidata/biditype.awk: New file.
 admin/unidata/Makefile.in (../../src/biditype.h): New target.
 admin/unidata/makefile.w32-in (../../src/biditype.h): New target.

 bidi.c (bidi_move_to_visually_next): Make sure the sentinel
 state is always cached.

 .gdbinit (prowlims): Display row->minpos and row->maxpos.
 Display truncated_on_left_p and truncated_on_right_p flags.
 Formatting fixes.
 (pmtxrows): Display the ordinal number of each row.  Don't display
 rows beyond the last one.
 xdisp.c (RECORD_MAX_MIN_POS): New macro.
 (display_line): Use it to record the minimum and maximum buffer
 positions for glyphs in the row being assembled.  If word wrap is
 in effect, restore minimum and maximum positions seen up to the
 wrap point, when iterator returns to it.
 (find_row_edges): Fix logic; eol_pos should be tested before the
 rest.
 (try_window_reusing_current_matrix): Give up if in bidi-reordered
 row and cursor not already at point.  Restore original pre-bidi
 code for unidirectional buffers.
 bidi.c (bidi_cache_shrink, bidi_cache_iterator_state): Fix
 reallocation of the cache.  (Bug#6210)
 (bidi_cache_iterator_state): Don't zero out new_paragraph (it is
 not copied by bidi_copy_it).

 bidi.c (bidi_cache_shrink, bidi_cache_iterator_state): Fix
 reallocation of the cache.

 bidi.c (bidi_paragraph_init): Remove redundant assertion that we are at
 the beginning of a line after call to bidi_find_paragraph_start.

 src/bidi.c (bidi_paragraph_init): Don't leave alone garbage values
 of bidi_it->paragraph_dir.  Call bidi_initialize if needed.
 src/xdisp.c (Fcurrent_bidi_paragraph_direction): New function.
 (syms_of_xdisp): Defsubr it.
 src/cmds.c (Fforward_char, Fbackward_char): Doc fix.
 src/subr.el (right-arrow-command, left-arrow-command): New functions.
 src/bindings.el (global-map): Bind them to right and left arrow keys.
 etc/NEWS: Mention current-bidi-paragraph-direction

 bidi.c (bidi_cache_shrink): New function.
 (bidi_init_it): Call it.
 (bidi_cache_iterator_state): Enlarge the cache if needed.

 bidi.c (bidi_move_to_visually_next): Renamed from
 bidi_get_next_char_visually.  All callers changed.

 bidi.c (bidi_find_paragraph_start, bidi_at_paragraph_end): Don't
 use buffer-local values of paragraph-start and paragraph-separate.
 <paragraph_start_re, paragraph_separate_re>: Rename from
 fallback_paragraph_start_re and fallback_paragraph_separate_re.

* buffer.c (init_buffer_once, syms_of_buffer): Remove its initialization.

* bidi.c (bidi_initialize): Simplify fallback_paragraph_*_re init.

Basically, this makes the structure of buffer-local values and object
forwarding explicit in the type of Lisp_Symbols rather than use
special Lisp_Objects for that.  This tends to lead to slightly more
verbose code, but is more C-like, simpler, and makes it easier to make
sure we handled all cases, among other things by letting the compiler
help us check it.
* lisp.h (enum Lisp_Misc_Type, union Lisp_Misc):
Removing forwarding objects.
(enum Lisp_Fwd_Type, enum symbol_redirect, union Lisp_Fwd): New types.
(struct Lisp_Symbol): Make the various forms of variable-forwarding
explicit rather than hiding them inside Lisp_Object "values".
(XFWDTYPE): New macro.
(XINTFWD, XBOOLFWD, XOBJFWD, XKBOARD_OBJFWD): Redefine.
(XBUFFER_LOCAL_VALUE): Remove.
(SYMBOL_VAL, SYMBOL_ALIAS, SYMBOL_BLV, SYMBOL_FWD, SET_SYMBOL_VAL)
(SET_SYMBOL_ALIAS, SET_SYMBOL_BLV, SET_SYMBOL_FWD): New macros.
(SYMBOL_VALUE, SET_SYMBOL_VALUE): Remove.
(struct Lisp_Intfwd, struct Lisp_Boolfwd, struct Lisp_Objfwd)
(struct Lisp_Buffer_Objfwd, struct Lisp_Kboard_Objfwd):
Remove the Lisp_Misc_* header.
(struct Lisp_Buffer_Local_Value): Redefine.
(BLV_FOUND, SET_BLV_FOUND, BLV_VALUE, SET_BLV_VALUE): New macros.
(struct Lisp_Misc_Any): Add filler to get the right size.
(struct Lisp_Free): Use struct Lisp_Misc_Any rather than struct
Lisp_Intfwd.
(DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL, DEFVAR_INT)
(DEFVAR_KBOARD): Allocate a forwarding object.
* data.c (do_blv_forwarding, store_blv_forwarding): New macros.
(let_shadows_global_binding_p): New function.
(union Lisp_Val_Fwd): New type.
(make_blv): New function.
(swap_in_symval_forwarding, indirect_variable, do_symval_forwarding)
(store_symval_forwarding, swap_in_global_binding, Fboundp)
(swap_in_symval_forwarding, find_symbol_value, Fset)
(let_shadows_buffer_binding_p, set_internal, default_value)
(Fset_default, Fmake_variable_buffer_local, Fmake_local_variable)
(Fkill_local_variable, Fmake_variable_frame_local)
(Flocal_variable_p, Flocal_variable_if_set_p)
(Fvariable_binding_locus):
* xdisp.c (select_frame_for_redisplay):
* lread.c (Fintern, Funintern, init_obarray, defvar_int)
(defvar_bool, defvar_lisp_nopro, defvar_lisp, defvar_kboard):
* frame.c (store_frame_param):
* eval.c (Fdefvaralias, Fuser_variable_p, specbind, unbind_to):
* bytecode.c (Fbyte_code) <varref, varset>: Adapt to the new symbol
value structure.
* buffer.c (PER_BUFFER_SYMBOL): Move from buffer.h.
(clone_per_buffer_values): Only adjust markers into the current buffer.
(reset_buffer_local_variables): PER_BUFFER_IDX is never -2.
(Fbuffer_local_value, set_buffer_internal_1)
(swap_out_buffer_local_variables):
Adapt to the new symbol value structure.
(DEFVAR_PER_BUFFER): Allocate a Lisp_Buffer_Objfwd object.
(defvar_per_buffer): Take a new arg for the fwd object.
(buffer_lisp_local_variables): Return a proper alist (different fix
for bug#4138).
* alloc.c (Fmake_symbol): Use SET_SYMBOL_VAL.
(Fgarbage_collect): Don't handle buffer_defaults specially.
(mark_object): Handle new symbol value structure rather than the old
special Lisp_Misc_* objects.
(gc_sweep) <symbols>: Free also the buffer-local-value objects.
* term.c (set_tty_color_mode):
* bidi.c (bidi_initialize): Don't access the ->value field directly.
* buffer.h (PER_BUFFER_VAR_OFFSET): Don't bother with
a buffer_local_flags.
* print.c (print_object): Get rid of impossible forwarding objects.

 bidi.c (bidi_get_type, bidi_get_category)
 (bidi_at_paragraph_end, bidi_resolve_weak, bidi_resolve_neutral)
 (bidi_type_of_next_char, bidi_level_of_next_char): Declare
 static.  Use `INLINE' rather than `inline'.

 bidi.c (bidi_init_it): Fix initialization of bidi_it->prev.
 (bidi_resolve_weak): Don't use prev.type_after_w1 if it is
 NEUTRAL_B or UNKNOWN_BT.

 bidi.c (bidi_resolve_weak): Use prev.type_after_w1, instead of
 prev.orig_type, for resolving type of NSM.

 bidi.c (bidi_resolve_explicit, bidi_level_of_next_char): Check
 bidi_it->bytepos against ZV_BYTE instead of bidi_it->ch against
 BIDI_EOB.

 bidi.c (bidi_cache_iterator_state): Invalidate the cache if we
 are outside the range of cached character positions.

 bidi.c (bidi_get_next_char_visually): Improve commentary.
 dispextern.h (PRODUCE_GLYPHS): Set the reversed_p flag in the
 iterator's glyph_row here.
 xdisp.c (handle_invisible_prop, set_iterator_to_next)
 (next_element_from_buffer): Don't set the reversed_p flag in the
 iterator's glyph_row here.

 xdisp.c (handle_invisible_prop): If we are `reseat'ed, init the
 paragraph direction and set the `reversed_p' flag in the IT's
 glyph row.  Fix exit conditions of the loop that skips invisible
 text.  Update IT->prev_stop after skipping invisible text.  Check
 for additional overlays at IT->stop_charpos, not at start_pos.

Clean up the mess with setting the glyph row reversed_p flag.
 dispnew.c (prepare_desired_row): Preserve the reversed_p flag.

 bidi.c (bidi_cache_find): Use bidi_copy_it instead of copying
 the whole struct (which includes uninitialized parts).
 (bidi_init_it): Don't initialize bidi_it->paragraph_dir.

 xdisp.c (display_line): Remove misplaced setting of
 row->reversed_p flags.  Copy the reversed_p flag to the next glyph
 row.
 (next_element_from_buffer): Check bidi_it.paragraph_dir rather
 than level_stack[0].level.  Reset the reversed_p flag for non-R2L
 paragraphs.

Redesign handle_stop_backwards.
Fix character mirroring for non-ASCII characters.

 xdisp.c (handle_stop_backwards): Call compute_stop_pos in the
 loop, instead of calling handle_stop.  Call handle_stop only once,
 after the loop.
 (next_element_from_buffer): Don't call handle_stop_backwards if at
 stop position.  If base_level_stop is zero, set it to 1.

 term.c (append_glyph): Fill resolved_level and bidi_type slots
 of struct glyph for unidirectional display.

 xdisp.c (set_cursor_from_row): Handle zero-width characters.

 bidi.c (bidi_mirror_char): More efficient code (suggested by
 Ehud Karni <ehud@unix.mvs.co.il>).  Don't even try to mirror
 non-ASCII characters.

Fix reordering of Arabic text in etc/HELLO.
Extend .gdbinit commands to support bidirectional display.

 buffer.c (Fbuffer_swap_text): Swap the values of
 bidi_display_reordering and bidi_paragraph_direction.

 bidi.c (bidi_resolve_weak): Fix nesting of conditions for Wn
 processing.  Move W3 after W1 and W2.  Simplify W4 because it is
 now always after W1.

 .gdbinit (pbiditype): New command.
 (pgx): Use it to display bidi level and type of the glyph.