GitLab

* coding.c (encode_coding_utf_8): Correctly count produced_chars
also in unibyte case.

Fixes: debbugs:17846

 src/indent.c (Fvertical_motion): Move to the goal column, if any,
 with a single call to move_it_in_display_line, not in two calls.
 Doing this with two calls causes move_it_in_display_line apply the
 line-prefix handling twice instead of just once.

 src/indent.c (Fvertical_motion): Doc fix.

 doc/lispref/positions.texi (Screen Lines): Clarify how columns are counted
 by vertical-motion.

* fileio.c (Ffile_acl): Port to OS X, where acl_get_file (...,
ACL_TYPE_ACCESS) doesn't work.

Fixes: debbugs:17810

before checking key-translation-map.

Fixes: debbugs:17659

crash GC (Bug#17771).

 src/image.c [5 < GIFLIB_MAJOR + (1 <= GIFLIB_MINOR)]: Declare the
 prototype of DGifCloseFile as appropriate for older and newer
 versions of giflib.
 (gif_close): New function, encapsulates the differences in the
 calling sequence of DGifCloseFile before v5.1.0 and after it.
 (gif_load): Call gif_close instead of DGifCloseFile.  Divulge the
 error string where appropriate.

 lisp/term/w32-win.el (dynamic-library-alist): Support giflib 5.1.0
 and later.

 src/xdisp.c (Fmove_point_visually): Instead of testing for keyboard
 macro execution, make sure point didn't move since last complete
 redisplay, as the condition for using the glyph matrix
 information.

 src/xdisp.c (Fmove_point_visually): Don't use the glyph matrix
 information if we are in the middle of executing a keyboard macro,
 since redisplay doesn't update the screen until the macro is
 finished.

 src/alloc.c (cleanup_vector): Don't dereference a font driver
 pointer if it is NULL.

 src/xdisp.c (set_cursor_from_row): Fix an off-by-one error when
 matching overlay strings with 'cursor' property against buffer
 positions traversed in the glyph row.

* doc/lispref/numbers.texi (Comparison of Numbers): Copyedits.

* src/data.c (Flss, Fgtr, Fleq, Fgeq): Doc tweaks.

 src/sysdep.c (reset_sys_modes): Use cursorX, not curX, as the latter
 contains garbage on WINDOWSNT (which could potentially infloop at
 exit).

 src/term.c (tty_menu_display): Don't position cursor here.  Instead,
 pass the cursor coordinates to update_frame_with_menu.
 (tty_menu_activate): Send the hide cursor command only once in an
 iteration through the outer 'while' loop.
 src/dispnew.c (update_frame_1): Accept an additional argument
 SET_CURSOR_P, and position the cursor at the end of the frame
 update only if that argument is non-zero.  All callers changed to
 provide the additional argument as non-zero, except for
 update_frame_with_menu.
 (update_frame_with_menu): Accept 2 additional arguments ROW and
 COL; if they are non-negative, instruct update_frame_1 not to
 position the cursor, and instead position it according to ROW and
 COL.
 src/dispextern.h (update_frame_with_menu): Update prototype.

anything.

Fixes: debbugs:17666

* xterm.c (xg_scroll_callback): Remove position, for jump set portion
to min(value, whole).

And only if it's not pre-4.2 GCC.
* lisp.h (ENUMABLE, DEFINE_GDB_SYMBOL_ENUM): New macros.
(ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG, VALMASK): Use them.
(ARRAY_MARK_FLAG_val, PSEUDOVECTOR_FLAG_val, VALMASK_val):
New macros.

 src/fileio.c (Finsert_file_contents): Call prepare_to_modify_buffer
 with PT, not GPT.

 Revert last changes to GDB-visible symbols.
 src/lisp.h (ENUMABLE, DEFINE_GDB_SYMBOL_ENUM): Delete macros.
 (ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG, VALMASK): Don't use them.
 (ARRAY_MARK_FLAG_val, PSEUDOVECTOR_FLAG_val, VALMASK_val):
 Delete macros.

Fixes: debbugs:17649

This doesn't fix Bug#17598, but it does fix a regression since Emacs
built with xlc until recently, and perhaps it'll help us fix Bug#17598.
* configure.ac (GC_SETJMP_WORKS): Define for AIX, too.
Merge from gnulib, incorporating:
2014-05-30 ftoastr: work around compiler bug in IBM xlc 12.1
* lib/ftoastr.c: Update from gnulib.
* src/alloc.c (gdb_make_enums_visible): Remove FLOAT_TO_STRING_BUFSIZE.
* src/conf_post.h (FLEXIBLE_ARRAY_MEMBER) [__IBMC__]: Don't define to empty.
* src/lisp.h (FLOAT_TO_STRING_BUFSIZE): Make it a macro, instead of an enum,
to work around a compiler bug in IBM xlc 12.1.

 src/xterm.c (x_update_window_end): Don't invalidate the entire
 mouse-highlight info, just signal frame_up_to_date_hook that mouse
 highlight needs to be redisplayed.

Without them, GDB doesn't work to debug Emacs, since the AIX linker
optimizes away the relevant external symbols.  Use enums instead;
this suffices for the AIX port, which is 32-bit-only anyway.
* lisp.h (ENUMABLE, DEFINE_GDB_SYMBOL_ENUM): New macros.
(ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG, VALMASK): Use them.
(ARRAY_MARK_FLAG_val, PSEUDOVECTOR_FLAG_val, VALMASK_val):
New macros.

* admin/unidata/IVD_Sequences.txt: New file.
* admin/unidata/Makefile.in (${top_srcdir}/src/macuvs.h): New rule.
(all): Build it.
(extraclean): Remove it.
* admin/unidata/README: Mention BidiMirroring.txt and IVD_Sequences.txt.
* admin/unidata/copyright.html: Update to current version from Unicode
Consortium.
* admin/unidata/uvs.el: Rename from admin/mac/uvs.el.
(uvs-print-table-ivd): Output a header in the form that
unidata-gen.el generates.
* lisp/international/README: Refer to the Unicode Terms of Use rather
than copying it bodily here, as that simplifies maintenance.
* src/Makefile.in ($(srcdir)/macuvs.h): New rule.
* src/macuvs.h: Use automatically-generated header.

 src/xdisp.c (move_it_in_display_line_to): Don't record wrap position
 if we are iterating over an object that generates glyphs for
 marginal areas.

 src/xdisp.c (safe__call): Accept va_list argument instead of '...'.
 (safe_call, safe__call1): Construct a va_list argument for safe_call.
 (safe_call1): Call safe_call instead of safe__call directly.

Fixes: debbugs:17577

* src/w32term.c (x_delete_display) [CYGWIN]: Don't free
dpyinfo->w32_id_name, to make sure it doesn't get freed more than
once.

(safe__call, safe__call1, safe__eval): New functions.
(safe_call): Use it.
(prepare_menu_bars): Use it for pre-redisplay-function.
(display_mode_element): Same for `:eval'.

Fixes: debbugs:17577

* configure.ac (opsys): On Power Architecture, treat release 7 of
AIX like releases 5 and 6.
* src/unexaix.c (copy_text_and_data): Don't add text_scnptr to ptr
twice.  _text already includes this offset.
(unrelocate_symbols): Don't cast 64-bit integer to pointer.

Fixes: debbugs:17540

 src/xdisp.c (move_it_in_display_line_to): Avoid infinite recursion:
 when closest_pos is identical to to_charpos, don't recurse, since
 we already tried that, and failed.

 src/w32fns.c (unwind_create_frame) [GLYPH_DEBUG]: If we are
 unwinding when frame's faces were not initialized yet, increment
 the frame's image-cache reference count before calling
 x_free_frame_resources.  Don't dereference
 dpyinfo->terminal->image_cache if it is NULL.

instead of deprecated g_settings_list_schemas if possible.

Fixes: debbugs:17434

Fixes: debbugs:17430