(vc-read-revision): New function.
(vc-version-diff, vc-merge): Use it.

Add fixmes.

(kill-do-not-save-duplicates): New user option.
(kill-new): When it is non-nil, and the new string is the same as
the latest kill, set replace to t to avoid duplicates in kill-ring.

* net/tramp-cache.el (top): Autoload `tramp-time-less-p'.
(tramp-cache-inhibit-cache): Extend doc string.  It allows also
timestamps.
(tramp-get-file-property): Check for timestamps in
`tramp-cache-inhibit-cache'.
(tramp-set-file-property): Write timestamp.

* net/tramp.el (tramp-methods): New method "rsyncc".
(top): Add completion function for "rsyncc".
(tramp-message-show-message): New defvar.
(tramp-message, tramp-error): Use it.
(tramp-do-copy-or-rename-file-directly): Extend check for direct
remote copying.
(tramp-do-copy-or-rename-file-out-of-band): Handle new
`tramp-methods' entry `copy-env' of "rsyncc".
((tramp-handle-process-file): Do not flush all
caches when `process-file-side-effects' is set.
tramp-vc-registered-read-file-names): New defconst.
(tramp-vc-registered-file-names): New defvar.
(tramp-handle-vc-registered): Implement optimization strategy.
(tramp-run-real-handler): Add `tramp-vc-file-name-handler'.
(tramp-vc-file-name-handler): New defun.
(tramp-get-ls-command, tramp-get-test-command)
(tramp-get-file-exists-command, tramp-get-remote-ln)
(tramp-get-remote-perl, tramp-get-remote-stat)
(tramp-get-remote-id): Remove
superfluous `with-current-buffer'.

(Rewrite Rules): Improve the example.
(Simplifying Formulas): Explain use of the I and H flags for simplification.

(send_process): Use encode_coding_object instead of
encode_coding_string to perform eol-conversion even if the string
is unibyte.

(encode_coding_utf_16): Fix checking of an Unicode character.

* vc-dir.el (vc-dir-update): Remove debug helper.

(japanese-symbol-table): Add entries for cp932-2-byte.

Add category `j' to cp932-2-byte.

(build-default-fontset-data): New macro.
(setup-default-fontset): Use build-default-fontset-data for CJK,
tibetan, ethiopic, and ipa

(Fself_insert_command): Avoid unnecessay unibyte->multibyte
conversion.

(nnrss-request-article): Avoid default-fill-column.

* subr.el (default-mode-line-format, default-header-line-format)
(default-line-spacing, default-abbrev-mode, default-ctl-arrow)
(default-direction-reversed, default-truncate-lines)
(default-left-margin, default-tab-width, default-case-fold-search)
(default-left-margin-width, default-right-margin-width)
(default-left-fringe-width, default-right-fringe-width)
(default-fringes-outside-margins, default-scroll-bar-width)
(default-vertical-scroll-bar, default-indicate-empty-lines)
(default-indicate-buffer-boundaries, default-fringe-indicator-alist)
(default-fringe-cursor-alist, default-scroll-up-aggressively)
(default-scroll-down-aggressively, default-fill-column)
(default-cursor-type, default-buffer-file-type)
(default-cursor-in-non-selected-windows)
(default-buffer-file-coding-system, default-major-mode)
(default-enable-multibyte-characters): Mark as obsolete.
* cus-start.el (default-major-mode): Customize `major-mode' instead.
(enable-multibyte-characters): Not customizable any more.

(vc-cvs-update-changelog): Fix typo.

(save-interprogram-paste-before-kill): New user option.
(kill-new): When `save-interprogram-paste-before-kill' is non-nil,
save the interprogram-paste into kill-ring before overriding it
with the Emacs kill.

(Fcall_process): Remove always true #if.

* lisp.h: Replace #if 0 code for checking with text pointing to
the --enable-checking configure flag.

* emacs.c (main): Mention the --enable-profiling configure flag
instead of using CFLAGS.

* vc.el (vc-trunk-p): Rename to vc-rcs-trunk-p and move to vc-rcs.el.
(vc-minor-part): Rename to vc-rcs-minor-part and move to vc-rcs.el.
(vc-default-previous-revision): Rename to vc-rcs-previous-revision
and move to vc-rcs.el.
(vc-default-next-revision): Rename to vc-rcs-next-revision and
move to vc-rcs.el.
(vc-cvs-update-changelog): Move to vc-cvs.el, use vc-call-backend.
(vc-rcs-update-changelog): Remove.
(vc-update-changelog-rcs2log): Rename to vc-rcs-update-changelog
and move to vc-rcs.el.

* vc-rcs.el (vc-rcs-latest-on-branch-p, vc-rcs-checkin)
(vc-rcs-checkout, vc-rcs-rollback): Adjust for the vc-rcs-trunk-p
renaming.
(vc-rcs-trunk-p, vc-rcs-minor-part, vc-rcs-previous-revision)
(vc-rcs-next-revision, vc-rcs-update-changelog): Moved here from
vc.el, renamed to be RCS specific.

* vc-cvs.el (vc-cvs-previous-revision, vc-cvs-next-revision): New functions.
(vc-cvs-update-changelog): Moved here from vc.el.

* vc-sccs.el (vc-sccs-previous-revision, vc-sccs-next-revision):
New functions.

(byte-compile-lapcode): Fix up last change.

* Makefile.in (buildobj.h): New target.
(doc.o): Depend on it.
(temacs${EXEEXT}): Don't generate buildobj.lst.
(mostlyclean): Delete buildobj.h, not buildobj.lst.
* makefile.w32-in ($(SRC)/buildobj.h): New target.
($(BLD)/doc.$(O)): Depend on it.
(make-buildobj-CMD, make-buildobj-SH): New targets.  (Syntax help
provided by Eli Zaretskii.)
($(TEMACS)): Don't generate buildobj.lst.
* doc.c: Include buildobj.h.
(buildobj): New static variable.
(Fsnarf_documentation): Use it, instead of opening and reading
buildobj.lst.

* vc.el (vc-default-prettify-state-info): Remove function, unused.

* vc-bzr.el (vc-bzr-prettify-state-info): Remove function, unused.

(vc-git-stash, vc-git-stash-show): New functions.
(vc-git-extra-menu-map): Bind them.

(vc-git-register): Use "git add" for directories.

(vc-dir-node-directory, vc-dir-update): Get the parent
directory correctly in case the item is a directory itself.

Document the desired behavior for reverted files in the
`added' state.

(enable-local-variables, enable-local-eval)
(safe-local-variable-values, safe-local-eval-forms): Mark as risky in
the defcustoms.
(auto-mode-alist, ignored-local-variables)
(save-some-buffers-action-alist): Move risky declarations to the
definitions.
(dabbrev-case-fold-search, dabbrev-case-replace, display-time-string)
(font-lock-defaults, format-alist, imenu--index-alist)
(imenu-generic-expression, input-method-alist, minor-mode-alist)
(mode-line-buffer-identification, mode-line-client, mode-line-modes)
(mode-line-modified, mode-line-mule-info, mode-line-position)
(mode-line-process, mode-line-remote, outline-level)
(parse-time-rules, rmail-output-file-alist)
(special-display-buffer-names, vc-mode):
Move risky declarations to the relevant files.

Define risky-local-variable property here rather than in files.el.

(standard-mode-line-format): Reposition dashes in which-func entry. (Bug#4217)

Ulrich Mueller  <ulm at gentoo.org>

(Character Codes): Fix typos.

(byte-compile-lapcode): Signal overflow.

* dbus.texi (Top): Remove footnote saying D-Bus is not enabled by
default.  (Bug#4256)

* dbusbind.c (Fdbus_call_method)
(Fdbus_call_method_asynchronously): Use English numeric format for
timeout values in doc string.

* net/tramp-gvfs.el (top): Use timeout of 100 msec pinging GVFS
daemon.  Replace ping by checking for running service for bluez
and zeroconf.  (Bug#4239)

* net/dbus.el (dbus-ping): Add optional parameter TIMEOUT.

* progmodes/grep.el (grep-probe): Let-bind `process-file-side-effects' with nil.

(vc-svn-dir-extra-headers, vc-svn-find-revision):
Let-bind `process-file-side-effects' with nil.

* vc-hooks.el (vc-user-login-name):
Let-bind `process-file-side-effects' with nil.

* vc-git.el (vc-git-registered, vc-git-working-revision)
(vc-git-find-revision, vc-git-diff, vc-git-revision-table)
(vc-git--empty-db-p): Let-bind `process-file-side-effects' with nil.

* vc.el (vc-diff-internal): Let-bind `process-file-side-effects' with nil.

* vc-cvs.el (vc-cvs-state, vc-cvs-diff, vc-cvs-revision-table):
Let-bind `process-file-side-effects' with nil.

* vc-bzr.el (vc-bzr-sha1, vc-bzr-revision-completion-table):
Let-bind `process-file-side-effects' with nil.

* vc-arch.el (vc-arch-diff): Let-bind `process-file-side-effects' with nil.

* dired-aux.el (dired-show-file-type): Let-bind
`process-file-side-effects' with nil.

* simple.el (process-file-side-effects): New defvar.

* dbus.texi (Bus names): Add optional parameter TIMEOUT to dbus-ping.
Describe autostart behaviour of dbus-ping.
(Synchronous Methods, Asynchronous Methods): Use English numeric format
for timeout values.

* processes.texi (Synchronous Processes): New defvar process-file-side-effects.

(byte-compile-file-form-require): Tweak previous change.

(byte-compile-eval): Fix test for cl in load-history for absolute file-names.
(byte-compile-file-form-require): Warn about use of the cl package.

Fix typo.

(top-level): Don't require cl at run-time.
(nnir-run-waissearch, nnir-run-swish-e, nnir-run-hyrex):
Replace cl-function substitute with gnus-replace-in-string.
(nnir-run-waissearch, nnir-run-swish++, nnir-run-swish-e)
(nnir-run-hyrex, nnir-run-namazu): Replace cl-function sort* with sort.
(nnir-run-find-grep): Replace cl-functions find-if and subseq with
simplified expansions.

Unify local variables at end.
Don't warn about use of cl functions in this file.

(mark_char_table): New function.
(mark_object): Use mark_char_table for a char-table.

(top-level): Don't require lucid (and hence run-time cl).

(top-level): Don't require cl at run-time.

Kevin Ryde  <user42 at zip.com.au>

(dig): Add autoload cookie.

Kevin Ryde <user42 at zip.com.au>

Add "languages" keywords: entry.

Kevin Ryde <user42 at zip.com.au>

Add "games" keywords: entry.

Kevin Ryde <user42 at zip.com.au>

Fix keywords: comment.

Revert accidental commit.

joakim at verona.se

Replace some C99 comments.

(format-alist): Doc fix.

(Format Conversion Round-Trip): Mention nil regexp.

(Fontsets): Fix typo.

(CHAR_TABLE_REF_ASCII): New macor.
(CHAR_TABLE_REF): Use it.

(gdb-mapcar*): Replacement for `mapcar*'
from cl package.
(gdb-table-add-row, gdb-table-string): Use `gdb-mapcar*'.

(math-trig-rewrite, math-hyperbolic-trig-rewrite): New functions.
(calc-simplify): Simplify trig functions when asked.

(diff-find-source-location): Avoid goto-line.

(mapthread): Delete it.
(combinatorial): New function.
(indian--puthash-cv): Use combinatorial instead of mapthread.

Fix the previous entry.

(Encrypting/decrypting *.gpg files): Don't refer to nonexistent
epa-setup.

(Quick start): Don't refer to nonexistent epa-mode.
(Mail-mode integration): Mention epa-mail-mode and
epa-global-mail-mode.  Reported by Jari Aalto (Bug#4211).

* Makefile.in (emacs${EXEEXT}) [CANNOT_DUMP]: Set EMACSLOADPATH
before invoking the newly build emacs to check for load-path
shadowing.

* Makefile.in (install-arch-indep): If the versioned DOC-####
generated during loadup+dump isn't found, install the plain DOC
file that always gets generated, in case CANNOT_DUMP is set.

* configure.in: Warn if package version specified here doesn't
match the version in version.el.
* configure: Regenerate.

(auto-mode-alist): Remove code for defunct system-type next-mach.

Kevin Ryde  <user42 at zip.com.au>

(checkdoc-force-history-flag, checkdoc-arguments-in-order-flag):
Add safe-local-variable booleanp.
(checkdoc-symbol-words): Add safe-local-variable for list of strings.
Clarify docstring that the value is strings not symbols.
(checkdoc-list-of-strings-p): New function.

(bootstrap_exe): New variable.
(.el.elc, ${lispsource}loaddefs.el, bootstrap-emacs${EXEEXT}):
Use ${bootstrap_exe}.

Remove code for defunct system-types emx, macos, mswindows,
unisoft-unix, vax-vms, win32, w32.

Remove code for defunct system-types Apple-Macintosh, emx, ms-windows,
next-mach.

Comment.

Re-fill.

(diary-mark-entries-1): Only mark all days of a given name if the
pattern is not more specific.

(lunar-phase-names): New option.
(lunar-phase): Doc fix.
(lunar-cycles-per-year): New constant.
(lunar-index): New function.
(lunar-phase-list, diary-lunar-phases): Use lunar-index.
(lunar-phase-name): Use lunar-phase-names.
(calendar-lunar-phases): Use format.
(lunar-new-moon-on-or-after): Use lunar-cycles-per-year.

(vi-goto-line): Don't warn about non-interactive goto-line.

Comment.

(cperl-imenu-name-and-position): Copy imenu-example--name-and-position
function here for own use.
(cperl-xsub-scan): Use cperl-imenu-name-and-position.
(cperl-time-fontification): Use forward-line rather than goto-line.

Use forward-line rather than goto-line.

(compilation-error-regexp-alist, compilation-forget-errors): Declare.

(makefile-browser-toggle): Use forward-line rather than goto-line.
(makefile-browser-insert-selection): Use goto-char rather than goto-line.

(nfd, decomposition-translation-alist, decomposition-char-recursively)
(alist-list-to-vector, quick-check-list, quick-check-list-to-regexp):
Declare.

(gnus-button-patch): Use forward-line rather than goto-line.

(encode_coding_string): Don't encode unibyte strings.  (Bug#4047)

How to reassign a bug to a list of packages.

* dbusbind.c (XD_WITH_DBUS_WATCH_GET_UNIX_FD): Remove.  It was
intended as hotfix only.
(xd_add_watch, xd_remove_watch): Use HAVE_DBUS_WATCH_GET_UNIX_FD.

* config.in (HAVE_DBUS_WATCH_GET_UNIX_FD): Add.

* configure: Regenerate.

* configure.in: AC_CHECK_FUNCS dbus_watch_get_unix_fd.

Details of how to check for problems with DOS 8+3 file-name restrictions.