Improvements to vc-bzr conffile handling and pull/merge support.

* vc/vc-bzr.el (vc-bzr--branch-conf): Function deleted.
(vc-bzr-branch-conf): New function, similar to vc-bzr--branch-conf
but returning an alist.  Ignore comments in bzr conffile.
(vc-bzr-pull, vc-bzr-merge-branch): Use vc-bzr-branch-conf.
(vc-bzr-error-regex-alist): New var.
(vc-bzr-merge-branch): Use it to highlight the pull/merge buffer.

* progmodes/compile.el (compilation--flush-directory-cache):
Handle the case where cdr of compilation--flush-directory-cache
points to no buffer, which can occur if we previously switched to
compilation-mode in a pregenerated buffer.

* vc/vc-dispatcher.el (vc-do-async-command): Bind
inhibit-read-only to t.

dired-x no longer requires dired-aux.

* lisp/dired-x.el: Don't require dired-aux.
(dired-do-create-files, dired-mark-read-regexp)
(dired-do-create-files-regexp): Autoload from dired-aux.

Merge dired-x's dired-find-buffer-nocreate into dired.el.

* lisp/dired-x.el (dired-find-buffer-nocreate): Merge into dired.el.

* lisp/dired.el (dired-find-buffer-nocreate): Merge dired-x version.

* doc/misc/dired-x.texi (Technical Details):
No longer redefines dired-find-buffer-nocreate.

Adapt and fix the MS-DOS port due to gnulib imports.

 msdos/depfiles.bat: New file.
 msdos/sedlibmk.inp: New file.
 msdos/sedlibcf.inp: New file.
 msdos/sedleim.inp (RUN_EMACS): Rename from RUN-EMACS.
 (BUILT_EMACS): Rename from BUILT-EMACS.
 msdos/sed6.inp (MAKEINFO): Edit to "makeinfo".
 (ENVADD): Adjust to MAKEINFO_OPTS.
 (texinputdir): Don't edit.
 msdos/sed3v2.inp (-DVERSION): Edit out.
 (LOADLIBES): Don't edit to empty.
 msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
 BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
 (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
 (HAVE__BOOL): Edit to 1.
 (VERSION, inline, restrict): Edit for DJGPP.
 (my_strftime): Edit to nstrftime.
 msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
 (@true): Edit to "@rem".
 (move-if-change): Edit to "update".
 (echo): Edit to "djecho".
 (cd $(lib) && ...): Edit to "$(MAKE) -C ...".
 (LIBOBJS): Edit to empty.
 ($(libsrc)/make-docfile): Two new edits, one each for every
 invocation of make-docfile.
 (move-if-change): Fix edit.
 Remove some unused switches from $(ALL_CFLAGS), to make the GCC
 command line shorter.
 msdos/mainmake.v2 (version): Remove, no longer needed (config.in
 defines VERSION).
 (all): Add lib.
 (lib): New target and recipe.
 (lib-src): Depend on lib.
 (src): Depend on lib and lib-src.
 (clean, mostlyclean, distclean, maintainer-clean, extraclean)
 (bootstrap-clean): Recurse into lib.
 (lib, lib-src, src): Specify "all" as an explicit target.
 .bzrignore: Ignore cxxdefs.h and lib/*.in-h files.
 Add lib/deps/.
 config.bat: Configure in `lib'.
 Generate *.Po files in lib/deps.
 src/termcap.c (tputs): Don't declare baud_rate.
 src/s/msdos.h (strtold): Define to _strtold.

Fix MS-DOS build in src/: delete gl-tmp.

 msdos/sed1v2.inp: Delete gl-tmp after updating globals.h

Finish fixing the MS-DOS build.  Everything builds and works.

 src/termcap.c (tputs): Don't declare baud_rate.
 msdos/sedlibmk.inp (gl_LIBOBJS): Add getloadavg.o.
 msdos/sedleim.inp (RUN_EMACS): Rename from RUN-EMACS.
 (BUILT_EMACS): Rename from BUILT-EMACS.
 msdos/sed6.inp (MAKEINFO): Edit to "makeinfo".
 (ENVADD): Adjust to MAKEINFO_OPTS.
 (texinputdir): Don't edit.
 msdos/sed2v2.inp (my_strftime): Edit to nstrftime.
 msdos/sed1v2.inp (LIBOBJS): Edit to empty.
 ($(libsrc)/make-docfile): Two new edits, one each for every
 invocation of make-docfile.
 (move-if-change): Fix edit.
 Remove some unused switches from $(ALL_CFLAGS), to make the GCC
 command line shorter.

Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca

Fix typo in auth.texi (Bug#8068).

Merge dired-x's dired-read-shell-command into dired-aux's version.

* lisp/dired-x.el (dired-read-shell-command): Merge into dired-aux's version.

* lisp/dired-aux.el (dired-read-shell-command): Merge dired-x's version.

* doc/misc/dired-x.texi (Technical Details):
No longer redefines dired-read-shell-command.

Merge dired-x's dired-clean-up-after-deletion into dired's version.

* lisp/dired-x.el (dired-clean-up-after-deletion): Merge into dired.el.

* lisp/dired.el (dired-clean-up-after-deletion): Merge dired-x's version.
(dired-clean-up-buffers-too): Declare.

* doc/misc/dired-x.texi (Technical Details):
No longer redefine dired-clean-up-after-deletion.

Fix msdos/sed3v2.inp.  lib-src/ now builds.

 sed3v2.inp (-DVERSION): Edit out.
 (LOADLIBES): Don't edit to empty.
 mainmake.v2 (lib, lib-src, src): Specify "all" as an explicit target.

Fix msdos/sedlibmk.inp.  lib/ builds now.

 sedlibmk.inp (HAVE_GETOPT_H, PRAGMA_SYSTEM_HEADER, PRAGMA_COLUMNS): Fix
 editing.
 (DEFS): Edit to -DHAVE_CONFIG_H.
 (Makefile, &&): Fix removal.

* Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.

See http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00715.html

Fix generation of auto-dependency files in lib/.

 .bzrignore: Add lib/deps/.
 config.bat: Generate *.Po files in lib/deps.
 msdos/sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Fix editing of *-clean
 rules.
 msdos/depfiles.bat: New file.

Update .bzrignore for files produced by the MS-DOS build.

 .bzrignore: Ignore cxxdefs.h and lib/*.in-h files.

Commit new Sed scripts in msdos/.

Initial version of fix for the MS-DOS build, not yet tested.

 config.bat: Configure in `lib'.
 msdos/sedlibmk.inp: New file.
 msdos/sedlibcf.inp: New file.
 msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
 (@true): Edit to "@rem".
 (move-if-change): Edit to "update".
 (echo): Edit to "djecho".
 (cd $(lib) && ...): Edit to "$(MAKE) -C ...".
 msdos/mainmake.v2 (version): Remove, no longer needed (config.in
 defines VERSION).
 (all): Add lib.
 (lib): New target and recipe.
 (lib-src): Depend on lib.
 (src): Depend on lib and lib-src.
 (clean, mostlyclean, distclean, maintainer-clean, extraclean)
 (bootstrap-clean): Recurse into lib.
 msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
 BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
 (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
 (HAVE__BOOL): Edit to 1.
 (VERSION, inline, restrict): Edit for DJGPP.
 src/s/msdos.h (strtold): Define to _strtold.
 admin/admin.el (set-version): Add msdos/sed2v2.inp.

merge emacs-23

nnimap.el (nnimap-parse-copied-articles): Allow for "<foo> OK" outputs from the server.
gnus-art.el (gnus-article-prepare): Run gnus-article-prepare-hook later so that bbdb can hook in easier.

dired.el: Update autoloads.

Fix setting of buffer-file-coding-system for MIME message.

Merge dired-x's redefinition of dired-initial-position into the main version.

* lisp/dired-x.el (dired-initial-position): Merge into dired.el's version.

* lisp/dired.el (dired-initial-position): Merge dired-x's version here.
(dired-find-subdir): Declare.

* doc/misc/dired-x.texi (Technical Details):
No longer redefines dired-initial-position.

* doc/emacs/dired.texi (Dired): Dired-X version number was dropped.

Merge dired-x's dired-add-entry modifications into the main definition.

* lisp/dired-aux.el (dired-add-entry): Give it a doc-string.
Merge dired-x's dired-omit handling here.
(dired-omit-mode, dired-omit-regexp, dired-omit-localp): Declare.

* lisp/dired-x.el (dired-omit-new-add-entry): Merge into dired-add-entry.

* doc/misc/dired-x.texi (Technical Details): No longer redefines
dired-add-entry.

mule-diag.el fix for bug#8066.

* lisp/international/mule-diag.el (list-input-methods-1):
Indent all lines of multi-line doc-strings.

auth-source.el (auth-source-search): If we don't find a match, don't bug out on non-bound variables.
 (auth-source-search): Only ask a single backend to create the credentials.

Fix incorrect changes introduced in 2011-02-02T17:59:44Z!sds@gnu.org.

* lisp/apropos.el (apropos-print): Call apropos-mode before setting up
buffer variables.  Use inhibit-read-only.

* lisp/emacs-lisp/package.el (package--list-packages): Call
package-menu-mode before setting up buffer variables.

* lisp/play/solitaire.el (solitaire): Call solitaire-mode before
setting up buffer variables.  Use inhibit-read-only.

* lib-src/emacsclient.c (main): Loop while `recv' return EINTR.

* lisp/progmodes/sh-script.el (sh-syntax-propertize-here-doc):
Bind case-fold-search to nil when looking for end of here-doc.

Fixes: debbugs:8053

Still more followup for bug #7942.

doc/misc/eieio.texi: More followup for bug #7942.

Followup for fixing bug #7942.

 doc/lispref/elisp.texi: Sync @dircategory with ../../info/dir.
 doc/lispintro/emacs-lisp-intro.texi: Sync @dircategory with ../../info/dir.
 doc/misc/ede.texi: Sync letter-case with ../../info/dir.

Fix bug #8047 with require-final-newline in binary image buffers.

 image-mode.el (image-toggle-display-image): Set
 find-file-literally non-nil in buffers visiting binary image
 files.

Fix bug #8047 with require-final-newline and image file display.

 image-mode.el (image-toggle-display-image): Disable
 require-final-newline in buffers visiting binary image files.

* alloc.c (make_unibyte_string): Don't SET_UNIBYTE redundantly.
* process.c (Fstart_process, Fmake_serial_process)
(Fmake_network_process, server_accept_connection):
Use empty_unibyte_string.

* lisp/files.el (cd): Make completion obey cd-path.
* lread.c (Qdir_ok): New constant.
(syms_of_lread): Initialize it.
(openp): Don't ignore directories if the predicate returns dir-ok.

Fixes: debbugs:7924

Document *SUBSTRING completion for Unicode character names.

 international/mule-cmds.el (read-char-by-name, ucs-insert):
 Document completion with asterisk and a substring.

xdisp.c (display_line): Fix the change made for bug#7939.

Fix bug #7840 with default terminal and keyboard encodings.

 terminal.c (create_terminal): Use default-keyboard-coding-system
 and default-terminal-coding-system to initialize coding systems of
 the new terminal.

Synchronize @dircategory directives in doc/misc with info/dir.

 ada-mode.texi: Sync @dircategory with ../../info/dir.
 auth.texi: Sync @dircategory with ../../info/dir.
 autotype.texi: Sync @dircategory with ../../info/dir.
 calc.texi: Sync @dircategory with ../../info/dir.
 cc-mode.texi: Sync @dircategory with ../../info/dir.
 cl.texi: Sync @dircategory with ../../info/dir.
 dbus.texi: Sync @dircategory with ../../info/dir.
 dired-x.texi: Sync @dircategory with ../../info/dir.
 ebrowse.texi: Sync @dircategory with ../../info/dir.
 ede.texi: Sync @dircategory with ../../info/dir.
 ediff.texi: Sync @dircategory with ../../info/dir.
 edt.texi: Sync @dircategory with ../../info/dir.
 eieio.texi: Sync @dircategory with ../../info/dir.
 emacs-mime.texi: Sync @dircategory with ../../info/dir.
 epa.texi: Sync @dircategory with ../../info/dir.
 erc.texi: Sync @dircategory with ../../info/dir.
 eshell.texi: Sync @dircategory with ../../info/dir.
 eudc.texi: Sync @dircategory with ../../info/dir.
 flymake.texi: Sync @dircategory with ../../info/dir.
 forms.texi: Sync @dircategory with ../../info/dir.
 gnus.texi: Sync @dircategory with ../../info/dir.
 idlwave.texi: Sync @dircategory with ../../info/dir.
 mairix-el.texi: Sync @dircategory with ../../info/dir.
 message.texi: Sync @dircategory with ../../info/dir.
 mh-e.texi: Sync @dircategory with ../../info/dir.
 newsticker.texi: Sync @dircategory with ../../info/dir.
 nxml-mode.texi: Sync @dircategory with ../../info/dir.
 org.texi: Sync @dircategory with ../../info/dir.
 pcl-cvs.texi: Sync @dircategory with ../../info/dir.
 pgg.texi: Sync @dircategory with ../../info/dir.
 rcirc.texi: Sync @dircategory with ../../info/dir.
 reftex.texi: Sync @dircategory with ../../info/dir.
 remember.texi: Sync @dircategory with ../../info/dir.
 sasl.texi: Sync @dircategory with ../../info/dir.
 sc.texi: Sync @dircategory with ../../info/dir.
 semantic.texi: Sync @dircategory with ../../info/dir.
 ses.texi: Sync @dircategory with ../../info/dir.
 sieve.texi: Sync @dircategory with ../../info/dir.
 smtpmail.texi: Sync @dircategory with ../../info/dir.
 speedbar.texi: Sync @dircategory with ../../info/dir.
 trampver.texi [emacs]: Set emacsname to "Emacs".
 tramp.texi: Sync @dircategory with ../../info/dir.
 url.texi: Sync @dircategory with ../../info/dir.
 vip.texi: Sync @dircategory with ../../info/dir.
 viper.texi: Sync @dircategory with ../../info/dir.
 widget.texi: Sync @dircategory with ../../info/dir.
 woman.texi: Sync @dircategory with ../../info/dir.

Document find-file-literally in the ELisp manual.

 files.texi (Visiting Functions): Document find-file-literally,
 both the command and the variable.

Improve documentation of permanent local variables.

 variables.texi (Creating Buffer-Local): Explain the meaning of
 permanent local variables.

Silence prolog.el compilation.

* lisp/progmodes/prolog.el: Don't require compile when compiling.
  -- not using any macros from it, it's just a cheap way to silence the
  compiler that actually produces one warning.
(compilation-shell-minor-mode, compilation-error-regexp-alist)
(compilation-forget-errors, compilation-fake-loc)
(compilation-parse-errors-function, compilation-error-list): Declare.
(prolog-inferior-mode): Require 'compile.

* lisp/emulation/cua-base.el (pc-selection-mode): Declare.

Use generated-autoload-file for internal eieio autoloads.

* lisp/emacs-lisp/eieio-custom.el: Set generated-autoload-file.
(customize-object): Add autoload cookie.

* lisp/emacs-lisp/eieio-opt.el: Set generated-autoload-file.
(eieio-browse, describe-class, eieio-describe-class)
(eieio-describe-constructor, describe-generic, eieio-describe-generic)
(eieio-help-mode-augmentation-maybee): Add autoload cookies.

* lisp/emacs-lisp/eieio.el: Regenerate with automatic autoloads.

* lisp/Makefile.in (autoloads): Make eieio.el writable.

* doc/misc/dired-x.texi (Optional Installation File At Point): Simplify.

dired-x largely cosmetic changes.

* lisp/dired-x.el (dired-clean-up-after-deletion, dired-do-relsymlink)
(dired-do-relsymlink-regexp, dired-find-buffer-nocreate): Use #'.
(dired-hack-local-variables): Use inhibit-read-only.
(dired-guess-default): Simplify.
(dired-make-relative-symlink): Use dotimes.
(dired-simultaneous-find-file): Use dolist.
(dired-mark-sexp): Remove unneeded `if'.  Use line-end-position.
(dired-x-hands-off-my-keys): Doc fix.
(dired-x-bind-find-file): Doc fix.  Use remapping.
(after-init-hook): No need to add dired-x-bind-find-file.
(dired-x-find-file, dired-x-find-file-other-window): Doc fixes.
No need to call expand-file-name.
(dired-filename-at-point): Remove unused locals `end', `filename'.

Import IRIX 6.5 getloadavg fixes from gnulib.

* configure, lib/getloadavg.c, m4/getloadavg.m4: Regenerate.

* lisp/.gitignore: Remove arch-tag.

* lisp/gnus.el (gnus-meta): Doc fix.

* lisp/files.el (find-file-literally): Doc fix.

* doc/lispref/keymaps.texi (Remapping Commands): Mention how to undo it.

* lisp/emacs-lisp/pcase.el (pcase--u1): Understand non-linear patterns.

Fix ERT.

* lisp/emacs-lisp/ert.el (ert--setup-results-buffer)
(ert-results-pop-to-backtrace-for-test-at-point)
(ert-results-pop-to-messages-for-test-at-point)
(ert-results-pop-to-should-forms-for-test-at-point)
(ert-results-pop-to-timings): Revert parts of 2011-02-02T17:59:44Z!sds@gnu.org that
were incorrect and unnecessary.  This should make `make check'
pass again.

Don't GC-scan stack data redundantly.
* src/alloc.c (Fgarbage_collect): When using stack scanning, don't
redundantly scan byte-code stacks, catchlist, and handlerlist.
* src/bytecode.c (BYTE_MAINTAIN_TOP): New macros.
(struct byte_stack): Only define `top' and `bottom' if used.
(mark_byte_stack): Only define if used.
(BEFORE_POTENTIAL_GC, AFTER_POTENTIAL_GC): Nullify if BYTE_MAINTAIN_TOP
is not set.
(Fbyte_code): Don't set `bottom' unless BYTE_MAINTAIN_TOP is set.
* src/lisp.h (BYTE_MARK_STACK): New macro.
(mark_byte_stack): Only declare if BYTE_MARK_STACK is set.
* src/term.c (OUTPUT_IF): Use OUTPUT.

auth-source.el (auth-source-search): Don't try to create credentials if the caller doesn't want that.

nnimap.el (nnimap-log-command): Add a newline to the inhibited logging.
 (nnimap-credentials): Protect against auth-source-search returning nil.
 (nnimap-request-list): Protect against not being able to open the server.

auth-source.el (auth-source-search): Do a two-phase search, one with no :create to get the responses from all backends.

Merge chagnes made in Gnus trunk.

auth.texi (GnuPG and EasyPG Assistant Configuration): Mention the default now is to have two files in `auth-sources'.
nnimap.el (nnimap-open-connection-1): Delete duplicate server names when getting credentials.
gnus-util.el (gnus-delete-duplicates): New function.
nnimap.el (nnimap-credentials): Instead of picking the first port as a creation default, pass the whole port list down.  It will be completed.
auth-source.el (auth-source-search): Updated docs to talk about multiple creation choices.
 (auth-source-netrc-create): Accept a list as a value (from the search parameters) and do completion on that list.  Keep a separate netrc line with the password obscured for showing the user.
nnimap.el (nnimap-open-connection-1): Make the `nnimap-address' the first choice to `auth-source-search' so it will be used for entry creation instead of the server's Gnus-specific name.
 (nnimap-credentials): Rely on the auth-source library to select which port is actually wanted in the new netrc entry, so don't override `auth-source-creation-defaults'.

(allout-encrypt-string): Recognize epg failure to decrypt gpg2 armored text
using gpg1, and add indication the gpg version *might* be the problem in
the error message.

* lisp/allout-widgets.el: (allout-widgets-icons-light-subdir)
(allout-widgets-icons-dark-subdir): Track relocations of icons
* lisp/allout.el: Remove commentary about remove encryption passphrase
mnemonic support and verification.
* etc/images/icons/allout-widgets/dark-bg,
etc/images/icons/allout-widgets/light-bg,
encrypted-locked.{xpm,png}, unlocked-encrypted.{xpm,png}: Reorganize icon
directories and files to reconcile against windows short-filename clashes.

auth-source.el (auth-source-debug): Default to off.

auth.texi (Help for users): Use :port instead of :protocol for all auth-source docs.
auth-source.el (auth-source-netrc-parse): Use :port instead of :protocol and accept a missing user, host, or port as a wildcard match.
 (auth-source-netrc-search, auth-source-netrc-create)
 (auth-source-secrets-search, auth-source-secrets-create)
 (auth-source-user-or-password, auth-source-backend, auth-sources)
 (auth-source-backend-parse-parameters, auth-source-search): Use :port instead of :protocol.
nnimap.el (nnimap-credentials): Pass a port default to `auth-source-search' in case an entry needs to be created.
 (nnimap-open-connection-1): Use :port instead of :protocol.

* lisp/net/rcirc.el (rcirc-float-time): New function.
(rcirc-keepalive, rcirc-handler-ctcp-KEEPALIVE)
(rcirc-ctcp-sender-PING): Use it.

Fix KVAR/BVAR,

* nsfns.m (Fx_create_frame, ns_set_name_as_filename)
(Fns_read_file_name): Replace B_ with BVAR.

* nsterm.m (ns_term_init): Use KVAR.

* lisp/simple.el (rfc822-goto-eoh): Give it a doc-string.

log-edit.el fix for bug#8057.

* lisp/log-edit.el (log-edit-insert-changelog):
Fix `log-edit-strip-single-file-name' functionality.

* lisp/progmodes/prolog.el: Header comment fix.

Convert some defvars to defcustoms.

* lisp/speedbar.el (speedbar-ignored-modes, speedbar-file-unshown-regexp)
(speedbar-update-flag, speedbar-fetch-etags-command)
(speedbar-fetch-etags-arguments):
* lisp/term.el (term-buffer-maximum-size, term-input-chunk-size)
(term-completion-autolist, term-completion-addsuffix)
(term-completion-recexact, term-completion-fignore):
* lisp/term/sup-mouse.el (sup-mouse-fast-select-window):
* lisp/term/x-win.el (x-select-request-type):
Convert some defvars with "*" to defcustoms.

auth-source.el (auth-source-secrets-search): Use mm-delete-duplicates instead of delete-dups that is not available in XEmacs 21.4.

shell.el fix for bug#8027 and friends.

* lisp/shell.el (shell-delimiter-argument-list): Set it to nil.

This is a test, to see if causes any issues.

vc.el fix for bug#4496.

* lisp/vc/vc.el (vc-default-previous-version):
Remove broken alias that points nowhere.

More dired-x cleanup.

* lisp/dired-x.el (dired-clean-up-after-deletion):
kill-buffer does not need save-excursion.
(dired-do-run-mail): Doc fix.
(dired-filename-at-point): Doc fix.
Use looking-at, and skip-chars rather than re search.
(skip-chars were used prior to 2003-01-27T11:36:08Z!fx@gnu.org, and are ok to use again
since Emacs 22.1, because char-classes are supported.)

Fix copyright, standardize header and licence.

* lisp/dired-x.el (dired-filename-at-point): Fix 8-year old typo.
Introduced in 2003-01-27T11:36:08Z!fx@gnu.org, 2003/01/27.

Don't let-bind copyright-update in nnfolder-save-buffer.

See:
http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00284.html
http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00651.html

* nnfolder.el (nnfolder-save-buffer): Don't let-bind copyright-update,
in case it's not yet loaded.

Merge changes made in Gnus trunk.

gnus-sum.el (gnus-propagate-marks): Change default to t again, since nil means that nnimap doesn't get updated.
auth-source.el (auth-source-netrc-create): Return a synthetic search result when the user doesn't want to write to the file.
 (auth-source-netrc-search): Expect a synthetic result and proceed accordingly.
 (auth-source-cache-expiry): New variable to override `password-cache-expiry'.
 (auth-source-remember): Use it.
nnimap.el (nnimap-credentials): Remove the `inhibit-create' parameter.  Create entry if necessary by using :create t.
 (nnimap-open-connection-1): Don't pass `inhibit-create'.

* lisp/allout-widgets.el: New allout extension that shows allout outline
structure with graphical widgets.  'allout-widgets' customize group is an
'allout' subgroup, for easy discovery.
* etc/images/icons/allout-widgets-dark-bg,
etc/images/icons/allout-widgets-light-bg: Icons for new allout-widgets.el.
* etc/images/icons/README: Include coypright and GPL 3 license for new
icons.

Include PGP and GnuPG in Keywords, and other commentary refinements.
(allout-abbreviate-flattened-numbering): Rename to
allout-flattened-numbering-abbreviation, and define-obsolete-variable-alias
the old name.
(allout-flattened-numbering-abbreviation): Rename from
allout-abbreviate-flattened-numbering.
(allout-mode-p): Include among autoloads, for use by other modes with impunity.
(allout-listify-exposed): Use allout-flattened-numbering-abbreviation.
(allout-encrypt-string): Use set-buffer-multibyte directly.
(allout-set-buffer-multibyte): Remove.

* lisp/simple.el (just-one-space): Remove useless `or' call.

* soap-client.el (soap-well-known-xmlns, soap-local-xmlns)
(soap-default-xmlns, soap-target-xmlns, soap-multi-refs)
(soap-decoded-multi-refs, soap-current-wsdl)
(soap-encoded-namespaces): Rename CL-style *...* variables.

* NEWS: Add soap-client.el and soap-inspect.el.

* net/soap-client.el: Add "comm" and "hypermedia" to the
keywords.  Reflow too long lines.

* net/soap-inspect.el: Ditto.  Require 'cl.

Use KVAR in the MS-DOS build.

 msdos.c (internal_terminal_init): Use KVAR.

Fix formatting of src/ChangeLog entries.

src/s/ms-w32.h (getloadavg): Declare prototype which was removed from lisp.h.

Use KVAR in MS-Windows build, remove buffer-file-type.

 w32fns.c (Fx_create_frame): Use KVAR.
 w32term.c (w32_create_terminal): Use KVAR.
 s/ms-w32.h (MODE_LINE_BINARY_TEXT): Remove.
 xdisp.c (decode_mode_spec): Don't use MODE_LINE_BINARY_TEXT.
 fileio.c (Finsert_file_contents, Fwrite_region): Remove
 references to buffer_file_type.
 (syms_of_fileio): Don't intern and staticpro
 find-buffer-file-type.
 callproc.c (syms_of_callproc): Remove references to
 buffer_file_type.
 buffer.c (reset_buffer_local_variables): Don't set
 buffer_file_type.
 (init_buffer_once): Likewise.
 (syms_of_buffer): Don't define buffer-file-type.
 buffer.h (struct buffer): Remove buffer_file_type.

play/doctor.el: bugfix for `doctor-mode'.

* play/doctor.el (doctor-mode): Bugfix: escape the "," character
in a `doctor-type' argument.

Hide implementation of `struct kboard'
* callint.c (Fcall_interactively): Update.
* doc.c (Fsubstitute_command_keys): Update.
* cmds.c (Fself_insert_command): Update.
* keymap.c (Fcurrent_active_maps, Fkey_binding)
(Fdescribe_buffer_bindings): Update.
* macros.c (Fstart_kbd_macro, end_kbd_macro, Fend_kbd_macro)
(store_kbd_macro_char, Fcall_last_kbd_macro, Fexecute_kbd_macro):
Update.
* keyboard.c (echo_char, echo_dash, echo_now, cancel_echoing)
(echo_length, echo_truncate, cmd_error, command_loop_1)
(read_char, kbd_buffer_store_event_hold, make_lispy_event)
(menu_bar_items, tool_bar_items, read_char_minibuf_menu_prompt)
(read_key_sequence, Fcommand_execute, Fexecute_extended_command)
(Fdiscard_input, init_kboard, init_keyboard, mark_kboards):
Update.
* xfns.c (Fx_create_frame): Update.
* xterm.c (x_connection_closed, x_term_init): Update.
* term.c (term_get_fkeys_1, CONDITIONAL_REASSIGN, init_tty):
Update.
* window.c (window_scroll_pixel_based, window_scroll_line_based):
Update.
* frame.c (make_frame_without_minibuffer, Fhandle_switch_frame)
(delete_frame): Update.
* lisp.h (DEFVAR_KBOARD): Update for change to field names.
* keyboard.h (struct kboard): Rename all Lisp_Object fields.
(KBOARD_INTERNAL_FIELD, KVAR): New macros.

* lisp.h (DEFVAR_BUFFER_DEFAULTS): Use BVAR.

Change B_ to BVAR
* xfns.c (x_create_tip_frame, Fx_show_tip): Replace B_ with BVAR.
* xfaces.c (compute_char_face): Replace B_ with BVAR.
* xdisp.c (pos_visible_p, init_iterator, reseat_1)
(message_dolog, update_echo_area, ensure_echo_area_buffers)
(with_echo_area_buffer, setup_echo_area_for_printing)
(set_message_1, update_menu_bar, update_tool_bar)
(text_outside_line_unchanged_p, redisplay_internal)
(try_scrolling, try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, row_containing_pos)
(try_window_id, get_overlay_arrow_glyph_row, display_line)
(Fcurrent_bidi_paragraph_direction, display_mode_lines)
(decode_mode_spec_coding, decode_mode_spec, display_count_lines)
(get_window_cursor_type, note_mouse_highlight): Replace B_ with
BVAR.
* window.c (window_display_table, unshow_buffer, window_loop)
(window_min_size_2, set_window_buffer, Fset_window_buffer)
(select_window, Fforce_window_update, temp_output_buffer_show)
(Fset_window_configuration, save_window_save): Replace B_ with
BVAR.
* w32fns.c (x_create_tip_frame, Fx_show_tip, Fw32_shell_execute):
Replace B_ with BVAR.
* undo.c (record_point, record_insert, record_delete)
(record_marker_adjustment, record_first_change)
(record_property_change, Fundo_boundary, truncate_undo_list)
(Fprimitive_undo): Replace B_ with BVAR.
* syntax.h (Vstandard_syntax_table, CURRENT_SYNTAX_TABLE)
(SETUP_BUFFER_SYNTAX_TABLE): Replace B_ with BVAR.
* syntax.c (update_syntax_table, dec_bytepos, Fsyntax_table)
(Fset_syntax_table, Fmodify_syntax_entry, skip_chars)
(skip_syntaxes, scan_lists): Replace B_ with BVAR.
* search.c (compile_pattern_1, compile_pattern, looking_at_1)
(string_match_1, fast_looking_at, newline_cache_on_off)
(search_command, search_buffer, simple_search, boyer_moore)
(Freplace_match): Replace B_ with BVAR.
* process.c (get_process, list_processes_1, Fstart_process)
(Fmake_serial_process, Fmake_network_process)
(read_process_output, send_process, exec_sentinel)
(status_notify, setup_process_coding_systems): Replace B_ with
BVAR.
* print.c (PRINTDECLARE, PRINTPREPARE, PRINTFINISH, printchar)
(strout, print_string, temp_output_buffer_setup, print_object):
Replace B_ with BVAR.
* msdos.c (IT_frame_up_to_date): Replace B_ with BVAR.
* minibuf.c (read_minibuf, get_minibuffer, Fread_buffer): Replace
B_ with BVAR.
* marker.c (Fmarker_buffer, Fset_marker, set_marker_restricted)
(set_marker_both, set_marker_restricted_both, unchain_marker):
Replace B_ with BVAR.
* lread.c (readchar, unreadchar, openp, readevalloop)
(Feval_buffer, Feval_region): Replace B_ with BVAR.
* lisp.h (DOWNCASE_TABLE, UPCASE_TABLE): Replace B_ with BVAR.
* keymap.c (Flocal_key_binding, Fuse_local_map)
(Fcurrent_local_map, push_key_description)
(Fdescribe_buffer_bindings): Replace B_ with BVAR.
* keyboard.c (command_loop_1, read_char_minibuf_menu_prompt)
(read_key_sequence): Replace B_ with BVAR.
* intervals.h (TEXT_PROP_MEANS_INVISIBLE): Replace B_ with BVAR.
* intervals.c (set_point_both, get_local_map): Replace B_ with
BVAR.
* insdel.c (check_markers, insert_char, insert_1_both)
(insert_from_string_1, insert_from_gap, insert_from_buffer_1)
(adjust_after_replace, replace_range, del_range_2)
(modify_region, prepare_to_modify_buffer)
(Fcombine_after_change_execute): Replace B_ with BVAR.
* indent.c (buffer_display_table, recompute_width_table)
(width_run_cache_on_off, current_column, scan_for_column)
(Findent_to, position_indentation, compute_motion, vmotion):
Replace B_ with BVAR.
* fringe.c (get_logical_cursor_bitmap)
(get_logical_fringe_bitmap, update_window_fringes): Replace B_
with BVAR.
* frame.c (make_frame_visible_1): Replace B_ with BVAR.
* font.c (font_at): Replace B_ with BVAR.
* fns.c (Fbase64_encode_region, Fbase64_decode_region, Fmd5):
Replace B_ with BVAR.
* filelock.c (unlock_all_files, Flock_buffer, Funlock_buffer)
(unlock_buffer): Replace B_ with BVAR.
* fileio.c (Fexpand_file_name, Ffile_directory_p)
(Ffile_regular_p, Ffile_selinux_context)
(Fset_file_selinux_context, Ffile_modes, Fset_file_modes)
(Fset_file_times, Ffile_newer_than_file_p, decide_coding_unwind)
(Finsert_file_contents, choose_write_coding_system)
(Fwrite_region, build_annotations, Fverify_visited_file_modtime)
(Fset_visited_file_modtime, auto_save_error, auto_save_1)
(Fdo_auto_save, Fset_buffer_auto_saved): Replace B_ with BVAR.
* editfns.c (region_limit, Fmark_marker, save_excursion_save)
(save_excursion_restore, Fprevious_char, Fchar_before)
(general_insert_function, Finsert_char, Finsert_byte)
(make_buffer_string_both, Finsert_buffer_substring)
(Fcompare_buffer_substrings, subst_char_in_region_unwind)
(subst_char_in_region_unwind_1, Fsubst_char_in_region)
(Ftranslate_region_internal, save_restriction_restore)
(Fchar_equal): Replace B_ with BVAR.
* dispnew.c (Fframe_or_buffer_changed_p): Replace B_ with BVAR.
* dispextern.h (WINDOW_WANTS_MODELINE_P)
(WINDOW_WANTS_HEADER_LINE_P): Replace B_ with BVAR.
* dired.c (directory_files_internal): Replace B_ with BVAR.
* data.c (swap_in_symval_forwarding, set_internal)
(Fmake_local_variable, Fkill_local_variable, Flocal_variable_p):
Replace B_ with BVAR.
* composite.c (fill_gstring_header)
(composition_compute_stop_pos, composition_adjust_point)
(Ffind_composition_internal): Replace B_ with BVAR.
* coding.c (decode_coding, encode_coding)
(make_conversion_work_buffer, decode_coding_gap)
(decode_coding_object, encode_coding_object)
(Fdetect_coding_region, Ffind_coding_systems_region_internal)
(Funencodable_char_position, Fcheck_coding_systems_region):
Replace B_ with BVAR.
* cmds.c (Fself_insert_command, internal_self_insert): Replace B_
with BVAR.
* charset.c (Ffind_charset_region): Replace B_ with BVAR.
* character.h (FETCH_CHAR_ADVANCE, INC_BOTH, DEC_BOTH)
(ASCII_CHAR_WIDTH): Replace B_ with BVAR.
* character.c (chars_in_text, Fget_byte): Replace B_ with BVAR.
* category.h (Vstandard_category_table): Replace B_ with BVAR.
* category.c (check_category_table, Fcategory_table)
(Fset_category_table, char_category_set): Replace B_ with BVAR.
* casetab.c (Fcurrent_case_table, set_case_table): Replace B_ with
BVAR.
* casefiddle.c (casify_object, casify_region): Replace B_ with
BVAR.
* callproc.c (Fcall_process, Fcall_process_region): Replace B_
with BVAR.
* callint.c (check_mark, Fcall_interactively): Replace B_ with
BVAR.
* bytecode.c (Fbyte_code): Replace B_ with BVAR.
* buffer.h (FETCH_CHAR, FETCH_CHAR_AS_MULTIBYTE, BVAR): Replace B_
with BVAR.
* buffer.c (Fbuffer_live_p, Fget_file_buffer)
(get_truename_buffer, Fget_buffer_create)
(clone_per_buffer_values, Fmake_indirect_buffer, reset_buffer)
(reset_buffer_local_variables, Fbuffer_name, Fbuffer_file_name)
(Fbuffer_local_value, buffer_lisp_local_variables)
(Fset_buffer_modified_p, Frestore_buffer_modified_p)
(Frename_buffer, Fother_buffer, Fbuffer_enable_undo)
(Fkill_buffer, Fset_buffer_major_mode, set_buffer_internal_1)
(set_buffer_temp, Fset_buffer, set_buffer_if_live)
(Fbarf_if_buffer_read_only, Fbury_buffer, Ferase_buffer)
(Fbuffer_swap_text, swapfield_, Fbuffer_swap_text)
(Fset_buffer_multibyte, swap_out_buffer_local_variables)
(record_overlay_string, overlay_strings, init_buffer_once)
(init_buffer, syms_of_buffer): Replace B_ with BVAR.

* net/soap-client.el:
* net/soap-inspect.el: New files.

More dired-x cleanup.

* lisp/dired-x.el (dired-mode-map, dired-extra-startup):
Remove dired-copy-filename-as-kill since it's already in dired.el.

Use emacsver.texi in dired-x.texi.

* doc/misc/dired-x.texi: Use emacsver.texi to get Emacs version.
* doc/misc/Makefile.in ($(infodir)/dired-x, dired-x.dvi, dired-x.pdf):
Depend on emacsver.texi.

Merge from emacs-23; up to 2010-05-28T19:18:47Z!juri@jurta.org.

More dired-x cleanup.

* lisp/dired-x.el (dired-bind-jump, dired-bind-man, dired-bind-info):
Doc fixes.  Add :set property, replacing top-level calls.
(dired-vm-read-only-folders, dired-vm): Doc fix (drop v. old VM 4).
(dired-guess-shell-gnutar): Test tar version rather than system-type.
(dired-extra-startup, dired-man, dired-info): Doc fixes.
(dired-clean-up-after-deletion): Use when and dolist.
(dired-jump): Use unless and when.
(dired-virtual): Use line-end-position.
(dired-default-directory-alist): Rename from default-directory-alist.
(dired-default-directory): Update for above name change.
(dired-vm): Drop VM < 5 and simplify.
(dired-buffer-more-recently-used-p): Rewrite.
(dired-filename-at-point): Use when and or.
(dired-x-read-filename-at-point): Rename from read-filename-at-point.
Update callers.

* doc/misc/dired-x.texi (Multiple Dired Directories): Update for rename of
default-directory-alist.
(Miscellaneous Commands): No longer mention very old VM version 4.

Import getloadavg module from gnulib.

* install-sh: Update to scriptversion 2011-01-19.21.

auth-source.el (auth-source-debug): Enable by default and don't mention the obsolete `auth-source-hide-passwords'.
 (auth-source-do-warn): New function to debug unconditionally.
 (auth-source-do-debug): Use it.
 (auth-source-backend-parse): Use it for invalid `auth-sources' entries and for Secrets API entries when the secrets.el library is not available.

Merge changes made in Gnus trunk.

auth.texi (Help for users): Login collection is "Login" and not "login".
gnus-sum.el (gnus-propagate-marks): Default to nil.
 (gnus-summary-exit): Kill the correct article buffer on exit from a `C-d' group.
gnus-start.el (gnus-use-backend-marks): Removed, since it duplicates gnus-propagate-marks.
gnus-sum.el (gnus-summary-exit-no-update): Restore the group conf before killing the buffers so that a non-full window conf gets handled correctly.
 (gnus-summary-exit): Ditto.
 (gnus-summary-read-group-1): Ditto.
nntp.el (nntp-retrieve-group-data-early): Reinstate the two-part async code again so that we can debug it properly.
message.el (message-reply): Take an optional switch-buffer parameter so that Gnus window confs are respected better.
auth-source.el (auth-source-secrets-search): Use `delete-dups', `append mapcar', and `butlast' instead of `remove-duplicates', `mapcan', and `subseq'.
 (auth-sources, auth-source-backend-parse, auth-source-secrets-search): Login collection is "Login" and not "login".
gnus-art.el (article-update-date-lapsed): Don't bug out when updating multiple headers.