Make ERC use completion-at-point
* lisp/erc/erc.el (erc-mode-map): Use completion-at-point.
(erc-mode): Tell completion-at-point to obey erc-complete-functions.
(erc-complete-word-at-point): New function.
(erc-complete-word): Make it obsolete.
* lisp/erc/erc-pcomplete.el (erc-pcompletions-at-point): New function.
(pcomplete): Use it.
* lisp/erc/erc-dcc.el (erc-dcc-chat-mode-map): Use completion-at-point.
(erc-dcc-chat-mode): Tell completion-at-point to obey
erc-complete-functions.
* lisp/erc/erc-button.el (erc-button-next-function): New function extracted from
erc-button-next.
(button, erc-button-next): Use it.

Don't return in emacs_gnutls_handshake without an explicit value.

* gnutls.c (emacs_gnutls_handshake): Return an error if we're not
supposed to be handshaking.
Reported by Paul Eggert <eggert@cs.ucla.edu>.

Fix verb tense in ChangeLog message.

Implement debug-on-event

Improve Windows quoting robustness

* admin/notes/bzr: Small updates.

* admin/notes/years: Small updates.

Convert some function definitions to standard C.

* src/alloc.c (check_sblock, check_string_bytes)
(check_string_free_list): Convert to standard C.

* lisp/emulation/cua-base.el (cua-selection-mode): Make it toggle again.

* trampver.texi: Update release number.

* net/tramp.el (tramp-process-actions): Add POS argument.  Delete
region between POS and (pos).

* net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use
`nil' position in `tramp-process-actions' call.
(tramp-maybe-open-connection): Call `tramp-process-actions' with pos.

* net/tramp-smb.el (tramp-smb-maybe-open-connection): Use `nil'
position in `tramp-process-actions' call.

* net/trampver.el: Update release number.

* lisp/custom.el (defcustom): Obey lexical-binding.

Fix octave-inf completion problems reported by Alexander Klimov.
* lisp/progmodes/octave-inf.el (inferior-octave-mode-syntax-table):
Inherit from octave-mode-syntax-table.
(inferior-octave-mode): Set info-lookup-mode.
(inferior-octave-completion-at-point): New function.
(inferior-octave-complete): Use it and completion-in-region.
(inferior-octave-dynamic-complete-functions): Use it as well, and use
comint-filename-completion.
* lisp/progmodes/octave-mod.el (octave-mode-syntax-table): Use _ syntax for
symbol elements which shouldn't be word elements.
(octave-font-lock-keywords, octave-beginning-of-defun)
(octave-function-header-regexp): Adjust regexps accordingly.
(octave-mode-map): Also use info-lookup-symbol for C-c C-h.

lisp/net/gnutls.el (gnutls-errorp): Declare before first use.

Fix typo in GnuTLS W32 support.

* w32.c (emacs_gnutls_push): Fix typo.

Avoid compilation warnings in gnutls.c on 64-bit hosts.

 src/gnutls.c (emacs_gnutls_handshake): Avoid compiler warnings about
 "cast to pointer from integer of different size".

Auto-commit of generated files.

Improve doprnt and its use in verror.  (Bug#8545)

 src/doprnt.c (doprnt): Document the set of format control sequences
 supported by the function.  Use SAFE_ALLOCA instead of always
 using `alloca'.
 src/eval.c (verror): Don't limit the buffer size at size_max-1, that
 is one byte too soon.  Don't use xrealloc; instead xfree and
 xmalloc anew.

gnus-registry.el (gnus-registry-ignore-group-p): Don't call `gnus-parameter-registry-ignore' if the *Group* buffer doesn't exist.

Bug fixes and certificate and hostname verification for the Emacs GnuTLS support.

* lisp/net/gnutls.el (gnutls-negotiate): Add hostname, verify-flags,
verify-error, and verify-hostname-error parameters.  Check whether
default trustfile exists before going to use it. Add missing
argument to gnutls-message-maybe call. Return return value.
Reported by Claudio Bley <claudio.bley@gmail.com>.
(open-gnutls-stream): Add usage example.

* lisp/net/network-stream.el (network-stream-open-starttls): Give host
parameter to `gnutls-negotiate'.
(gnutls-negotiate): Adjust `gnutls-negotiate' declaration.

Add GnuTLS support for W32 and certificate and hostname verification in GnuTLS.

* src/gnutls.c: Renamed global_initialized to
gnutls_global_initialized.  Added internals for the
:verify-hostname-error, :verify-error, and :verify-flags
parameters of `gnutls-boot' and documented those parameters in the
docstring.  Start callback support.
(emacs_gnutls_handshake): Add Woe32 support. Retry handshake
unless a fatal error occured. Call gnutls_alert_send_appropriate
on error. Return error code.
(emacs_gnutls_write): Call emacs_gnutls_handle_error.
(emacs_gnutls_read): Likewise.
(Fgnutls_boot): Return handshake error code.
(emacs_gnutls_handle_error): New function.
(wsaerror_to_errno): Likewise.

* src/gnutls.h: Add GNUTLS_STAGE_CALLBACKS enum to denote we're in the
callbacks stage.

* src/w32.c (emacs_gnutls_pull): New function for GnuTLS on Woe32.
(emacs_gnutls_push): Likewise.

* src/w32.h (emacs_gnutls_pull): Add prototype.
(emacs_gnutls_push): Likewise.

Add certificate verify callback check for GnuTLS.

* configure.in: Check for GnuTLS certificate verify callbacks.

Add GnuTLS support for W32.

* nt/configure.bat: New options --without-gnutls and --lib, new build
variable USER_LIBS, automatically detect GnuTLS.  Copies the PNG
library setup with trivial modifications.
* nt/INSTALL: Add instructions for GnuTLS support.
* nt/gmake.defs: Prefix USER_LIBS with -l.

Add GnuTLS support for W32.

* lib-src/makefile.w32-in (obj): Added gnutls.o.

* progmodes/cc-engine.el (c-forward-decl-or-cast-1): Use
correct match group (bug#8438).

shr.el (shr-tag-sup, shr-tag-sub): New functions.

Restore ability to show a restricted list of packages in Package Menu.

* emacs-lisp/package.el (package-built-in-p): Fix typo.
(package-menu--generate): New arg specifying packages to show.
(package-menu-refresh, package-menu-execute, list-packages):
Callers changed.
(package-show-package-list): New function.

* finder.el (finder-list-matches): Use package-show-package-list
instead of deleted package--list-packages.

Add vc-annotate-goto-line.
* vc/vc-annotate.el (vc-annotate-goto-line): New command.  Based
on a previous implementation by Juanma Barranquero (Bug#8366).
(vc-annotate-mode-map): Bind it to RET.

Fix next-file command in etags.el.

* lisp/progmodes/etags.el (next-file): Don't use set-buffer to change
buffers (Bug#8478).

* doc/lisp/maintaining.texi (List Tags): Document next-file.

Revert undocumented change to .dir-locals.el in 2011-04-01T17:19:52Z!monnier@iro.umontreal.ca.

This bumped fill-column from 70 to 79, but was not documented in the
commit log, and appears to be a mistake.

Minor cleanup in src/xdisp.c.

 src/xdisp.c (handle_single_display_spec): Rename the
 display_replaced_before_p argument into display_replaced_p, to
 make it consistent with the commentary.  Fix typos in the
 commentary.

Minor cleanup in src/textprop.c.

 src/textprop.c (syms_of_textprop): Remove dead code.
 (copy_text_properties): Delete obsolete commentary about an
 interface that was deleted long ago.  Fix typos in the description
 of arguments.

Repair the MSDOS build following latest changes.

 msdos/sedlibmk.inp (am_libgnu_a_OBJECTS): Edit out
 allocator.$(OBJEXT).  Add editing for the new GNULIB_* and
 REPLACE_* variables.
 src/msdos.c (XMenuActivate, XMenuAddSelection): Adjust argument list
 to changes in oldXMenu/XMenu.h from 2011-04-16.
 <menu_help_message, prev_menu_help_message>: Constify.
 (IT_menu_make_room): menu->help_text is now `const char **';
 adjust.
 src/msdos.h (XMenuActivate, XMenuAddSelection): Adjust prototypes
 to changes in oldXMenu/XMenu.h from 2011-04-16.
 (struct XMenu): Declare `help_text' `const char **'.
 src/xfaces.c <Qunspecified>: Make extern again.
 src/syntax.c: Include sys/types.h before including regex.h, as
 required by Posix.

Fallout from resurrecting doprnt.

 src/doc.c (get_doc_string): Improve the format passed to `error'.
 src/doprnt.c (doprnt): Improve commentary.
 src/term.c (init_tty) [MSDOS]: Fix 1st argument to maybe_fatal.
 src/Makefile.in (TAGS): Depend on $(M_FILE) and $(S_FILE), and scan
 them with etags.
 src/makefile.w32-in (TAGS): Depend on $(CURDIR)/m/intel386.h and
 $(CURDIR)/s/ms-w32.h.
 (TAGS-gmake): Scan $(CURDIR)/m/intel386.h and $(CURDIR)/s/ms-w32.h.

Fix a minor bug in src/makefile.w32-in.

 src/makefile.w32-in (globals.h): Add a dummy recipe, to make any
 changes in globals.h immediately force recompilation.

Delete char-direction-table and char-direction.

 See http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00675.html
 for the reasons.

 src/character.c (Fchar_direction): Function deleted.
 (syms_of_character): Don't defsubr it.
 <char-direction-table>: Deleted.
 etc/NEWS: Document the removal.

* files.el (auto-mode-alist): Use js-mode for .json (Bug#8529).

Improve apropos buffer highlighting.

* lisp/apropos.el (apropos-label-face): Avoid variable-pitch face.
(apropos-accumulator): Doc fix.
(apropos-function, apropos-macro, apropos-command)
(apropos-variable, apropos-face, apropos-group, apropos-widget)
(apropos-plist): Add face property.
(apropos-symbols-internal): Fix indentation.
(apropos-print): Simplify help, and recognize apropos-multi-type.
(apropos-print-doc): Use button-type-get to extract the button's
face property.  Fill docstring (Bug#8352).

Fix typos in comments in character.c and textprop.c.

Fix doprnt so it could be used safely in `verror'.  (Bug#8435)

 src/doprnt.c: Include limits.h.
 (SIZE_MAX): New macro.
 (doprnt): Return a size_t value.  2nd arg is now size_t.  Many
 local variables are now size_t instead of int or unsigned.
 Improve overflow protection.  Support `l' modifier for integer
 conversions.  Support %l conversion.  Don't assume an EMACS_INT
 argument for integer conversions and for %c.
 src/lisp.h (doprnt): Restore prototype.
 src/makefile.w32-in ($(BLD)/callint.$(O)): Depend on
 $(SRC)/character.h.
 src/Makefile.in (base_obj): Add back doprnt.o.
 src/deps.mk (doprnt.o): Add back prerequisites.
 (callint.o): Depend on character.h.
 src/eval.c (internal_lisp_condition_case): Include the handler
 representation in the error message.
 (verror): Call doprnt instead of vsnprintf.  Fix an off-by-one bug
 when breaking from the loop.
 src/xdisp.c (vmessage): Call doprnt instead of vsnprintf.
 src/callint.c (Fcall_interactively): When displaying error message
 about invalid control letter, pass the character's codepoint, not
 a pointer to its multibyte form.  Improve display of the character
 in octal and display also its hex code.
 src/character.c (char_string): Use %x to display the (unsigned)
 codepoint of an invalid character, to avoid displaying a bogus
 negative value.
 src/font.c (check_otf_features): Pass SDATA of SYMBOL_NAME to
 `error', not SYMBOL_NAME itself.
 src/coding.c (Fencode_sjis_char, Fencode_big5_char): Use %c for
 character arguments to `error'.
 src/charset.c (check_iso_charset_parameter): Fix incorrect argument
 to `error' in error message about FINAL_CHAR argument.  Make sure
 FINAL_CHAR is a character, and use %c when it is passed as
 argument to `error'.

Merge from emacs-23; up to 2010-06-09T17:54:28Z!albinus@detlef.

* lisp/gnus/gnus-sum.el (gnus-extra-headers): Bump :version.

Revert incorrect change to copyright years.

gnus-registry.el (gnus-registry-ignore-group-p): Test specifically for the case where `gnus-registry-ignored-groups' is a list of lists, and don't call `gnus-parameter-registry-ignore' otherwise.

Add trailing underscores to appropriate member names, per change 2011-02-14T15:39:19Z!tromey@redhat.com of src/lisp.h.

lisp/eshell/esh-mode.el (find-tag-interactive): Small cleanup.

* eshell/esh-mode.el (find-tag-interactive): Declare function.
  (eshell-find-tag): Remove `with-no-warnings', unneeded now.
  Pass argument NO-DEFAULT to `find-tag-interactive'.

lisp/buff-menu.el (Buffer-menu--buffers): Fix typo in docstring.

Fixes: debbugs:8535

lisp/progmodes/*.el: Lexical-binding cleanup.

Doc fixes for package.el.

* emacs-lisp/package.el (package--builtins, package-alist)
(package-load-descriptor, package-built-in-p, package-activate)
(define-package, package-installed-p)
(package-compute-transaction, package-buffer-info)
(package--push): Doc fix.  Distinguish more clearly between
version strings and version lists.

nnimap.el (nnimap-user): New backend variable.
 (nnimap-open-connection-1): Use it.
 (nnimap-credentials): Accept user parameter so it's explicit what user name is desired.

gnus-sum.el (gnus-extra-headers): Add Keywords, Cc, and Gcc to default.
gnus-registry.el: Mention in comments how to modify `gnus-extra-headers' for proper recipient tracking and that it may already have To and Cc recently, which it does as of this commit.

gnus.el (gnus-registry-ignored-groups): Provide default in gnus.el, not gnus-registry.el.
gnus-registry.el (gnus-registry-ignored-groups): Remove defcustom.  Explain why in comments.
 (gnus-registry-action): Fix data-header reference to use the extra headers.  Explain in package commentary how to add To and Cc headers to the gnus-extra-headers.
 (gnus-registry-ignored-groups): Adjust defaults to match the parameter.
 (gnus-registry-ignore-group-p): Adjust to take either a group/topic parameter list or a string list in `gnus-registry-ignored-groups'.  Fix logic error.

lisp/play/*.el: Lexical-binding cleanup.

lisp/play/mpuz.el: Small fixes.

* play/mpuz (mpuz-silent): Doc fix.
  (mpuz-mode-map): Move initialization into declaration.
  (mpuz-put-number-on-board): Rename parameter L to COLUMNS.
  (mpuz-letter-to-digit, mpuz-check-all-solved, mpuz-create-buffer):
  Fix typos in docstrings.

shr.el (shr-expand-url): Fix typo.

lisp/play/doctor.el: Fix typos in docstrings.

shr.el (shr-expand-url): Protect against null urls.

shr.el (shr-base): New binding.
 (shr-tag-base): Keep track of <base>.
 (shr-expand-url): New function used throughout.

lisp/vc/vc.el (ediff-vc-internal): Declare function.

* lisp/shell.el: Use lexical-binding and std completion UI.
(shell-filter-ctrl-a-ctrl-b): Work as a preoutput filter.
(shell-mode): Put shell-filter-ctrl-a-ctrl-b on
comint-preoutput-filter-functions rather than on
comint-output-filter-functions.
(shell-command-completion, shell--command-completion-data)
(shell-filename-completion, shell-environment-variable-completion)
(shell-c-a-p-replace-by-expanded-directory): New functions.
(shell-dynamic-complete-functions, shell-dynamic-complete-command)
(shell-dynamic-complete-filename, shell-replace-by-expanded-directory)
(shell-dynamic-complete-environment-variable): Use them.
(shell-dynamic-complete-as-environment-variable)
(shell-dynamic-complete-as-command): Remove.
(shell-match-partial-variable): Match past point.
* lisp/comint.el: Clean up use of completion-at-point-functions.
(comint-completion-at-point): New function.
(comint-mode): Use it completion-at-point-functions.
(comint-dynamic-complete): Make it obsolete.
(comint-replace-by-expanded-history-before-point): Add dry-run arg.
(comint-c-a-p-replace-by-expanded-history): New function.
(comint-dynamic-complete-functions)
(comint-replace-by-expanded-history): Use it.
* lisp/minibuffer.el (completion-table-with-terminator): Allow dynamic
termination strings.  Try harder to avoid second try-completion.
(completion-in-region-mode-map): Disable bindings that don't work yet.

gnus-registry.el (gnus-registry--split-fancy-with-parent-internal): Fix loop bugs.
 (gnus-registry-ignored-groups): New variable.
 (gnus-registry-ignore-group-p): Use it.
 (gnus-registry-handle-action): Use `gnus-registry-ignore-group-p' and set the destination group to nil (same as delete) if it's ignored.

* lisp/comint.el: Use lexical-binding.  Use std completion UI.  Require CL.
(comint-dynamic-complete-functions): Use comint-filename-completion.
(comint-completion-addsuffix): Tweak custom type.
(comint-filename-completion, comint--common-suffix)
(comint--common-quoted-suffix, comint--table-subvert)
(comint--complete-file-name-data): New functions.
(comint-dynamic-complete-as-filename, comint-dynamic-complete-filename)
(comint-dynamic-list-filename-completions): Use them.
(comint-dynamic-simple-complete): Make obsolete.
* lisp/minibuffer.el (completion-in-region-mode):
Keep completion-in-region-mode--predicate global.
(completion-in-region--postch):
Assume completion-in-region-mode--predicate is not null.

* lisp/progmodes/flymake.el (flymake-start-syntax-check-process): Obey `dir'.

* lisp/vc/vc.el (vc-version-ediff): Call ediff-vc-internal directly, since
we're in VC after all.

* 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.

ChangeLog whitespace fix (no need to merge to trunk).

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.

Fix a bug in time functions when timezone is changed on Windows.

 src/s/ms-w32.h (localtime): Redirect to sys_localtime.
 src/w32.c: Include <time.h>.
 (sys_localtime): New function.

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.