* lisp/vc/vc.el (vc-diff-build-argument-list-internal)
(vc-version-ediff, vc-ediff): New functions.
(vc-version-diff): Use vc-diff-build-argument-list-internal.
* doc/emacs/maintaining.texi (Old Revisions): Add paragraph on new function
vc-ediff.
* etc/NEWS: Document new function `vc-ediff'.

* lisp/emacs-lisp/byte-opt.el (byte-decompile-bytecode-1): Remove dead code,
add sanity check.

* Makefile.in (config.status): Don't erase in case of error.
In case it disappeared, rebuild it with `configure'.

* lisp/obsolete/erc-hecomplete.el: Make obsolete.
* obsolete/: Standardize obsolescence info in the header.

Auto-commit of loaddefs files.

Auto-commit of generated files.

* configure.in (use_mmap_for_buffers): Set to yes on Cygwin.

solar.el fixes.

* lisp/calendar/solar.el (solar-horizontal-coordinates):
Use the longitude argument rather than `calendar-longitude' (15yr old bug).
(solar-date-next-longitude): Remove unused locals.

gnus-registry.el (gnus-registry-action, gnus-registry-fetch-header-fast):
 Don't use mail-header that looks an internal function of mailheader.el.

* lisp/progmodes/octave-mod.el (octave-in-comment-p, octave-in-string-p)
(octave-not-in-string-or-comment-p): Use syntax-ppss so it works with
multi-line comments as well.

lisp/*.el: Lexical-binding cleanup.

Support buffers > 2GB on 64-bit hosts.

 src/insdel.c (make_gap_larger): Remove limitation of buffer size
 to <= INT_MAX.
 src/syntax.h (SETUP_SYNTAX_TABLE_FOR_OBJECT): Fix setting of
 gl_state.e_property when gl_state.object is Qt.

calendar housekeeping prompted by lexical-binding.

* lisp/calendar/appt.el (appt-make-list):
* lisp/calendar/cal-china.el (calendar-chinese-date-string):
* lisp/calendar/cal-hebrew.el (calendar-hebrew-list-yahrzeits)
(diary-hebrew-yahrzeit):
* lisp/calendar/cal-tex.el (cal-tex-last-blank-p, cal-tex-cursor-week2):
* lisp/calendar/calendar.el (calendar-generate-window):
* lisp/calendar/time-date.el (time-to-days):
Remove unused local variables.

* lisp/calendar/cal-dst.el (dst-adjust-time): Remove never-implemented
optional argument `style'.

* lisp/calendar/cal-tex.el (cal-tex-list-holidays, cal-tex-cursor-month)
(cal-tex-cursor-week, cal-tex-cursor-week2, cal-tex-cursor-week-iso)
(cal-tex-cursor-filofax-2week, cal-tex-cursor-filofax-week)
(cal-tex-cursor-filofax-daily, cal-tex-mini-calendar)
* lisp/calendar/cal-html.el (cal-html-insert-minical):
* lisp/calendar/diary-lib.el (diary-list-entries-1, diary-list-entries)
(calendar-mark-date-pattern):
Prefix "unused" locals.

Allow glyphless-char-display to distinguish between X and text terminals.
Use this for Tabulated List mode.

* lisp/emacs-lisp/tabulated-list.el (tabulated-list-mode): Use a custom
glyphless-char-display table.
(tabulated-list-glyphless-char-display): New var.

* src/term.c (produce_glyphless_glyph): Handle cons cell entry in
glyphless-char-display.

* src/xdisp.c (lookup_glyphless_char_display)
(produce_glyphless_glyph): Handle cons cell entry in
glyphless-char-display.
(Vglyphless_char_display): Document it.

gnus-registry.el, registry.el: Silence the byte compiler.

gnus-registry.el: Eliminate cl functions.
 (gnus-registry-sort-addresses): New function that replaces mapcan.
 (gnus-registry-action, gnus-registry-spool-action)
 (gnus-registry-split-fancy-with-parent)
 (gnus-registry-fetch-recipients-fast): Use it.
 (gnus-registry-import-eld): Replace delete* with dolist + delq.
registry.el (initialize-instance, registry-lookup)
 (registry-lookup-breaks-before-lexbind, registry-lookup-secondary)
 (registry-lookup-secondary-value, registry-search, registry-delete)
 (registry-insert, registry-reindex, registry-size, registry-prune):
 Use eval-and-compile.

* lisp/vc/add-log.el (change-log-font-lock-keywords): Add "Thanks to" to acknowledgments.

Auto-commit of generated files.

Merge from gnulib.

Minor redisplay cleanups.

* src/dispextern.h (FACE_SUITABLE_FOR_ASCII_CHAR_P): Add missing
definition for no-X builds.

* src/termhooks.h (FRAME_WINDOW_P): Remove duplicated definitions.

* src/xdisp.c (get_next_display_element): Remove unnecessary ifdefs.

* etc/CONTRIBUTE: Recommend bug-gnu-emacs for patches.

Replace stack-trace-on-error usage in calendar.

* lisp/calendar/diary-lib.el (diary-sexp-entry):
* lisp/calendar/holidays.el (holiday-sexp):
Set debug-on-error rather than the removed stack-trace-on-error.

ChangeLog fix.

Use lexcical-binding in f90.el.

* lisp/progmodes/f90.el: Use lexical-binding.  Use utf-8 coding.
(f90-get-correct-indent): Remove unnecessary local variable `cont'.

Static checks with GCC 4.6.0 and non-default toolkits.

* xdisp.c (x_produce_glyphs): Mark var as initialized (Bug#8512).

* pop.c: Undo previous change.

Merge from mainline.

* s/sol2-6.h, s/unixware.h (PTY_TTY_NAME_SPRINTF): Protoize decl.

* process.c (keyboard_bit_set): Define only if SIGIO.

(send_process_trap): Mark it with NO_RETURN if it doesn't return.
(send_process): Repair possible setjmp clobbering.

* s/usg5-4-common.h (SETUP_SLAVE_PTY): Don't pass extra arg to 'fatal'.

* eval.c: Include <stdio.h>, for vsnprintf on non-GNU/Linux hosts.

* data.c (arith_error): Mark with NO_RETURN if it doesn't return.

* alloc.c (bytes_used_when_full, SPARE_MEMORY, BYTES_USED):

Define only if needed.

* xterm.c (xembed_send_message): Likewise.

* xfaces.c (USG, __TIMEVAL__): Likewise.

* termhooks.h (struct terminal): Likewise.

* sysdep.c (_FILE_OFFSET_BITS): Make this hack even uglier

by pacifying GCC about it.  Maybe it's time to retire it?

* dispextern.h (struct redisplay_interface): Rename param

to avoid shadowing.

* lwlib-utils.c (XtCompositeChildren): Likewise.

* lwlib-Xm.c (make_dialog): Rename local to avoid shadowing.

(make_menu_in_widget): Add cast to avoid warning.

* pop.c (socket_connection): Double-cast to avoid GCC warning

about alignment.

* movemail.c (mail_spool_name): Protoize.

(main): Remove unused var.  Mark var as initialized.
Move locals to avoid shadowing, and use time_t for times.

* fakemail.c (xmalloc, xreallc): Use standard C prototypes

with void *.  This avoids warnings about pointer casts.

* emacsclient.c (main): Don't use uninitialized var.

(IS_ANY_SEP): Remove; unused.
(get_current_dir_name): Add an extern decl.

* insdel.c (make_gap_smaller): Define only if

USE_MMAP_FOR_BUFFERS || REL_ALLOC || DOUG_LEA_MALLOC.

* keyboard.c (read_char): Make a var volatile so longjmp won't clobber

it.

* emacs.c (MAX_HEAP_BSS_DIFF, my_edata): Move to where they're used,

so that we aren't warned about unused symbols.

Add bug#.

* xfns.c (Fx_file_dialog): Rename local to avoid shadowing.

* xdisp.c (x_produce_glyphs): Avoid possibly-uninitialized var.

Fix argument to `error' in `gnutls-boot'.

 src/gnutls.c (Fgnutls_boot): Don't pass Lisp_Object to `error'.

Fix regex.c, syntax.c and friends for buffers > 2GB.

 src/syntax.h (struct gl_state_s): Declare character position members
 EMACS_INT.
 src/syntax.c (update_syntax_table): Declare 2nd argument EMACS_INT.
 src/textprop.c (verify_interval_modification, interval_of): Declare
 arguments EMACS_INT.
 src/intervals.c (adjust_intervals_for_insertion): Declare arguments
 EMACS_INT.
 src/intervals.h (CHECK_TOTAL_LENGTH): Cast to EMACS_INT, not `int'.
 src/indent.c (Fvertical_motion): Local variable it_start is now
 EMACS_INT.
 src/regex.c (re_match, re_match_2, re_match_2_internal)
 (bcmp_translate, regcomp, regexec, print_double_string)
 (group_in_compile_stack, re_search, re_search_2, regex_compile)
 (re_compile_pattern, re_exec): Declare arguments and local
 variables `size_t' and `ssize_t' and return values `regoff_t', as
 appropriate.
 (POP_FAILURE_REG_OR_COUNT) <pfreg>: Declare `long'.
 (CHECK_INFINITE_LOOP) <failure>: Declare `ssize_t'.
 <compile_stack_type>: `size' and `avail' are now `size_t'.
 src/regex.h <regoff_t>: Use ssize_t, not int.
 (re_search, re_search_2, re_match, re_match_2): Arguments that
 specify buffer/string position and length are now ssize_t and
 size_t.  Return type is regoff_t.

* xterm.c (x_dispatch_event): More accurate ifdefs.

* lwlib.c (first_child) [USE_MOTIF]: Protoize.

* xfns.c (x_real_positions): Mark locals as initialized.

* xmenu.c (xmenu_show): Don't use uninitialized vars.

* xterm.c: Fix problems found by static analysis with other toolkits.

(toolkit_scroll_bar_interaction): Define and use only if USE_X_TOOLKIT.
(x_dispatch_event): Declare static only if !USE_GTK && USE_X_TOOLKIT.
Define if USE_GTK || (HAVE_MENUS && USE_X_TOOLKIT); USE_MOTIF need
not be part of this test.
(SET_SAVED_BUTTON_EVENT): Define only if USE_X_TOOLKIT || USE_GTK.
* xterm.h (x_dispatch_event): Use USE_GTK, not USE_MOTIF, when testing
whether to declare.
* xterm.c, xterm.h (x_mouse_leave): Bring this function back, but only if
defined HAVE_MENUS && !defined USE_X_TOOLKIT && !defined USE_GTK.

* xmenu.c (menu_help_callback): Pointer type fixes.

Use const pointers when pointing at readonly data.  Avoid pointer
signedness clashes.
(FALSE): Remove unused macro.
(update_frame_menubar): Remove unused decl.

* xfns.c (Fx_hide_tip): Move locals to avoid shadowing.

* menu.c (push_submenu_start, push_submenu_end): Do not define unless

USE_X_TOOLKIT || USE_GTK || HAVE_NS || defined HAVE_NTGUI.
(single_menu_item): Rename local to avoid shadowing.

(url-http-wait-for-headers-change-function): Protect against malformed headerless responses from servers.

* keyboard.c (make_lispy_event): Remove unused local var.

* frame.c, frame.h (x_get_resource_string): Bring this back, but

only if HAVE_X_WINDOWS && !USE_X_TOOLKIT.

Change bitmaps back to X11-compatible types.

Modernize to C89, for better static checking.

* Activate.c (XMenuActivate): Callback's first arg is readonly.
* AddPane.c (XMenuAddPane): Label is readonly.  Rename local
to avoid shadowing.
* AddSel.c (XMenuAddSelection): Help arg is readonly.  Rename local.
* Create.c (atoi, atof): Remove decls; include <stdlib.h>.
(MAX_INACT_PNUM, TILE_BUF_SIZE): Remove; unused.
(x_get_resource_string): Args are readonly.
(XAllocDisplayColor): colorName is readonly.
(XMenuCreate): def_env is readonly.  Remove unused locals.  Avoid
"else;".
* Destroy.c (XMenuDestroy): Return void.
* Error.c (XMenuError): Remove const pointer.
* EvHand.c (XMenuEventHandler): Return void.
* FindPane.c, FindSel.c: Include <string.h>.
* InsPane.c (XMenuInsertPane): Rename local to avoid shadowing.
* InsSel.c (XMenuInsertSelection): Likewise.
* Internal.c (toggle_color, BUFFER_SIZE): Remove; unused.
(_XMErrorList): Now const.
(_XMWinQueInit, _XMRecomputeGlobals, _XMTransToOrigin, _XMRefreshPane):
(_XMRefreshSelection): Return void.
(_XMWinQueFlush, _XMRefreshSelection): Rename locals to avoid
shadowing.
(_XMWinQueFlush): Use stack, not heap.  Don't use uninitialized var.
* SetAEQ.c (XMenuSetAEQ): Now returns void.
* SetFrz.c (XMenuSetFreeze): Likewise.
* X10.h (XAssoc): Use void * for generic pointer.
* XDelAssoc.c: Include XMenuInt.h rather than duplicating part of it.
* XDestAssoc.c, XMakeAssoc.c: Likewise.
* XDestAssoc.c (XDestroyAssocTable): Return void.
* XMakeAssoc.c (XMakeAssoc): Use void * for generic pointer.
* XMenu.h, XMenuInt.h: Adjust to signature changes.  Use const
for pointers to readonly storage.
* insque.c: Include XMenuInt.h, to check our own signature.
(emacs_insque, emacs_remque): Use void * for generic pointers.

* xgselect.c (xgselect_initialize): Check vs interface

even if ! (defined (USE_GTK) || defined (HAVE_GCONF)).

registry.el (registry-reindex): New method to recreate the secondary registry indices.
gnus-registry.el (gnus-registry-fixup-registry): Use it if the tracked field changes.
 (gnus-registry-unfollowed-addresses, gnus-registry-track-extra)
 (gnus-registry-action, gnus-registry-spool-action)
 (gnus-registry-handle-action)
 (gnus-registry--split-fancy-with-parent-internal)
 (gnus-registry-split-fancy-with-parent)
 (gnus-registry-register-message-ids): Add recipient tracking on spool, move, and delete actions, and for fancy splitting with parent.
 (gnus-registry-extract-addresses)
 (gnus-registry-fetch-recipients-fast)
 (gnus-registry-fetch-header-fast): Convenience functions.
 (gnus-registry-misc-test): ERT test of `gnus-registry-extract-addresses'.

* xmenu.c (xmenu_show): Rename parm to avoid shadowing.

* xrdb.c (x_load_resources): Omit unused local.

* xterm.c (x_create_toolkit_scroll_bar): Use const * for pointers

to read-only memory.

lisp/ChangeLog, src/ChangeLog: Fix typos.

Fixed bugs in ns_get_family and ns_descriptor_to_entity that were caused by using free to deallocate memory blocks that were allocated by xmalloc (via xstrdup).

* fns.c (vector): Remove; this old hack is no longer needed.

* xsmfns.c (gdk_x11_set_sm_client_id) [!USE_GTK]: Don't define.

* xsmfns.c: Remove unused var.

* xsmfns.c (create_client_leader_window): Rename shadowing arg.

* xrdb.c (x_load_resources) [!USE_MOTIF]: Omit unused local.

* xfns.c (USG): Use the kludged USG macro, to pacify gcc.

* xfns.c (x_window): Rename locals to avoid shadowing.

* xfns.c (free_frame_menubar, atof): Remove duplicate decls.

* xterm.c (x_term_init): Remove local to avoid shadowing.

* xterm.c (x_alloc_nearest_color_for_widget): Remove; unused.

* xfns.c, xterm.c (_XEditResCheckMessages): Protoize decl.

* xdisp.c, dispextern.h (set_vertical_scroll_bar): Now extern if

USE_TOOLKIT_SCROLL_BARS && !USE_GTK, as xterm.c needs it then.

* lwlib.c (EXPLAIN, destroy_one_instance): Avoid "else;".

* lwlib-utils.h, lwlib-utils.c (XtSafelyDestroyWidget): Remove; unused.

* xlwmenu.c (MINL): Define only if not emacs.

* xlwmenu.c (XlwMenuSetValues): Rename/ move locals to avoid shadowing.

Modified the code that parses the --cflags and --ldflags options to support parameters that include the = character as long as they are enclosed in quotes.

nus-registry.el (gnus-registry--split-fancy-with-parent-internal): Track by subject first, then sender.

Use completion-at-point for mailalias.el
* lisp/mail/mailalias.el: Use lexical-binding.
(pattern, mailalias-done): Declare dynamic.
(mail-completion-at-point-function): New function, from mail-complete.
(mail-complete): Use it.
(mail-completion-expand): New function.
(mail-get-names): Use it.
(mail-directory, mail-directory-process, mail-directory-stream):
Don't use `pattern' for lexically bound arg.
* lisp/mail/sendmail.el (mail-mode-map): Use completion-at-point.
(mail-mode): Setup mailalias completion here instead.

* lisp/emacs-lisp/lisp-mode.el (eval-defun-2): Use eval-sexp-add-defvars.

* lisp/gnus/gnus-draft.el (gnus-draft-setup): New arg `dont-pop'.
(gnus-draft-send): Use it to avoid popping
up frames from gnus-group-send-queue.
* lisp/gnus/gnus.el (gnus-splash-svg-color-symbols): Don't use insert-file
from Lisp.
* lisp/gnus/message.el (message-bogus-system-names): Replace ^...$ => \`...\'.

* lisp/htmlfontify.el (hfy-etags-cmd): Remove inoperant eval-and-compile.
(hfy-e2x-etags-cmd, hfy-etags-cmd-alist-default)
(hfy-etags-cmd-alist): Don't eval-and-compile any more.

* lisp/emacs-lisp/bytecomp.el (byte-temp-output-buffer-show)
(byte-save-window-excursion, byte-temp-output-buffer-setup)
(byte-interactive-p): Define them again, for use when inlining old code.

* sysdep.c (emacs_read): Remove unnecessary check vs MAX_RW_COUNT.

emacs_write: Accept and return EMACS_INT for sizes.

* sound.c: Use EMACS_INT rather than size_t.

* process.c (send_process): Change a size_t to EMACS_INT.

* process.c (send_process): Change another size_t to EMACS_INT.