* configure.in (AC_OUTPUT): Remove doc/emacs/emacsver.texi.
* configure: Regenerate.

* .bzrignore: Remove doc/emacs/emacsver.texi.

* doc/emacs/Makefile.in (distclean): Do not delete emacsver.texi.
* doc/emacs/emacsver.texi: New file, replacing emacsver.texi.in.

* admin/admin.el (set-version): Add doc/emacs/emacsver.texi.

(ibuffer-mode-map): Don't redefine the cursor keys, since that's too annoying.

Move the filter groups commands to TAB/backtab.

Don't use foo() to talk about functions.

(emacs_gnutls_write): Check for GNUTLS_E_AGAIN and not EINTR.

According to the documentation, this is correct, and it seems to
make things work.

(epa-passphrase-callback-function): Say what we're querying the password for.

* ibuffer.el (ibuffer-visit-buffer): To mimick list-buffers
behaviour, don't bury the ibuffer buffer when visiting other
buffers.

Make emacs_gnutls_read() return the expected on errors.

Also interface cleanups.

nnir.el (nnir-read-parm): Fix call to gnus-completing-read.

shr,el: Allow shr table char to be customized.
gnus-gravatar.el (gnus-gravatar-transform-address): Error errors when retrieving gravatars.

gnus.texi: untabify.

* xterm.c (x_draw_relief_rect): Clear corner pixels.

More face customization cleanups.

* cus-edit.el (custom-commands, custom-buffer-create-internal)
(custom-magic-value-create): Pad button tags with spaces.
(custom-face-edit): New variable.
(custom-face-value-create): Determine whether to use the usual
face editor here, instead of using custom-face-selected.  Pass
face defaults to custom-face-edit widget.
(custom-face-selected, custom-display-unselected): Delete widgets.
(custom-display-unselected-match): Function removed.
(custom-face-set, custom-face-mark-to-save): Accept
custom-face-edit widgets as the direct widget child.

* wid-edit.el (widget--completing-widget): New var.
(widget-default-complete): Bind it when doing completion.
(widget-string-complete, widget-file-complete): Use it.

Small simplifications for some cal-hebrew calculations.

* lisp/calendar/cal-hebrew.el (holiday-hebrew-rosh-hashanah)
(holiday-hebrew-passover, holiday-hebrew-tisha-b-av)
(holiday-hebrew-misc): Small simplifications.

* configure.in: Combine some conditionals.

Add doc/ dependencies on emacsver.texi.

* doc/misc/Makefile.in ($(infodir)/efaq): Depend on emacsver.texi.

* doc/lispref/Makefile.in (srcs): Add emacsver.texi.

* doc/emacs/Makefile.in (EMACSSOURCES): Add emacsver.texi.

Regenerate configure, src/config.in.

* doc/misc/gnus.texi (Article Washing): Fix previous change.

Set the version number in the texinfo manuals using configure.

* doc/misc/Makefile.in (emacsdir): New variable.
($(infodir)/efaq): Pass -I $(emacsdir) to makeinfo.
* doc/misc/faq.texi (VER): Replace with EMACSVER from emacsver.texi.

* doc/lispref/Makefile.in (emacsdir): New variable.
(MAKEINFO): Add -I $emacsdir.
(dist): Copy emacsver.texi.
* doc/lispref/book-spine.texinfo, doc/lispref/elisp.texi:
* doc/lispref/vol2.texi, doc/lispref/vol1.texi:
Set EMACSVER by including emacsver.texi.

* doc/emacs/emacsver.texi.in: New file.
* doc/emacs/emacs.texi: Set EMACSVER by including emacsver.texi.
* doc/emacs/Makefile.in (distclean): Delete emacsver.texi.
(dist): Copy emacsver.texi.

* admin/admin.el (set-version): No need to act on doc/ files any more.

* configure.in (AC_OUTPUT): Add doc/emacs/emacsver.texi.
* make-dist: Include doc/emacs/*.texi.in.

Remove lib-src/b2m.c and b2m.pl.
Emacs does not use Babyl files since 23.1, and you can use M-x unrmail.

* msdos/mainmake.v2 (install): Remove b2m.

* lisp/emacs-lisp/authors.el (authors-valid-file-names): Add b2m.c.

* lib-src/b2m.c, lib-src/b2m.pl: Remove files.
* lib-src/Makefile.in (INSTALLABLES): Remove b2m.
* lib-src/makefile.w32-in ($(BLD)/b2m.$(O)): Remove.

* doc/emacs/ack.texi (Acknowledgments): No more b2m.c.

* admin/quick-install-emacs (PUBLIC_LIBSRC_BINARIES): Remove b2m.

* INSTALL, make-dist: Remove references to b2m.
* Makefile.in (MAN_PAGES): Remove b2m.1.

Mark some doc/ rules as PHONY.

* doc/misc/Makefile.in (.PHONY): Declare info, dvi, pdf and the clean rules.

* doc/lispref/Makefile.in (.PHONY): Declare info, dvi, pdf, dist.

* doc/lispintro/Makefile.in (.PHONY): Declare info, dvi, html, pdf, dist.

* doc/emacs/Makefile.in (.PHONY): Declare info, dvi, pdf, dist.
(emacs): Remove rule.
(dist): No need to deal with the emacs rule any more.

browse-url.el trivia.

* lisp/net/browse-url.el: Don't require thingatpt, term, dired,
executable, or w3-auto when compiling.
(dired-get-filename, term-char-mode, term-send-down, term-send-string):
Declare.
(browse-url-text-emacs): Require term.

shr.el (shr-insert): Don't insert double spaces.
auth.texi (Help for users, GnuPG and EasyPG Assistant Configuration): Update docs.
gnus-registry.el, nnregistry.el: Remove nnregistry refer method auto-install and update docs.
gnus.texi (Finding the Parent, The Gnus Registry, Registry Article Refer Method): Update docs for nnregistry.el.
gnus-demon.el, gnus-group.el, gnus-msg.el, gnus-sum.el, gnus-util.el, gnus.el: Rename `gnus-pull' to `gnus-alist-pull'.
gnus.texi (Article Washing): Add mm-shr.
mm-decode.el (mm-text-html-renderer): Add mm-shr in choice list.

* net/browse-url.el (browse-url-xdg-open): Remove use of /bin/sh.

* keyboard.c: Revert last change; it was not intended to be
synchronized with the trunk.

gnus.el (gnus-expand-group-parameter): Only return and act on what was matched.

Merge changes from emacs-23 branch.

Remove some tests for defunct system-types.
* lisp/vc/ediff-wind.el (ediff-setup-control-frame):
* lisp/vc/ediff-ptch.el (ediff-default-backup-extension):
* lisp/vc/ediff-diff.el (ediff-shell, ediff-diff-options)
(ediff-exec-process): Remove system-types emx, windows-95.

* lisp/htmlfontify.el: Add utf-8 coding cookie (eg for ellipsis at l1686).

gnus-gravatar.el (gnus-treat-from-gravatar, gnus-treat-mail-gravatar): Bind gnus-gravatar-too-ugly to nil when called interactively.

* xterm.c (x_draw_relief_rect): If box width is larger than 1,
draw the outermost line using the black relief, for legibility.
Omit drawing the four corner pixels.

ChangeLog fix.

* lisp/net/browse-url.el (browse-url-xdg-open): Shell-quote url.  (Bug#7166)

ChangeLog fix.

etc/NEWS.

* lisp/obsolete/cl-compat.el, lisp/obsolete/lmenu.el: Comments.

* emacs-lisp/cl-compat.el, emacs-lisp/lmenu.el: Move to obsolete/.

Rename some shadow.el things.

* lisp/emacs-lisp/shadow.el (lisp-shadow): Change prefix.
(shadows-compare-text-p): Make it an obsolete alias for...
(load-path-shadows-compare-text): ... new name.
(find-emacs-lisp-shadows): Update for above name change.
(load-path-shadows-same-file-or-nonexistent): New name for the old
shadow-same-file-or-nonexistent.

Minor cl.texi change.

* doc/misc/cl.texi (Organization, Installation, Old CL Compatibility):
Deprecate cl-compat for new code.

merge emacs-23

gnus-art.el (gnus-mime-view-part-externally, gnus-mime-view-part-internally): Make predicate function passed to gnus-mime-view-part-as-type assume argument is a mime type, not a list of a mime type.

shr.el (shr-table-widths): Don't use cl function `reduce'.

coding.c (complement_process_encoding_system): Fix previous change.

Improvements to face customization interface.

* lisp/cus-edit.el (custom-variable, custom-face): Doc fix.
(custom-face-edit): Add value-create attribute.
(custom-face-edit-value-create)
(custom-face-edit-value-visibility-action): New functions.  Hide
unused face attributes by default, and add a visibility toggle.
(custom-face-edit-deactivate): Show empty values with shadow face.
(custom-face-selected): Only use this for face specs with default
attributes.
(custom-face-value-create): Cleanup.

* lisp/wid-edit.el (widget-checklist-value-create): Use dolist.
(widget-checklist-match-find): Make second arg optional.

Merge changes made in Gnus trunk.

shr.el (shr-render-td): Use a cache for the table rendering function to avoid getting an exponential rendering behaviour in nested tables.
shr.el (shr-insert): Rework the line-breaking algorithm.
shr.el (shr-insert): Don't leave trailing spaces.
shr.el (shr-insert-table): Also insert empty TDs.
shr.el (shr-tag-blockquote): Ensure paragraphs after </ul>.
gnus-start.el (gnus-get-unread-articles): Require gnus-agent before bidning gnus-agent variables.
mm-decode.el (mm-save-part): If given a non-directory result, expand the file name before using to avoid setting mm-default-directory to nil.
gnus.el (gnus-carpal): The carpal mode has been removed, but define the variable for backwards compatability.
nnimap.el (nnimap-update-info): Remove double setting of high.
nnimap.el (nnimap-update-info): Don't ignore groups that have no UIDNEXT.
shr.el (require): Require cl when compiling.
shr.el (shr-tag-hr): New function.

* lisp/gnus/gnus-sum.el (gnus-number): Rename from `number'.
(gnus-article-marked-p, gnus-summary-limit-to-display-predicate)
(gnus-summary-limit-children): Update uses correspondingly.

Tiny hilit-chg.el change.
* lisp/hilit-chg.el (hilit-chg-get-diff-info, hilit-chg-get-diff-list-hk):
Prefix things.

Rename some more shadow.el stuff.
* lisp/emacs-lisp/shadow.el (load-path-shadows-font-lock-keywords)
(load-path-shadows-find-file): Rename variable and button.
(list-load-path-shadows): Update button caller.

Rename shadow-mode.
* lisp/emacs-lisp/shadow.el (shadow-font-lock-keywords)
(load-path-shadows-mode, list-load-path-shadows): Rename shadow-mode to
load-path-shadows-mode, update references.

[Gnus] Introduce gnus-gravatar-too-ugly.

gnus-gravatar.el (gnus-gravatar-too-ugly): New user option.
gnus-gravatar.el (gnus-gravatar-transform-address): Don't show avatars of people of which mail addresses match gnus-gravatar-too-ugly.
gnus.texi (Gravatars): Document gnus-gravatar-too-ugly.

Merge changes made in Gnus trunk.

nnimap.el (nnimap-request-rename-group): Add this method.
shr.el: Keep track of the natural width of TD elements, so we know which ones to expand.
shr.el: Expand TD elements to fill available space.

url-http.el (url-http-end-of-document-sentinel): Protect against the
process buffer being killed.

SMIE: Reliably distinguish openers/closers in smie-prec2-levels
* lisp/emacs-lisp/smie.el (smie-bnf-classify): New function.
(smie-bnf-precedence-table): Use it to remember the closers/openers.
(smie-merge-prec2s): Handle those new entries.
(smie-prec2-levels): Only set precedence to nil for actual
openers/closers.
* lisp/progmodes/octave-mod.el (octave-smie-op-levels): Remove dummy entry
that is now unnecessary.

(regexp-opt): Add `symbols' mode.

[Gnus] Enable XEmacs to display images.

gnus-html.el (gnus-html-schedule-image-fetching): Remove function name from XEmacs' function-arglist.
gnus-gravatar.el (gnus-gravatar-insert): Don't add properties to gravatar under XEmacs.

gnus-int.el, gnus-util.el: Gnus hooks for the mark get/set operations.
gnus-sync.el: Update docs to explain state and plans.
auth-source.el: Update docs with TODO items.

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.

* doc/misc/eudc.texi (CCSO PH/QI, LDAP Requirements): Remove old information.

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.

* doc/misc/cl.texi (Usage, Installation): Remove outdated information.

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.