merge trunk
[bpt/emacs.git] / src / ChangeLog
index 56ee8f6..418a89d 100644 (file)
@@ -1,9 +1,58 @@
+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.
+       (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>