Merge remote-tracking branch 'origin/trunk' into xwidget

Conflicts:
	ChangeLog
	lisp/ChangeLog
	lisp/progmodes/octave.el
	src/Makefile.in

1 files changed, 411 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4245a1f0256..b1f13e62b40 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,413 @@
+2013-05-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (pos_visible_p): When CHARPOS is displayed frrom a
+        display vector, and we backtrack, handle the case that the
+        previous character position is also displayed from a display
+        vector or covered by a display string or image.  (Bug#14476)
+
+2013-05-25  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xfns.c (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource): Remove.
+        (struct MonitorInfo, free_monitors): Remove.
+        (x_make_monitor_attribute_list): Call make_monitor_attribute_list.
+        (Fx_display_monitor_attributes_list): Call make_monitor_attribute_list.
+        (syms_of_xfns): Remove DEFSYM for Qgeometry, Qworkarea, Qmm_size,
+        Qframes, Qsource.
+
+        * nsfns.m (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource): Remove.
+        (struct MonitorInfo, free_monitors): Remove.
+        (ns_screen_name): Make static.
+        (ns_make_monitor_attribute_list): Call make_monitor_attribute_list.
+        (syms_of_nsfns): Remove DEFSYM for Qgeometry, Qworkarea, Qmm_size,
+        Qframes, Qsource.
+
+        * frame.h (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource): Declare.
+        (struct MonitorInfo): New struct.
+        (free_monitors, make_monitor_attribute_list): Declare.
+
+        * frame.c (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource): New
+        Lisp_Object:s.
+        (free_monitors, make_monitor_attribute_list): New functions.
+        (syms_of_frame): DEFSYM Qgeometry, Qworkarea, Qmm_size, Qframes,
+        Qsource.
+
+2013-05-25  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * callproc.c (call_process): Refine the doc string.  (Bug#14045)
+
+2013-05-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c: Apply keyboard decoding only to events that come directly
+        from the tty, not from unread-command-events (bug#14368).
+        (read_event_from_main_queue): New function, extracted from read_char).
+        (read_decoded_char): Remove.
+        (read_decoded_event_from_main_queue): New function to replace it.
+        (read_char): Use it.
+        (read_key_sequence): Use read_char rather than read_decoded_char.
+
+        * keyboard.c (read_decoded_char): Don't decode under w32 (bug#14403).
+
+2013-05-22  Barry OReilly  <gundaetiapo@gmail.com>  (tiny change)
+
+        * casetab.c (init_casetab_once): Fix last change (bug#14424).
+
+2013-05-22  Kenichi Handa  <handa@gnu.org>
+
+        The following changes are to fix the setting of
+        buffer-file-coding-system on, for instance, C-x RET c unix RET
+        _FILE_OF_DOS_EOL_TYPE_ RET.
+
+        * coding.h (struct coding_system): New member detected_utf8_chars.
+
+        * coding.c (detect_coding_utf_8): Count characters and check EOL
+        format.  Include CATEGORY_MASK_UTF_8_AUTO in detect_info->found if
+        BOM is there.
+        (setup_coding_system): Do not initialize coding->head_ascii.
+        (check_ascii): Do not set coding->eol_seen but update it.  Do not
+        call adjust_coding_eol_type here.
+        (detect_coding): Fix detection of BOM for utf-8 and utf-16.
+        If the eol-type of CODING is already specified, adjust the eol type
+        of the found coding-system.
+        (decode_coding_gap): Cancel previous change.  Utilize the
+        character numbers counted by detect_coding_utf_8.  Fix detection
+        of BOM for utf-8.
+
+2013-05-21  Barry OReilly  <gundaetiapo@gmail.com>  (tiny change)
+
+        * search.c (looking_at_1): Only set last_thing_searched if the match
+        changed the match-data (bug#14281).
+
+2013-05-21  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * xdisp.c (reseat_at_previous_visible_line_start):
+        Already declared in dispextern.h, so remove it here.
+        (move_it_vertically_backward): Likewise.
+
+2013-05-20  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * xfns.c (check_x_display_info): Don't use XINT for terminal object.
+        (Fx_display_pixel_width, Fx_display_pixel_height)
+        (Fx_display_mm_width, Fx_display_mm_height):
+        Mention `display-monitor-attributes-list' in docstrings.
+
+        * nsfns.m (ns_get_screen): Remove function.  All uses removed.
+        (check_ns_display_info): Sync with check_x_display_info in xfns.c.
+        (Fx_server_max_request_size, Fx_server_vendor, Fx_server_version)
+        (Fx_display_screens, Fx_display_mm_width, Fx_display_mm_height)
+        (Fx_display_backing_store, Fx_display_visual_class)
+        (Fx_display_save_under, Fx_close_connection, Fxw_display_color_p)
+        (Fx_display_grayscale_p, Fx_display_pixel_width)
+        (Fx_display_pixel_height, Fx_display_planes)
+        (Fx_display_color_cells): Sync args and docstrings with xfns.c.
+        (Fx_display_screens): Don't confuse X11 screens with NS screens.
+        (Fx_display_mm_width, Fx_display_mm_height)
+        (Fx_display_pixel_width, Fx_display_pixel_width): Return width or
+        height for all physical monitors as in X11.
+
+        * nsterm.m (x_display_pixel_width, x_display_pixel_height):
+        Return pixel width or height for all physical monitors as in X11.
+
+2013-05-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port --enable-gcc-warnings to clang.
+        * bytecode.c (exec_byte_code):
+        * regex.c:
+        Redo diagnostic pragmas to pacify clang, too.
+        * dbusbind.c (xd_retrieve_arg): Do not use uninitialized variable.
+        * editfns.c (Fencode_time):
+        * fileio.c (file_accessible_directory_p):
+        * font.c (font_unparse_xlfd):
+        Use '&"string"[index]' instead of '"string" + (index)'.
+        * undo.c (user_error): Remove; unused.
+
+2013-05-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * insdel.c (insert_1_both): Document the arguments, instead of
+        referring to insert_1, which no longer exists.
+
+        * xdisp.c (message_dolog): If the *Messages* buffer is shown in
+        some window, increment windows_or_buffers_changed, so that
+        *Messages* display in that window is updated.  (Bug#14408)
+
+        * w32.c: Include epaths.h.
+        (init_environment): Use cmdproxy.exe without leading directories.
+        Support emacs.exe in src; point SHELL to cmdproxy in ../nt in that
+        case.
+        (gettimeofday): Adjust signature and return value to Posix
+        expectations.
+
+        * unexw32.c (open_output_file): Delete the existing emacs.exe
+        before creating it, to break the hard link to the versioned
+        executable.
+
+        * Makefile.in (EMACS_MANIFEST, CM_OBJ, TEMACS_POST_LINK)
+        (ADDSECTION, EMACS_HEAPSIZE, MINGW_TEMACS_POST_LINK)
+        (FIRSTFILE_OBJ): New variables.
+        (W32_RES): Rename to EMACSRES.  All users changed.
+        (base_obj): Use $(CM_OBJ).
+        (ALLOBJS): Use $(FIRSTFILE_OBJ).
+        (emacs$(EXEEXT)): Depend on $(ADDSECTION).
+        (temacs$(EXEEXT)): Use $(TEMACS_POST_LINK), and move
+        $(W32_RES_LINK) before $(LIBES).
+        (emacs.res): Depend on $(EMACS_MANIFEST).  Put emacs.rc in nt.
+
+2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * makefile.w32-in (DOC): Use just "DOC".
+
+        * Makefile.in (bootstrap-clean): DOC-* doesn't exist any more.
+
+        * process.c: Export default filters and sentinels to Elisp.
+        (Qinternal_default_process_sentinel, Qinternal_default_process_filter):
+        New constants.
+        (pset_filter, pset_sentinel, make_process, Fset_process_filter)
+        (Fset_process_sentinel, Fformat_network_address):
+        Default to them instead of nil.
+        (server_accept_connection): Sentinels can't be nil any more.
+        (read_and_dispose_of_process_output): New function, extracted from
+        read_process_output.
+        (read_process_output): Use it; filters can't be nil.
+        (Finternal_default_process_filter): New function, extracted from
+        read_process_output.
+        (exec_sentinel_unwind): Remove function.
+        (exec_sentinel): Don't zilch sentinel while running.
+        (status_notify): Sentinels can't be nil.
+        (Finternal_default_process_sentinel): New function extracted from
+        status_notify.
+        (setup_process_coding_systems): Default filter is not nil any more.
+        (syms_of_process): Export new Elisp functions and initialize
+        new constants.
+        * lisp.h (make_lisp_proc): New function.
+
+2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * regex.c (regex_compile) [\=, \>, \<]: Don't forget to set laststart.
+
+2013-05-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (w32_wnd_proc): Don't call WINDOW_HEADER_LINE_HEIGHT
+        unless we know that the window w is a leaf window.
+        Another attempt at solving bug#14062.
+
+2013-05-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsfont.m (ns_spec_to_descriptor): Retain and autorelease
+        fdesc (Bug#14375).
+
+2013-05-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * image.c (gif_load): Check that subimages fit (Bug#14345).
+
+2013-05-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lread.c (skip_dyn_eof): New function.
+        (read1): Use it to skip the end of a file in response to #@00.
+
+        * doc.c (get_doc_string): Slightly relax the sanity checking.
+
+2013-05-09  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsfns.m: Include IOGraphicsLib.h if Cocoa.
+        (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource): Declare.
+        (MonitorInfo): New struct.
+        (free_monitors, ns_screen_name, ns_make_monitor_attribute_list)
+        (Fns_display_monitor_attributes_list): New functions.
+        (display-usable-bounds): Remove.
+        (syms_of_nsfns): DEFSYM Qgeometry, Qworkarea, Qmm_size, Qframes and
+        Qsource.
+
+2013-05-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xterm.h (GTK_PREREQ): Remove, replacing with GTK_CHECK_VERSION.
+        (GTK_CHECK_VERSION): New macro, if not already defined.
+        All uses of GTK_PREREQ, GTK_MAJOR_VERSION, etc.
+        replaced by GTK_CHECK_VERSION.
+
+2013-05-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xterm.h (GTK_PREREQ): New macro.
+        All simple uses of GTK_MAJOR_VERSION and GTK_MINOR_VERSION changed
+        to use this macro instead, for consistency and clarity.
+
+2013-05-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (row_for_charpos_p): New function, with code of
+        cursor_row_p, but accepts an additional argument CHARPOS instead
+        of using a hardcoded PT.
+        (cursor_row_p): Call row_for_charpos_p with 2nd argument PT.
+        (row_containing_pos): Call row_for_charpos_p instead of partially
+        doing the same.  Fixes cursor positioning under longlines-mode
+        when longlines-show-effect includes more than one newline, when
+        moving the cursor vertically up.
+
+2013-05-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (ACL_H): New macro.
+        ($(BLD)/fileio.$(O)): Update dependencies.
+
+2013-05-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295)
+        * Makefile.in (LIB_ACL): New macro.
+        (LIBACL_LIBS): Remove.
+        (LIBES): Use LIB_ACL, not LIBACL_LIBS.
+        * fileio.c: Include <acl.h>.
+        Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL.
+        (ACL_NOT_WELL_SUPPORTED): Remove.  All uses replaced by
+        !acl_errno_valid.
+        (Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling
+        it ourselves.
+
+        * unexelf.c: Don't assume ElfW (Half) fits in int.
+        (entry_address, find_section, unexec): Use ptrdiff_t, not int,
+        when dealing with ElfW (Half) values, since they can exceed 2**31
+        on 64-bit OpenBSD hosts.  Problem reported privately by Han Boetes.
+        (entry_address): Omit unused NUM arg.  All uses changed.
+
+2013-05-07  Juri Linkov  <juri@jurta.org>
+
+        * callint.c (Fcall_interactively): Set `visargs[i]' for code 'n'
+        to the string converted from number with `Fnumber_to_string'.
+        (Bug#14254)
+
+2013-05-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xfns.c (x_get_net_workarea): Define only if !GTK || GTK<3.4.
+        This fixes a problem introduced by my previous change.
+
+2013-05-07  Glenn Morris  <rgm@gnu.org>
+
+        * lread.c (readchar): Don't read from a dead buffer.  (Bug#14280)
+
+2013-05-07  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xfns.c: Move misplaced ifndef USE_GTK from previous checkin.
+
+2013-05-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Static checking by GCC 4.8.0.
+        * xfns.c (x_get_net_workarea, struct MonitorInfo, free_monitors)
+        (x_get_monitor_for_frame, x_make_monitor_attribute_list)
+        (x_get_monitor_attributes_fallback)
+        (x_get_monitor_attributes_xinerama)
+        (x_get_monitor_attributes_xrandr, x_get_monitor_attributes):
+        Define only if USE_GTK.
+        (free_monitors): Define only if HAVE_XINERAMA || HAVE_XRANDR.
+        (x_get_monitor_attributes_fallback): Omit unused locals.
+        (x_get_monitor_attributes_xinerama, Fx_display_monitor_attributes_list):
+        Use double, not float, to avoid mixed-mode floating point arithmetic.
+
+2013-05-07  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+            Jan Djärv  <jan.h.d@swipnet.se>
+
+        * Makefile.in (XRANDR_LIBS, XRANDR_CFLAGS, XINERAMA_LIBS)
+        (XINERAMA_CFLAGS): New macros.
+        (ALL_CFLAGS, LIBES): Use them.
+
+        * xfns.c: Include <X11/extensions/Xrandr.h> if HAVE_XRANDR, and
+        include <X11/extensions/Xinerama.h> if HAVE_XINERAMA.
+        (Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource): New variables.
+        (syms_of_xfns): DEFSYM them.
+        (struct MonitorInfo): New struct.
+        (x_get_net_workarea, free_monitors, x_get_monitor_for_frame)
+        (x_make_monitor_attribute_list, x_get_monitor_attributes_fallback)
+        (x_get_monitor_attributes_xrandr, x_get_monitor_attributes)
+        (x_get_monitor_attributes_xinerama): New functions.
+        (Fx_display_monitor_attributes_list): New primitive.
+        (syms_of_xfns): Defsubr it.
+
+        * xterm.h (x_display_info): Add Xatom_net_workarea and
+        Xatom_net_current_desktop.
+
+        * xterm.c (x_term_init): Initialize dpyinfo->Xatom_net_workarea
+        and dpyinfo->Xatom_net_current_desktop.
+
+2013-05-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (pos_visible_p): Use the special code for finding the
+        beginning of a display property or overlay for any "replacing"
+        display property, not just for display strings.  This solves
+        incorrect reporting of position by posn-at-point.  (Bug#14241)
+
+2013-05-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * unexelf.c: Fix some 32-bit integer problems, notably when debugging.
+        Include <limits.h>, <stdbool.h>, <intprops.h>, <verify.h>.
+        Verify that ElfW (Half) fits in int.
+        (fatal): Use same signature as lisp.h.
+        (UNEXELF_DEBUG): New macro, replacing DEBUG, so that people can
+        configure and build with -DUNEXELF_DEBUG without worrying about
+        other modules that use DEBUG.
+        (DEBUG_LOG) [UNEXELF_DEBUG]: New macro.  All debug code that prints
+        possibly-wide integers now uses it instead of plain fprintf.
+        (entry_address): New function, which avoids problems with 32-bit
+        overflow on 64-bit hosts.
+        (OLD_SECTION_H, NEW_SECTION_H, NEW_PROGRAM_H): Use it.
+        (round_up): Don't assume the remainder fits in int.
+        (find_section): Use bool for boolean.  Simplify debug code.
+        (unexec): Don't assume file sizes fit in int or size_t.
+        Omit unnecessary trailing newline in 'fatal' format.
+        Use strerror rather than outputting decimal error number.
+        Remove unused code when emacs is not defined;
+        this file relies on Emacs now.
+        Don't assume e_phnum and e_shnum are positive.
+
+        * regex.c: Fix problems when DEBUG is defined.
+        (extract_number, extract_number_and_incr): Define regardless of
+        whether DEBUG is defined; that's simpler and makes the code less
+        likely to go stale in the normal case when DEBUG is not defined.
+        Return int rather than taking an int * arg.  All callers changed.
+        (DEBUG_PRINT1, DEBUG_PRINT2, DEBUG_PRINT3, DEBUG_PRINT4):
+        Remove, replacing with ...
+        (DEBUG_PRINT): New macro.  All callers changed.
+        (DEBUG_COMPILES_ARGUMENTS): New macro.
+        (print_fastmap, print_partial_compiled_pattern) [DEBUG]:
+        (print_compiled_pattern, print_double_string) [DEBUG]:
+        Use prototype rather than old-style definition.
+        (print_partial_compiled_pattern, print_compiled_pattern) [DEBUG]:
+        (ENSURE_FAIL_STACK, PUSH_FAILURE_REG) [DEBUG]:
+        (POP_FAILURE_REG_OR_COUNT, PUSH_FAILURE_POINT) [DEBUG]:
+        (POP_FAILURE_POINT, re_match_2_internal) [DEBUG]:
+        Don't assume ptrdiff_t, size_t, and long are the same width as int.
+        (POINTER_TO_OFFSET): Return ptrdiff_t, not regoff_t.
+        This matters only when DEBUG is defined.
+
+2013-05-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (set_iterator_to_next): Set the
+        ignore_overlay_strings_at_pos_p flag only if we are _really_
+        iterating over an overlay string, as indicated by the
+        current.overlay_string_index member.  (Bug#14306)
+
+2013-05-05  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsmenu.m (ns_update_menubar): Move initialization of submenuTitle
+        to where it is used, to avoid autorelease issues (Bug#14050).
+
+2013-05-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        `write-region-inhibit-fsync' defaults to noninteractive (Bug#14273).
+        * fileio.c (syms_of_fileio): Implement this.
+        * filelock.c (create_lock_file): If symbolic links don't work, so
+        we use a regular file as a lock file, do not fsync the lock file;
+        it's not needed.
+
+2013-05-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuf.c (Fread_minibuffer, Feval_minibuffer): Move to Elisp.
+        (syms_of_minibuf): Adjust accodingly.
+        * lread.c (Fread):
+        * callint.c (Fcall_interactively): Adjust calls accordingly.
+
+2013-05-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * dispextern.h (WINDOW_WANTS_HEADER_LINE_P): Verify that
+        w->contents is a buffer before computing everything else.
+        Use parentheses to disambiguate last part of the condition.
+
+        * w32fns.c (w32_wnd_proc): Remove temporary code used to trap
+        assertion violations.  (Bug#14062)
+
 2013-05-01  David Reitter  <david.reitter@gmail.com>
 
         * nsfns.m (ns_tooltip): Initialize.
@@ -35,6 +445,7 @@
         size.
 
 2013-04-26  Paul Eggert  <eggert@cs.ucla.edu>
+
         Port better to AIX (Bug#14258).
         * lisp.h (ENUM_BF) [__IBMC__]: Make it 'unsigned int' here, too,
         to pacify AIX xlc.