conflict resolve

1 files changed, 189 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ae25a3c5d00..288996fffb2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,192 @@
+2013-03-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * coding.c (decode_coding_gap): Fix typo caught by static checking.
+
+2013-03-15  handa  <handa@gnu.org>
+
+        * insdel.c (insert_from_gap): New arg text_at_gap_tail.
+        (adjust_after_replace): Make it back to static.  Delete the third
+        arg text_at_gap_tail.  Cancel the code for handling it.
+
+        * coding.h (struct coding_system): New member eol_seen.
+
+        * coding.c (detect_ascii): New function.
+        (detect_coding): Set coding->head_ascii and coding->eol_seen only
+        when the source bytes are actually scanned.  On detecting for
+        coding_category_utf_8_auto, call detect_ascii instead of scanning
+        source bytes directly.
+        (produce_chars): Call insert_from_gap with the new arg 0.
+        (encode_coding): Likewise.
+        (decode_coding_gap): Control ASCII optimization by the variable
+        disable_ascii_optimization instead of #ifndef .. #endif.
+        Deccode EOL format according to coding->eol_seen.
+        (syms_of_coding): Declare disable-ascii-optimization as a Lisp
+        variable.
+
+        * global.h (struct emacs_globals): New member
+        f_disable_ascii_optimization.
+        (disable_ascii_optimization): New macro.
+
+        * lisp.h (adjust_after_replace): Cancel externing it.
+        (insert_from_gap): Adjust prototype.
+
+2013-03-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32term.c (w32fullscreen_hook): Swap FULLSCREEN_BOTH and
+        FULLSCREEN_MAXIMIZED.  (Bug#13935)
+
+2013-03-15  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * region-cache.c (find_cache_boundary, move_cache_gap)
+        (insert_cache_boundary, delete_cache_boundaries, set_cache_region):
+        Simplify debugging check and convert to eassert.  Adjust comment.
+        (pp_cache): Put under ENABLE_CHECKING.
+
+2013-03-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32term.c (w32_read_socket) <WM_WINDOWPOSCHANGED>: Remove old
+        and incorrect code.  Treat WM_WINDOWPOSCHANGED like WM_ACTIVATE
+        and WM_ACTIVATEAPP.
+        (w32fullscreen_hook): If the frame is visible, reset
+        f->want_fullscreen flag after changing the frame size.  If the
+        frame is not visible, set f->want_fullscreen to FULLSCREEN_WAIT.
+        (Bug#13953)
+
+2013-03-13  Daniel Colascione  <dancol@dancol.org>
+
+        * emacs.c (main): Call syms_of_cygw32 on CYGWIN non-NTGUI builds
+        too so that these builds can use Cygwin's file conversion
+        functions.  (We've been building and linking cygw32.o all along
+        and just not using it.)
+
+2013-03-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        File synchronization fixes (Bug#13944).
+        * Makefile.in (LIB_FDATASYNC): New macro.
+        (LIBES): Use it.
+        * conf_post.h (BSD_SYSTEM, BSD_SYSTEM_AHB): Remove; no longer needed.
+        * fileio.c (Fwrite_region, write_region_inhibit_fsync):
+        Don't worry about HAVE_FSYNC, since a substitute fsync is
+        available if the system lacks one.
+        (Fwrite_regin): Retry fsync if interrupted.
+
+2013-03-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32term.c (w32_read_socket): If the Emacs frame is being
+        activated, call w32fullscreen_hook, to make sure the new frame
+        dimensions are in effect.  (Bug#13937)
+
+2013-03-13  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * xdisp.c (init_iterator): Simplify because both character and byte
+        positions are either specified or -1.  Add eassert.  Adjust comment.
+        * window.c (Fscroll_other_window): Use SET_PT_BOTH because both
+        character and byte positions can be obtained from marker.
+
+2013-03-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Static checking by Sun C 5.12.
+        * alloc.c (buffer_memory_full) [REL_ALLOC]:
+        * bytecode.c (exec_byte_code):
+        * dispnew.c (init_display):
+        * eval.c (error):
+        * fileio.c (Fsubstitute_in_file_name):
+        * keyboard.c (Fevent_convert_list):
+        * keymap.c (Fsingle_key_description):
+        * term.c (maybe_fatal, fatal):
+        * xfns.c (Fx_display_backing_store, Fx_display_visual_class):
+        * xsmfns.c (Fhandle_save_session):
+        Omit unreachable code.
+        * keymap.c (map_keymap_char_table_item): Cast void * to
+        a function pointer type; the C Standard requires this.
+
+        * sysdep.c: Remove a use of BSD_SYSTEM, which I'm trying to phase out.
+        Include <sys/param.h> unconditionally, as that works elsewhere and
+        is simpler here.  Include <sys/sysctl.h> if DARWIN_OS ||
+        __FreeBSD__, not if BSD_SYSTEM, since it's needed only for Darwin
+        and FreeBSD now.
+
+2013-03-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * insdel.c (adjust_after_replace): Use bool for boolean.
+
+2013-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c: Move keyboard decoding to read_key_sequence.
+        (decode_keyboard_code): Remove.
+        (tty_read_avail_input): Don't try to decode input.
+        (read_decoded_char): New function.
+        (read_key_sequence): Use it.
+
+2013-03-10  Daniel Colascione  <dancol@dancol.org>
+
+        * w32term.h (GUISTR, GUI_ENCODE_FILE, GUI_ENCODE_SYSTEM, GUI_FN)
+        (GUI_SDATA, guichar_t): Macros to abstract out differences between
+        NTGUI_UNICODE and !NTGUI_UNICODE builds, some moved out of
+        w32fns.c.
+
+        * w32term.c (construct_drag_n_drop): Use the above macros to make
+        drag-and-drop work for non-ASCII filenames in cygw32 builds.
+
+        * w32fns.c (x_set_name, x_set_title): Use the above macros to
+        properly display non-ASCII frame titles in cygw32 builds.
+
+        * w32fns.c (Fw32_shell_execute): Use the above macros to properly
+        call ShellExecute in cygw32 builds.
+
+        * w32fn.c (Fx_file_dialog): Use the above macros to simplify the
+        common file dialog code.
+
+        * w32fns.c (Ffile_system_info): Remove from cygw32 builds, which
+        can just use du like other systems.
+
+        * coding.c (from_unicode_buffer): Declare.
+        * coding.c (from_unicode_buffer): Implement.
+
+2013-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lread.c: Minor cleanup.
+        (FROM_FILE_P): New macro.
+        (skip_dyn_bytes, unreadchar, read1): Use it.
+        (read_list): Consolidate duplicated code.
+
+        * bytecode.c (struct byte_stack): Remove `constants' when unused.
+
+2013-03-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (display_tool_bar_line, redisplay_tool_bar)
+        (redisplay_internal, set_cursor_from_row, try_window)
+        (try_window_id, dump_glyph_row, extend_face_to_end_of_line)
+        (display_line, notice_overwritten_cursor)
+        (mouse_face_from_buffer_pos, note_mouse_highlight):
+        Use MATRIX_ROW_DISPLAYS_TEXT_P.
+        (note_mouse_highlight): Use MATRIX_ROW_GLYPH_START.
+        (mouse_face_from_string_pos, fast_find_string_pos):
+        Use MATRIX_ROW_VPOS.
+
+        * xfns.c (Fx_show_tip): Use MATRIX_ROW_DISPLAYS_TEXT_P.
+
+        * w32fns.c (Fx_show_tip): Use MATRIX_ROW_DISPLAYS_TEXT_P.
+
+        * xdisp.c (try_cursor_movement): Use MATRIX_ROW and
+        MATRIX_MODE_LINE_ROW.
+
+        * dispnew.c (update_window): Use MATRIX_ROW and MATRIX_MODE_LINE_ROW.
+
+2013-03-10  handa  <handa@gnu.org>
+
+        * lisp.h (adjust_after_replace): Extern it.
+
+        * coding.c (detect_coding): Cound the heading ASCII bytes in the
+        case of detection for coding_category_utf_8_auto.
+        (decode_coding_gap) [not CODING_DISABLE_ASCII_OPTIMIZATION]:
+        Skip decoding if all bytes are ASCII.
+
+        * insdel.c (adjust_after_replace): Make it public.  New arg
+        text_at_gap_tail.
+        (adjust_after_insert): Call adjust_after_replace with the new arg
+        value 0.
+
 2013-03-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * keyboard.h (EVENT_START, EVENT_END, POSN_WINDOW, POSN_POSN)