merge from trunk

1 files changed, 249 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c0c85c15ee9..115b8d42915 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,249 @@
+2013-01-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * alloc.c (free_save_value): Now static.
+
+2013-01-15  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * keymap.c (map_keymap_internal): Use format_save_value.
+        (map_keymap_char_table_item): Adjust accordingly.
+        * fileio.c (non_regular_fd, non_regular_inserted)
+        (non_regular_nbytes): Remove.
+        (Finsert_file_contents): Convert trytry to ptrdiff_t.  Use
+        format_save_value to pass parameters to read_non_regular.
+        (read_non_regular): Use XSAVE_ macros to extract parameters.
+        Adjust comment.
+        * xmenu.c (xmenu_show) [!USE_X_TOOLKIT && !USE_GTK]: Use
+        format_save_value.
+        (pop_down_menu) [!USE_X_TOOLKIT && !USE_GTK]: Adjust user.
+
+2013-01-15  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * lisp.h (XSAVE_POINTER, XSAVE_INTEGER): Change to allow
+        extraction from any Lisp_Save_Value slot.  Add type checking.
+        * alloc.c, dired.c, editfns.c, fileio.c, ftfont.c, gtkutil.c:
+        * keymap.c, lread.c, nsterm.h, nsmenu.c, xfns.c, xmenu.c:
+        * xselect.c: All users changed.
+
+2013-01-15  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Some convenient bits to deal with Lisp_Save_Values.
+        * lisp.h (XSAVE_OBJECT): New macro to extract saved objects.
+        (allocate_misc): Remove prototype.
+        (format_save_value): New prototype.
+        * alloc.c (allocate_misc): Revert back to static.
+        (format_save_value): New function to build Lisp_Save_Value
+        object with the specified internal structure.
+        (make_save_value): Reimplement using format_save_value.
+        * editfns.c (save_excursion_save): Use format_save_value.
+        (save_excursion_restore): Use XSAVE_OBJECT.
+
+2013-01-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Avoid needless casts with XSAVE_POINTER.
+        * alloc.c (mark_object) [GC_MARK_STACK]:
+        * dired.c (directory_files_internal_unwind):
+        * fileio.c (do_auto_save_unwind):
+        * gtkutil.c (pop_down_dialog):
+        * keymap.c (map_keymap_char_table_item):
+        * lread.c (load_unwind):
+        * nsmenu.m (pop_down_menu):
+        * print.c (print_object) [GC_MARK_STACK]:
+        * xfns.c (clean_up_file_dialog):
+        * xmenu.c (cleanup_widget_value_tree):
+        Omit casts between XSAVE_POINTER and a pointer type.
+
+2013-01-14  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Fix compilation with GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE.
+        * eval.c (eval_sub): Protect `form' from being GCed before its
+        car and cdr becomes protected with the backtrace entry.
+
+2013-01-14  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Make Lisp_Save_Value more versatile storage for up to four objects.
+        * lisp.h (toplevel): Enumeration to describe types of saved objects.
+        (struct Lisp_Save_Value): New layout.  Adjust comments.
+        (XSAVE_POINTER): New macro.
+        (XSAVE_INTEGER): Likewise.
+        (allocate_misc): Add prototype.
+        (free_misc): Likewise.
+        * alloc.c (allocate_misc): Now global.
+        (free_misc): Likewise.  Adjust comment.
+        (make_save_value): Use new Lisp_Save_Value layout.  Adjust comment.
+        (free_save_value): Likewise.
+        (mark_object): Likewise.
+        * editfns.c (save_excursion_save): Pack everything within
+        Lisp_Save_Value and so avoid xmalloc.
+        (save_excursion_restore): Adjust to match new layout.  Use free_misc
+        because we do not allocate extra memory any more.  Add eassert.
+        * print.c (print_object): New code to print Lisp_Save_Value.  Do not
+        rely on valid_lisp_object_p if !GC_MARK_STACK.  Adjust comments.
+        * dired.c, fileio.c, font.c, ftfont.c, gtkutil.c, keymap.c,
+        * lread.c, nsmenu.m, nsterm.h, xfns.c, xmenu.c, xselect.c:
+        Use XSAVE_POINTER and XSAVE_INTEGER where appropriate.
+
+2013-01-13  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsfont.m (LCD_SMOOTHING_MARGIN): New define.
+        (nsfont_draw): Remove disabling of LCD smoothing.
+        (ns_glyph_metrics): Add LCD_SMOOTHING_MARGIN to bearings to fix
+        Bug#11484 with LCD smoothing on.
+
+2013-01-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix SIGDANGER handlers, for AIX (Bug#13408).
+        * sysdep.c.c (handle_danger_signal, deliver_danger_signal) [SIGDANGER]:
+        Move handlers here from emacs.c; they were out of place.
+
+2013-01-11  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (syms_of_xterm): Adjust documentation for
+        scroll-bar-adjust-thumb-portion.
+
+2012-12-31  Adam Sjøgren  <asjo@koldfront.dk>  (tiny change)
+
+        * xterm.c (scroll-bar-adjust-thumb-portion): New variable to
+        determine whether scroll bar thumb size should be adjusted or
+        not. Use variable for MOTIF.
+
+        * gtkutil.c (scroll-bar-adjust-thumb-portion): Use variable for
+        GTK.
+
+2013-01-13  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (keyDown:): Set processingCompose to NO if an emacs key
+        event is generated.
+        (doCommandBySelector:): Set processingCompose to NO.
+
+        * nsfont.m (ns_findfonts): Add block/unblock_input calls.
+        Remove check for fkeys count > zero, block/unblock fixes the real bug.
+        (nsfont_list_family): Add block/unblock_input calls.
+        (nsfont_open): Move block_input earlier.  Add unblock_input before early
+        return.
+        (nsfont_draw): Add block/unblock_input calls.
+
+2013-01-12  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * indent.c (Fvertical_motion): Remove now-incorrect GCPROs
+        for old_charpos and old_bytepos.
+
+2013-01-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix bug with set-time-zone-rule and LOCALTIME_CACHE (Bug#13415).
+        * editfns.c (set_time_zone_rule) [LOCALTIME_CACHE]:
+        Clear tzvalbuf_in_environ if this workaround is in effect.
+        Problem and fix reported by Kazuhiro Ito.
+
+2013-01-11  Aaron S. Hawley  <Aaron.Hawley@vtinfo.com>
+
+        * insdel.c (Fcombine_after_change_execute, syms_of_insdel): Fix
+         ambiguous doc string cross-reference(s).
+
+        * keyboard.c (Fcommand_execute, syms_of_keyboard): Fix ambiguous
+         doc string cross-reference(s).
+
+        * window.c (Fwindow_point, syms_of_window): Fix ambiguous doc
+         string cross-reference(s).
+
+2013-01-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Avoid unnecessary byte position calculation for the gap movement.
+        Since all users of move_gap do CHAR_TO_BYTE for other purposes
+        anyway, all of them should use move_gap_both instead.
+        * lisp.h (move_gap): Remove prototype.
+        * insdel.c (move_gap): Remove.
+        (move_gap_both): Add eassert.
+        * editfns.c (Ftranspose_regions): Tweak to use move_gap_both.
+        * xml.c (parse_region): Likewise.
+
+2013-01-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        emacsclient -t should not suspend Emacs server (Bug#13387)
+        * lisp.h, sysdep.c (block_tty_out_signal, unblock_tty_out_signal):
+        New functions.
+        * term.c (init_tty): Use them instead of rolling our own code.
+        * sysdep.c (tcsetpgrp_without_stopping): Likewise.  Here, this
+        switches from 'signal' to 'pthread_sigmask', which is safer in
+        multithreaded applications.
+        * term.c (Fresume_tty): Don't bother dissociating if O_IGNORE_CTTY,
+        which has already arranged for that.
+        (dissociate_if_controlling_tty): If setsid fails, fall back on TIOCNOTTY.
+        This is the main part of the bug fix.
+
+2013-01-10  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>  (tiny change)
+
+        * gtkutil.c (xg_initialize): Add ifdef HAVE_FREETYPE around
+        x_last_font_name (Bug#13403).
+
+2013-01-10  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Omit buffer_slot_type_mismatch and use generic predicates to enforce
+        the type of per-buffer values where appropriate.
+        * lisp.h (struct Lisp_Buffer_Objfwd): Rename slottype member to
+        predicate, which is how it's really used now.  Adjust comment.
+        * buffer.h (buffer_slot_type_mismatch): Remove prototype.
+        * buffer.c (buffer_slot_type_mismatch): Remove.
+        (DEFVAR_PER_BUFFER, defvar_per_buffer): Rename type argument to
+        predicate.  Adjust comment.
+        (syms_of_buffer): Use Qsymbolp for major-mode.  Use Qintegerp for
+        fill-column, left-margin, tab-width, buffer-saved-size,
+        left-margin-width, right-margin-width, left-fringe-width,
+        right-fringe-width, scroll-bar-width and buffer-display-count.
+        Use Qstringp for default-directory, buffer-file-name,
+        buffer-file-truename and buffer-auto-save-file-name.  Use Qfloatp for
+        scroll-up-aggressively and scroll-down-aggressively.  Use Qnumberp for
+        line-spacing.
+        * data.c (store_symval_forwarding): Adjust to call the predicate.
+
+2013-01-09  Juanma Barranquero  <lekktu@gmail.com>
+
+        * w32.c (get_name_and_id, acl_set_file):
+        * w32term.c (w32fullscreen_hook): Remove unused local variables.
+
+2013-01-09  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * lisp.h (make_gap_1): New prototype.
+        * buffer.h (GAP_BYTES_DFL, GAP_BYTES_MIN): New macros for the special
+        gap size values.
+        * editfns.c (Fbuffer_size): Rename from Fbufsize to fit the common
+        naming convention.
+        (syms_of_editfns): Adjust defsubr.  Drop commented-out obsolete code.
+        * insdel.c (make_gap_larger): Use GAP_BYTES_DFL.  Adjust comment.
+        (make_gap_smaller): Use GAP_BYTES_MIN.  Adjust comment.
+        (make_gap_1): New function to adjust the gap of any buffer.
+        * coding.c (coding_alloc_by_making_gap): Use it.
+        * buffer.c (compact_buffer): Likewise.  Use BUF_Z_BYTE, BUF_GAP_SIZE,
+        GAP_BYTES_DFL and GAP_BYTES_MIN.  Adjust comment.
+
+2013-01-08  Juri Linkov  <juri@jurta.org>
+
+        * xfaces.c (tty_supports_face_attributes_p): Return 0 for the case
+        of (supports :underline (:style wave)).  (Bug#13000)
+
+2013-01-08  Aaron S. Hawley  <aaron.s.hawley@gmail.com>
+
+        * undo.c (Fprimitive_undo): Move to simple.el.
+        (syms_of_undo): Remove declarations for Sprimitive_undo.
+
+2013-01-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c (echo_add_key): Rename from echo_add_char.
+
+2013-01-06  Chong Yidong  <cyd@gnu.org>
+
+        * keyboard.c (echo_add_char): New function, factored out from
+        echo_char.  Don't add a space if the previous echo string was
+        empty (Bug#13255).
+        (echo_char): Use it.
+        (read_key_sequence): When echoing mock input, ensure that the
+        trailing dash is properly added.
+
 2013-01-05  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (dump_glyph): Align glyph data better.  Use "pD" instead
         of a non-portable "t" to print ptrdiff_t values.  Allow up to 9
-        digits for buffer positions, before misalignment starts.  Display
-        "0" for integer "object" field.
+        digits for buffer positions, before misalignment starts.
+        Display "0" for integer "object" field.
         (dump_glyph_row): Adapt the header line to changes in dump_glyph.
         Display the newline glyph more unambiguously.
 
@@ -44,8 +284,8 @@
 2012-12-31  Eli Zaretskii  <eliz@gnu.org>
 
         * w32.c (unsetenv): Set up the string passed to _putenv
-        correctly.  See
-        http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00863.html
+        correctly.
+        See http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00863.html
         for the bug this caused.
 
 2012-12-30  Paul Eggert  <eggert@cs.ucla.edu>
@@ -117,8 +357,8 @@
 
 2012-12-27  Eli Zaretskii  <eliz@gnu.org>
 
-        * fileio.c (file_name_as_directory, directory_file_name): Accept
-        an additional argument MULTIBYTE to indicate whether the input C
+        * fileio.c (file_name_as_directory, directory_file_name):
+        Accept an additional argument MULTIBYTE to indicate whether the input C
         came from a multibyte or a unibyte Lisp string; all callers
         adjusted.  Don't assume the input string is always multibyte.
         (Bug#13262)
@@ -202,8 +442,8 @@
         * w32.c (sys_close): Do not call delete_child on a subprocess
         whose handle is not yet closed.  Instead, set its file descriptor
         to a negative value, so that reap_subprocess will call
-        delete_child on that subprocess when its SIGCHLD arrives.  This
-        avoids closing handles used for communications between sys_select
+        delete_child on that subprocess when its SIGCHLD arrives.
+        This avoids closing handles used for communications between sys_select
         and reader_thread, which doesn't give sys_select a chance to
         notice that the process exited and invoke the SIGCHLD handler for
         it.
@@ -1642,7 +1882,7 @@
         * image.c (xpm_make_color_table_h): Fix compiler error because
         make_hash_table changed.
 
-2012-11-08  Thomas Kappler <tkappler@gmail.com> (tiny change)
+2012-11-08  Thomas Kappler  <tkappler@gmail.com>  (tiny change)
 
         * nsfont.m (ns_findfonts): Handle empty matchingDescs (Bug#11541).