Synch with Gnus trunk.
(gnus-mime-buttonized-part-id): New internal variable.
(gnus-article-edit-part): Bind it to make last part that is substituted
 or deleted visible.
(gnus-mime-display-single): Buttonize part of which id equals to
 gnus-mime-buttonized-part-id.

* src/m/ibms390x.h: Rather than duplicating ibms390.h, just include it.

Minor update for Acknowledgments in manual.

* doc/emacs/ack.texi (Acknowledgments):
* doc/emacs/emacs.texi (Acknowledgments): Update for notifications.el.

Fix ChangeLog attribution.

This is on the assumption that the change from

http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00196.html

is actually based on the change from

http://lists.gnu.org/archive/html/emacs-devel/2009-02/msg00606.html
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=2404

The fact that this wasn't pointed out at the time explains the recent
confusion with the latest emacs23 -> trunk merge.

* lisp/net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve
merge conflict, giving preference to the emacs-23 version of the code.

Remove duplicate ChangeLog entries.

Synch with Gnus trunk.
2010-06-10  Dan Christensen  <jdc@uwo.ca>
 * gnus-util.el (gnus-user-date): Use gnus-date-get-time.
 (gnus-dd-mmm): Use gnus-date-get-time.
 * gnus-sum.el (gnus-thread-latest-date): Use gnus-date-get-time and
 simplify logic.
 (gnus-summary-limit-to-age): Use gnus-date-get-time.
 (gnus-sort-threads): emit message if gnus-sort-threads-loop used.

Conflict resolution fixup

Merge from emacs-23

* src/s/usg5-4.h: Fix previous change.
Suggested by Lawrence Mitchell <wence@gmx.li>

* net/notifications.el (notifications-notify): Fix docstring.

Update to Unicode 6.0.0 beta.
* lisp/international/charprop.el: Update copyright.
* lisp/international/mule-cmds.el (ucs-names): Update character ranges.
* lisp/international/uni-bidi.el:
* lisp/international/uni-category.el:
* lisp/international/uni-combining.el:
* lisp/international/uni-comment.el:
* lisp/international/uni-decimal.el:
* lisp/international/uni-decomposition.el:
* lisp/international/uni-digit.el:
* lisp/international/uni-lowercase.el:
* lisp/international/uni-mirrored.el:
* lisp/international/uni-name.el:
* lisp/international/uni-numeric.el:
* lisp/international/uni-old-name.el:
* lisp/international/uni-titlecase.el:
* lisp/international/uni-uppercase.el: Regenerate.
* admin/unidata/UnicodeData.txt: Update from
  http://www.unicode.org/Public/6.0.0/ucd/UnicodeData-6.0.0d5.txt

* dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
Check `object's type before accessing its guts.

* emacs-lisp/smie.el (comment-string-strip): Declare function.
  (smie-precs-precedence-table): Fix typo in docstring.

* vc-mtn.el (log-edit-extract-headers): Declare function.

* vc-hg.el (log-edit-extract-headers): Remove duplicate declaration.

* net/notifications.el (dbus-register-signal): Declare function.
(notifications-notify): Fix typos and reflow docstring.

Improve VC create/retrieve tag/branch.
* lisp/vc.el (vc-create-tag): Do not read the directory name for VCs
with repository revision granularity.  Adjust the tag/branch
prompt.  Reset VC properties.
(vc-retrieve-tag): Do not read the directory name for VCs
with repository revision granularity.  Reset VC properties.

move notifications.el to net/

* NEWS: Add notifications.el.

* notifications.el: New file.

* admin/notes/bugtracker: Note on some emacs-bug-tracker minutiae.

Add optional support for resetting VC properties.
* lisp/vc-dispatcher.el (vc-resynch-window): Add new optional argument,
call vc-file-clearprops when true.
(vc-resynch-buffer): Add new optional argument, pass it down.
(vc-resynch-buffers-in-directory): Likewise.

Improve support for special markup in the VC commit message.
* lisp/vc-mtn.el (vc-mtn-checkin): Add support for Author: and Date: markup.
* lisp/vc-hg.el (vc-hg-checkin): Add support for Date:.
* lisp/vc-git.el (vc-git-checkin):
* lisp/vc-bzr.el (vc-bzr-checkin): Likewise.

* lisp/emacs-lisp/smie.el (smie-indent-keyword): Remove special case that
can be handled with a ((:before "fn") (:prev "=>" parent)) rule.

* lisp/emacs-lisp/advice.el (ad-compile-function):
Define warning-suppress-types before we let-bind it.

Fixes: debbugs:6275

* lisp/vc-dispatcher.el: Rename mode-line-hook to vc-mode-line-hook;
declare it, make it buffer-local, and permanent-local.
(vc-resynch-window): Adjust name.
* lisp/vc-hooks.el (vc-find-file-hook): Adjust name.

Fixes: debbugs:6324

* minibuf.c (Fall_completions): Add more checks.

* minibuf.c (Fall_completions): Add more checks.

* minibuf.c (Fall_completions): Check COLLECTION's size (bug#6378).

* auth-source.el (top): Autoload `secrets-list-collections',
`secrets-create-item', `secrets-delete-item'.
(auth-sources): Fix tag string.
(auth-get-source, auth-source-retrieve, auth-source-create)
(auth-source-delete): New defuns.
(auth-source-pick): Rewrite in order to avoid 2 passes.
(auth-source-forget-user-or-password): New parameter USERNAME.
(auth-source-user-or-password): New parameters CREATE-MISSING and
DELETE-EXISTING.  Retrieve password interactively, if needed.

* src/lread.c (X_OK): Remove, unused.

* src/dispnew.c: Remove obsolete comment.

Remove INCLUDED_FCNTL.
* xterm.c (INCLUDED_FCNTL):
* callproc.c (INCLUDED_FCNTL):
* alloc.c (INCLUDED_FCNTL):
* systty.h (INCLUDED_FCNTL): Remove all uses, not needed anymore.
(emacs_get_tty, emacs_set_tty): Declare unconditionally.

Include <strings.h> and <string.h> instead of
"strings.h" and "string.h".

Synch with Gnus trunk.
2010-06-07  Teodor Zlatanov  <tzz@lifelogs.com>
 * gnus.texi (Interactive): Explain effect of gnus-expert-user better.

2010-06-07  Teemu Likonen  <tlikonen@iki.fi>  (tiny change)
 * gnus-agent.el (gnus-agent-expire-unagentized-dirs): Don't ask about
 deleting unused directories when gnus-expert-user is t.

* lisp/net/rcirc.el: Add support for password authentication.
(rcirc-server-alist): Add :password keyword.
(rcirc): Ask for a password, or get it from the server's alist.
(rcirc-connect): Add password argument.  Pass it to server.

* lisp/iimage.el: Remove images as soon as the underlying text is modified.
(iimage-modification-hook): New function.
(iimage-mode-buffer): Use it.

* lisp/emacs-lisp/smie.el (smie-indent-offset-rule): Rename from
smie-indent-offset-after.  Add :prev case.  Make a bit more generic.
(smie-indent-virtual): Remove `virtual' arg.  Update callers.
(smie-indent-keyword): Add handling of open-paren keywords.
(smie-indent-comment-continue): Don't assume comment-continue.

* window.el (pop-to-buffer): Remove the conditional that
compares new-window and old-window, so it will reselect
the selected window unconditionally.
http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00078.html

* window.c (Fselect_window): Move `record_buffer' up to the
beginning of this function, so the buffer gets recorded
even if the selected window does not change.
http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00137.html

* cmds.c (Fforward_char, Fbackward_char): Fix typos in docstrings.
  (Fforward_line, Fbeginning_of_line): Reflow docstrings.

Make (after keyword) indent-rules more flexible.
* lisp/emacs-lisp/smie.el (smie-indent-offset-after)
(smie-indent-forward-token, smie-indent-backward-token): New functions.
(smie-indent-after-keyword): Use them.
(smie-indent-fixindent): Only applies to the indentation of the BOL.
(smie-indent-keyword): Tweak the black magic.
(smie-indent-comment-continue): Strip comment-continue before use.
(smie-indent-functions): Indent comments before keywords.

* lisp/isearch.el (isearch-lazy-highlight-search): Fix looping
by checking for empty match.  This syncs this loop with the
similar loop in `isearch-search'.  (Bug#6362)

Remove BSTRING related code, all platforms define it.
* src/s/usg5-4.h (BSTRING): Remove definition.
* src/s/template.h (BSTRING):
* src/s/msdos.h (BSTRING):
* src/s/ms-w32.h (BSTRING):
* src/s/hpux10-20.h (BSTRING):
* src/s/gnu-linux.h (BSTRING):
* src/s/darwin.h (BSTRING):
* src/s/cygwin.h (BSTRING):
* src/s/bsd-common.h (BSTRING):
* src/s/aix4-2.h (BSTRING): Likewise.
* src/sysdep.c: Remove code depending on BSTRING not being defined.

* configure.in: Remove code dealing with BSTRING.

* lib-src/ntlib.h: Remove code dealing with BSTRING.

* nt/config.nt: Remove code depending on BSTRING.

* net/dbus.el: Fix typos and declare function.

vc-log-incoming/vc-log-outgoing fixes for Git.
* lisp/vc-git.el (vc-git-log-view-mode): Fix font lock for
incoming/outgoing logs.
(vc-git-log-outgoing, vc-git-log-incoming): Use @{upstream}
instead of vc-git-compute-remote.
(vc-git-compute-remote): Remove.

Remove obsolete macro BASE_LEADING_CODE_P.

* character.h (BASE_LEADING_CODE_P): Remove.
* regex.c [!emacs] (BASE_LEADING_CODE_P): Remove.
* buffer.c (Fset_buffer_multibyte):
* indent.c (scan_for_column, compute_motion):
* insdel.c (count_combining_before, count_combining_after):
  Use LEADING_CODE_P instead of BASE_LEADING_CODE_P.

* lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Instead of setting `replace' to t and replacing the same string
with itself, don't do certain actions when
kill-do-not-save-duplicates is non-nil and string is equal to car
of kill-ring: don't call menu-bar-update-yank-menu, don't push
interprogram-paste strings to kill-ring, and don't push the input
argument `string' to kill-ring.
http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00072.html

* term/common-win.el (x-colors): Add "dark green" and "dark turquoise" (Bug#6332).

Turn `directory-sep-char' into a noop.

* lisp/subr.el (directory-sep-char): Move from fileio.c and make a defconst.

* src/emacs.c (decode_env_path): Don't check DIRECTORY_SEP,
  call dostounix_filename directly.

* src/fileio.c (CORRECT_DIR_SEPS): Remove.
  (Ffile_name_directory, directory_file_name, Fexpand_file_name)
  (Fsubstitute_in_file_name): Use dostounix_filename instead.
  (file_name_as_directory): Use dostounix_filename, DIRECTORY_SEP.
  (syms_of_fileio) <directory-sep-char>: Move to subr.el.

* src/lisp.h [WINDOWSNT] (Vdirectory_sep_char): Don't declare.
  (DIRECTORY_SEP): Define unconditionally.

* src/w32proc.c (CORRECT_DIR_SEPS): Remove.
  (Fw32_short_file_name, Fw32_long_file_name): Use dostounix_filename.

* src/s/ms-w32.h (DIRECTORY_SEP): Remove.

* net/tramp-gvfs.el (tramp-gvfs-handle-expand-file-name): Expand "~/".
(tramp-gvfs-handler-mounted-unmounted)
(tramp-gvfs-connection-mounted-p): Handle default-location.

* net/tramp-smb.el (tramp-smb-handle-delete-directory): Don't try to
move files to trash.

mule-cmds.el: Add obsolescence information for nonascii-* vars.

* international/mule-cmds.el (nonascii-insert-offset)
  (nonascii-translation-table): Add obsolescence information.

* international/mule.el (make-translation-table-from-vector): Doc fix.

vc-log-incoming/vc-log-outgoing improvements for Git.
* lisp/vc-git.el (vc-git-log-outgoing): Use the same format as the
short log.
(vc-git-log-incoming): Likewise.  Run "git fetch" before the log command.

Add bindings for vc-log-incoming and vc-log-outgoing.
* lisp/vc-hooks.el (vc-prefix-map): Add bindings for vc-log-incoming
and vc-log-outgoing.
* lisp/vc-dir.el (vc-dir-menu-map): Add menu bindings for vc-log-incoming
and vc-log-outgoing.

Add bug number

* process.c (conv_lisp_to_sockaddr): Fix conversion of IPv4
address.

* configure.in (AC_PREREQ): Require autoconf 2.65.

Move UNEXEC definition to autoconf.
* configure.in (unxec): Do not define and substitute.
(UNEXEC_OBJ): New output variable, replaces cpp UNEXEC.

* msdos/sed1v2.inp (UNEXEC_OBJ): Use UNEXEC_OBJ instead of unexec.

* src/s/usg5-4.h (UNEXEC): Remove, move to configure.in.
* src/s/sol2-10.h (UNEXEC):
* src/s/irix6-5.h (UNEXEC):
* src/s/hpux10-20.h (UNEXEC):
* src/s/gnu-linux.h (UNEXEC):
* src/s/darwin.h (UNEXEC):
* src/s/cygwin.h (UNEXEC):
* src/s/bsd-common.h (UNEXEC):
* src/s/aix4-2.h (UNEXEC):
* src/m/alpha.h (UNEXEC): Likewise.
* src/Makefile.in (UNEXEC_OBJ): Define using @UNEXEC_OBJ@.

Remove obsolete pre-unicode2 macros.

* character.h (MULTIBYTE_FORM_LENGTH, PARSE_MULTIBYTE_SEQ): Remove.
* composite.c (composition_reseat_it):
* data.c (Faset):
* fns.c (Ffillarray):
* regex.c (re_search_2): Use BYTES_BY_CHAR_HEAD.
  [!emacs] (BYTES_BY_CHAR_HEAD): Define instead of MULTIBYTE_FORM_LENGTH.

* src/buffer.c (Fother_buffer): Add CHECK_FRAME.
(Fswitch_to_buffer): Remove unused variable `err'.

* net/rcirc.el (rcirc-sort-nicknames): Remove.
(rcirc-handler-366): Always sort nicknames.

Fix to semantic-lex-spp-table-write-slot-value (Bug#6324).

* cedet/semantic/lex-spp.el
(semantic-lex-spp-table-write-slot-value): Instead of erroring on
invalid values during save, just save a nil (Bug#6324).

* emacs-lisp/smie.el (comment-continue): Declare for byte-compiler.

* net/rcirc.el (rcirc-nickname<, rcirc-sort-nicknames-join): Doc fix.

* net/rcirc.el (rcirc-sort-nicknames): Change default.
(rcirc-sort-nicknames-join): Avoid setq.

Fix typos.

* lisp/net/rcirc.el (rcirc-sort-nicknames): New custom.
(rcirc-nickname<, rcirc-sort-nicknames-join): New funs.
(rcirc-handler-366): Use them.

Close bug#6336.
* lisp/desktop.el (desktop-clear-preserve-buffers): Add "*Warnings*" buffer.

* src/s/sol2-10.h: Comment fix.

* src/m/ibms390.h: Comment fix.

Remove NO_SOCK_SIGIO references.

* src/m/template.h (NO_SOCK_SIGIO): Remove, no longer used.

* nextstep/DEV-NOTES: Remove out-of-date information.

Regenerate src/config.in.

* admin/notes/font-backend: Remove obsolete information.

m/hp800.h simplification.

* src/m/hp800.h (alloca) [__NetBSD__ && __GNUC__]: No need to define it,
now that AH_BOTTOM does it.

HAVE_ALLOCA not needed since alloca.s was removed.

* src/m/hp800.h (HAVE_ALLOCA):
* src/m/ibms390x.h (HAVE_ALLOCA): Do not define, no longer needed.

* msdos/sed2v2.inp: Do not edit HAVE_ALLOCA.

* admin/CPP-DEFINES: Remove HAVE_ALLOCA.

NOT_C_CODE is always true now.

* configure.in (AH_BOTTOM): Remove NOT_C_CODE test, it is always true.

* m/ia64.h, s/gnu-linux.h, s/gnu.h, s/netbsd.h, s/usg5-4.h:
Remove NOT_C_CODE tests, it is always true now.

* nt/config.nt: Remove NOT_C_CODE tests, it is always true now.

* admin/CPP-DEFINES: Remove NOT_C_CODE.

Split smie-indent-calculate into more manageable chunks.
* lisp/emacs-lisp/smie.el (smie-indent-virtual, smie-indent-fixindent)
(smie-indent-comment, smie-indent-after-keyword, smie-indent-keyword)
(smie-indent-close, smie-indent-comment-continue, smie-indent-bob)
(smie-indent-exps): Extract from smie-indent-calculate.
(smie-indent-functions): New var.
(smie-indent-functions): Use them.

* lisp/emacs-lisp/smie.el (smie-indent-calculate): Simplify and cleanup.
(smie-indent-hanging-p): Use smie-bolp.
* test/indent: New dir.

Better doc fix for Bug#6283.

searching.texi (Regexp Special): Remove obsolete information
about matching non-ASCII characters, and suggest using char
classes (Bug#6283).

searching.texi (Regexp Special): Replace "octal 377" with "#o377" (Bug#6283).

* net/tramp-gvfs.el (top): Require url-util.
(tramp-gvfs-mount-point): Removed.
(tramp-gvfs-stringify-dbus-message, tramp-gvfs-send-command): New
defuns.
(with-tramp-dbus-call-method): Format trace message.
(tramp-gvfs-handle-copy-file, tramp-gvfs-handle-rename-file):
Implement backup call, when operation on local files fails.  Use
progress reporter.  Flush properties of changed files.
(tramp-gvfs-handle-make-directory): Make more traces.
(tramp-gvfs-url-file-name): Hexify file name in url.
(tramp-gvfs-fuse-file-name): Take also prefix (like dav shares)
into account for the resulting file name.
(tramp-gvfs-handler-askquestion): Return dummy mountpoint, when
the answer is "no".  See `tramp-gvfs-maybe-open-connection'.
(tramp-gvfs-handler-mounted-unmounted)
(tramp-gvfs-connection-mounted-p): Test also for new mountspec
attribute "default_location".  Set "prefix" property.
(tramp-gvfs-mount-spec): Return both prefix and mountspec.
(tramp-gvfs-maybe-open-connection): Test, whether mountpoint
exists.  Raise an error, if not (due to a corresponding answer
"no" in interactive questions, for example).

* lisp/vc-dir.el (vc-dir-update): Remove entries with a nil state (bug#5539).
Backport from trunk.

* lisp/log-edit.el (log-edit-font-lock-keywords): Make group 4 match lax.

Fix config.h includes.
* src/xsettings.c:
* src/xgselect.c:
* src/nsterm.m:
* src/nsselect.m:
* src/nsimage.m:
* src/nsfont.m:
* src/nsfns.m:
* src/dbusbind.c: Use #include <config.h> instead of "config.h" as all
other files do.

* src/gmalloc.c: Remove BROKEN_PROTOTYPES reference, unused.

* src/s/sol2-6.h: Remove obsolete comments.

Remove unnecessary alloca.h includes.
* src/keymap.c: Do not include alloca.h, config.h does that.
* src/sysdep.c: Likewise.  Do not define fwrite, not used.

Fix alloca definition when using gcc on non-gnu systems.
* configure.in: Use the code sequence indicated by "info autoconf"
for alloca (bug#6170).

Synch with Gnus trunk.
(gnus-article-browse-delete-temp-files): Don't make query
 for each temp file when gnus-article-browse-delete-temp is ask.

Fix bug#6265: * eldoc.el: Add completions for new commands left-* and right-*.

Add support for vc-log-incoming, improve vc-log-outgoing for Git.
* lisp/vc-git.el (vc-git-compute-remote): New function.
(vc-git-log-outgoing): Use it instead of hard coding a value.
(vc-git-log-incoming): New function.

Improve state updating for VC tag commands.
* lisp/vc.el (vc-create-tag, vc-retrieve-tag): Call vc-resynch-buffer
to update the state of all buffers in the directory.

lisp/ChangeLog: Fix some typos.

* vc-dir.el (vc-dir-update): Remove entries with a nil state (bug#5539).

Merge from emacs-23

* lisp/vc-bzr.el (vc-bzr-revision-completion-table): Apply
`file-directory-p' to the filename part rather than to the whole text.

* sysdep.c (child_setup_tty): Move the non-canonical initialization to
the HAVE_TERMIO where it belongs.

Fixes: debbugs:6149

Fix up changelog entry

* lisp/cedet/ede/cpp-root.el (ede-set-project-variables): Fix feature name.

Fixes: debbugs:6231

* src/keymap.c (Fwhere_is_internal): Fix handling of remapping (in thread
of bug#6305).