Merge from trunk.

1 files changed, 131 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 25a4e92a1ca..34e730183de 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,134 @@
+2012-10-12  Glenn Morris  <rgm@gnu.org>
+
+        * buffer.c (Fset_buffer): Doc fix.  (Bug#12624)
+
+2012-10-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * buffer.c (Fkill_buffer): Null out the overlay list(s) as well.
+
+        * eval.c (Fautoload): Remember previous autoload status in load-history.
+
+2012-10-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        lread.c, macros.c, marker.c, menu.c, minibuf.c: Use bool for booleans.
+        * lread.c (load_each_byte, new_backquote_flag, readchar)
+        (read_filtered_event, lisp_file_lexically_bound_p)
+        (safe_to_load_version, Fload, complete_filename_p, openp)
+        (build_load_history, readevalloop, read_escape, read1)
+        (string_to_number, read_vector, read_list):
+        * macros.c (Fstart_kbd_macro):
+        * marker.c (CONSIDER):
+        * menu.c (parse_single_submenu, digest_single_submenu)
+        (find_and_return_menu_selection, Fx_popup_menu):
+        * minibuf.c (read_minibuf_noninteractive, read_minibuf)
+        (Ftry_completion):
+        * nsmenu.m (ns_update_menubar, runMenuAt:forFrame:keymaps:):
+        (ns_menu_show):
+        * xmenu.c (set_frame_menubar, create_and_show_popup_menu)
+        (xmenu_show, xdialog_show):
+        Use bool for booleans.
+        * lread.c (safe_to_load_version): Rename from safe_to_load_p,
+        as it's not a predicate.  All uses changed.  Omit unnecessary
+        buffer termination.
+
+2012-10-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * editfns.c (save_excursion_save): Use nil if mark points to nowhere.
+        (save_excursion_restore): Do not restore mark if it was not saved.
+
+2012-10-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * marker.c (cached_modiff): EMACS_INT, not int.
+
+        * w32select.c (waiting_for_input): Declare by including "keyboard.h"
+        instead of having a wrong decl.
+        * nsmenu.m (waiting_for_input): Remove wrong decl.
+
+2012-10-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        keyboard.c, keymap.c: Use bool for booleans.
+        * dispnew.c (sit_for): Distinguish between 3-way display_option
+        and boolean do_display.
+        * keyboard.c (single_kboard, this_command_key_count_reset)
+        (waiting_for_input, echoing, immediate_quit, input_pending)
+        (interrupt_input, interrupts_deferred, pop_kboard)
+        (temporarily_switch_to_single_kboard, ignore_mouse_drag_p)
+        (command_loop_1, adjust_point_for_property)
+        (safe_run_hooks_error, input_polling_used, read_char):
+        (help_char_p, readable_events, kbd_buffer_events_waiting)
+        (kbd_buffer_get_event, timer_check_2, make_lispy_event)
+        (lucid_event_type_list_p, get_input_pending):
+        (gobble_input, menu_separator_name_p, menu_bar_item)
+        (parse_menu_item, parse_tool_bar_item, read_char_x_menu_prompt)
+        (read_char_minibuf_menu_prompt, access_keymap_keyremap)
+        (keyremap_step, test_undefined, read_key_sequence)
+        (detect_input_pending, detect_input_pending_ignore_squeezables)
+        (detect_input_pending_run_timers, requeued_events_pending_p)
+        (quit_throw_to_read_char, Fset_input_interrupt_mode):
+        * keymap.c (get_keymap, keymap_parent, keymap_memberp)
+        (access_keymap_1, access_keymap, map_keymap, get_keyelt)
+        (Fdefine_key, Flookup_key, struct accessible_keymaps_data)
+        (accessible_keymaps_1, Fkey_description, push_key_description):
+        (shadow_lookup, struct where_is_internal_data)
+        (where_is_internal, Fwhere_is_internal, where_is_internal_1)
+        (Fdescribe_buffer_bindings, describe_map_tree, struct describe_map_elt)
+        (describe_map, describe_vector):
+        * menu.c (single_menu_item):
+        * nsmenu.m (ns_update_menubar):
+        * process.c (wait_reading_process_output):
+        * search.c (scan_buffer, scan_newline):
+        Use bool for boolean.
+        * keyboard.c (timers_run, swallow_events)
+        (detect_input_pending_run_timers):
+        * process.c (wait_reading_process_output):
+        Use unsigned for counter where wraparound-on-overflow is desired,
+        since unsigned is guaranteed to have that behavior and signed is not.
+        (read_char): Use ptrdiff_t for string length.
+        (get_input_pending): Remove first argument, since it was always
+        the same pointer-to-int (now pointer-to-boolean) &input_pending,
+        and behave as if it had that value.  Return new value of
+        input_pending.  All callers changed.
+        * keyboard.h (struct kboard): Use unsigned : 1 for boolean member
+        immediate_echo.  Use ptrdiff_t for echo_after_prompt, since it's
+        a string length.
+        * keymap.c (push_key_description): Omit last arg, which was always 1.
+        All callers changed.
+
+        * regex.c (immediate_quit) [emacs]: Remove duplicate decl.
+
+2012-10-10  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in ($(BLD)/dispnew.$(O), $(BLD)/indent.$(O))
+        ($(BLD)/term.$(O)): Update dependencies.
+
+2012-10-10  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * alloc.c (mark_object): Use meaningful PVEC_NORMAL_VECTOR.
+        * lisp.h (enum pvec_type): Adjust comments and omit explicit
+        initializer for PVEC_NORMAL_VECTOR.
+
+2012-10-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Clean out old termopts cruft.
+        * termopts.h (flow_control, meta_key): Remove unused decls.
+        * dispnew.c, indent.c, nsterm.m, term.c, xsettings.c, xsmfns.c:
+        Don't include termopts.h.
+
+2012-10-10  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * alloc.c (gc_sweep): Use pointer-to-a-pointer loop for buffers.
+
+2012-10-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * commands.h (immediate_quit): Remove duplicate decl.
+
+2012-10-09  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsfont.m (Vfonts_in_cache): Remove, not needed as font.c handles
+        caching.
+        (nsfont_open): Remove setting of Vfonts_in_cache.
+        (syms_of_nsfont): Remove initialization of Vfonts_in_cache
+
 2012-10-09  Eli Zaretskii  <eliz@gnu.org>
 
         * w32fns.c (w32_last_error): Change the return value to DWORD, to