(info-real): Don't ignore errors from doc Makefiles.
(info): Don't give an error in the absence of makeinfo - let the doc
Makefiles do that, if the info files need rebuilding.  (Bug#3982)

* progmodes/cc-vars.el (c-comment-continuation-stars):
* progmodes/cc-engine.el (c-looking-at-bos):
* progmodes/cc-cmds.el (c-toggle-auto-state)
(c-forward-into-nomenclature, c-backward-into-nomenclature)
(c-comment-line-break-function): Add version of obsolescence.

Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1629

(image-type-header-regexps): Use only JPEG magic number
to determine JPEG images, and don't use `image-jpeg-p' because
Emacs can display non-JFIF non-Exif JPEG images.

(magic-fallback-mode-alist): Add ZIP magic number
associated with `archive-mode'.

[temacs] Undef HAVE_POSIX_MEMALIGN.

(print_load_command_name) [LC_DYLD_INFO]: Add cases
LC_DYLD_INFO and LC_DYLD_INFO_ONLY.
(copy_data_segment): Also copy __program_vars section.
(copy_dyld_info) [LC_DYLD_INFO]: New function.
(dump_it) [LC_DYLD_INFO]: Use it.

documented save-interprogram-paste-before-kill & kill-do-not-save-duplicates

* arc-mode.el (archive-mode):
* emacs-lisp/re-builder.el (re-builder-unload-function):
  Protect against the default value of `major-mode' being nil.

* international/ucs-normalize.el (ucs-normalize-sort, quick-check-list):
  Fix typos in docstrings.

* progmodes/js.el (js--macro-decl-re): Doc fix.
  (js--plain-method-re, js--split-name): Refloc docstring.
  (js--class-styles, js--make-merged-item, js--splice-into-items):
  Fix typos in docstrings; reflow docstrings.
  (js--maybe-join, js--function-prologue-beginning, js--flush-caches)
  (js--variable-decl-matcher, js--inside-pitem-p)
  (js--parse-state-at-point, js--get-all-known-symbols)
  (js--symbol-history, js-find-symbol, js--js-references)
  (js--moz-interactor, js--js-encode-value, js--read-tab):
  Fix typos in docstrings.

* gnus/nnheader.el (nnheader-find-file-noselect):
* gnus/mm-util.el (mm-insert-file-contents):
* org/org-html.el (org-export-as-html):
* org/org-docbook.el (org-export-as-docbook):
* textmodes/reftex.el (reftex-get-file-buffer-force):
* progmodes/verilog-mode.el (verilog-batch-execute-func):
* emulation/viper.el (viper-go-away, viper-set-hooks):
* emacs-lisp/re-builder.el (re-builder-unload-function):
* emacs-lisp/bytecomp.el (byte-compile-file):
* ses.el (ses-unload-function):
* hexl.el (hexl-find-file):
* files.el (normal-mode):
* ehelp.el (with-electric-help):
* autoinsert.el (auto-insert-alist):
* arc-mode.el (archive-mode):
Use (default-value 'major-mode) instead of default-major-mode.

* textmodes/ispell.el (ispell-check-version, ispell-send-string):
* international/mule.el (load-with-code-conversion):
* emacs-lisp/debug.el (debug):
* ediff-vers.el (ediff-rcs-get-output-buffer):
* dired.el (dired-internal-noselect): Don't let-bind
default-major-mode around code that doesn't use it.
E.g. buffer creation via get-buffer-create doesn't use it.

* tramp.texi (Version Control): Remove.
(Obtaining Tramp): Update cvs checkout command. Remove nightly tarballs
reference.
(External methods): Correct `scpc' concept index entries.  New method
`rsyncc'.
(External packages): New subsections "Filename completion" and "File
attributes cache".

(clean): Add buildobj.h.

(buildobj.h): Renamed from $(SRC)/buildobj.h.
(make-buildobj-CMD, make-buildobj-SH): Create buildobj.h, not
$(SRC)/buildobj.h.
($(BLD)/doc.$(O)): Depend on buildobj.h, not on $(SRC)/buildobj.h.

*** empty log message ***

* net/tramp.el (all): Replace "'(lambda" by "(lambda".
(tramp-handle-file-local-copy): Unset `file-name-handler-alist'
when writing the temp file.  Otherwise, epa-file gets confused.
(tramp-register-file-name-handlers): Make it a defun.  Move also
`epa-file-handler' to the front of `file-name-handler-alist'.

* net/tramp.el (tramp-shell-prompt-pattern): Allow a prompt to
start right after a ^M.
(tramp-root-regexp, tramp-completion-file-name-regexp-unified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-url): Use \\` and \\'.
(tramp-handle-file-attributes, tramp-set-file-uid-gid): Don't
modify last-coding-system-used by accident.
(tramp-completion-file-name-handler): Apply the checks here,
instead during registration.
(tramp-register-file-name-handlers) Renamed from
`tramp-register-file-name-handler'.  Register both
`tramp-file-name-handler' and `tramp-completion-file-name-handler'.
(tramp-register-completion-file-name-handler): Removed.

(gdb-use-separate-io-buffer): Remove
variable ...
(gdb-init-1, gdb-display-separate-io-buffer)
(gdb-frame-separate-io-buffer, gdb-setup-windows): ... and
references to it.
(gdb-inferior-io-mode): Use make-comint-in-buffer.
(gdb-inferior-filter): Use comint-output-filter to stop
echoing and remove ^M characters.

*** empty log message ***

(print_object): Set escapeflag to 1 when printing
hashtable keys and values.

Ignore all backup files.

Mention bug numbers in last cmds.c log entry.

* NEWS: Mention Tramp connection method "rsyncc" and variable
`process-file-side-effects'.

* emulation/viper-init.el (viper-restore-cursor-type):
* emulation/cua-base.el (cua--update-indications):
Replace default-cursor-type with (default-value 'cursor-type).

* mh-e/mh-comp.el (mh-send-letter):
* mail/sendmail.el (mail-recover-1):
* international/mule-diag.el (describe-current-coding-system-briefly)
(describe-current-coding-system):
* international/mule-cmds.el (select-safe-coding-system)
(select-message-coding-system)
(set-language-environment-coding-systems, set-locale-environment):
* hexl.el (hexl-insert-multibyte-char):
* dos-w32.el (find-buffer-file-type-coding-system):
* simple.el (what-cursor-position):
Replace uses of default-buffer-file-coding-system
with (default-value 'buffer-file-coding-system).

(edebug-display, edebug-outside-excursion):
Replace uses of default-cursor-in-non-selected-windows
with (default-value 'cursor-in-non-selected-windows).  Use with-current-buffer.

* mail/feedmail.el: Use CL macros.
(feedmail-run-the-queue, feedmail-send-it-immediately):
* dos-w32.el (find-buffer-file-type): Replace uses of
default-buffer-file-type with (default-value 'buffer-file-type).

(diary-list-entries, diary-goto-entry)
(diary-show-all-entries, diary-mark-entries, diary-make-entry):
Use default-value of major-mode rather than default-major-mode.

* leim/.gitignore, lisp/.gitignore: Ignore .el~ files.

* .cvsignore, .gitignore: Ignore buildobj.h.

(read_integer): Use doubles (and potentially return a float
number) as we do in string-to-number.
(read1): Use strtol to read integers, signal errors on strtol's
overflow and use floats if strtol's output is too large for
Elisp integers.

Update.

Fix typos.

Fix typos.

(buildobj.h): Replace "echo" with "djecho".

(Mode Line Variables): Fix last change.

(update-elcfiles): Report left over elc files.

(SRC): Move to before where it's first used.
($(SRC)/buildobj.h, make-buildobj-CMD, make-buildobj-SH): Fix last change.

(build-mail-aliases): Use with-temp-buffer,
expand-file-name and with-current-buffer.
(mail-get-names, mail-directory): Use with-current-buffer.

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