Reduce rmail.el's use of sendmail.el

* lisp/mail/rmail.el (mail-sendmail-delimit-header, mail-header-end)
(mail-position-on-field): Remove declarations.
(mail-position-on-field): Autoload it.
(rmail-retry-failure): Replace use of mail-sendmail-delimit-header
and mail-header-end.  Don't require sendmail.

Add a shadow-mode for load-path shadows.

* lisp/emacs-lisp/shadow.el (shadow-font-lock-keywords): New variable.
(shadow-mode): New mode.
(shadow-find-file): New button.
(list-load-path-shadows): Use shadow-mode and buttons.

Minor iimage.el changes.

* lisp/iimage.el (iimage-version): Remove.
(iimage-mode-image-search-path, iimage-mode-image-regex-alist):
Turn into defcustoms.
(iimage-mode-map): Give it a doc string.

Minr appt.el change.
* lisp/calendar/appt.el (appt-activate): Give a warning rather than an error
if there is no diary-file.

Include version number in doc `make dist' tarfiles.

* doc/lispref/Makefile.in (version): New, set by configure.
(clean): Delete dist tar file.
(dist): Use version in tar name.

* doc/lispintro/Makefile.in (version): New, set by configure.
(clean): Delete dist tar file.
(dist): Use version in tar name.

* doc/emacs/Makefile.in (version): New, set by configure.
(clean): Delete dist tar file.
(dist): Use version in tar name.

sieve-manage.el: Add authenticate function.
sieve-manage.el (sieve-manage-open): Use sieve-manage-default-port.

shr.el (shr-render-td): Only delete space at the end of the TD.

sieve-manage: use auth-source.

Merge changes made in Gnus trunk.

shr.el: Rearrange function order to be more logical.
gnus-faq.texi: Remove reference to my.gnus.org
message.el (message-change-subject): Remove 404 URL in a comment.
nnir.el: Fix Swish-E URL.
nnir.el: Fix Namazu URL.
nnrss.el (nnrss-check-group): Remove 404 URL in comment.
nnrss.el (nnrss-discover-feed): Remove 404 URL in docstring.
gnus-faq.texi (FAQ 5-5): Fix Flyspell URL.
gnus-faq.texi (FAQ 7-1): Fix getmail URL.
gnus.texi (Comparing Mail Back Ends): Remove broken link and allusion to ReiserFS.
nnimap.el (nnimap-open-connection): Prepare to support open-gnutls-stream.
shr.el (shr-insert): Get 'space transition right.
message.texi: Remove reference to gpg-2comp.

* net/tramp-sh.el (tramp-sh-file-name-handler-alist): Use
`tramp-handle-find-backup-file-name'.

nt/INSTALL: Add note about problematic characters passed to configure.

* epa.texi (Caching Passphrases): New section.

Minor doc/*/Makefile.in change.

* doc/emacs/Makefile.in ($(infodir)): Add parallel build workaround.
* doc/lispintro/Makefile.in ($(infodir)): Add parallel build workaround.
* doc/lispref/Makefile.in ($(infodir)): Add parallel build workaround.
* doc/misc/Makefile.in ($(infodir)): Add parallel build workaround.

Remove obsolete variable font-lock-defaults-alist.

* lisp/font-core.el (font-lock-defaults-alist): Remove variable.
(font-lock-mode): Doc fix.
(font-lock-default-function): Do not consult font-lock-defaults-alist.
* lisp/font-lock.el (font-lock-refresh-defaults): Doc fix.
(font-lock-set-defaults): Doc fix.
Do not consult font-lock-defaults-alist.

* etc/NEWS: Mention above change.

* lisp/hilit-chg.el (hilit-chg-get-diff-list-hk): Declare `e' for compiler.
Remove arch-tag comment.

gnus-art.el (gnus-mime-view-part-as-type): Make it work when being called interactively.

* lisp/emacs-lisp/cl.el: No longer provide cl-19.

* etc/NEWS: Mention this change.

Misc cleanup for doc/*/Makefiles.

* doc/misc/Makefile.in (SHELL): Set it.
(info): Move the mkdir dependency to the individual info files.
(mostlyclean): Tidy up.
(clean): Only delete the specific dvi and pdf files.
(maintainer-clean): Be more restrictive in what we delete.

* doc/lispref/Makefile.in: Rearrange to more closely resemble
doc/emacs/Makefile.
(INSTALL_INFO): Remove unused variable.
(mostlyclean, infoclean, dist): New rules.
(clean): Delete dvi and pdf files.
(maintainer-clean): Remove elisp.oaux, use infoclean.

* doc/lispintro/Makefile.in (SHELL): Use /bin/sh, like every other Makefile.in.
(INFO_SOURCES, INFO_TARGETS, DVI_TARGETS): Remove variables.
($(infodir), html, pdf, infoclean, dist): New rules.
(${infodir}/eintr): Ensure $infodir exists.  Use $@.
(emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $^.
(.PHONY): Declare clean rules.
(mostlyclean): Delete more temp files.
(clean): Delete specific dvi, pdf and html files.
(maintainer-clean): Use infoclean.
(.NOEXPORT): Remove, unused by any other Makefile.in.

* doc/emacs/Makefile.in (EMACS_XTRA): Add the main source file.
(emacs-xtra.dvi, emacs-xtra.pdf): Remove explicit emacs-xtra.texi.
(mostlyclean): No core files, reorder other files.
(clean): Delete specific dvi and pdf files.
(infoclean, dist): New rules.
(maintainer-clean): Use infoclean.

gnus-group.el (gnus-group-completing-read): Fix last change.

Eliminate `remove-if-not' that is a cl function.

gnus-util.el (gnus-remove-if): Allow hash table.
gnus-util.el (gnus-remove-if-not): New function.
gnus-art.el (gnus-mime-view-part-as-type): Replace remove-if-not with gnus-remove-if-not.
gnus-score.el (gnus-summary-score-effect): Replace remove-if-not with gnus-remove-if-not.
gnus-sum.el (gnus-read-move-group-name): Replace remove-if-not with gnus-remove-if-not.
gnus-group.el (gnus-group-completing-read): Regard collection as a hash table if it is not a list.

shr.el (shr-render-td): Allow blank/missing <TD>s.
shr.el: Document the table-rendering algorithm.

Merge changes made in Gnus trunk.

mm-decode.el (mm-shr): Bind shr-blocked-images to gnus-blocked-images.
shr.el (shr-tag-table): Put all the images after the table.
shr.el (shr-tag-table): Really inhibit images inside the table.
shr.el (shr-collect-overlays): Copy over overlays from the TD elements to the main document.
nnimap.el (nnimap-request-newgroups): Return success.
gnus-group.el (gnus-group-make-group): Doc fix.
nnir.el (nnir-retrieve-headers): Don't bug out on invalid data.
gnus-sum.el (gnus-article-sort-by-most-recent-date): New function, added for symmetry.
mm-decode.el (mm-shr): Allow displaying cid: images from shr.el.
shr.el (shr-insert-table): Bind free variable.
gnus-art.el (gnus-blocked-images): Move variable here.
mm-decode.el (mm-shr): Require shr.
shr.el (shr-tag-img): Shorten ALT texts and allow them to be line-broken.
shr.el (shr-tag-img): Ignore image fetching errors.
shr.el (shr-overlays-in-region): Compute overlay positions correctly.
gnus-html.el (gnus-html-schedule-image-fetching): Protect against invalid URLs.

* net/tramp.el (tramp-handle-directory-files-and-attributes)
(tramp-handle-file-exists-p, tramp-handle-file-newer-than-file-p):
New defuns, taken from tramp-smb.el.
(tramp-coding-system-change-eol-conversion)
(tramp-set-process-query-on-exit-flag): Removed.

* net/tramp-compat.el (top): Do not check for byte-compiler
objects.
(tramp-compat-coding-system-change-eol-conversion)
(tramp-compat-set-process-query-on-exit-flag): New defuns, taken
from tramp.el.

* net/tramp-gvfs.el:
* net/tramp-gw.el: Replace `tramp-set-process-query-on-exit-flag'
by `tramp-compat-set-process-query-on-exit-flag'.

* net/tramp-imap.el (tramp-imap-file-name-handler-alist): Use
`tramp-handle-directory-files-and-attributes',
`tramp-handle-file-exists-p' and
`tramp-handle-file-newer-than-file-p'.
(tramp-imap-handle-file-exists-p)
(tramp-imap-handle-file-executable-p)
(tramp-imap-handle-file-readable-p)
(tramp-imap-handle-directory-files-and-attributes)
(tramp-imap-handle-file-newer-than-file-p): Removed.

* net/tramp-sh.el: Replace `tramp-set-process-query-on-exit-flag'
by `tramp-compat-set-process-query-on-exit-flag' and
`tramp-coding-system-change-eol-conversion' by
`tramp-compat-coding-system-change-eol-conversion'.

* net/tramp-smb.el (tramp-smb-file-name-handler-alist): Use
`tramp-handle-directory-files-and-attributes',
`tramp-handle-file-exists-p' and
`tramp-handle-file-newer-than-file-p'.
(tramp-smb-handle-directory-files-and-attributes)
(tramp-smb-handle-file-exists-p)
(tramp-smb-handle-file-newer-than-file-p): Removed.
(tramp-smb-maybe-open-connection): Replace
`tramp-set-process-query-on-exit-flag' by
`tramp-compat-set-process-query-on-exit-flag'.

sieve-manage.el (sieve-manage-capability): Do not bug out when the server-value of the capability is nil.
gnus-html.el (gnus-html-wash-images): Rescale image from cid too.

Merge changes made in Gnus trunk.

sieve-manage.el (sieve-manage-default-stream): Make default stream customizable.
gnus-html.el (gnus-html-wash-tags): Decode URL entities to avoid broken links.
nnimap.el (nnimap-open-connection): Give an error if nnimap-stream is unknown.
shr.el (shr-tag-em): Add <EM> tag.

gnus-util.el (gnus-emacs-completing-read, gnus-iswitchb-completing-read): Use autoload rather than require.

Merge changes made ein Gnus trunk.

gnus-util.el (gnus-completing-read-function): Exclude gnus-icompleting-read and gnus-ido-completing-read from candidates for XEmacs since iswitchb.el is very old and ido.el is unavailable in XEmacs.
gnus-registry.el (gnus-registry-install-nnregistry): Rewrite so as not to use `delete-dups' that is unavailable in XEmacs 21.4.

NEWS update.

* lisp/obsolete/rnews.el, lisp/obsolete/rnewspost.el: Remove files.

Fix rnewspost.el comment typo.

gnus-html.el (gnus-html-schedule-image-fetching): Work for XEmacs.

* .dir-locals.el: The Emacs convention is sentence-end-double-space.
Remove arch-tag comment.

mm-decode.el (mm-shr): Decode contents by charset.

shr.el: Revert last change.

shr.el (shr-encode-url-chars): New function.

Merge changes made in Gnus trunk.

shr.el: Implement table rendering.
shr.el (shr-make-table): Tweak table generation.
shr.el (shr-make-table): Fix typo.
nnimap.el (nnimap-open-connection): Allow tls as a synonym for ssl.
gnus-util.el (gnus-emacs-completing-read): Mapcar collection to list, for XEmacs.
nnimap.el (nnimap-close-server): Implement.
gnus-salt.el: Remove all gnus-carpal stuff -- it's not useful.
nnir.el (nnir-run-imap): Remove spurious space in search string.
message.el (message-idna-to-ascii-rhs-1): Don't bug out on addresses without @ signs.
gnus-sum.el (gnus-widen-article-window): New variable.
shr.el (browse-url): Required.
shr.el (shr-ensure-paragraph): Don't insert a new newline after empty-ish lines.
shr.el (shr-show-alt-text, shr-browse-image): New commands.
gravatar.el (gravatar-retrieved): kill buffer when retrieved.
shr.el (shr-browse-url, shr-copy-url): New commands.
shr.el (shr-render-td): Protect against too-wide text.
spam-report.el (spam-report-url-ping-plain): Don't query about killing the process.
nnimap.el (nnimap-finish-retrieve-group-infos): Message while waiting for data.
shr.el (shr-tag-blockquote): Ensure paragraph after quote, too.
mml-smime.el: Fix gnus-completing-read usage.
shr.el (shr-get-image-data): Ensure against the cache file missing.
nnimap.el (nnimap-open-connection): Give an error if nnimap-stream is unknown.

Continue reorganization of load dependencies.  (Bug#7156)

* net/tramp.el (tramp-handle-file-local-copy-hook)
(tramp-delete-temp-file-function): Move down.
(tramp-exists-file-name-handler): Move up.
(tramp-register-file-name-handlers): Simplify autoload.
(tramp-handle-write-region-hook, tramp-handle-directory-file-name)
(tramp-handle-directory-files, tramp-handle-dired-uncache)
(tramp-handle-file-modes, tramp-handle-file-name-as-directory)
(tramp-handle-file-name-completion)
(tramp-handle-file-name-directory)
(tramp-handle-file-name-nondirectory, tramp-handle-file-regular-p)
(tramp-handle-file-remote-p, tramp-handle-file-symlink-p)
(tramp-handle-find-backup-file-name)
(tramp-handle-insert-file-contents, tramp-handle-load)
(tramp-handle-substitute-in-file-name)
(tramp-handle-unhandled-file-name-directory)
(tramp-mode-string-to-int, tramp-local-host-p)
(tramp-make-tramp-temp-file): Moved from tramp-sh.el.

* net/tramp-gvfs.el (top):
* net/tramp-smb.el (top): Do not require 'tramp-sh.

* net/tramp-sh.el (all): Move several objects to tramp.el, see
there.  Rename `tramp-handle-*' to `tramp-sh-handle-*'.

(url-http-wait-for-headers-change-function): Revert previous
change.  It lead to really slow loads.

* url-http.el (url-http-wait-for-headers-change-function): Protect
against url-http-response-status for degenerate documents.

Don't add an echo dash for the first keystroke (Bug#7137).

* src/keyboard.c (echo_prompt): Function moved into read_key_sequence.
(read_key_sequence): Inline echo_prompt.
(echo_dash): Add a dash only if key is continued (Bug#7137).

Remove O_RDONLY, O_WRONLY definitions, not needed.
* src/unexcoff.c:
* src/lread.c:
* src/fileio.c:
* src/doc.c:
* src/callproc.c:
* src/alloc.c:
* src/termcap.c: Remove O_RDONLY O_WRONLY definitions.

shr.el (shr-tag-li): Get <li> indentation right.
shr.el (shr-tag-li): Get <li> indentation even righter.
shr.el (shr-tag-blockquote): Ensure paragraph start.

shr.el (shr-insert): Tweak line breaking.
shr.el (shr-insert): Handle <pre> better.

Merge changes made in Gnus trunk.

gnus-html.el (gnus-html-put-image): Fix resize image code.
shr.el (shr-ensure-paragraph): Fix the non-empty line case.

shr.el (shr-insert): Use string anchors instead of line anchors.

Minor appt.el changes.
* lisp/calendar/appt.el (appt-add): Ensure reminders are enabled.
(appt-activate): Give status messages.

Provide GnuTLS API with `gnutls-negotiate' and `open-gnutls-stream'.

* net/gnutls.el: Improve docs.        Remove starttls and ssl emulation.
Provide only `open-gnutls-stream' (formerly `open-ssl-stream') and
`gnutls-negotiate' (formerly `starttls-negotiate').  Remove
trivial wrapper `starttls-open-stream'.

* doc/lispref/Makefile.in ($(infodir)/elisp): Fix -I typo.

Minor doc Makefile.in clean-up.

* doc/emacs/Makefile.in (SHELL): Set it.
(INFO_TARGETS, DVI_TARGETS): Remove variables.
(info, dvi): Replace above variables with their expansions.
(info): Move mkdir from here...
($(infodir)/emacs): ... to here (for parallel builds).
(pdf): New target.
($(infodir)/emacs): Pass -o option to makeinfo.
(.PHONY): Declare clean rules.
(maintainer-clean): Delete dvi and pdf files.
Guard against cd failures.  Use a more restrictive delete.

* doc/lispref/Makefile.in (dvi, pdf, $(infodir)): New targets.
($(infodir)/elisp): Ensure target directory exists.  Use $@.
(clean): No 'make.out' or 'core' files.
(.PHONY): Declare clean rules.
(maintainer-clean): Delete pdf file.  Guard against cd failures.

Mention the 'g' binding in VC diff,log, etc.

Make 'g' (AKA revert-buffer) rerun the VC log, log-incoming and
log-outgoing commands.
* lisp/vc/vc.el (vc-log-internal-common): Add a new argument and use it
to create a buffer local revert-buffer-function variable.
(vc-print-log-internal, vc-log-incoming, vc-log-outgoing): Pass a
revert-buffer-function lambda.

Merge changes made in Gnus trunk.

shr.el: Rename the tag functions a bit, and add some new ones.
gnus-sum.el (gnus-summary-select-article-buffer): If the article buffer isn't shown, then select the current article first instead of bugging out.
gnus-sum.el (gnus-summary-select-article-buffer): Show both the article and summary buffers again.
shr.el (shr-tag-blockquote): Convert name.
shr.el (shr-rescale-image): Use the right image-size variant.
shr.el (shr-tag-p): Don't insert newlines at the start of the buffer.
shr.el: Implement indentation in blockquotes.
gnus-sum.el (gnus-summary-select-article-buffer): Really select the article buffer again.
shr.el (shr-ensure-paragraph): Don't insert newlines on empty tags at the beginning of the buffer.
gnus-ems.el, gnus-util.el, mm-decode.el, mm-view.el: Add resize for large images in mm.
gnus-html.el (gnus-html-put-image): Use gnus-rescale-image.
shr.el (shr-tag-p): Don't insert newlines on empty tags at the beginning of the buffer.
gnus-ems.el, gnus-html.el, gnus-util.el, mm-decode.el, mm-view.el: Support image resizing.
shr.el: Add headings.
shr.el (shr-ensure-paragraph): Actually work.
shr.el (shr-tag-li): Make <ul> prettier.
shr.el (shr-insert): Get white space at the beginning/end of elements right.
shr.el (shr-tag-li): Tweak <li> rendering.
shr.el (shr-tag-p): Collapse subsequent <p>s.
shr.el (shr-ensure-paragraph): Don't insert double line feeds after blank lines.
shr.el (shr-tag-h6): Add.
shr.el (shr-insert): \t is also space.

Fix compilation warnings.
* lib-src/test-distrib.c (cool_read):
* lib-src/movemail.c (main, concat):
* lib-src/make-docfile.c (scan_file, write_c_args):
* emacsclient.c (get_server_config): Fix -Wconversion warning.
(egetenv): Move conditional definition earlier.
(progname): Use const.
* lib-src/sorted-doc.c (xstrdup): Use const.

Rework the gnutls boot interface.

From Teodor Zlatanov.

Cosmetic changes for some lisp/url files.

* lisp/url/url-util.el (url-get-url-filename-chars): Don't eval-and-compile.
(url-get-url-at-point): Don't use eval-when-compile.

* lisp/url/url-cache.el (url-cache-create-filename-human-readable)
(url-cache-create-filename-using-md5):
* lisp/url/url-util.el (url-file-directory, url-file-nondirectory):
Don't use eval-when-compile and regexp-quote.

* src/fileio.c (Vdirectory_sep_char): Remove.

Remove directory-sep-char, obsolete since 21.1.

* lisp/subr.el (directory-sep-char): Remove obsolete variable.
* lisp/net/tramp-compat.el: Don't mess about with the byte-compiler unless
it is "necessary".

* doc/lispref/files.texi (File Name Components): Remove ignored
section about deleted variable directory-sep-char.

* etc/NEWS: Mention above change.

Remove vc-header-alist, obsolete since 21.1.

* lisp/vc/vc-hooks.el (vc-header-alist): Remove obsolete variable.
* lisp/vc/vc.el (vc-static-header-alist): Doc fix.
* lisp/vc/vc-cvs.el (vc-cvs-header):
* lisp/vc/vc-rcs.el (vc-rcs-header):
* lisp/vc/vc-sccs.el (vc-sccs-header):
* lisp/vc/vc-svn.el (vc-svn-header): Do not consult vc-header-alist.
* lisp/obsolete/vc-mcvs.el (vc-mcvs-header):
* lisp/progmodes/cperl-mode.el (cperl-mode): Only set vc-header-alist
on XEmacs.

* etc/NEWS: Mention above change.

Avoid using plusp; cl may not be loaded.

* lisp/gnus/shr.el (shr-insert):
* lisp/gnus/pop3.el (pop3-movemail):
* lisp/gnus/gnus-html.el (gnus-html-wash-tags): Don't use plusp.

Add user option `remote-file-name-inhibit-cache'.

* src/termhooks.h: Remove #ifdef CONSP.

* files.texi (Magic File Names): New defopt remote-file-name-inhibit-cache.

* lib-src/Makefile.in: Remove ^L, old makes choke on it.

* configure.in (NO_INLINE, noinline): Move here from src/xterm.c.
* src/xterm.c (NO_INLINE, noinline): Move definitions to ../configure.in.

Include <fcntl.h> unconditionally.
* src/termcap.c:
* src/sysdep.c:
* src/lread.c:
* src/keyboard.c:
* src/filelock.c:
* src/fileio.c:
* src/doc.c:
* src/callproc.c:
* src/alloc.c: Remove include guards for <fcntl.h>, process.c already
does it.

* tramp.texi (Frequently Asked Questions): Mention
remote-file-name-inhibit-cache.

* src/process.c: Do not include <sys/wait.h>, syswait.h does it.

* src/sysdep.c (flush_pending_output): Remove code, does not do
anything on any platform.

Remove unused code.
* src/sysdep.c (select_alarm, sys_select, read_input_waiting): Remove
select emulation, all systems support select.
(set_exclusive_use): Remove, the only user is in an #if 0 block.
* src/process.c (create_process): Remove #if 0 code.

Remove unused arguments for unexec.
The third one is never used, and the last two are always passed as zero.
* src/emacs.c (unexec): Add declaration.
(Fdump_emacs): Only pass the first two arguments to unexec.
Simplify #ifdef.
* src/unexw32.c (unexec):
* src/unexsol.c (unexec):
* src/unexhp9k800.c (unexec):
* src/unexcw.c (unexec): Remove the last 3 arguments, unused.
* src/unexelf.c (unexec): Remove the last 3 arguments, unused.
(find_section): Use const.
* src/unexmacosx.c (unexec): Remove the last 3 arguments, unused.
(unexec_error): Declare it NO_RETURN.
* src/unexcoff.c (make_hdr): Assume bss_start is always zero, remove
it as an argument, remove data_start and entry_address arguments, unused.
(unexec): Remove bss_start, data_start and
entry_address arguments.
* src/unexaix.c (make_hdr): Assume bss_start is always zero, remove
it as an argument, remove data_start and entry_address arguments, unused.
(unexec): Remove bss_start, data_start and
entry_address arguments.

src/gnutls.c: Fix typo in docstring.

url-vars.el (url-mime-charset-string): Changed the default to nil to
avoid sending 1171 bytes of not very useful data to the HTTP server
every request.

src/makefile.w32-in (TAGS, TAGS-LISP, TAGS-gmake): Add $(FONTOBJ).

Remove obsolete use of binary-overwrite-mode in bytecomp (Bug#7001).

* emacs-lisp/bytecomp.el (byte-compile-from-buffer): Remove
obsolete use of binary-overwrite-mode (Bug#7001).

src/gnutls.c: Doc fixes.  Make some functions static.

(emacs_gnutls_handshake, gnutls_make_error, gnutls_emacs_global_init)
(gnutls_emacs_global_deinit): Make static.
(Fgnutls_get_initstage, Fgnutls_deinit, Fgnutls_boot, Fgnutls_bye):
 Fix typos in docstrings.
(Fgnutls_error_fatalp, Fgnutls_error_string): Doc fixes.
(Fgnutls_errorp): Doc fix; use ERR for the argument name.

* lisp/obsolete/x-menu.el: Remove file, obsolete since 21.1

* textmodes/rst.el (rst-font-lock-keywords-function): Drop Emacs 20 code.

* lisp/textmodes/artist.el (artist-replace-char): Drop Emacs 20 code.

* lisp/printing.el: Drop Emacs 20 code.

* lisp/gnus/nnmairix.el (nnmairix-replace-illegal-chars): Drop Emacs 20 code.

* lisp/gnus/smime.el (smime-cert-by-ldap-1): Drop Emacs 21 code.

* lisp/gnus/gnus-art.el (gnus-next-page-map): Drop Emacs 20 compat cruft.

Tix fypo in previous change.

* lisp/gnus/gmm-utils.el (gmm-write-region): Drop Emacs 20 compat cruft.

Do not autoload appt-delete.

* lisp/calendar/appt.el (appt-delete): Don't autoload it (you can't use it
without having used appt.el already).

* lisp/subr.el (make-local-hook): Remove function obsolete since 21.1.
* lisp/progmodes/cc-mode.el (make-local-hook): Don't do cc-bytecomp stuff.
(c-basic-common-init, c-font-lock-init): Only call make-local-hook on
XEmacs.
* lisp/progmodes/cc-styles.el (make-local-hook): Don't do cc-bytecomp stuff.
(c-make-styles-buffer-local): Only call make-local-hook on XEmacs.

* lisp/gnu/gnus-util.el (gnus-make-local-hook): Simplify.

* etc/NEWS: Mention above change.

Remove some unused ps-def definitions.

* lisp/ps-def.el (leading-code-private-22, charset-bytes, charset-id)
(charset-width, find-charset-region, chars-in-region, forward-point)
(encode-coding-string, coding-system-p, ccl-execute-on-string)
(define-ccl-program, multibyte-string-p, string-make-multibyte):
Remove compatibility cruft (none of these are used by ps*.el).

url-http.el comment.

* subr.el (booleanp): Return t instead of a list (Bug#7086).

* keyboard.c (command_loop_1): Make sure the mark is really alive
before using it (Bug#7044).

Merge changes made in Gnus trunk.

shr.el: Start implementation.
shr.el: Continue implementation.
gnus-gravatar.el (gnus-gravatar-insert): Adjust character where we should go backward.
shr.el: Minimally useful state achieved.
mm-decode.el (mm-text-html-renderer): Switch to using shr.el for HTML rendering.
shr.el: (shr-insert): Add a newline after every picture before text.
gnus.texi (Splitting Mail): Really fix the @ref syntax.
shr.el (shr-add-font): Use overlays for combining faces.
shr.el (shr-add-font): Use overlays for combining faces.
shr.el (shr-insert): Pass upwards the text start point.
gnus-util.el: Reintroduce multiple completion functions.

* lisp/server.el (server-process-filter, server-return-error): Give
emacsclient time to shut down after receiving an error string.

* etc/NEWS: Document tweak to emacsclient exit status.

* emacsclient.c (main): Return EXIT_FAILURE if Emacs sends us an error string
(Bug#6963).

Add minor comment (Bug#7001).

lisp/gnus/shr.el (shr): Fix typo in provide call.

gnus.texi (Splitting Mail): Fix @xref syntax.

* files.el (remote-file-name-inhibit-cache): New defcustom.

* time.el (display-time-file-nonempty-p): Use
`remote-file-name-inhibit-cache'.

* net/tramp.el (tramp-completion-reread-directory-timeout): Fix
docstring.

* net/tramp-cache.el (tramp-cache-inhibit-cache): Remove.
(tramp-get-file-property): Replace `tramp-cache-inhibit-cache' by
`remote-file-name-inhibit-cache'.  Check also for an integer
value.  Add/increase counter when `tramp-verbose' >= 10.
(tramp-set-file-property): Add/increase counter when
`tramp-verbose' >= 10.

* net/tramp-cmds.el (tramp-cleanup-all-connections)
(tramp-cleanup-all-buffers): Set tramp-autoload cookie.
(tramp-bug): Set tramp-autoload cookie.  Report all interned
tramp-* variables.  Report also `remote-file-name-inhibit-cache'.
(tramp-reporter-dump-variable): Fix docstring.  Mask non-7bit
characters only in strings.

* net/tramp-compat.el (remote-file-name-inhibit-cache): Define due
to backward compatibility.

* net/tramp-sh.el (tramp-handle-verify-visited-file-modtime)
(tramp-handle-file-name-all-completions)
(tramp-handle-vc-registered): Use
`remote-file-name-inhibit-cache'.
(tramp-open-connection-setup-interactive-shell): Call
`tramp-cleanup-connection' directly.

(url-lazy-message): Remove leftover debugging code.

Rework tags targets in Windows makefiles to protect against old/stupid makes.

* lib-src/makefile.w32-in (tags): Remove target.
* src/makefile.w32-in (tags): Rename target to full-tags.

Add lisp/gnus/nnregistry.el.