Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-160
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-161
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-162
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-163
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-164
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-165
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-166
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-167
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-168
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-169
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-170
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-171
   Update from CVS: man/mh-e.texi (Folders): Various edits.

 * emacs@sv.gnu.org/emacs--devo--0--patch-172
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-58
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-59
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-60
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-61
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-62
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-63
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-64
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-534

45 files changed, 1369 insertions, 710 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f58a240c3ec..acfc4975c54 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,239 @@
+2006-03-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cus-edit.el (custom-face-set): Call custom-push-theme before
+        face-spec set so that `changed' theme is correctly saved.
+        (custom-face-reset-standard): Reset to recalculated face rather
+        than defface spec.
+
+        * custom.el (custom-push-theme): Only save `changed' theme if the
+        current face does not match the defface specs.
+
+2006-03-21  Simon Josefsson  <jas@extundo.com>
+
+        * pgg-gpg.el: Ideas below based on patch from Sascha Wilde
+        <wilde@sha-bang.de>.
+        (pgg-gpg-use-agent): New variable.
+        (pgg-gpg-process-region): Use it.
+        (pgg-gpg-encrypt-region): Likewise.
+        (pgg-gpg-encrypt-symmetric-region): Likewise.
+        (pgg-gpg-decrypt-region): Likewise.
+        (pgg-gpg-sign-region): Likewise.
+        (pgg-gpg-possibly-cache-passphrase): Don't cache a nil password.
+
+2006-03-21  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el: (org-open-at-point): Fixed bug in wiki-style
+        bracket links.
+
+2006-03-21  Kim F. Storm  <storm@cua.dk>
+
+        * progmodes/gdb-ui.el (gdb-reset): Set buffer local value of
+        fringe-indicator-alist instead of modifying global value.
+        (gdb-frame-handler): Likewise.
+
+2006-03-21  Nick Roberts  <nickrob@snap.net.nz>
+
+        * diff-mode.el (diff-function): Make it inherit from diff-header
+        instead of diff-context.
+
+        * progmodes/gdb-ui.el (hollow-right-triangle): Define as fringe
+        bitmap.
+        (gdb-info-stack-custom): Rename from gdb-info-frames-custom and
+        change names in macro above for consistency.
+        (gdb-frame-handler): Use hollow-right-triangle for all selected
+        frames which except the innermost (where execution has stopped).
+        (gdb-reset): Reset buffer-local values of overlay-arrow.
+
+2006-03-20  Richard Stallman  <rms@gnu.org>
+
+        * simple.el (set-mark-command): Doc fix.
+
+        * files.el (display-buffer-other-frame): New command.
+        (ctl-x-4-map): Bind C-x 5 C-o to it.
+
+2006-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * jit-lock.el (jit-lock-function): Check for the actual defer-timer
+        rather than just defer-time, in case defer-time has been changed but
+        the timer isn't running yet.
+        (jit-lock-deferred-fontify): Correspondingly let-bind defer-timer.
+
+2006-03-19  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * help-mode.el (help-follow-symbol): New function.
+        Essentially identical to the old `help-follow', but do not let
+        `push-button' do the work when on an xref.
+        (help-mode-map): Bind `help-follow-symbol' to "C-c C-c".
+
+2006-03-19  Richard Stallman  <rms@gnu.org>
+
+        * help-mode.el (help-xref-symbol-regexp): Make no xref for symbol
+        preceded by the word `program'.
+        (help-follow-mouse, help-follow): Throw error if not on xref.
+        Delete no longer used args.
+
+2006-03-20  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-stopped): Even when there is no source
+        annotation ensure gud-overlay-arrow-position is redisplayed.
+
+2006-03-19  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
+
+        * textmodes/bibtex.el (bibtex-include-OPTkey)
+        (bibtex-entry-field-alist, bibtex-generate-url-list): Mark as risky.
+        (bibtex-autokey-name-case-convert)
+        (bibtex-autokey-titleword-case-convert): Make these the aliases
+        for the following two variables.
+        (bibtex-autokey-name-case-convert-function)
+        (bibtex-autokey-titleword-case-convert-function): Make these the
+        real names.
+        (bibtex-font-lock-keywords): Make bibtex-font-lock-url and
+        bibtex-font-lock-crossref sublists.
+        (bibtex-mode): Revert 2005-12-30 change (which made
+        completion-ignore-case buffer-local).
+        (bibtex-url): Simplify.
+
+2006-03-19  Kim F. Storm  <storm@cua.dk>
+
+        * emulation/cua-rect.el (cua--highlight-rectangle): Set overlay
+        cursor property value to 2 (to align with C level change).
+
+2006-03-19  Bill Wohler  <wohler@newt.com>
+
+        * image.el (image-load-path-for-library): Shorten first line in
+        docstring.
+
+2006-03-18  Richard Stallman  <rms@gnu.org>
+
+        * mail/rmail.el (rmail-reply-regexp): Undo previous change.
+
+2006-03-18  Ben North  <ben@redfrontdoor.org>  (tiny change)
+
+        * isearch.el (isearch-other-meta-char): Handle user bindings for
+        shifted control characters.
+
+2006-03-18  Agustin Martin  <agustin.martin@hispalinux.es>
+
+        * textmodes/ispell.el (ispell-skip-region-alist): Add "_+" to the
+        part that matches email addresses, file names, etc.
+
+2006-03-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * term/w32-win.el (mouse-set-font):
+        Mention w32-list-proportional-fonts in the doc string.
+
+2006-03-18  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-cache-ftp-work-directory-time): Doc fix.
+        (ido-unc-hosts): New user option to explicitly define list of know
+        UNC-style hosts for completion.
+        (ido-cache-unc-host-shares-time): New user option.
+        (ido-is-unc-root, ido-is-unc-host, ido-cache-unc-valid):
+        New helper functions for UNC file-name support.
+        (ido-may-cache-directory): Check for UNC host.  Simplify.
+        (ido-wash-history): Clean out old UNC hosts.
+        (ido-nonreadable-directory-p): UNC hosts are always readable.
+        (ido-directory-too-big-p): UNC hosts are never too big.
+        (ido-set-current-directory): Handle UNC root path.
+        (ido-file-name-all-completions): Complete UNC host names from
+        ido-unc-hosts list.  Cache UNC host shares.
+        (ido-make-file-list-1): Don't filter UNC root.
+        (ido-exhibit): Check for // in root directory, and switch to UNC
+        mode by setting ido-current-directory to //.
+
+2006-03-17  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * cus-edit.el (customize-changed-options): Mention explicit
+        version number as default in prompt.
+
+2006-03-17  Bill Wohler  <wohler@newt.com>
+
+        * image.el (image-load-path-for-library): Minor docstring fix.
+
+2006-03-17  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-read-date): Include subgroup 5 into
+        replacement text.
+        (org-popup-calendar-for-date-prompt): Fix customization type.
+
+2006-03-17  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gud-watch): Provide completion.
+        (gdb-continuation): New variable.
+        (gdb-send): Deal with continuation lines.
+
+        * progmodes/gud.el (gud-gdb-complete-command)
+        (gud-gdb-run-command-fetch-lines): Adapt for use with watch
+        expressions.
+        (gud-tooltip-mode): Use buffer-local value.
+
+2006-03-16  Kim F. Storm  <storm@cua.dk>
+
+        * ido.el (ido-edit-input): Use selected match, if any.
+
+2006-03-16  Bill Wohler  <wohler@newt.com>
+
+        * image.el (image-load-path-for-library): Prefer user's images in
+        image-load-path.
+
+2006-03-16  Martin Rudalics  <rudalics@gmx.at>
+
+        * mouse.el (mouse-drag-vertical-line): Use window-inside-edges
+        when checking for attempt to drag leftmost or rightmost scrollbar.
+
+2006-03-16  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-inferior-status): New variable.
+        (gdb-force-mode-line-update): New function.
+        (gdb-resync, gdb-starting, gdb-signal, gdb-exited, gdb-stopped)
+        (gdb-exited): Use them.
+        (gdb-signal): New fuction.
+        (gdb-annotation-rules): Provide a rule for it.
+
+2006-03-16  Kenichi Handa  <handa@m17n.org>
+
+        * international/mule.el (auto-coding-regexp-alist): Add entries
+        for Unicode BOM.
+
+        * sort.el (sort-build-lists): Temporarily bind
+        inhibit-field-text-motion to t.
+
+2006-03-15  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * locate.el (locate-command, locate-make-command-line)
+        (locate-fcodes-file, locate-update-command)
+        (locate-prompt-for-command, locate, locate-with-filter)
+        (locate-get-file-positions): Doc fixes.
+        (locate-buffer-name, locate-header-face): Remove leading `*' in
+        defcustom.
+        (locate-filter-output): Use `keep-lines' instead of its alias
+        `delete-non-matching-lines'.
+        (locate-get-filename, locate-get-dirname): Add introductory comment.
+        (locate-find-directory-other-window): Give appropriate error
+        message if used outside main listing.
+
+2006-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * font-lock.el (font-lock-lines-before): Delete variable, subsumed by
+        the new extend-region feature.
+        (font-lock-after-change-function): Update correspondingly.
+        * jit-lock.el (jit-lock-after-change): Update correspondingly.
+        * progmodes/grep.el (font-lock-lines-before): Don't disable.
+
+2006-03-15  Bill Wohler  <wohler@newt.com>
+
+        * image.el (image-load-path-for-library): Fix example by not
+        recommending that one binds image-load-path. Just defvar it to
+        placate compiler and only use it if previously defined.
+
+2006-03-15  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-insert-centered): Use `string-width' to
+        make underlining work for wide characters.
+        (org-goto-map, org-agenda-mode-map, org-mode-map): Explicitly bind
+        TAB to `org-cycle', to make sure that no binding in
+        `outline-mode-map' can supercede it.
+
 2006-03-14  Ken Manheimer  <ken.manheimer@gmail.com>
 
         * allout.el: Increment version to 2.2.1 in file commentary.
@@ -28,8 +264,8 @@
 
         * progmodes/gdb-ui.el (gdb-var-list): Change order of first two
         elements.
-        (gdb-find-watch-expression): Make it work for arrays too.  Follow
-        change to gdb-var-list.
+        (gdb-find-watch-expression): Make it work for arrays too.
+        Follow change to gdb-var-list.
         (gud-watch): Allow the user to enter variable name with a prexix
         arg.  Create keybindings.
         (gdb-var-create-handler, gdb-var-evaluate-expression-handler)
@@ -37,8 +273,7 @@
         (gdb-var-delete, gdb-edit-value, gdb-speedbar-expand-node)
         (gdb-var-list-children-handler-1, gdb-var-update-handler-1):
         Follow change to gdb-var-list.
-        (gdb-starting): Don't show the overlay arrows when program is
-        running.
+        (gdb-starting): Don't show the overlay arrows when program is running.
 
         * progmodes/gud.el (gud-speedbar-buttons): Follow change to
         gdb-var-list.
@@ -46,27 +281,32 @@
 2006-03-14  Bill Wohler  <wohler@newt.com>
 
         * image.el (image-load-path-for-library): Pass value of path
-        rather than symbol. Always return list of directories. Guarantee
-        that image directory comes first.
+        rather than symbol.  Always return list of directories.
+        Guarantee that image directory comes first.
 
 2006-03-14  Alan Mackenzie  <acm@muc.de>
 
-        * font-core.el: New function/variable
-        font-lock-extend-region\(-function\)?.
+        * font-core.el (font-lock-extend-region\(-function\)?.):
+        New function/variable.
 
-        * font-lock.el (font-lock-after-change-function): Call
-        font-lock-extend-region.  Obey font-lock-lines-before.
+        * font-lock.el (font-lock-after-change-function):
+        Call font-lock-extend-region.  Obey font-lock-lines-before.
         (font-lock-default-fontify-region): Remove reference to
         font-lock-lines-before.
 
-        * jit-lock.el (jit-lock-after-change): Call
-        font-lock-extend-region.  Obey font-lock-lines-before.
+        * jit-lock.el (jit-lock-after-change):
+        Call font-lock-extend-region.  Obey font-lock-lines-before.
 
 2006-03-14  David Ponce  <david@dponce.com>
 
         * tree-widget.el (tree-widget-themes-load-path)
         (tree-widget-themes-directory, tree-widget-theme): Doc fix.
 
+2006-03-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcvs-util.el (cvs-insert-strings): Fix bug with strings longer than
+        wwidth.
+
 2006-03-13  Ryan Yeske  <rcyeske@gmail.com>
 
         * net/rcirc.el (rcirc) <defgroup>: Add link to manual.
@@ -87,18 +327,18 @@
         themes sub-directory found in tree-widget-themes-load-path.
         (tree-widget-themes-directory, tree-widget-theme): Doc fix.
         (tree-widget--locate-sub-directory): Return all occurrences.
-        (tree-widget-themes-path): New function.  Replace
-        tree-widget-themes-directory, and return a list of directories.
+        (tree-widget-themes-path): New function.
+        Replace tree-widget-themes-directory, and return a list of directories.
         (tree-widget-set-parent-theme)
         (tree-widget-lookup-image): Use it.
 
 2006-03-13  Carsten Dominik  <dominik@science.uva.nl>
 
-        * textmodes/org.el: (org-link-search): Avoid self-matching of
+        * textmodes/org.el (org-link-search): Avoid self-matching of
         links, allow target text to be distributed over several lines.
         (org-search-not-link): New function.
-        (org-set-regexps-and-options, org-get-current-options): New
-        startup options.
+        (org-set-regexps-and-options, org-get-current-options):
+        New startup options.
         (org-export-as-html): Take odd-level setting from local variable.
         (org-fontify-emphasized-text): New option.
         (org-set-font-lock-defaults): Include emphasized text.
@@ -169,8 +409,8 @@
 
 2006-03-11  Kurt Hornik  <Kurt.Hornik@wu-wien.ac.at>
 
-        * progmodes/octave-mod.el (octave-indent-for-comment): Behave
-        according to do string.
+        * progmodes/octave-mod.el (octave-indent-for-comment):
+        Behave according to do string.
 
 2006-03-11  Agustin Martin  <agustin.martin@hispalinux.es>
 
@@ -208,7 +448,7 @@
         * progmodes/gdb-ui.el (gdb-remove-text-properties): Rename from
         gdb-remove-mouse-face and remove help-echo too.
         (gdb-enqueue-input): Correct conditional clause.
-        
+
 2006-03-10  Glenn Morris  <rgm@gnu.org>
 
         * calendar/calendar.el (calendar-holidays): Doc fix.
@@ -233,8 +473,8 @@
 
 2006-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
-        * files.el (hack-local-variables-confirm): Set
-        coding-system-for-read to nil before writing to .emacs.
+        * files.el (hack-local-variables-confirm):
+        Set coding-system-for-read to nil before writing to .emacs.
 
         * arc-mode.el (archive-extract): Check if an existing buffer name
         comes from a different archive.
@@ -256,8 +496,8 @@
 
 2006-03-07  Carsten Dominik  <dominik@science.uva.nl>
 
-        * textmodes/org.el: Move defvars out of eval-when-compile.  Use
-        buffer-file-name variable.
+        * textmodes/org.el: Move defvars out of eval-when-compile.
+        Use buffer-file-name variable.
         (org-agenda-file-to-end, org-agenda-file-to-front): Remove unused
         arg `file'.
         (org-level-faces): Remove startup dependency.
@@ -272,8 +512,7 @@
         (org-tag): New face.
         (org-get-level-face): New function.
         (org-set-font-lock-defaults): Simplify setup for headlines.
-        (org-complete): Pass common substring to
-        `display-completion-list'.
+        (org-complete): Pass common substring to `display-completion-list'.
 
 2006-03-06  David Ponce  <david@dponce.com>
 
@@ -445,9 +684,8 @@
 
         * t-mouse.el: New file.
         (t-mouse-tty): Use with-temp-buffer.  Add more terminal types.
-        (t-mouse-lispy-buffer-posn-from-coords): Remove.  Use the C
-        primitive...
-        (t-mouse-make-event-element): ...posn-at-x-y instead.
+        (t-mouse-lispy-buffer-posn-from-coords): Remove.
+        (t-mouse-make-event-element): Use posn-at-x-y instead.
         (t-mouse-make-event): Deal with Fedora Core 3.
         (t-mouse-make-event): Don't sink the `stupid text mode menubar'.
         (t-mouse-mouse-position-function): New function.  Use it instead
@@ -480,8 +718,7 @@
         * textmodes/reftex-index.el (reftex-index-map): Add `follow-mouse'
         binding.
 
-        * textmodes/reftex-toc.el (reftex-toc-map): Add `follow-mouse'
-        binding.
+        * textmodes/reftex-toc.el (reftex-toc-map): Add `follow-mouse' binding.
 
         * textmodes/reftex-sel.el (reftex-select-label-map)
         (reftex-select-bib-map): Add `follow-mouse' binding.
@@ -4059,20 +4296,20 @@
         CC Mode update to 5.31.
 
         * progmodes/cc-subword.el: Add a dummy `c-subword-mode' for
-        Emacsen which lack `define-minor-mode'.  (Currently Emacs <21.  We
-        might do this function properly in the future).
+        Emacsen which lack `define-minor-mode'.  (Currently Emacs <21.
+        We might do this function properly in the future).
 
-        * progmodes/cc-cmds.el, cc-defs.el, cc-styles.el, cc-vars.el: New
-        macros c-sentence-end and c-default-value-sentence end, to cope
+        * progmodes/cc-cmds.el, cc-defs.el, cc-styles.el, cc-vars.el:
+        New macros c-sentence-end and c-default-value-sentence end, to cope
         with Emacs 22's new function `sentence-end'.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-cmds.el (c-show-syntactic-information): Solved the
+        * progmodes/cc-cmds.el (c-show-syntactic-information): Solve the
         compat issue using `c-put-overlay' and `c-delete-overlay'.
 
-        * progmodes/cc-defs.el (c-put-overlay, c-delete-overlay): New
-        compat macros to handle overlays/extents.
+        * progmodes/cc-defs.el (c-put-overlay, c-delete-overlay):
+        New compat macros to handle overlays/extents.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
@@ -4093,20 +4330,19 @@
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-fonts.el (c-make-syntactic-matcher): New internal
-        helper.
+        * progmodes/cc-fonts.el (c-make-syntactic-matcher):
+        New internal helper.
 
         (c-cpp-matchers, c-basic-matchers-before): Use the `eval'
         construct to make the indirect face lookup work in XEmacs.
 
         (c-cpp-matchers): Append the negation char face to the existing
-        fontification, so that the cpp face doesn't disappear.  Use
-        `c-make-syntactic-matcher' to avoid negation chars in comments and
-        strings.
+        fontification, so that the cpp face doesn't disappear.
+        Use `c-make-syntactic-matcher' to avoid negation chars in comments
+        and strings.
 
         * progmodes/cc-fonts.el (c-negation-char-face-name): New variable
-        to map to `font-lock-negation-char-face' in emacsen where it
-        exists.
+        to map to `font-lock-negation-char-face' in emacsen where it exists.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
@@ -4129,18 +4365,17 @@
         (i) Insert a binding for C-c C-backspace into
         c-bind-special-erase-keys which works in TTYs.
         (ii) Make sure that when file styles are used, any explicitly
-        given style variables take priority over those in the style.  Do
-        this by calling `hack-local-variables' a second time.
+        given style variables take priority over those in the style.
+        Do this by calling `hack-local-variables' a second time.
 
         * progmodes/cc-vars.el: Add language specific customization
         widgets for AWK to c-doc-comment-style, c-require-final-newline
-        and c-default-style.  Add a defcustom for awk-mode-hook.  Give
-        c-syntactic-element and c-syntactic-context doc-strings by
-        directly setting their `variable-documentation' propery.  This
-        allows Emacs 22.1 to read these with C-h v.
+        and c-default-style.  Add a defcustom for awk-mode-hook.
+        Give c-syntactic-element and c-syntactic-context doc-strings by
+        directly setting their `variable-documentation' propery.
+        This allows Emacs 22.1 to read these with C-h v.
 
-        * progmodes/cc-awk.el: Apply a tidy-up patch (from Stefan
-        Monnier).
+        * progmodes/cc-awk.el: Apply a tidy-up patch (from Stefan Monnier).
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
@@ -4166,8 +4401,8 @@
         * progmodes/cc-mode.el: Give c-hungry-backspace and
         c-hungry-delete-forward permanent key bindings.
 
-        * progmodes/cc-cmds.el (c-electric-semi&comma): Bind
-        c-syntactic-context for calls to "criteria functions", for
+        * progmodes/cc-cmds.el (c-electric-semi&comma):
+        Bind c-syntactic-context for calls to "criteria functions", for
         consistency with other calls to user functions.
 
         * progmodes/cc-cmds.el (c-indent-command): Expunge use of
@@ -4181,7 +4416,7 @@
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-engine.el (c-on-identifier): Fixed bug when at the
+        * progmodes/cc-engine.el (c-on-identifier): Fix bug when at the
         first char of an identifier.
 
         * progmodes/cc-engine.el (c-on-identifier): Handle the "operator
@@ -4206,14 +4441,14 @@
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-fonts.el (c-cpp-matchers, c-basic-matchers-before):
-        Incorporated the patterns added in the Emacs development branch
+        Incorporate the patterns added in the Emacs development branch
         for the new Emacs 22 face `font-lock-negation-char-face'.
 
         * progmodes/cc-fonts.el (c-invalid-face-name): Use "red1" instead
         of "red" since it stands out better in xterms and DOS terminals.
 
-        * progmodes/cc-engine.el (c-literal-faces): Added
-        `font-lock-comment-delimiter-face' which is new in Emacs 22.
+        * progmodes/cc-engine.el (c-literal-faces):
+        Add `font-lock-comment-delimiter-face' which is new in Emacs 22.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
@@ -4221,14 +4456,13 @@
         forcibly enable c-electric-flag.
 
         * progmodes/cc-vars.el, cc-cmds.el: New clean-up
-        `comment-close-slash' on c-electric-slash: if enabled, typing `/'
-        just after the comment-prefix of a C-style comment will close that
-        comment.
+        `comment-close-slash' on c-electric-slash: if enabled, typing `/' just
+        after the comment-prefix of a C-style comment will close that comment.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-fonts.el (c-basic-matchers-before)
-        (c-complex-decl-matchers): Fixed the "not-arrow-prefix" regexp used
+        (c-complex-decl-matchers): Fix the "not-arrow-prefix" regexp used
         in Pike.
 
         * progmodes/cc-langs.el (c-other-op-syntax-tokens): Only C++ has
@@ -4237,10 +4471,10 @@
         * progmodes/cc-fonts.el, cc-langs.el, cc-engine.el
         (c-cpp-message-directives, c-cpp-include-directives)
         (c-opt-cpp-macro-define, c-opt-cpp-macro-define-start)
-        (c-cpp-expr-directives): Introduced new language constants to
+        (c-cpp-expr-directives): Introduce new language constants to
         control cpp syntax in a cleaner way.
 
-        (c-cpp-expr-functions): Renamed from c-cpp-defined-fns.
+        (c-cpp-expr-functions): Rename from c-cpp-defined-fns.
 
         (c-cpp-matchers, c-forward-to-cpp-define-body): Use them.
 
@@ -4272,22 +4506,21 @@
         (c-guess-basic-syntax): Handle C++ operator identifiers in
         declarations.
 
-        * progmodes/cc-langs.el (c-assignment-operators): Added the
+        * progmodes/cc-langs.el (c-assignment-operators): Add the
         trigraph version of ^= too.
 
-        * progmodes/cc-langs.el (c-assignment-operators): Added the
+        * progmodes/cc-langs.el (c-assignment-operators): Add the
         trigraph version of |= in C++.
 
-        * progmodes/cc-fonts.el (c-font-lock-declarators): Handle
-        `c-decl-hangon-kwds' after the identifier name.
+        * progmodes/cc-fonts.el (c-font-lock-declarators):
+        Handle `c-decl-hangon-kwds' after the identifier name.
 
         * progmodes/cc-engine.el (c-guess-basic-syntax): When deciding
         whether an arglist is "nonempty", ignore a comment after the open
-        paren if it isn't followed by a non-comment token on the same
-        line.
+        paren if it isn't followed by a non-comment token on the same line.
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Case 4: Enable
-        heuristics below the point to cope with classes inside special
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Case 4:
+        Enable heuristics below the point to cope with classes inside special
         brace lists in Pike.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
@@ -4326,12 +4559,11 @@
         * progmodes/cc-cmds.el: Add `c-bytecomp-defun's for
         c-\(forward\|backward\)-subword.
         (c-update-modeline): Add the new modeline flag `l' for
-        `c-electric-flag'.  Make the auto-newline flag `a' dependent on
-        `l'.
-        (c-toggle-auto-state): Rename it to `c-toggle-auto-newline'.  Make
-        the old name an alias of the new name.
+        `c-electric-flag'.  Make the auto-newline flag `a' dependent on `l'.
+        (c-toggle-auto-state): Rename it to `c-toggle-auto-newline'.
+        Make the old name an alias of the new name.
         (c-toggle-electric-state): New function.
-        c-electric-\(pound\|brace\|slash\|star\|semi&comma\|colon\|lt-gt\|paren\|continued-statement\):
+        (c-electric-\(pound\|brace\|slash\|star\|semi&comma\|colon\|lt-gt\|paren\|continued-statement\)):
         Adapt these functions to do electric things only when
         c-electric-flag is non-nil.
         (c-point-syntax, c-brace-newlines, c-try-oneliner): Extract these
@@ -4347,18 +4579,17 @@
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-cmds.el (c-show-syntactic-information): Show the
-        anchor position(s) using faces.  Thanks to Masatake YAMATO for the
-        idea.
+        anchor position(s) using faces.  Thanks to Masatake YAMATO for the idea.
 
         * progmodes/cc-mode.el, cc-cmds.el, cc-defs.el, cc-engine.el
-        (c-submode-indicators): Changed name from `c-auto-hungry-string'
+        (c-submode-indicators): Change name from `c-auto-hungry-string'
         since it's now used to track another submode.
 
-        (c-update-modeline): Converted to function and extended to check
+        (c-update-modeline): Convert to function and extended to check
         `c-subword-move-mode'.
 
         (c-forward-into-nomenclature, c-backward-into-nomenclature):
-        Converted to compat aliases for `c-forward-subword' and
+        Convert to compat aliases for `c-forward-subword' and
         `c-backward-subword'.
 
         * progmodes/cc-subword.el: New functions and minor mode to handle
@@ -4401,10 +4632,10 @@
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-engine.el (c-forward-label): Fixed fontification of
+        * progmodes/cc-engine.el (c-forward-label): Fix fontification of
         macros inside labels.
 
-        * progmodes/cc-engine.el (c-looking-at-bos): Obsoleted in favor of
+        * progmodes/cc-engine.el (c-looking-at-bos): Obsolete in favor of
         `c-at-statement-start-p' and `c-at-expression-start-p'.
 
         * progmodes/cc-defs.el (c-tnt-chng-record-state): Don't signal an
@@ -4418,9 +4649,8 @@
         like `c-at-statement-start-p' that additionally recognizes commas
         and expression parentheses as delimiters.
 
-        * progmodes/cc-engine.el (c-looking-at-inexpr-block): Added flag
+        * progmodes/cc-engine.el (c-looking-at-inexpr-block): Add flag
         to avoid heuristics that doesn't work for unclosed blocks.
-
         (c-at-statement-start-p): New function.
 
         * progmodes/cc-engine.el, cc-fonts.el: Fixes in handling of
@@ -4435,54 +4665,53 @@
         (c-just-after-func-arglist-p, c-guess-basic-syntax)
         (c-basic-matchers-before): Use it.
 
-        (c-font-lock-objc-iip-decl): Removed.
+        (c-font-lock-objc-iip-decl): Remove.
 
         * progmodes/cc-engine.el (c-guess-basic-syntax): Some improvement
         in the template arglist recognition.
 
-        * progmodes/cc-styles.el (c-style-alist): Fixed several
+        * progmodes/cc-styles.el (c-style-alist): Fix several
         inconsistencies in the Whitesmith style.
 
         * progmodes/cc-align.el (c-lineup-after-whitesmith-blocks):
         New lineup function to get lines after Whitesmith style blocks
         correctly indented.
 
-        (c-lineup-whitesmith-in-block): Backed out the compensation for
+        (c-lineup-whitesmith-in-block): Back out the compensation for
         opening parens since it's done using `add' lists in the style
         definition instead.  Don't use the anchor position since it varies
         too much between the syntactic symbols. :P
 
-        * progmodes/cc-vars.el (c-valid-offset): Updated.
+        * progmodes/cc-vars.el (c-valid-offset): Update.
 
-        * progmodes/cc-engine.el (c-evaluate-offset): Extended to handle
+        * progmodes/cc-engine.el (c-evaluate-offset): Extend to handle
         lists where the offsets are combined according to several
-        different methods: `first', `min', `max', and `add'.  Report
-        offset evaluation errors with `c-benign-error' so that some kind
+        different methods: `first', `min', `max', and `add'.
+        Report offset evaluation errors with `c-benign-error' so that some kind
         of reindentation still is done.
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Anchor
-        `arglist-intro' the same way as `arglist-cont-nonempty' and
+        * progmodes/cc-engine.el (c-guess-basic-syntax):
+        Anchor `arglist-intro' the same way as `arglist-cont-nonempty' and
         `arglist-close'.
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed similar
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Fix similar
         situations for `arglist-cont-nonempty' and `arglist-close'.
 
-        * progmodes/cc-langs.el (c-opt-identifier-concat-key-depth): New
-        constant.
+        * progmodes/cc-langs.el (c-opt-identifier-concat-key-depth): New const.
 
         * progmodes/cc-defs.el: Use `cc-bytecomp-fboundp' and
         cc-bytecomp-boundp' in a number of places.
 
-        * progmodes/cc-engine.el (c-beginning-of-statement-1): Fixed a
+        * progmodes/cc-engine.el (c-beginning-of-statement-1): Fix a
         macro related issue.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-awk.el: Change the terminology of regexps: A char
-        list is now [asdf], a char class [:alpha:].  Include code for char
-        classes.  Set c-awk-NL-prop on lines ending in open strings.  (Bug
-        fix.)  Add character classes (e.g. "[:alpha:]") into AWK Mode's
-        regexps.
+        list is now [asdf], a char class [:alpha:].
+        Include code for char classes.
+        Set c-awk-NL-prop on lines ending in open strings.  (Bug fix.)
+        Add character classes (e.g. "[:alpha:]") into AWK Mode's regexps.
 
         Remove (nearly all of) the cruft associated with AWK Mode's former
         concept of "virtual semicolons":
@@ -4521,15 +4750,14 @@
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-awk.el: Regexps for analysing AWK code have been
-        moved to near the start of the file.  ^L now separate sections of
-        the file.  New defconsts: c-awk-non-eol-esc-pair-re,
-        c-awk-blank-or-comment-line-re,
-        c-awk-one-line-possibly-open-string-re,
-        c-awk-regexp-one-line-possibly-open-char-class-re,
-        c-awk-one-line-possibly-open-regexp-re,
-        c-awk-one-line-non-syn-ws*-re.  New functions: c-awk-at-vsemi-p,
-        c-awk-vsemi-status-unknown-p.
+        * progmodes/cc-awk.el: Move regexps for analysing AWK code to near the
+        start of the file.  ^L now separate sections of the file.
+        (c-awk-non-eol-esc-pair-re,     c-awk-blank-or-comment-line-re)
+        (c-awk-one-line-possibly-open-string-re)
+        (c-awk-regexp-one-line-possibly-open-char-class-re)
+        (c-awk-one-line-possibly-open-regexp-re)
+        (c-awk-one-line-non-syn-ws*-re): New defonsts.
+        (c-awk-at-vsemi-p, c-awk-vsemi-status-unknown-p): New functions.
 
         Amend the concept of "virtual semicolons" (in the indentation
         engine) for languages like AWK, such that they are now
@@ -4537,12 +4765,12 @@
         the end of the line.  (In AWK Mode, however, the pertinent text
         property is still physically set on the EOL.)  Remove the specific
         tests for awk-mode, thus facilitating the introduction of other
-        language modes where EOLs can end statements.  (Note: The
-        funtionality in cc-cmds.el, specifically
+        language modes where EOLs can end statements.
+        (Note: The funtionality in cc-cmds.el, specifically
         c-beginning/end-of-statement has yet to be amended.)
 
-        * progmodes/cc-defs.el: New macros c-at-vsemi-p,
-        c-vsemi-status-unknown-p.
+        * progmodes/cc-defs.el (c-at-vsemi-p, c-vsemi-status-unknown-p):
+        New macros.
 
         * progmodes/cc-langs.el: Added `#' into AWK Mode's value of
         c-stmt-delim-chars.  New c-lang-defvars: c-at-vsemi-p-fn,
@@ -4552,25 +4780,21 @@
         c-crosses-statement-barrier-p, c-guess-basic-syntax, replace
         numerous awkward forms like
         (if (c-major-mode-is 'awk-mode) (c-awk-prev-line-incomplete-p))
-        with
-        (c-at-vsemi-p).  Fix a few typos.  In c-guess-basic-syntax, new
-        variable before-ws-ip, the place just after char-before-ip
-        appears.
+        with (c-at-vsemi-p).  Fix a few typos.  In c-guess-basic-syntax, new
+        variable before-ws-ip, the place just after char-before-ip appears.
 
         * progmodes/cc-mode.el: Fix what's almost a semantic ambiguity in
         a comment.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
-        * progmodes/cc-cmds.el (c-electric-brace): Cleaned up using
+        * progmodes/cc-cmds.el (c-electric-brace): Clean up using
         `c-tentative-buffer-changes'.
 
-        * progmodes/cc-defs.el (c-region-is-active-p): Simplified and
-        converted to macro to choose between Emacs and XEmacs at compile
-        time.
+        * progmodes/cc-defs.el (c-region-is-active-p): Simplify and
+        convert to macro to choose between Emacs and XEmacs at compile time.
 
-        (c-set-region-active): New set counterpart to
-        `c-region-is-active-p'.
+        (c-set-region-active): New set counterpart to `c-region-is-active-p'.
 
         (c-tentative-buffer-changes): New macro to handle temporary buffer
         changes in a convenient way.
@@ -4578,7 +4802,7 @@
         (c-tnt-chng-record-state, c-tnt-chng-cleanup): Internal helpers
         for `c-tentative-buffer-changes'.
 
-        * progmodes/cc-engine.el (c-looking-at-inexpr-block): Tightened up
+        * progmodes/cc-engine.el (c-looking-at-inexpr-block): Tighten up
         the checks for paren sexps between the point and the keyword, to
         avoid some false alarms.
 
@@ -4587,23 +4811,22 @@
         parens.  Changed to make use of c-keyword-member' to avoid some
         repeated regexp matches.
 
-        (c-opt-lambda-key, c-opt-inexpr-block-key,
-        c-opt-inexpr-class-key): These language variable are no longer
-        necessary.
+        (c-opt-lambda-key, c-opt-inexpr-block-key, c-opt-inexpr-class-key):
+        These language variable are no longer necessary.
 
         (c-block-stmt-kwds): New language constant used by
         c-looking-at-inexpr-block'.
 
-        (c-guess-basic-syntax): Removed an optional check that looked at
+        (c-guess-basic-syntax): Remove an optional check that looked at
         the existence of the now removed language variables.
 
-        * progmodes/cc-engine.el (c-fdoc-shift-type-backward,
-        c-forward-decl-or-cast-1): Fixed invalid recognition of C++ style
+        * progmodes/cc-engine.el (c-fdoc-shift-type-backward)
+        (c-forward-decl-or-cast-1): Fix invalid recognition of C++ style
         object instantiation expressions as declarations in some contexts.
         This bug only affected languages where the declarator can't be
         enclosed in parentheses.
 
-        * progmodes/cc-styles.el (c-style-alist): Fixed the GNU style to
+        * progmodes/cc-styles.el (c-style-alist): Fix the GNU style to
         insert newlines before and after substatement braces.
 
         * progmodes/cc-engine.el: Improved the heuristics for recognizing
@@ -4613,15 +4836,14 @@
         (c-just-after-func-arglist-p): Rewritten to use
         `c-forward-decl-or-cast-1'.  Now behaves a bit differently too.
 
-        (c-beginning-of-member-init-list): Removed since it isn't used
-        anymore.
+        (c-beginning-of-member-init-list): Remove since it isn't used anymore.
 
-        (c-guess-basic-syntax): Case 5B adapted for the new
-        `c-just-after-func-arglist-p'.  Cases 5B.1 and 5B.3 merged.  Cases
-        5D.1 and 5D.2 removed since they aren't trigged anymore (case 5B.1
+        (c-guess-basic-syntax): Adapt case 5B for the new
+        `c-just-after-func-arglist-p'.  Merge cases 5B.1 and 5B.3.
+        Remove cases 5D.1 and 5D.2 since they aren't trigged anymore (case 5B.1
         covers all cases now).
 
-        * progmodes/cc-defs.el (c-point): Added `bosws' and `eosws'.
+        * progmodes/cc-defs.el (c-point): Add `bosws' and `eosws'.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
@@ -4644,15 +4866,15 @@
         (c-search-uplist-for-classkey): The old one.  It's now a wrapper
         for compatibility.
 
-        (c-add-class-syntax, c-guess-continued-construct,
-        c-guess-basic-syntax): Adapted for `c-looking-at-decl-block'.
+        (c-add-class-syntax, c-guess-continued-construct)
+        (c-guess-basic-syntax): Adapt for `c-looking-at-decl-block'.
 
-        (c-decl-block-key): Changed to tell apart ambiguous and
+        (c-decl-block-key): Change to tell apart ambiguous and
         unambiguous keywords.  Pike specials are now handled directly in
         the code instead.
 
-        (c-block-prefix-disallowed-chars, c-block-prefix-charset): New
-        language constants and variables to make the backward skip in
+        (c-block-prefix-disallowed-chars, c-block-prefix-charset):
+        New language constants and variables to make the backward skip in
         `c-looking-at-decl-block' as tight as possible.
 
         (c-nonsymbol-token-char-list): New language constant.
@@ -4663,7 +4885,7 @@
         * progmodes/cc-defs.el (c-make-bare-char-alt): New helper for
         making char classes for `c-syntactic-skip-backward'.
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Simplified case
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Simplify case
         16D - can't be a class-close at that point.
 
         * progmodes/cc-engine.el (c-guess-basic-syntax)
@@ -4674,17 +4896,16 @@
         `c-guess-basic-syntax' never will look at things outside the
         current narrowment now.  The anchor position for `topmost-intro'
         is affected by this, but it was so bogus it was basically useless
-        before, and now it's equally bogus but in a slightly different
-        way.
+        before, and now it's equally bogus but in a slightly different way.
 
         (c-narrow-out-enclosing-class): Gone.
 
         (c-most-enclosing-brace, c-least-enclosing-brace): Don't filter to
         the narrowed region.
 
-        (c-least-enclosing-brace): Removed silly optional argument.
+        (c-least-enclosing-brace): Remove silly optional argument.
 
-        * progmodes/cc-engine.el (c-beginning-of-decl-1): Fixed bug where
+        * progmodes/cc-engine.el (c-beginning-of-decl-1): Fix bug where
         the point could be left directly after an open paren when finding
         the beginning of the first decl in the block.
 
@@ -4709,13 +4930,11 @@
         (c-identifier-start, c-identifier-key): Now completely calculated
         from other constants.
 
-        (c-identifier-last-sym-match): Decommissioned since it's no longer
-        used.
+        (c-identifier-last-sym-match): Decommission since it's no longer used.
 
-        (c-operators): Use `c-identifier-ops'.  Documented
-        `postfix-if-paren'.
+        (c-operators): Use `c-identifier-ops'.  Document `postfix-if-paren'.
 
-        * progmodes/cc-engine.el (c-forward-name): Removed the
+        * progmodes/cc-engine.el (c-forward-name): Remove the
         optimization when c-identifier-key is equal to c-symbol-key since
         it doesn't work in byte compiled files.  Don't record empty
         regions as identifiers.
@@ -4731,13 +4950,13 @@
         * progmodes/cc-defs.el (c-lang-const): Fixes to allow use without
         an explicit language in functions.
 
-        * progmodes/cc-defs.el (c-make-keywords-re): Added an appendable
+        * progmodes/cc-defs.el (c-make-keywords-re): Add an appendable
         variant of adornment.
 
-        * progmodes/cc-langs.el (c-any-class-key): Removed unused language
+        * progmodes/cc-langs.el (c-any-class-key): Remove unused language
         variable.
 
-        (c-type-decl-prefix-key): Removed some now unnecessary cruft from
+        (c-type-decl-prefix-key): Remove some now unnecessary cruft from
         the Pike value.
 
         * progmodes/cc-engine.el (c-on-identifier)
@@ -4745,7 +4964,7 @@
         correctly in `skip-chars-backward'.  Affected the operator lfun
         syntax in Pike.
 
-        * progmodes/cc-langs.el (c-make-init-lang-vars-fun): Disabled the
+        * progmodes/cc-langs.el (c-make-init-lang-vars-fun): Disable the
         diagnostic message about precompiled language vars not being used.
 
         * progmodes/cc-langs.el (c-paren-nontype-kwds): The GCC keyword
@@ -4755,9 +4974,9 @@
         (c-specifier-key, c-not-decl-init-keywords): Some cleanup using new
         language constants `c-type-start-kwds' and `c-prefix-spec-kwds'.
 
-        * progmodes/cc-fonts.el, cc-langs.el, cc-engine.el: Internal
-        cleanups to properly detect the declared identifiers in various
-        declarations.
+        * progmodes/cc-fonts.el, cc-langs.el, cc-engine.el:
+        Internal cleanups to properly detect the declared identifiers in
+        various declarations.
 
         (c-decl-start-kwds): New language constant to recognize
         declarations that can start anywhere.  Used for class declarations
@@ -4768,7 +4987,7 @@
         (c-find-decl-spots): Implement `c-decl-start-kwds'.
 
         (c-other-decl-kwds, c-postfix-decl-spec-kwds, c-decl-hangon-kwds)
-        (c-decl-hangon-key, c-forward-decl-or-cast-1): Separated the
+        (c-decl-hangon-key, c-forward-decl-or-cast-1): Separate the
         handling of the compiler specific extension keywords into a new
         language constant `c-decl-hangon-kwds' that defines keyword
         clauses to be ignored in declarations.
@@ -4784,9 +5003,8 @@
         (c-forward-decl-or-cast-1): Recognize the declared identifier in
         class and enum declarations as such and not as part of the type.
 
-        (c-forward-decl-or-cast-1, c-forward-label): Relaxed the
-        interpretation of PRECEDING-TOKEN-END when there's no preceding
-        token.
+        (c-forward-decl-or-cast-1, c-forward-label): Relax the
+        interpretation of PRECEDING-TOKEN-END when there's no preceding token.
 
         (c-forward-decl-or-cast-1): Don't disregard sure signs of
         declarations when there's some syntax error later on.
@@ -4799,7 +5017,7 @@
 
         * progmodes/cc-engine.el, cc-fonts.el, cc-langs.el, cc-menus.el
         * cc-mode.el, cc-styles.el, cc-vars.el, cc-align.el, cc-awk.el
-        * cc-cmds.el, cc-defs.el: Changed the policy for marking up
+        * cc-cmds.el, cc-defs.el: Change the policy for marking up
         functions that might do hidden buffer changes: All such internal
         functions are now marked instead of those that don't.
 
@@ -4814,10 +5032,10 @@
         (c-electric-semi&comma, c-electric-colon, c-electric-lt-gt)
         (c-electric-paren, c-electric-continued-statement, c-indent-command)
         (c-indent-region, c-mask-paragraph, c-indent-new-comment-line)
-        (c-context-line-break): Added `c-save-buffer-state' calls to comply
+        (c-context-line-break): Add `c-save-buffer-state' calls to comply
         with the changed semantics of the functions above.
 
-        * progmodes/cc-engine.el (c-beginning-of-statement-1): Fixed a bug
+        * progmodes/cc-engine.el (c-beginning-of-statement-1): Fix a bug
         when macros occur in obscure places.  Optimized the sexp movement
         a bit.
 
@@ -4849,13 +5067,13 @@
         * progmodes/cc-engine.el, cc-fonts.el, cc-langs.el: Cleaned up the
         label handling.  Labels are now recognized in a uniform and more
         robust way, regardless of context.  Text properties are put on all
-        labels to recognize the following declarations better.  Multiword
-        labels are handled both in indentation and fontification for the
-        benefit of language extensions like Qt.  For consistency, keywords
-        in labels are now fontified with the label face instead.  That
-        also applies to "case" and "default".
+        labels to recognize the following declarations better.
+        Multiword labels are handled both in indentation and fontification for
+        the benefit of language extensions like Qt.  For consistency, keywords
+        in labels are now fontified with the label face instead.
+        That also applies to "case" and "default".
 
-        (c-beginning-of-statement-1): Fixed some bugs in the label
+        (c-beginning-of-statement-1): Fix some bugs in the label
         handling.  Disregard `c-nonlabel-token-key' in labels that begin
         with `c-label-kwds'.
 
@@ -4867,70 +5085,68 @@
 
         (c-forward-label): New function to recognize labels.
 
-        (c-guess-basic-syntax): Replaced uses of `c-label-key' with
+        (c-guess-basic-syntax): Replace uses of `c-label-key' with
         `c-forward-label'.  Moved the label recognition cases (14 and 15)
         earlier since they aren't so context sensitive now.  Handle labels
         on the top level gracefully.  Moved access label recognition to
         the generic label case (CASE 15) - removed CASE 5E.
 
-        (c-font-lock-declarations): Added recognition of labels in the
+        (c-font-lock-declarations): Add recognition of labels in the
         same round since we need to handle labels in parallell with other
         declarations to recognize both accurately.  It should also improve
         speed.
 
-        (c-simple-decl-matchers, c-basic-matchers-after): Moved
-        `c-font-lock-labels' so that it only is used on decoration level 2
+        (c-simple-decl-matchers, c-basic-matchers-after):
+        Move `c-font-lock-labels' so that it only is used on decoration level 2
         since `c-font-lock-declarations' handles it otherwise.
 
-        (c-complex-decl-matchers): Removed the simplistic recognition of
+        (c-complex-decl-matchers): Remove the simplistic recognition of
         access labels.
 
-        (c-decl-prefix-re): Removed the kludges that was necessary to cope
+        (c-decl-prefix-re): Remove the kludges that was necessary to cope
         with labels earlier.
 
         (c-decl-start-re): New language variable to make
         `c-font-lock-declarations' stop for the special protection labels
         in Objective-C that start with `@'.
 
-        (c-label-key): Removed since it's no longer used.
+        (c-label-key): Remove since it's no longer used.
 
         (c-recognize-colon-labels, c-label-prefix-re): New language
-        constants to support recognition of generic colon-terminated
-        labels.
+        constants to support recognition of generic colon-terminated labels.
 
         (c-type-decl-end-used): `c-decl-end' is now used whenever there
         are colon terminated labels.
 
-        * progmodes/cc-align.el (c-lineup-arglist): Fixed bug when the
+        * progmodes/cc-align.el (c-lineup-arglist): Fix bug when the
         first argument starts with a special brace list.
 
         * progmodes/cc-engine.el, cc-fonts.el (c-forward-decl-or-cast-1)
-        (c-font-lock-declarations): Broke out the declaration and cast
+        (c-font-lock-declarations): Break out the declaration and cast
         recognition from `c-font-lock-declarations' to a new function, so
         that it can be used in the indentation engine.
 
-        * progmodes/cc-engine.el (c-find-decl-spots): Fixed bug in backing
+        * progmodes/cc-engine.el (c-find-decl-spots): Fix bug in backing
         up to the start of the literal.  Fixed bug with the point on the
         wrong side of the search limit that could happen when the start
         position is inside a literal.
 
         * progmodes/cc-engine.el (c-parse-state)
-        (c-invalidate-state-cache): Modified the use of `c-state-cache-end'
+        (c-invalidate-state-cache): Modify the use of `c-state-cache-end'
         so that it's kept a little bit back to increase the hit rate.
 
-        (c-parse-state): Changed the macro handling and fixed some
+        (c-parse-state): Change the macro handling and fixed some
         glitches.  Macro context is checked more often than necessary now,
         but otoh less garbage conses are generated.
 
         * progmodes/cc-engine.el (c-parse-state)
         (c-invalidate-state-cache): Cache the last position where
         `c-state-cache' applies.  This can speed up refontification quite
-        a bit in blocks where there are many non-brace parens before the
-        point.
+        a bit in blocks where there are many non-brace parens before the point.
 
         (c-state-cache-end): New variable for this.
 
-        (c-guess-basic-syntax, c-debug-parse-state): Adapted for the new
+        (c-guess-basic-syntax, c-debug-parse-state): Adapt for the new
         cache variable.
 
         * progmodes/cc-engine.el (c-find-decl-spots): Take more care to
@@ -4941,39 +5157,39 @@
         region is a single line inside a literal or macro (typically when
         the current line is refontified).
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Simplified calls
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Simplify calls
         to `c-add-stmt-syntax' - there's no need to explicitly whack off
         entries from the paren state.
 
-        * progmodes/cc-engine.el (c-add-stmt-syntax): Narrowed down the
+        * progmodes/cc-engine.el (c-add-stmt-syntax): Narrow down the
         special case for "else if" clauses.
 
         * progmodes/cc-engine.el (c-looking-at-inexpr-block)
         (c-add-stmt-syntax): Use `c-recognize-paren-inexpr-blocks'.
 
-        * progmodes/cc-langs.el (c-recognize-paren-inexpr-blocks): New
-        language variable to recognize the gcc extension with statement
+        * progmodes/cc-langs.el (c-recognize-paren-inexpr-blocks):
+        New language variable to recognize the gcc extension with statement
         blocks inside expressions.
 
-        * progmodes/cc-engine.el (c-add-stmt-syntax): Restructured to make
+        * progmodes/cc-engine.el (c-add-stmt-syntax): Restructure to make
         it somewhat more comprehensible.  The argument AT-BLOCK-START is
         no longer used and hence removed.
 
-        (c-guess-continued-construct, c-guess-basic-syntax): Updated calls
+        (c-guess-continued-construct, c-guess-basic-syntax): Update calls
         to `c-add-stmt-syntax'.
 
-        * progmodes/cc-engine.el (c-backward-to-decl-anchor): Use
-        `c-beginning-of-statement-1' instead of duplicating parts of it.
+        * progmodes/cc-engine.el (c-backward-to-decl-anchor):
+        Use `c-beginning-of-statement-1' instead of duplicating parts of it.
         This fixes bogus label recognition.
 
         * progmodes/cc-engine.el (c-add-type, c-check-type)
-        (c-forward-name, c-forward-type): Improved storage of template
+        (c-forward-name, c-forward-type): Improve storage of template
         types in `c-found-types' so that they can be recognized better.
 
-        (c-syntactic-content): Added option to skip past nested parens.
+        (c-syntactic-content): Add option to skip past nested parens.
 
-        * progmodes/cc-engine.el (c-forward-name): Set
-        `c-last-identifier-range' all the time.  It's less work that way.
+        * progmodes/cc-engine.el (c-forward-name):
+        Set `c-last-identifier-range' all the time.  It's less work that way.
         Handle that there might not be an identifier to store in
         `c-last-identifier-range'.
 
@@ -4981,7 +5197,7 @@
         nil from `c-forward-name'.
 
         * progmodes/cc-defs.el (c-safe-scan-lists)
-        (c-(go-)?(up|down)-list-(forward|backward)): Added limit arguments.
+        (c-(go-)?(up|down)-list-(forward|backward)): Add limit arguments.
 
         * progmodes/cc-defs.el (c-save-buffer-state): Use `unwind-protect'
         to work even if the form fails.
@@ -4989,14 +5205,13 @@
         * progmodes/cc-engine.el (c-parse-state): Speedup when moving far
         down in a large file in one go.
 
-        (c-get-fallback-start-pos): New helper function for
-        `c-parse-state'.
+        (c-get-fallback-start-pos): New helper function for `c-parse-state'.
 
         * progmodes/cc-align.el (c-lineup-assignments): New lineup
         function which is like `c-lineup-math' but returns nil instead of
         `c-basic-offset' when it doesn't match.
 
-        (c-lineup-math): Changed to use `c-lineup-assignments'.
+        (c-lineup-math): Change to use `c-lineup-assignments'.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
@@ -5011,7 +5226,7 @@
         places to use skip by syntax instead of skip by char class.
 
         * progmodes/cc-langs.el (c-unterminated-block-comment-regexp):
-        Fixed a bug in the regexp that caused extreme backtracking.
+        Fix a bug in the regexp that caused extreme backtracking.
 
         * progmodes/cc-langs.el (c-block-comment-starter)
         (c-block-comment-ender): New language constants to specify in a
@@ -5030,18 +5245,16 @@
 
         (c-simple-ws): New language constant for simple whitespace.
 
-        * progmodes/cc-defs.el (c-concat-separated): New convenience
-        function.
+        * progmodes/cc-defs.el (c-concat-separated): New convenience function.
 
-        * progmodes/cc-defs.el (c-make-keywords-re): Added kludge for bug
+        * progmodes/cc-defs.el (c-make-keywords-re): Add kludge for bug
         in `regexp-opt' in Emacs 20 and XEmacs when strings contain
         newlines.  Allow and ignore nil elements in the list.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-cmds.el: Comment out a (n almost certainly
-        superfluous) check, (eq here (point-max)) in
-        c-beginning-of-statement.
+        superfluous) check, (eq here (point-max)) in c-beginning-of-statement.
 
         * progmodes/cc-cmds.el: Tidy up the comments in
         c-beginning-of-statement and subfunctions.
@@ -5050,8 +5263,7 @@
         more flexible c-put-char-property and c-clear-char-properties.
         Add the author's email address.
 
-        * progmodes/cc-langs.el: New variable,
-        c-block-comment-start-regexp.
+        * progmodes/cc-langs.el (c-block-comment-start-regexp): New variable.
 
         * progmodes/cc-cmds.el: Fix bug with M-e, when point is inside the
         closing "*/" of a block comment.
@@ -5075,11 +5287,11 @@
         * progmodes/cc-fonts.el (c-font-lock-invalid-string): Fix when
         there are several strings on the same line.
 
-        * progmodes/cc-engine.el (c-literal-limits): Removed the
+        * progmodes/cc-engine.el (c-literal-limits): Remove the
         compatibility function for older emacsen.  `c-literal-limits-fast'
         has now taken the place of this function.
 
-        * progmodes/cc-vars.el (c-emacs-features): Removed compatibility
+        * progmodes/cc-vars.el (c-emacs-features): Remove compatibility
         with older emacsen: We now require `pps-extended-state'.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
@@ -5095,19 +5307,18 @@
         eachother.  Correct a few incidental bugs.
 
         * progmodes/cc-cmds.el: Restructure c-beginning-of-statement:
-        Improve its doc-string.  Improve the handling of certain specific
-        cases.
+        Improve its doc-string.  Improve the handling of certain specific cases.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-engine.el, cc-fonts.el, cc-langs.el
-        (c-guess-basic-syntax): Changed the way class-level labels are
+        (c-guess-basic-syntax): Change the way class-level labels are
         recognized; they can now contain essentially any symbols.
 
         (c-opt-extra-label-key): New language variable to cope with the
         special protection label syntax in Objective-C.
 
-        (c-opt-access-key): Removed; this is now handled better by
+        (c-opt-access-key): Remove; this is now handled better by
         `c-nonlabel-token-key' and `c-opt-extra-label-key'.
 
         (c-complex-decl-matchers): Update to handle that
@@ -5120,11 +5331,11 @@
         Recognize bitfields better.
 
         * progmodes/cc-engine.el (c-beginning-of-inheritance-list):
-        Removed some cruft and fixed a bug that could cause it to go to a
+        Remove some cruft and fixed a bug that could cause it to go to a
         position further down.
 
         * progmodes/cc-langs.el, cc-engine.el
-        (c-beginning-of-statement-1): Improved detection of labels in
+        (c-beginning-of-statement-1): Improve detection of labels in
         declaration contexts.
 
         (c-beginning-of-decl-1): Use it.
@@ -5132,11 +5343,11 @@
         (c-nonlabel-token-key): New language constant and variable needed
         by `c-beginning-of-statement-1'.
 
-        * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug that
+        * progmodes/cc-engine.el (c-guess-basic-syntax): Fix bug that
         manifested itself due to the correction in `c-forward-sexp'.
 
-        * progmodes/cc-defs.el (c-forward-sexp, c-backward-sexp): Made
-        these behave as documented when used at the buffer limits.
+        * progmodes/cc-defs.el (c-forward-sexp, c-backward-sexp):
+        Make these behave as documented when used at the buffer limits.
 
         * progmodes/cc-mode.el, cc-engine.el, cc-langs.el
         (c-type-decl-end-used): Made this a language variable.
@@ -5145,20 +5356,20 @@
         correctly when `combine-after-change-calls' is used together with
         temporary narrowings.
 
-        * progmodes/cc-engine.el (c-beginning-of-statement-1): Report
-        labels correctly when the start point is immediately after the
+        * progmodes/cc-engine.el (c-beginning-of-statement-1):
+        Report labels correctly when the start point is immediately after the
         colon.
 
-        * progmodes/cc-defs.el (c-parse-sexp-lookup-properties): Removed
-        since it isn't used anymore.
+        * progmodes/cc-defs.el (c-parse-sexp-lookup-properties):
+        Remove since it isn't used anymore.
 
         * progmodes/cc-cmds.el (c-electric-lt-gt): Detect and mark angle
         bracket arglists such as template parens in C++.
 
-        * progmodes/cc-engine.el (c-syntactic-skip-backward): Fixed a bug
+        * progmodes/cc-engine.el (c-syntactic-skip-backward): Fix a bug
         in the last check-in.  Some optimization.
 
-        * progmodes/cc-engine.el (c-syntactic-skip-backward): Fixed bug
+        * progmodes/cc-engine.el (c-syntactic-skip-backward): Fix bug
         where it could stop at the same level in a preceding sexp when
         PAREN-LEVEL is set.
 
@@ -5166,7 +5377,7 @@
         text property lookup only when it's needed.
 
         * progmodes/cc-langs.el, cc-engine.el, cc-fonts.el, cc-mode.el:
-        Changed the policy for paren marked angle brackets to be more
+        Change the policy for paren marked angle brackets to be more
         persistent; once marked they remain marked even when they're found
         to be unbalanced in the searched region.  This should keep the
         paren syntax around even when individual lines are refontified in
@@ -5180,7 +5391,7 @@
         (c-forward-<>-arglist, c-forward-<>-arglist-recur): The reparse
         argument has become `c-parse-and-markup-<>-arglists'.
 
-        (c-remove-<>-arglist-properties): Removed - no longer used.
+        (c-remove-<>-arglist-properties): Remove - no longer used.
 
         (c-after-change-check-<>-operators): New function used on
         `after-change-functions' to avoid that "<" and ">" characters that
@@ -5192,28 +5403,26 @@
         (c-after-change): Call `c-after-change-check-<>-operators'.
 
         (c-font-lock-<>-arglists): Use the context properties set by
-        `c-font-lock-declarations' to set
-        `c-disallow-comma-in-<>-arglists' correctly to avoid doing invalid
-        markup.
+        `c-font-lock-declarations' to set `c-disallow-comma-in-<>-arglists'
+        correctly to avoid doing invalid markup.
 
-        (c-font-lock-declarations): Removed code that undoes the invalid
+        (c-font-lock-declarations): Remove code that undoes the invalid
         markup done by `c-font-lock-<>-arglists'.
 
         (c-complex-decl-matchers): `c-font-lock-<>-arglists' now runs
         after `c-font-lock-declarations'.
 
-        * progmodes/cc-engine.el (c-syntactic-skip-backward): Added
-        paren-level feature.
+        * progmodes/cc-engine.el (c-syntactic-skip-backward):
+        Add paren-level feature.
 
-        (c-guess-basic-syntax): Improved the anchor position for
+        (c-guess-basic-syntax): Improve the anchor position for
         `template-args-cont' in nested template arglists.  There's still
         much to be desired in this area, though.
 
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-cmds.el, cc-engine.el, cc-langs.el, cc-vars.el:
-        Make the "Text Filling and Line Breaking" commands work for AWK
-        buffers.
+        Make the "Text Filling and Line Breaking" commands work for AWK buffers.
 
 2005-12-08  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
@@ -5252,7 +5461,7 @@
 
 2005-12-08  Kim F. Storm  <storm@cua.dk>
 
-        * emulation/cua-base.el (cua-use-hyper-key): Replaced by ...
+        * emulation/cua-base.el (cua-use-hyper-key): Replace by ...
         (cua-rectangle-modifier-key): ... this.  New defcustom.  Can now
         select either meta, hyper, or super modifier for rectangle commands.
         (cua--rectangle-modifier-key): New defvar.
@@ -5261,8 +5470,8 @@
         on X, to meta otherwise.  Always bind C-return to toggle
         rectangle.  Pass ?\s instead of `space' to cua--M/H-key.
 
-        * emulation/cua-rect.el (cua-help-for-rectangle): Use
-        cua--rectangle-modifier-key.  Handle super modifier too.
+        * emulation/cua-rect.el (cua-help-for-rectangle):
+        Use cua--rectangle-modifier-key.  Handle super modifier too.
         (cua--init-rectangles): Always bind C-return to toggle rectangle.
         Pass ?\s instead of `space' to cua--M/H-key and cua--rect-M/H-key.
 
@@ -5273,8 +5482,8 @@
         keymap if cua--prefix-override-timer is `shift'.
         (cua--shift-control-prefix): New function; emulate "type prefix
         key twice" functionality to handle shifted prefix key override.
-        (cua--shift-control-c-prefix, cua--shift-control-x-prefix): New
-        commands.
+        (cua--shift-control-c-prefix, cua--shift-control-x-prefix):
+        New commands.
         (cua--init-keymaps): Bind them to S-C-c and S-C-x.
 
 2005-12-08  Carsten Dominik  <dominik@science.uva.nl>
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 60705b30552..e2275ce356d 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1092,7 +1092,11 @@ or default values have changed since the previous major Emacs release.
 With argument SINCE-VERSION (a string), customize all settings
 that were added or redefined since that version."
 
-  (interactive "sCustomize options changed, since version (default all versions): ")
+  (interactive
+   (list
+    (read-from-minibuffer
+     (format "Customize options changed, since version (default %s): "
+             customize-changed-options-previous-release))))
   (if (equal since-version "")
       (setq since-version nil)
     (unless (condition-case nil
@@ -3408,12 +3412,12 @@ Optional EVENT is the location for the menu."
       ;; Make the comment invisible by hand if it's empty
       (custom-comment-hide comment-widget))
     (put symbol 'customized-face value)
+    (custom-push-theme 'theme-face symbol 'user 'set value)
     (if (face-spec-choose value)
         (face-spec-set symbol value)
       ;; face-set-spec ignores empty attribute lists, so just give it
       ;; something harmless instead.
       (face-spec-set symbol '((t :foreground unspecified))))
-    (custom-push-theme 'theme-face symbol 'user 'set value)
     (put symbol 'customized-face-comment comment)
     (put symbol 'face-comment comment)
     (custom-face-state-set widget)
@@ -3486,13 +3490,17 @@ restoring it to the state of a face that has never been customized."
     (put symbol 'customized-face nil)
     (put symbol 'customized-face-comment nil)
     (custom-push-theme 'theme-face symbol 'user 'reset)
+    (face-spec-set symbol value)
     (custom-theme-recalc-face symbol)
     (when (or (get symbol 'saved-face) (get symbol 'saved-face-comment))
       (put symbol 'saved-face nil)
       (put symbol 'saved-face-comment nil)
       (custom-save-all))
     (put symbol 'face-comment nil)
-    (widget-value-set child value)
+    (widget-value-set child
+                      (custom-pre-filter-face-spec
+                       (list (list t (custom-face-attributes-get
+                                      symbol nil)))))
     ;; This call manages the comment visibility
     (widget-value-set comment-widget "")
     (custom-face-state-set widget)
diff --git a/lisp/custom.el b/lisp/custom.el
index 15b5b4a815c..c67f3b06272 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -819,7 +819,8 @@ See `custom-known-themes' for a list of known themes."
                          (not (equal (eval (car (get symbol 'standard-value)))
                                      (symbol-value symbol)))))
                 (setq old (list (list 'changed (symbol-value symbol))))
-              (if (facep symbol)
+              (if (and (facep symbol)
+                       (not (face-spec-match-p symbol (get symbol 'face-defface-spec))))
                   (setq old (list (list 'changed (list
                     (append '(t) (custom-face-attributes-get symbol nil)))))))))
         (put symbol prop (cons (list theme value) old))
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 09645864573..7c7f7902d82 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -274,7 +274,7 @@ when editing big diffs)."
 (defvar diff-indicator-changed-face 'diff-indicator-changed)
 
 (defface diff-function
-  '((t :inherit diff-context))
+  '((t :inherit diff-header))
   "`diff-mode' face used to highlight function names produced by \"diff -p\"."
   :group 'diff-mode)
 ;; backward-compatibility alias
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 120866e7925..33b38552595 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -799,8 +799,8 @@ If command is repeated at same position, delete the rectangle."
                                 (if cua--virtual-edges-debug ?, ?\s))
                                'face rface))
                      (if (cua--rectangle-right-side)
-                         (put-text-property (1- (length ms)) (length ms) 'cursor t ms)
-                       (put-text-property 0 1 'cursor t ms))
+                         (put-text-property (1- (length ms)) (length ms) 'cursor 2 ms)
+                       (put-text-property 0 1 'cursor 2 ms))
                      (setq bs (concat bs ms))
                      (setq rface nil))
                     (t
@@ -810,8 +810,8 @@ If command is repeated at same position, delete the rectangle."
                                 (if cua--virtual-edges-debug ?~ ?\s))
                                'face rface))
                      (if (cua--rectangle-right-side)
-                         (put-text-property (1- (length as)) (length as) 'cursor t as)
-                       (put-text-property 0 1 'cursor t as))
+                         (put-text-property (1- (length as)) (length as) 'cursor 2 as)
+                       (put-text-property 0 1 'cursor 2 as))
                      (if (/= pr le)
                          (setq e (1- e))))))))
              ;; Trim old leading overlays.
diff --git a/lisp/files.el b/lisp/files.el
index c1fbf37da4a..e4610ac1d3c 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -990,6 +990,20 @@ documentation for additional customization information."
     (pop-to-buffer buffer t norecord)
     (raise-frame (window-frame (selected-window)))))
 
+(defun display-buffer-other-frame (buffer)
+  "Switch to buffer BUFFER in another frame.
+This uses the function `display-buffer' as a subroutine; see its
+documentation for additional customization information."
+  (interactive "BDisplay buffer in other frame: ")
+  (let ((pop-up-frames t)
+        same-window-buffer-names same-window-regexps
+        (old-window (selected-window))
+        new-window)
+    (setq new-window (display-buffer buffer t))
+    (lower-frame (window-frame new-window))
+    (make-frame-invisible (window-frame old-window))
+    (make-frame-visible (window-frame old-window))))
+
 (defvar find-file-default nil
   "Used within `find-file-read-args'.")
 
@@ -5154,6 +5168,7 @@ only these files will be asked to be saved."
 (define-key ctl-x-5-map "f" 'find-file-other-frame)
 (define-key ctl-x-5-map "\C-f" 'find-file-other-frame)
 (define-key ctl-x-5-map "r" 'find-file-read-only-other-frame)
+(define-key ctl-x-4-map "\C-o" 'display-buffer-other-frame)
 
 ;; arch-tag: bc68d3ea-19ca-468b-aac6-3a4a7766101f
 ;;; files.el ends here
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 1b4e79a0c87..c2b8d7200da 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -281,12 +281,6 @@ If a number, only buffers greater than this size have fontification messages."
                  (other :tag "always" t)
                  (integer :tag "size"))
   :group 'font-lock)
-
-(defcustom font-lock-lines-before 0
-  "*Number of lines before the changed text to include in refontification."
-  :type 'integer
-  :group 'font-lock
-  :version "22.1")
 
 
 ;; Originally these variable values were face names such as `bold' etc.
@@ -1098,9 +1092,8 @@ what properties to clear before refontifying a region.")
             ;; Fontify the region the major mode has specified.
             (setq beg (car region) end (cdr region))
           ;; Fontify the whole lines which enclose the region.
-          (setq beg (progn (goto-char beg)
-                           (forward-line (- font-lock-lines-before)))
-                end (progn (goto-char end) (forward-line 1) (point))))
+          (setq beg (progn (goto-char beg) (line-beginning-position))
+                end (progn (goto-char end) (line-beginning-position 2))))
         (font-lock-fontify-region beg end)))))
 
 (defun font-lock-fontify-block (&optional arg)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 8023af47bfd..966451cce3c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,65 @@
+2006-03-21  Daniel Pittman <daniel@rimspace.net>
+
+        * nnimap.el (nnimap-request-update-info-internal): Optimize.
+        Don't `gnus-uncompress-range' to avoid excessive memory usage.
+
+2006-03-21  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-agent.el (gnus-agent-queue-mail): Fix custom tag for `t'.
+
+        * spam.el (spam-mark-new-messages-in-spam-group-as-spam): Add
+        comment on version.
+
+2006-03-20  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * spam.el (spam-mark-new-messages-in-spam-group-as-spam): New
+        variable.
+        (spam-mark-junk-as-spam-routine): Use it.  Allow to disable
+        assigning the spam-mark to new messages.
+
+2006-03-20  Adam Sj,Ax(Bgren  <asjo@koldfront.dk>  (tiny change)
+
+        (spam-ham-copy-or-move-routine): Don't declare `todo' twice.
+
+2006-03-20  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * smiley.el: Add missing test smiley.
+
+2006-03-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-decode.el (mm-with-part): New macro.
+        (mm-get-part): Use it; work with message/external-body as well.
+        (mm-save-part): Treat name and filename equally.
+
+        * mm-extern.el (mm-extern-cache-contents): New function.
+        (mm-inline-external-body): Use it; force the part to be displayed;
+        move undisplayer added to the cached handle to the parent.
+
+        * gnus-art.el (gnus-mime-save-part-and-strip): Add name parameter.
+        (gnus-mime-view-part-as-type): Work with message/external-body.
+
+        * gnus-util.el (gnus-tool-bar-update): Bind tool-bar-mode.
+
+2006-03-15  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+        * gnus-art.el (gnus-article-only-boring-p): Bind
+        inhibit-point-motion-hooks to avoid infinite loop when entering
+        intangible text.  Reported by Ralf Wachinger
+        <rwnewsmampfer@geekmail.de>.
+
+2006-03-14  Simon Josefsson  <jas@extundo.com>
+
+        * message.el (message-unique-id): Don't use message-number-base36
+        if (user-uid) is a float.  Reported by Bjorn Solberg
+        <bjorn_ding1@hekneby.org>.
+
+2006-03-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-uu.el (mm-uu-dissect): Dissect all parts correctly.
+
+        * gnus-art.el (gnus-mime-display-single): Make sure there is an
+        empty line between a part and a message part.
+
 2006-03-10  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * smiley.el: Add more test smileys.
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index c467c296fa0..123ad340ae1 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -204,7 +204,7 @@ queue.  Otherwise, queue if and only if unplugged."
   :group 'gnus-agent
   :type '(radio (const :format "Always" always)
                 (const :format "Never" nil)
-                (const :format "When plugged" t)))
+                (const :format "When unplugged" t)))
 
 (defcustom gnus-agent-prompt-send-queue nil
   "If non-nil, `gnus-group-send-queue' will prompt if called when
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 0c9cb18506a..69fe8159c10 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -49,6 +49,7 @@
 (autoload 'gnus-button-mailto "gnus-msg")
 (autoload 'gnus-button-reply "gnus-msg" nil t)
 (autoload 'parse-time-string "parse-time" nil nil)
+(autoload 'mm-extern-cache-contents "mm-extern")
 
 (defgroup gnus-article nil
   "Article display."
@@ -4151,6 +4152,9 @@ Deleting parts may malfunction or destroy the article; continue? ")
           (insert "Content-Type: " (mm-handle-media-type data))
           (mml-insert-parameter-string (cdr (mm-handle-type data))
                                        '(charset))
+          ;; Add a filename for the sake of saving the part again.
+          (mml-insert-parameter
+           (mail-header-encode-parameter "name" (file-name-nondirectory file)))
           (insert "\n")
           (insert "Content-ID: " (message-make-message-id) "\n")
           (insert "Content-Transfer-Encoding: binary\n")
@@ -4330,6 +4334,10 @@ Deleting parts may malfunction or destroy the article; continue? ")
   (gnus-article-check-buffer)
   (let ((handle (get-text-property (point) 'gnus-data)))
     (when handle
+      (when (equal (mm-handle-media-type handle) "message/external-body")
+        (unless (mm-handle-cache handle)
+          (mm-extern-cache-contents handle))
+        (setq handle (mm-handle-cache handle)))
       (setq handle
             (mm-make-handle (mm-handle-buffer handle)
                             (cons mime-type (cdr (mm-handle-type handle)))
@@ -4889,13 +4897,18 @@ If displaying \"text/html\" is discouraged \(see
         (let ((id (1+ (length gnus-article-mime-handle-alist)))
               beg)
           (push (cons id handle) gnus-article-mime-handle-alist)
+          (when (and display
+                     (equal (mm-handle-media-supertype handle) "message"))
+            (insert-char
+             ?\n
+             (cond ((not (bolp)) 2)
+                   ((or (bobp) (eq (char-before (1- (point))) ?\n)) 0)
+                   (t 1))))
           (when (or (not display)
                     (not (gnus-unbuttonized-mime-type-p type)))
-            ;(gnus-article-insert-newline)
             (gnus-insert-mime-button
              handle id (list (or display (and not-attachment text))))
             (gnus-article-insert-newline)
-            ;(gnus-article-insert-newline)
             ;; Remember modify the number of forward lines.
             (setq move t))
           (setq beg (point))
@@ -5313,14 +5326,15 @@ not have a face in `gnus-article-boring-faces'."
              (boundp 'gnus-article-boring-faces)
              (symbol-value 'gnus-article-boring-faces))
     (save-excursion
-      (catch 'only-boring
-        (while (re-search-forward "\\b\\w\\w" nil t)
-          (forward-char -1)
-          (when (not (gnus-intersection
-                      (gnus-faces-at (point))
-                      (symbol-value 'gnus-article-boring-faces)))
-            (throw 'only-boring nil)))
-        (throw 'only-boring t)))))
+      (let ((inhibit-point-motion-hooks t))
+        (catch 'only-boring
+          (while (re-search-forward "\\b\\w\\w" nil t)
+            (forward-char -1)
+            (when (not (gnus-intersection
+                        (gnus-faces-at (point))
+                        (symbol-value 'gnus-article-boring-faces)))
+              (throw 'only-boring nil)))
+          (throw 'only-boring t))))))
 
 (defun gnus-article-refer-article ()
   "Read article specified by message-id around point."
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 686fe1cf837..cb3a4e9209c 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1459,6 +1459,9 @@ Return nil otherwise."
                                  display))
               display)))))
 
+(eval-when-compile
+  (defvar tool-bar-mode))
+
 (defun gnus-tool-bar-update (&rest ignore)
   "Update the tool bar."
   (when (and (boundp 'tool-bar-mode)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 1bdc2f6a11f..236ec1bc23f 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4671,7 +4671,9 @@ If NOW, use that time instead."
            (* 25 25)))
   (let ((tm (current-time)))
     (concat
-     (if (memq system-type '(ms-dos emx vax-vms))
+     (if (or (memq system-type '(ms-dos emx vax-vms))
+             ;; message-number-base36 doesn't handle bigints.
+             (floatp (user-uid)))
          (let ((user (downcase (user-login-name))))
            (while (string-match "[^a-z0-9_]" user)
              (aset user (match-beginning 0) ?_))
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 01557659fd6..f0f1ee430ff 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -36,6 +36,7 @@
   (autoload 'executable-find "executable")
   (autoload 'mm-inline-partial "mm-partial")
   (autoload 'mm-inline-external-body "mm-extern")
+  (autoload 'mm-extern-cache-contents "mm-extern")
   (autoload 'mm-insert-inline "mm-view"))
 
 (defvar gnus-current-window-configuration)
@@ -1082,17 +1083,35 @@ external if displayed external."
 ;;; Functions for outputting parts
 ;;;
 
+(defmacro mm-with-part (handle &rest forms)
+  "Run FORMS in the temp buffer containing the contents of HANDLE."
+  `(let* ((handle ,handle)
+          ;; The multibyteness of the temp buffer should be turned on
+          ;; if inserting a multibyte string.  Contrarily, the buffer's
+          ;; multibyteness should be off if inserting a unibyte string,
+          ;; especially if a string contains 8bit data.
+          (default-enable-multibyte-characters
+            (with-current-buffer (mm-handle-buffer handle)
+              (mm-multibyte-p))))
+     (with-temp-buffer
+       (insert-buffer-substring (mm-handle-buffer handle))
+       (mm-disable-multibyte)
+       (mm-decode-content-transfer-encoding
+        (mm-handle-encoding handle)
+        (mm-handle-media-type handle))
+       ,@forms)))
+(put 'mm-with-part 'lisp-indent-function 1)
+(put 'mm-with-part 'edebug-form-spec '(body))
+
 (defun mm-get-part (handle)
   "Return the contents of HANDLE as a string."
-  (let ((default-enable-multibyte-characters
-          (with-current-buffer (mm-handle-buffer handle)
-            (mm-multibyte-p))))
-    (with-temp-buffer
-      (insert-buffer-substring (mm-handle-buffer handle))
-      (mm-disable-multibyte)
-      (mm-decode-content-transfer-encoding
-       (mm-handle-encoding handle)
-       (mm-handle-media-type handle))
+  (if (equal (mm-handle-media-type handle) "message/external-body")
+      (progn
+        (unless (mm-handle-cache handle)
+          (mm-extern-cache-contents handle))
+        (with-current-buffer (mm-handle-buffer (mm-handle-cache handle))
+          (buffer-string)))
+    (mm-with-part handle
       (buffer-string))))
 
 (defun mm-insert-part (handle)
@@ -1148,18 +1167,19 @@ string if you do not like underscores."
 
 (defun mm-save-part (handle)
   "Write HANDLE to a file."
-  (let* ((name (mail-content-type-get (mm-handle-type handle) 'name))
-         (filename (mail-content-type-get
-                    (mm-handle-disposition handle) 'filename))
-         file)
+  (let ((filename (or (mail-content-type-get
+                       (mm-handle-disposition handle) 'filename)
+                      (mail-content-type-get
+                       (mm-handle-type handle) 'name)))
+        file)
     (when filename
       (setq filename (gnus-map-function mm-file-name-rewrite-functions
                                         (file-name-nondirectory filename))))
     (setq file
           (mm-with-multibyte
-            (read-file-name "Save MIME part to: "
-                            (or mm-default-directory default-directory)
-                            nil nil (or filename name ""))))
+           (read-file-name "Save MIME part to: "
+                           (or mm-default-directory default-directory)
+                           nil nil (or filename ""))))
     (setq mm-default-directory (file-name-directory file))
     (and (or (not (file-exists-p file))
              (yes-or-no-p (format "File %s already exists; overwrite? "
diff --git a/lisp/gnus/mm-extern.el b/lisp/gnus/mm-extern.el
index da3ecb8f351..b736374f016 100644
--- a/lisp/gnus/mm-extern.el
+++ b/lisp/gnus/mm-extern.el
@@ -112,11 +112,8 @@
     (insert "[" info "]\n\n")))
 
 ;;;###autoload
-(defun mm-inline-external-body (handle &optional no-display)
-  "Show the external-body part of HANDLE.
-This function replaces the buffer of HANDLE with a buffer contains
-the entire message.
-If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
+(defun mm-extern-cache-contents (handle)
+  "Put the external-body part of HANDLE into its cache."
   (let* ((access-type (cdr (assq 'access-type
                                  (cdr (mm-handle-type handle)))))
          (func (cdr (assq (intern
@@ -124,48 +121,61 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
                             (or access-type
                                 (error "Couldn't find access type"))))
                           mm-extern-function-alist)))
-         gnus-displaying-mime buf
-         handles)
-    (unless (mm-handle-cache handle)
-      (unless func
-        (error "Access type (%s) is not supported" access-type))
-      (with-temp-buffer
-        (mm-insert-part handle)
-        (goto-char (point-max))
-        (insert "\n\n")
-        (setq handles (mm-dissect-buffer t)))
-      (unless (bufferp (car handles))
-        (mm-destroy-parts handles)
-        (error "Multipart external body is not supported"))
-      (save-excursion ;; single part
-        (set-buffer (setq buf (mm-handle-buffer handles)))
-        (let (good)
-          (unwind-protect
-              (progn
-                (funcall func handle)
-                (setq good t))
-            (unless good
-              (mm-destroy-parts handles))))
-        (mm-handle-set-cache handle handles))
-      (setq gnus-article-mime-handles
-            (mm-merge-handles gnus-article-mime-handles handles)))
-    (unless no-display
-      (save-excursion
-        (save-restriction
-          (narrow-to-region (point) (point))
-          (gnus-display-mime (mm-handle-cache handle))
-          (mm-handle-set-undisplayer
-           handle
-           `(lambda ()
-              (let (buffer-read-only)
-                (condition-case nil
-                    ;; This is only valid on XEmacs.
-                    (mapcar (lambda (prop)
-                            (remove-specifier
-                             (face-property 'default prop) (current-buffer)))
-                            '(background background-pixmap foreground))
-                  (error nil))
-                (delete-region ,(point-min-marker) ,(point-max-marker))))))))))
+         buf handles)
+    (unless func
+      (error "Access type (%s) is not supported" access-type))
+    (mm-with-part handle
+      (goto-char (point-max))
+      (insert "\n\n")
+      ;; It should be just a single MIME handle.
+      (setq handles (mm-dissect-buffer t)))
+    (unless (bufferp (car handles))
+      (mm-destroy-parts handles)
+      (error "Multipart external body is not supported"))
+    (save-excursion
+      (set-buffer (setq buf (mm-handle-buffer handles)))
+      (let (good)
+        (unwind-protect
+            (progn
+              (funcall func handle)
+              (setq good t))
+          (unless good
+            (mm-destroy-parts handles))))
+      (mm-handle-set-cache handle handles))
+    (setq gnus-article-mime-handles
+          (mm-merge-handles gnus-article-mime-handles handles))))
+
+;;;###autoload
+(defun mm-inline-external-body (handle &optional no-display)
+  "Show the external-body part of HANDLE.
+This function replaces the buffer of HANDLE with a buffer contains
+the entire message.
+If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
+  (unless (mm-handle-cache handle)
+    (mm-extern-cache-contents handle))
+  (unless no-display
+    (save-excursion
+      (save-restriction
+        (narrow-to-region (point) (point))
+        (let* ((type (regexp-quote
+                      (mm-handle-media-type (mm-handle-cache handle))))
+               ;; Force the part to be displayed (but if there is no
+               ;; method to display, a user will be prompted to save).
+               ;; See `gnus-mime-display-single'.
+               (mm-inline-override-types nil)
+               (mm-attachment-override-types
+                (cons type mm-attachment-override-types))
+               (mm-automatic-display (cons type mm-automatic-display))
+               (mm-automatic-external-display
+                (cons type mm-automatic-external-display))
+               ;; Suppress adding of button to the cached part.
+               (gnus-inhibit-mime-unbuttonizing nil))
+          (gnus-display-mime (mm-handle-cache handle)))
+        ;; Move undisplayer added to the cached handle to the parent.
+        (mm-handle-set-undisplayer
+         handle
+         (mm-handle-undisplayer (mm-handle-cache handle)))
+        (mm-handle-set-undisplayer (mm-handle-cache handle) nil)))))
 
 (provide 'mm-extern)
 
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index eb5afa794f5..9029e0d699c 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -464,7 +464,8 @@ value of `mm-uu-text-plain-type'."
        (t (goto-char (point-max))))
       (setq text-start (point))
       (while (re-search-forward mm-uu-beginning-regexp nil t)
-        (setq start-point (match-beginning 0))
+        (setq start-point (match-beginning 0)
+              entry nil)
         (let ((alist mm-uu-type-alist)
               (beginning-regexp (match-string 0)))
           (while (not entry)
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 3c05b3713ea..bada9da6891 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1127,18 +1127,12 @@ function is generally only called when Gnus is shutting down."
           (let (seen unseen)
             ;; read info could contain articles marked unread by other
             ;; imap clients!  we correct this
-            (setq seen (gnus-uncompress-range (gnus-info-read info))
-                  unseen (imap-search "UNSEEN UNDELETED")
-                  seen (gnus-set-difference seen unseen)
-                  ;; seen might lack articles marked as read by other
-                  ;; imap clients! we correct this
-                  seen (append seen (imap-search "SEEN"))
-                  ;; remove dupes
-                  seen (sort seen '<)
-                  seen (gnus-compress-sequence seen t)
-                  ;; we can't return '(1) since this isn't a "list of ranges",
-                  ;; and we can't return '((1)) since g-list-of-unread-articles
-                  ;; is buggy so we return '((1 . 1)).
+            (setq unseen (gnus-compress-sequence
+                          (imap-search "UNSEEN UNDELETED"))
+                  seen (gnus-range-difference (gnus-info-read info) unseen)
+                  seen (gnus-range-add seen
+                                       (gnus-compress-sequence
+                                        (imap-search "SEEN")))
                   seen (if (and (integerp (car seen))
                                 (null (cdr seen)))
                            (list (cons (car seen) (car seen)))
diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index e8afe9dd10d..6476340f7bf 100644
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -42,6 +42,7 @@
 ;; indifferent       :-|
 ;; wry               :-/  :-\
 ;; sad               :-(
+;; frown             :-{
 ;; evil              >:-)
 ;; cry               ;-(
 ;; dead              X-)
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index ed5fd6e7980..047035536f2 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -100,6 +100,12 @@ spam groups."
   :type 'boolean
   :group 'spam)
 
+(defcustom spam-mark-new-messages-in-spam-group-as-spam t
+  "Whether new messages in a spam group should get the spam-mark."
+  :type 'boolean
+  ;; :version "22.1" ;; Gnus 5.10.8 / No Gnus 0.3
+  :group 'spam)
+
 (defcustom spam-log-to-registry nil
   "Whether spam/ham processing should be logged in the registry."
   :type 'boolean
@@ -676,15 +682,17 @@ spam-use-* variable.")
   ;; check the global list of group names spam-junk-mailgroups and the
   ;; group parameters
   (when (spam-group-spam-contents-p gnus-newsgroup-name)
-    (gnus-message 5 "Marking %s articles as spam"
+    (gnus-message 6 "Marking %s articles as spam"
                   (if spam-mark-only-unseen-as-spam
                       "unseen"
                     "unread"))
     (let ((articles (if spam-mark-only-unseen-as-spam
                         gnus-newsgroup-unseen
                       gnus-newsgroup-unreads)))
-      (dolist (article articles)
-        (gnus-summary-mark-article article gnus-spam-mark)))))
+      (if spam-mark-new-messages-in-spam-group-as-spam
+          (dolist (article articles)
+            (gnus-summary-mark-article article gnus-spam-mark))
+        (gnus-message 9 "Did not mark new messages as spam.")))))
 
 (defun spam-mark-spam-as-expired-and-move-routine (&rest groups)
   (if (and (car-safe groups) (listp (car-safe groups)))
@@ -732,7 +740,7 @@ spam-use-* variable.")
          (gnus-check-backend-function
           'request-move-article gnus-newsgroup-name))
         (respool-method (gnus-find-method-for-group gnus-newsgroup-name))
-        article mark todo deletep respool)
+        article mark deletep respool)
 
     (when (member 'respool groups)
       (setq respool t)                  ; boolean for later
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index c2e1f59e578..94621535154 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -40,7 +40,7 @@
 
 (define-key help-mode-map [mouse-2] 'help-follow-mouse)
 (define-key help-mode-map "\C-c\C-b" 'help-go-back)
-(define-key help-mode-map "\C-c\C-c" 'help-follow)
+(define-key help-mode-map "\C-c\C-c" 'help-follow-symbol)
 ;; Documentation only, since we use minor-mode-overriding-map-alist.
 (define-key help-mode-map "\r" 'help-follow)
 
@@ -233,10 +233,10 @@ Commands:
   "Label to use by `help-make-xrefs' for the go-back reference.")
 
 (defconst help-xref-symbol-regexp
-  (purecopy (concat "\\(\\<\\(\\(variable\\|option\\)\\|"
-                    "\\(function\\|command\\)\\|"
-                    "\\(face\\)\\|"
-                    "\\(symbol\\)\\|"
+  (purecopy (concat "\\(\\<\\(\\(variable\\|option\\)\\|"  ; Link to var
+                    "\\(function\\|command\\)\\|"          ; Link to function
+                    "\\(face\\)\\|"                        ; Link to face
+                    "\\(symbol\\|program\\)\\|"            ; Don't link
                     "\\(source \\(?:code \\)?\\(?:of\\|for\\)\\)\\)"
                     "[ \t\n]+\\)?"
                     ;; Note starting with word-syntax character:
@@ -584,15 +584,6 @@ help buffer."
 
 ;; Navigation/hyperlinking with xrefs
 
-(defun help-follow-mouse (click)
-  "Follow the cross-reference that you CLICK on."
-  (interactive "e")
-  (let* ((start (event-start click))
-         (window (car start))
-         (pos (car (cdr start))))
-    (with-current-buffer (window-buffer window)
-      (help-follow pos))))
-
 (defun help-xref-go-back (buffer)
   "From BUFFER, go back to previous help buffer text using `help-xref-stack'."
   (let (item position method args)
@@ -627,26 +618,38 @@ a proper [back] button."
   (let ((help-xref-following t))
     (apply function args)))
 
-(defun help-follow (&optional pos)
-  "Follow cross-reference at POS, defaulting to point.
+;; The doc string is meant to explain what buttons do.
+(defun help-follow-mouse ()
+  "Follow the cross-reference that you click on."
+  (interactive)
+  (error "No cross-reference here"))
+
+;; The doc string is meant to explain what buttons do.
+(defun help-follow ()
+  "Follow cross-reference at point.
 
 For the cross-reference format, see `help-make-xrefs'."
+  (interactive)
+  (error "No cross-reference here"))
+
+(defun help-follow-symbol (&optional pos)
+  "In help buffer, show docs for symbol at POS, defaulting to point.
+Show all docs for that symbol as either a variable, function or face."
   (interactive "d")
   (unless pos
     (setq pos (point)))
-  (unless (push-button pos)
-    ;; check if the symbol under point is a function or variable
-    (let ((sym
-           (intern
-            (save-excursion
-              (goto-char pos) (skip-syntax-backward "w_")
-              (buffer-substring (point)
-                                (progn (skip-syntax-forward "w_")
-                                       (point)))))))
-      (when (or (boundp sym)
-                (get sym 'variable-documentation)
-                (fboundp sym) (facep sym))
-        (help-do-xref pos #'help-xref-interned (list sym))))))
+  ;; check if the symbol under point is a function, variable or face
+  (let ((sym
+         (intern
+          (save-excursion
+            (goto-char pos) (skip-syntax-backward "w_")
+            (buffer-substring (point)
+                              (progn (skip-syntax-forward "w_")
+                                     (point)))))))
+    (when (or (boundp sym)
+              (get sym 'variable-documentation)
+              (fboundp sym) (facep sym))
+      (help-do-xref pos #'help-xref-interned (list sym)))))
 
 (defun help-insert-string (string)
   "Insert STRING to the help buffer and install xref info for it.
diff --git a/lisp/ido.el b/lisp/ido.el
index cae5446abcd..6bc2f45709f 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -613,6 +613,7 @@ A tramp file name uses the following syntax: /method:user@host:filename."
 
 (defcustom ido-cache-ftp-work-directory-time 1.0
   "*Maximum time to cache contents of an ftp directory (in hours).
+Use C-l in prompt to refresh list.
 If zero, ftp directories are not cached."
   :type 'number
   :group 'ido)
@@ -629,6 +630,18 @@ equivalent function, e.g. `find-file' rather than `ido-find-file'."
   :type '(repeat regexp)
   :group 'ido)
 
+(defcustom ido-unc-hosts nil
+  "*List of known UNC host names to complete after initial //."
+  :type '(repeat string)
+  :group 'ido)
+
+(defcustom ido-cache-unc-host-shares-time 8.0
+  "*Maximum time to cache shares of an UNC host (in hours).
+Use C-l in prompt to refresh list.
+If zero, unc host shares are not cached."
+  :type 'number
+  :group 'ido)
+
 (defcustom ido-max-work-file-list 10
   "*Maximum number of names of recently opened files to record.
 This is the list the file names (sans directory) which have most recently
@@ -1103,6 +1116,16 @@ it doesn't interfere with other minibuffer usage.")
        (string-match "\\`/[^/]+[@:]\\'"
                      (or dir ido-current-directory))))
 
+(defun ido-is-unc-root (&optional dir)
+  (and ido-unc-hosts
+       (string-equal "//"
+                     (or dir ido-current-directory))))
+
+(defun ido-is-unc-host (&optional dir)
+  (and ido-unc-hosts
+       (string-match "\\`//[^/]+/\\'"
+                     (or dir ido-current-directory))))
+
 (defun ido-is-root-directory (&optional dir)
   (setq dir (or dir ido-current-directory))
   (or
@@ -1148,6 +1171,12 @@ it doesn't interfere with other minibuffer usage.")
        (or (not time)
            (< (- (ido-time-stamp) time) ido-cache-ftp-work-directory-time))))
 
+(defun ido-cache-unc-valid (&optional time)
+  (and (numberp ido-cache-unc-host-shares-time)
+       (> ido-cache-unc-host-shares-time 0)
+       (or (not time)
+           (< (- (ido-time-stamp) time) ido-cache-unc-host-shares-time))))
+
 (defun ido-may-cache-directory (&optional dir)
   (setq dir (or dir ido-current-directory))
   (cond
@@ -1157,10 +1186,11 @@ it doesn't interfere with other minibuffer usage.")
          (or ido-enable-tramp-completion
              (memq system-type '(windows-nt ms-dos))))
     nil)
-   ((not (ido-is-ftp-directory dir))
-    t)
-   ((ido-cache-ftp-valid)
-    t)))
+   ((ido-is-unc-host dir)
+    (ido-cache-unc-valid))
+   ((ido-is-ftp-directory dir)
+    (ido-cache-ftp-valid))
+   (t t)))
 
 (defun ido-pp (list &optional sep)
   (let ((print-level nil) (eval-expression-print-level nil)
@@ -1262,15 +1292,21 @@ Removes badly formatted data and ignored directories."
                             (and
                              (stringp dir)
                              (consp time)
-                             (if (integerp (car time))
-                                 (and (/= (car time) 0)
-                                      (integerp (car (cdr time)))
-                                      (/= (car (cdr time)) 0)
-                                      (ido-may-cache-directory dir))
-                               (and (eq (car time) 'ftp)
-                                    (numberp (cdr time))
+                             (cond
+                              ((integerp (car time))
+                               (and (/= (car time) 0)
+                                    (integerp (car (cdr time)))
+                                    (/= (car (cdr time)) 0)
+                                    (ido-may-cache-directory dir)))
+                              ((eq (car time) 'ftp)
+                               (and (numberp (cdr time))
                                     (ido-is-ftp-directory dir)
                                     (ido-cache-ftp-valid (cdr time))))
+                              ((eq (car time) 'unc)
+                               (and (numberp (cdr time))
+                                    (ido-is-unc-host dir)
+                                    (ido-cache-unc-valid (cdr time))))
+                              (t nil))
                              (let ((s files) (ok t))
                                (while s
                                  (if (stringp (car s))
@@ -1535,6 +1571,7 @@ With ARG, turn ido speed-up on if arg is positive, off otherwise."
   ;; connect on incomplete tramp paths (after entring just method:).
   (let ((ido-enable-tramp-completion nil))
     (and (ido-final-slash dir)
+         (not (ido-is-unc-host dir))
          (file-directory-p dir)
          (not (file-readable-p dir)))))
 
@@ -1545,6 +1582,7 @@ With ARG, turn ido speed-up on if arg is positive, off otherwise."
   (let ((ido-enable-tramp-completion nil))
     (and (numberp ido-max-directory-size)
          (ido-final-slash dir)
+         (not (ido-is-unc-host dir))
          (file-directory-p dir)
          (> (nth 7 (file-attributes dir)) ido-max-directory-size))))
 
@@ -1560,8 +1598,18 @@ With ARG, turn ido speed-up on if arg is positive, off otherwise."
     (unless (and ido-enable-tramp-completion
                  (string-match "\\`/[^/]*@\\'" dir))
       (setq dir (ido-final-slash dir t))))
-  (if (equal dir ido-current-directory)
-      nil
+  (if (get-buffer ido-completion-buffer)
+      (kill-buffer ido-completion-buffer))
+  (cond
+   ((equal dir ido-current-directory)
+    nil)
+   ((ido-is-unc-root dir)
+    (ido-trace "unc" dir)
+    (setq ido-current-directory dir)
+    (setq ido-directory-nonreadable nil)
+    (setq ido-directory-too-big nil)
+    t)
+   (t
     (ido-trace "cd" dir)
     (setq ido-current-directory dir)
     (if (get-buffer ido-completion-buffer)
@@ -1569,7 +1617,7 @@ With ARG, turn ido speed-up on if arg is positive, off otherwise."
     (setq ido-directory-nonreadable (ido-nonreadable-directory-p dir))
     (setq ido-directory-too-big (and (not ido-directory-nonreadable)
                                      (ido-directory-too-big-p dir)))
-    t))
+    t)))
 
 (defun ido-set-current-home (&optional dir)
   ;; Set ido's current directory to user's home directory
@@ -1940,6 +1988,7 @@ If INITIAL is non-nil, it specifies the initial input string."
               (setq ido-exit 'fallback
                     done t)
             (setq ido-set-default-item t)))
+
          ((or (string-match "[/\\][^/\\]" ido-selected)
               (and (memq system-type '(windows-nt ms-dos))
                    (string-match "\\`.:" ido-selected)))
@@ -1973,7 +2022,7 @@ If INITIAL is non-nil, it specifies the initial input string."
 (defun ido-edit-input ()
   "Edit absolute file name entered so far with ido; terminate by RET."
   (interactive)
-  (setq ido-text-init ido-text)
+  (setq ido-text-init (if ido-matches (car ido-matches) ido-text))
   (setq ido-exit 'edit)
   (exit-minibuffer))
 
@@ -3184,36 +3233,52 @@ for first matching file."
 (defun ido-file-name-all-completions (dir)
   ;; Return name of all files in DIR
   ;; Uses and updates ido-dir-file-cache
-  (if (and (numberp ido-max-dir-file-cache) (> ido-max-dir-file-cache 0)
-           (stringp dir) (> (length dir) 0)
-           (ido-may-cache-directory dir))
-      (let* ((cached (assoc dir ido-dir-file-cache))
+  (cond
+   ((ido-is-unc-root dir)
+    (mapcar
+     (lambda (host)
+       (if (string-match "/\\'" host) host (concat host "/")))
+     ido-unc-hosts))
+   ((and (numberp ido-max-dir-file-cache) (> ido-max-dir-file-cache 0)
+         (stringp dir) (> (length dir) 0)
+         (ido-may-cache-directory dir))
+    (let* ((cached (assoc dir ido-dir-file-cache))
              (ctime (nth 1 cached))
              (ftp (ido-is-ftp-directory dir))
-             (attr (if ftp nil (file-attributes dir)))
+             (unc (ido-is-unc-host dir))
+             (attr (if (or ftp unc) nil (file-attributes dir)))
              (mtime (nth 5 attr))
              valid)
         (when cached        ; should we use the cached entry ?
-          (if ftp
-              (setq valid (and (eq (car ctime) 'ftp)
-                               (ido-cache-ftp-valid (cdr ctime))))
+          (cond
+           (ftp
+            (setq valid (and (eq (car ctime) 'ftp)
+                             (ido-cache-ftp-valid (cdr ctime)))))
+           (unc
+            (setq valid (and (eq (car ctime) 'unc)
+                             (ido-cache-unc-valid (cdr ctime)))))
+           (t
             (if attr
                 (setq valid (and (= (car ctime) (car mtime))
-                                 (= (car (cdr ctime)) (car (cdr mtime)))))))
-          (if (not valid)
-              (setq ido-dir-file-cache (delq cached ido-dir-file-cache)
-                    cached nil)))
+                                 (= (car (cdr ctime)) (car (cdr mtime))))))))
+          (unless valid
+            (setq ido-dir-file-cache (delq cached ido-dir-file-cache)
+                  cached nil)))
         (unless cached
-          (if (and ftp (file-readable-p dir))
-              (setq mtime (cons 'ftp (ido-time-stamp))))
+          (cond
+           (unc
+            (setq mtime (cons 'unc (ido-time-stamp))))
+           ((and ftp (file-readable-p dir))
+            (setq mtime (cons 'ftp (ido-time-stamp)))))
           (if mtime
               (setq cached (cons dir (cons mtime (ido-file-name-all-completions-1 dir)))
                     ido-dir-file-cache (cons cached ido-dir-file-cache)))
           (if (> (length ido-dir-file-cache) ido-max-dir-file-cache)
               (setcdr (nthcdr (1- ido-max-dir-file-cache) ido-dir-file-cache) nil)))
         (and cached
-             (cdr (cdr cached))))
-    (ido-file-name-all-completions-1 dir)))
+             (cdr (cdr cached)))))
+   (t
+    (ido-file-name-all-completions-1 dir))))
 
 (defun ido-remove-cached-dir (dir)
   ;; Remove dir from ido-dir-file-cache
@@ -3227,7 +3292,8 @@ for first matching file."
 (defun ido-make-file-list-1 (dir &optional merged)
   ;; Return list of non-ignored files in DIR
   ;; If MERGED is non-nil, each file is cons'ed with DIR
-  (and (or (ido-is-tramp-root dir) (file-directory-p dir))
+  (and (or (ido-is-tramp-root dir) (ido-is-unc-root dir)
+           (file-directory-p dir))
        (delq nil
              (mapcar
               (lambda (name)
@@ -3956,10 +4022,16 @@ For details of keybindings, do `\\[describe-function] ido-find-file'."
           )
 
          ((= (length contents) 1)
-          (when (and (ido-is-tramp-root) (string-equal contents "/"))
+          (cond
+           ((and (ido-is-tramp-root) (string-equal contents "/"))
             (ido-set-current-directory ido-current-directory contents)
             (setq refresh t))
-          )
+           ((and ido-unc-hosts (string-equal contents "/")
+                 (let ((ido-enable-tramp-completion nil))
+                   (ido-is-root-directory)))
+            (ido-set-current-directory "//")
+            (setq refresh t))
+          ))
 
          ((and (string-match (if ido-enable-tramp-completion "..[:@]\\'" "..:\\'") contents)
                (ido-is-root-directory)) ;; Ange-ftp or tramp
diff --git a/lisp/image.el b/lisp/image.el
index 6938dba05cb..2212b0fb471 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -79,12 +79,13 @@ value is used as a list of directories to search.")
 
 
 (defun image-load-path-for-library (library image &optional path no-error)
-  "Return a suitable search path for images relative to LIBRARY.
+  "Return a suitable search path for images used by LIBRARY.
 
-First it searches for IMAGE in a path suitable for LIBRARY, which
-includes \"../../etc/images\" and \"../etc/images\" relative to
-the library file itself, followed by `image-load-path' and
-`load-path'.
+It searches for IMAGE in `image-load-path' (excluding
+\"`data-directory'/images\") and `load-path', followed by a path
+suitable for LIBRARY, which includes \"../../etc/images\" and
+\"../etc/images\" relative to the library file itself, and then
+in \"`data-directory'/images\".
 
 Then this function returns a list of directories which contains
 first the directory in which IMAGE was found, followed by the
@@ -99,16 +100,46 @@ Here is an example that uses a common idiom to provide
 compatibility with versions of Emacs that lack the variable
 `image-load-path':
 
-    ;; Avoid errors on Emacsen without `image-load-path'.
-    (if (not (boundp 'image-load-path)) (defvar image-load-path nil))
+    ;; Shush compiler.
+    (defvar image-load-path)
 
     (let* ((load-path (image-load-path-for-library \"mh-e\" \"mh-logo.xpm\"))
-           (image-load-path (cons (car load-path) image-load-path)))
+           (image-load-path (cons (car load-path)
+                                  (when (boundp 'image-load-path)
+                                    image-load-path))))
       (mh-tool-bar-folder-buttons-init))"
   (unless library (error "No library specified"))
   (unless image   (error "No image specified"))
-  (let ((image-directory))
+  (let (image-directory image-directory-load-path)
+    ;; Check for images in image-load-path or load-path.
+    (let ((img image)
+          (dir (or
+                ;; Images in image-load-path.
+                (image-search-load-path image)
+                ;; Images in load-path.
+                (locate-library image)))
+          parent)
+      ;; Since the image might be in a nested directory (for
+      ;; example, mail/attach.pbm), adjust `image-directory'
+      ;; accordingly.
+      (when dir
+        (setq dir (file-name-directory dir))
+        (while (setq parent (file-name-directory img))
+          (setq img (directory-file-name parent)
+                dir (expand-file-name "../" dir))))
+      (setq image-directory-load-path dir))
+
+    ;; If `image-directory-load-path' isn't Emacs' image directory,
+    ;; it's probably a user preference, so use it. Then use a
+    ;; relative setting if possible; otherwise, use
+    ;; `image-directory-load-path'.
     (cond
+     ;; User-modified image-load-path?
+     ((and image-directory-load-path
+           (not (equal image-directory-load-path
+                       (file-name-as-directory
+                        (expand-file-name "images" data-directory)))))
+      (setq image-directory image-directory-load-path))
      ;; Try relative setting.
      ((let (library-name d1ei d2ei)
         ;; First, find library in the load-path.
@@ -118,33 +149,20 @@ compatibility with versions of Emacs that lack the variable
         ;; And then set image-directory relative to that.
         (setq
          ;; Go down 2 levels.
-         d2ei (expand-file-name
-               (concat (file-name-directory library-name) "../../etc/images"))
+         d2ei (file-name-as-directory
+               (expand-file-name
+                (concat (file-name-directory library-name) "../../etc/images")))
          ;; Go down 1 level.
-         d1ei (expand-file-name
-               (concat (file-name-directory library-name) "../etc/images")))
+         d1ei (file-name-as-directory
+               (expand-file-name
+                (concat (file-name-directory library-name) "../etc/images"))))
         (setq image-directory
               ;; Set it to nil if image is not found.
               (cond ((file-exists-p (expand-file-name image d2ei)) d2ei)
                     ((file-exists-p (expand-file-name image d1ei)) d1ei)))))
-     ;; Check for images in image-load-path or load-path.
-     ((let ((img image)
-            (dir (or
-                  ;; Images in image-load-path.
-                  (image-search-load-path image)
-                  ;; Images in load-path.
-                  (locate-library image)))
-            parent)
-        ;; Since the image might be in a nested directory (for
-        ;; example, mail/attach.pbm), adjust `image-directory'
-        ;; accordingly.
-        (and dir
-             (setq dir (file-name-directory dir))
-             (progn
-               (while (setq parent (file-name-directory img))
-                 (setq img (directory-file-name parent)
-                       dir (expand-file-name "../" dir)))
-               (setq image-directory dir)))))
+     ;; Use Emacs' image directory.
+     (image-directory-load-path
+      (setq image-directory image-directory-load-path))
      (no-error
       (message "Could not find image %s for library %s" image library))
      (t
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index ca8e29b52e6..bf9a9570216 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1593,7 +1593,10 @@ and the contents of `file-coding-system-alist'."
                        (symbol :tag "Coding system"))))
 
 (defcustom auto-coding-regexp-alist
-  '(("^BABYL OPTIONS:[ \t]*-\\*-[ \t]*rmail[ \t]*-\\*-" . no-conversion))
+  '(("^BABYL OPTIONS:[ \t]*-\\*-[ \t]*rmail[ \t]*-\\*-" . no-conversion)
+    ("\\`\xFE\xFF" . utf-16be-with-signature)
+    ("\\`\xFF\xFE" . utf-16le-with-signature)
+    ("\\`\xEF\xBB\xBF" . utf-8))
   "Alist of patterns vs corresponding coding systems.
 Each element looks like (REGEXP . CODING-SYSTEM).
 A file whose first bytes match REGEXP is decoded by CODING-SYSTEM on reading.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 0a85f10cf40..13b54a02467 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1696,12 +1696,15 @@ Isearch mode."
              (and (integerp main-event)
                   (memq 'shift mods)
                   (memq 'control mods)
-                  (lookup-key isearch-mode-map
-                              (let ((copy (copy-sequence key)))
-                                (aset copy 0
-                                      (- main-event (- ?\C-\S-a ?\C-a)))
-                                copy)
-                              nil)))
+                  (not (memq (lookup-key isearch-mode-map
+                                         (let ((copy (copy-sequence key)))
+                                           (aset copy 0
+                                                 (- main-event
+                                                    (- ?\C-\S-a ?\C-a)))
+                                           copy)
+                                         nil)
+                             '(nil
+                               isearch-other-control-char)))))
            (setcar keylist (- main-event (- ?\C-\S-a ?\C-a)))
            (cancel-kbd-macro-events)
            (apply 'isearch-unread keylist))
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index d7d82ae5551..93d4755cf3a 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -6,7 +6,6 @@
 ;; Author: Stephen Eglen <stephen@gnu.org>
 ;; Maintainer: Stephen Eglen <stephen@gnu.org>
 ;; Keywords: completion convenience
-;; location: http://www.anc.ed.ac.uk/~stephen/emacs/
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index f82ead462f0..0e131b665ef 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -301,7 +301,7 @@ Only applies to the current buffer."
 This function is added to `fontification-functions' when `jit-lock-mode'
 is active."
   (when (and jit-lock-mode (not memory-full))
-    (if (null jit-lock-defer-time)
+    (if (null jit-lock-defer-timer)
         ;; No deferral.
         (jit-lock-fontify-now start (+ start jit-lock-chunk-size))
       ;; Record the buffer for later fontification.
@@ -510,7 +510,7 @@ This functions is called after Emacs has been idle for
                    (setq pos (next-single-property-change pos 'fontified)))))))))
     (setq jit-lock-defer-buffers nil)
     ;; Force fontification of the visible parts.
-    (let ((jit-lock-defer-time nil))
+    (let ((jit-lock-defer-timer nil))
       ;; (message "Jit-Defer Now")
       (sit-for 0)
       ;; (message "Jit-Defer Done")
@@ -571,7 +571,7 @@ will take place when text is fontified stealthily."
          (setq start (if region
                          (car region)
                        (goto-char start)
-                       (line-beginning-position (- 1 font-lock-lines-before))))
+                       (line-beginning-position)))
 
          ;; If we're in text that matches a multi-line font-lock pattern,
          ;; make sure the whole text will be redisplayed.
diff --git a/lisp/locate.el b/lisp/locate.el
index bca53a32152..702ae98ecd6 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -122,7 +122,26 @@
   :group 'external)
 
 (defcustom locate-command "locate"
-  "*The executable program used to search a database of files."
+  "Executable program for searching a database of files.
+The Emacs commands `locate' and `locate-with-filter' use this.
+The value should be a program that can be called from a shell
+with one argument, SEARCH-STRING.  The program determines which
+database it searches.  The output of the program should consist
+of those file names in the database that match SEARCH-STRING,
+listed one per line, possibly with leading or trailing
+whitespace.  If the output is in another form, you may have to
+redefine the function `locate-get-file-positions'.
+
+The program may interpret SEARCH-STRING as a literal string, a
+shell pattern or a regular expression.  The exact rules of what
+constitutes a match may also depend on the program.
+
+The standard value of this variable is \"locate\".
+This program normally searches a database of all files on your
+system, or of all files that you have access to.  Consult the
+documentation of that program for the details about how it determines
+which file names match SEARCH-STRING.  (Those details vary highly with
+the version.)"
   :type 'string
   :group 'locate)
 
@@ -133,22 +152,34 @@
   "The history list used by the \\[locate-with-filter] command.")
 
 (defcustom locate-make-command-line 'locate-default-make-command-line
-  "*Function used to create the locate command line."
+  "Function used to create the locate command line.
+The Emacs commands `locate' and `locate-with-filter' use this.
+This function should take one argument, a string (the name to find)
+and return a list of strings.  The first element of the list should be
+the name of a command to be executed by a shell, the remaining elements
+should be the arguments to that command (including the name to find)."
   :type 'function
   :group 'locate)
 
 (defcustom locate-buffer-name "*Locate*"
-  "*Name of the buffer to show results from the \\[locate] command."
+  "Name of the buffer to show results from the \\[locate] command."
   :type 'string
   :group 'locate)
 
 (defcustom locate-fcodes-file nil
-  "*File name for the database of file names."
+  "File name for the database of file names used by `locate'.
+If non-nil, `locate' uses this name in the header of the `*Locate*'
+buffer.  If nil, it mentions no file name in that header.
+
+Just setting this variable does not actually change the database
+that `locate' searches.  The executive program that the Emacs
+function `locate' uses, as given by the variables `locate-command'
+or `locate-make-command-line', determines the database."
   :type '(choice (const :tag "None" nil) file)
   :group 'locate)
 
 (defcustom locate-header-face nil
-  "*Face used to highlight the locate header."
+  "Face used to highlight the locate header."
   :type '(choice (const :tag "None" nil) face)
   :group 'locate)
 
@@ -161,12 +192,12 @@ This should contain the \"-l\" switch, but not the \"-F\" or \"-b\" switches."
   :version "22.1")
 
 (defcustom locate-update-command "updatedb"
-  "The command used to update the locate database."
+  "The executable program used to update the locate database."
   :type 'string
   :group 'locate)
 
 (defcustom locate-prompt-for-command nil
-  "If non-nil, the locate command prompts for a command to run.
+  "If non-nil, the `locate' command prompts for a command to run.
 Otherwise, that behavior is invoked via a prefix argument."
   :group 'locate
   :type 'boolean
@@ -191,7 +222,22 @@ Otherwise, that behavior is invoked via a prefix argument."
 ;;;###autoload
 (defun locate (search-string &optional filter)
   "Run the program `locate', putting results in `*Locate*' buffer.
-With prefix arg, prompt for the locate command to run."
+Pass it SEARCH-STRING as argument.  Interactively, prompt for SEARCH-STRING.
+With prefix arg, prompt for the exact shell command to run instead.
+
+This program searches for those file names in a database that match
+SEARCH-STRING and normally outputs all matching absolute file names,
+one per line.  The database normally consists of all files on your
+system, or of all files that you have access to.  Consult the
+documentation of the program for the details about how it determines
+which file names match SEARCH-STRING.  (Those details vary highly with
+the version.)
+
+You can specify another program for this command to run by customizing
+the variables `locate-command' or `locate-make-command-line'.
+
+The main use of FILTER is to implement `locate-with-filter'.  See
+the docstring of that function for its meaning."
   (interactive
       (list
        (if (or (and current-prefix-arg
@@ -255,10 +301,17 @@ With prefix arg, prompt for the locate command to run."
 
 ;;;###autoload
 (defun locate-with-filter (search-string filter)
-  "Run the locate command with a filter.
-
-The filter is a regular expression. Only results matching the filter are
-shown; this is often useful to constrain a big search."
+  "Run the executable program `locate' with a filter.
+This function is similar to the function `locate', which see.
+The difference is that, when invoked interactively, the present function
+prompts for both SEARCH-STRING and FILTER.  It passes SEARCH-STRING
+to the locate executable program.  It produces a `*Locate*' buffer
+that lists only those lines in the output of the locate program that
+contain a match for the regular expression FILTER; this is often useful
+to constrain a big search.
+
+When called from Lisp, this function is identical with `locate',
+except that FILTER is not optional."
   (interactive
    (list (read-from-minibuffer "Locate: " nil nil
                                nil 'locate-history-list)
@@ -269,7 +322,7 @@ shown; this is often useful to constrain a big search."
 (defun locate-filter-output (filter)
   "Filter output from the locate command."
   (goto-char (point-min))
-  (delete-non-matching-lines filter))
+  (keep-lines filter))
 
 (defvar locate-mode-map nil
   "Local keymap for Locate mode buffers.")
@@ -303,6 +356,15 @@ shown; this is often useful to constrain a big search."
   "The amount of indentation for each file.")
 
 (defun locate-get-file-positions ()
+  "Return list of start and end of the file name on the current line.
+This is a list of two buffer positions.
+
+You should only call this function on lines that contain a file name
+listed by the locate program.  Inside inserted subdirectories, or if
+there is no file name on the current line, the return value is
+meaningless.  You can check whether the current line contains a file
+listed by the locate program, using the function
+`locate-main-listing-line-p'."
   (save-excursion
     (end-of-line)
     (let ((eol (point)))
@@ -320,6 +382,12 @@ shown; this is often useful to constrain a big search."
          1
        0)))
 
+;; You should only call this function on lines that contain a file name
+;; listed by the locate program.  Inside inserted subdirectories, or if
+;; there is no file name on the current line, the return value is
+;; meaningless.  You can check whether the current line contains a file
+;; listed by the locate program, using the function
+;; `locate-main-listing-line-p'.
 (defun locate-get-filename ()
   (let ((pos    (locate-get-file-positions))
         (lineno (locate-current-line-number)))
@@ -516,8 +584,16 @@ Database is updated using the shell command in `locate-update-command'."
 (defun locate-find-directory-other-window ()
   "Visit the directory of the file named on this line in other window."
   (interactive)
-  (find-file-other-window (locate-get-dirname)))
+  (if (locate-main-listing-line-p)
+      (find-file-other-window (locate-get-dirname))
+    (message "This command only works inside main listing.")))
 
+;; You should only call this function on lines that contain a file name
+;; listed by the locate program.  Inside inserted subdirectories, or if
+;; there is no file name on the current line, the return value is
+;; meaningless.  You can check whether the current line contains a file
+;; listed by the locate program, using the function
+;; `locate-main-listing-line-p'.
 (defun locate-get-dirname ()
   "Return the directory name of the file mentioned on this line."
   (let (file (filepos (locate-get-file-positions)))
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 935e7d1b92c..5c06a1fe1ad 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -453,10 +453,10 @@ examples:
   "String to prepend to Subject line when replying to a message.")
 
 ;; Some mailers use "Re(2):" or "Re^2:" or "Re: Re:" or "Re[2]:".
-;; This pattern should catch all the common variants.  The pattern
-;; also ignores mailing list identifiers sometimes added in square
-;; brackets at the beginning of subject lines.
-(defvar rmail-reply-regexp "\\`\\(\\[.+?\\] \\)?\\(Re\\(([0-9]+)\\|\\[[0-9]+\\]\\|\\^[0-9]+\\)?: *\\)*"
+;; This pattern should catch all the common variants.
+;; rms: I deleted the change to delete tags in square brackets
+;; because they mess up RT tags.
+(defvar rmail-reply-regexp "\\`\\(Re\\(([0-9]+)\\|\\[[0-9]+\\]\\|\\^[0-9]+\\)?: *\\)*"
   "Regexp to delete from Subject line before inserting `rmail-reply-prefix'.")
 
 (defcustom rmail-display-summary nil
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index ecdf207d252..7a6cf778bbe 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,42 @@
+2006-03-19  Bill Wohler  <wohler@newt.com>
+
+        * mh-comp.el (mh-reply): Sync docstring with manual.
+
+        * mh-compat.el (mh-image-load-path-for-library): Shorten first line in
+        docstring.
+
+2006-03-17  Bill Wohler  <wohler@newt.com>
+
+        * mh-compat.el (mh-image-load-path-for-library): Minor docstring
+        fix.
+
+2006-03-16  Bill Wohler  <wohler@newt.com>
+
+        * mh-comp.el (mh-send-letter): Use split-string to break up
+        mh-send-args (closes SF #1448604).
+        (mh-compose-and-send-mail): Use run-hook-with-args for
+        mh-compose-letter-function.
+
+        * mh-e.el (mh-list-to-string-1): Use dolist.
+
+        * mh-compat.el (mh-image-load-path-for-library): Prefer user's
+        images.
+
+2006-03-15  Bill Wohler  <wohler@newt.com>
+
+        * mh-compat.el (mh-image-load-path-for-library): Fix example by
+        not recommending that one binds image-load-path. Just defvar it to
+        placate compiler and only use it if previously defined.
+
+        * mh-e.el (image-load-path): Don't bind!
+
+        * mh-folder.el (mh-folder-mode): Only use image-load-path if
+        previously defined.
+
+        * mh-letter.el (mh-letter-mode): Ditto.
+
+        * mh-utils.el (mh-logo-display): Ditto.
+
 2006-03-14  Bill Wohler  <wohler@newt.com>
 
         * mh-compat.el (mh-image-load-path-for-library): Incorporate
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 0cedc83719c..27806dc9ab9 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -287,7 +287,7 @@ use `mh-send-prog' to tell MH-E the name."
            (set-buffer draft-buffer))   ; for annotation below
           (t
            (mh-exec-cmd-daemon mh-send-prog nil "-nodraftfolder" "-noverbose"
-                               mh-send-args file-name)))
+                               (split-string mh-send-args) file-name)))
     (if mh-annotate-char
         (mh-annotate-msg mh-sent-from-msg
                          mh-sent-from-folder
@@ -580,14 +580,16 @@ You have several choices here.
 
      Response     Reply Goes To
 
-     from         The person who sent the message.  This is the
+     from         The person who sent the message. This is the
                   default, so <RET> is sufficient.
 
      to           Replies to the sender, plus all recipients in the
                   \"To:\" header field.
 
-     all
-     cc           Forms a reply to the sender, plus all recipients.
+     all cc       Forms a reply to the addresses in the
+                  \"Mail-Followup-To:\" header field if one
+                  exists; otherwise forms a reply to the sender,
+                  plus all recipients.
 
 Depending on your answer, \"repl\" is given a different argument
 to form your reply. Specifically, a choice of \"from\" or none at
@@ -597,7 +599,11 @@ all runs \"repl -nocc all\", and a choice of \"to\" runs \"repl
 
 Two windows are then created. One window contains the message to
 which you are replying in an MH-Show buffer. Your draft, in
-MH-Letter mode (see `mh-letter-mode'), is in the other window.
+MH-Letter mode (*note `mh-letter-mode'), is in the other window.
+If the reply draft was not one that you expected, check the
+things that affect the behavior of \"repl\" which include the
+\"repl:\" profile component and the \"replcomps\" and
+\"replgroupcomps\" files.
 
 If you supply a prefix argument INCLUDEP, the message you are
 replying to is inserted in your reply after having first been run
@@ -895,15 +901,7 @@ letter."
   (mh-logo-display)
   (mh-make-local-hook 'kill-buffer-hook)
   (add-hook 'kill-buffer-hook 'mh-tidy-draft-buffer nil t)
-  (if (and (boundp 'mh-compose-letter-function)
-           mh-compose-letter-function)
-      ;; run-hooks will not pass arguments.
-      (let ((value mh-compose-letter-function))
-        (if (and (listp value) (not (eq (car value) 'lambda)))
-            (while value
-              (funcall (car value) to subject cc)
-              (setq value (cdr value)))
-          (funcall mh-compose-letter-function to subject cc)))))
+  (run-hook-with-args 'mh-compose-letter-function to subject cc))
 
 (defun mh-insert-x-mailer ()
   "Append an X-Mailer field to the header.
diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el
index 50542d67f4e..256a8cfe831 100644
--- a/lisp/mh-e/mh-compat.el
+++ b/lisp/mh-e/mh-compat.el
@@ -117,12 +117,13 @@ introduced in Emacs 22."
 
 (mh-defun-compat mh-image-load-path-for-library
   image-load-path-for-library (library image &optional path no-error)
-  "Return a suitable search path for images relative to LIBRARY.
+  "Return a suitable search path for images used by LIBRARY.
 
-First it searches for IMAGE in a path suitable for LIBRARY, which
-includes \"../../etc/images\" and \"../etc/images\" relative to
-the library file itself, followed by `image-load-path' and
-`load-path'.
+It searches for IMAGE in `image-load-path' (excluding
+\"`data-directory'/images\") and `load-path', followed by a path
+suitable for LIBRARY, which includes \"../../etc/images\" and
+\"../etc/images\" relative to the library file itself, and then
+in \"`data-directory'/images\".
 
 Then this function returns a list of directories which contains
 first the directory in which IMAGE was found, followed by the
@@ -137,16 +138,46 @@ Here is an example that uses a common idiom to provide
 compatibility with versions of Emacs that lack the variable
 `image-load-path':
 
-    ;; Avoid errors on Emacsen without `image-load-path'.
-    (if (not (boundp 'image-load-path)) (defvar image-load-path nil))
+    ;; Shush compiler.
+    (defvar image-load-path)
 
     (let* ((load-path (image-load-path-for-library \"mh-e\" \"mh-logo.xpm\"))
-           (image-load-path (cons (car load-path) image-load-path)))
+           (image-load-path (cons (car load-path)
+                                  (when (boundp 'image-load-path)
+                                    image-load-path))))
       (mh-tool-bar-folder-buttons-init))"
   (unless library (error "No library specified"))
   (unless image   (error "No image specified"))
-  (let ((image-directory))
+  (let (image-directory image-directory-load-path)
+    ;; Check for images in image-load-path or load-path.
+    (let ((img image)
+          (dir (or
+                ;; Images in image-load-path.
+                (mh-image-search-load-path image)
+                ;; Images in load-path.
+                (locate-library image)))
+          parent)
+      ;; Since the image might be in a nested directory (for
+      ;; example, mail/attach.pbm), adjust `image-directory'
+      ;; accordingly.
+      (when dir
+        (setq dir (file-name-directory dir))
+        (while (setq parent (file-name-directory img))
+          (setq img (directory-file-name parent)
+                dir (expand-file-name "../" dir))))
+      (setq image-directory-load-path dir))
+
+    ;; If `image-directory-load-path' isn't Emacs' image directory,
+    ;; it's probably a user preference, so use it. Then use a
+    ;; relative setting if possible; otherwise, use
+    ;; `image-directory-load-path'.
     (cond
+     ;; User-modified image-load-path?
+     ((and image-directory-load-path
+           (not (equal image-directory-load-path
+                       (file-name-as-directory
+                        (expand-file-name "images" data-directory)))))
+      (setq image-directory image-directory-load-path))
      ;; Try relative setting.
      ((let (library-name d1ei d2ei)
         ;; First, find library in the load-path.
@@ -156,33 +187,20 @@ compatibility with versions of Emacs that lack the variable
         ;; And then set image-directory relative to that.
         (setq
          ;; Go down 2 levels.
-         d2ei (expand-file-name
-               (concat (file-name-directory library-name) "../../etc/images"))
+         d2ei (file-name-as-directory
+               (expand-file-name
+                (concat (file-name-directory library-name) "../../etc/images")))
          ;; Go down 1 level.
-         d1ei (expand-file-name
-               (concat (file-name-directory library-name) "../etc/images")))
+         d1ei (file-name-as-directory
+               (expand-file-name
+                (concat (file-name-directory library-name) "../etc/images"))))
         (setq image-directory
               ;; Set it to nil if image is not found.
               (cond ((file-exists-p (expand-file-name image d2ei)) d2ei)
                     ((file-exists-p (expand-file-name image d1ei)) d1ei)))))
-     ;; Check for images in image-load-path or load-path.
-     ((let ((img image)
-            (dir (or
-                  ;; Images in image-load-path.
-                  (mh-image-search-load-path image)
-                  ;; Images in load-path.
-                  (locate-library image)))
-            parent)
-        ;; Since the image might be in a nested directory (for
-        ;; example, mail/attach.pbm), adjust `image-directory'
-        ;; accordingly.
-        (and dir
-             (setq dir (file-name-directory dir))
-             (progn
-               (while (setq parent (file-name-directory img))
-                 (setq img (directory-file-name parent)
-                       dir (expand-file-name "../" dir)))
-               (setq image-directory dir)))))
+     ;; Use Emacs' image directory.
+     (image-directory-load-path
+      (setq image-directory image-directory-load-path))
      (no-error
       (message "Could not find image %s for library %s" image library))
      (t
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 2f29a678f13..84e569bab81 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -325,9 +325,6 @@ Name of the Previous sequence.")
 
 ;; Etc. (alphabetical)
 
-;; Avoid errors on Emacsen without image-load-path.
-(if (not (boundp 'image-load-path)) (defvar image-load-path nil))
-
 (defvar mh-flists-present-flag nil
   "Non-nil means that we have \"flists\".")
 
@@ -430,20 +427,20 @@ gnus-version)
 
 (defun mh-list-to-string-1 (l)
   "Flatten the list L and make every element of the new list into a string."
-  (let ((new-list nil))
-    (while l
-      (cond ((null (car l)))
-            ((symbolp (car l))
-             (setq new-list (cons (symbol-name (car l)) new-list)))
-            ((numberp (car l))
-             (setq new-list (cons (int-to-string (car l)) new-list)))
-            ((equal (car l) ""))
-            ((stringp (car l)) (setq new-list (cons (car l) new-list)))
-            ((listp (car l))
-             (setq new-list (nconc (mh-list-to-string-1 (car l))
-                                   new-list)))
-            (t (error "Bad element in `mh-list-to-string': %s" (car l))))
-      (setq l (cdr l)))
+  (let (new-list)
+    (dolist (element l)
+      (cond ((null element))
+            ((symbolp element)
+             (push (symbol-name element) new-list))
+            ((numberp element)
+             (push (int-to-string element) new-list))
+            ((equal element ""))
+            ((stringp element)
+             (push element new-list))
+            ((listp element)
+             (setq new-list (nconc (mh-list-to-string-1 element) new-list)))
+            (t
+             (error "Bad element: %s" element))))
     new-list))
 
 
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index 2c32d1433f1..b1b8c7d859c 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -525,6 +525,7 @@ font-lock is done highlighting.")
 (eval-when-compile
   (defvar desktop-save-buffer)
   (defvar font-lock-auto-fontify)
+  (defvar image-load-path)
   (mh-do-in-xemacs (defvar font-lock-defaults)))
 
 (defvar mh-folder-buttons-init-flag nil)
@@ -592,7 +593,9 @@ perform the operation on all messages in that region.
   (mh-do-in-gnu-emacs
     (unless mh-folder-buttons-init-flag
       (let* ((load-path (mh-image-load-path-for-library "mh-e" "mh-logo.xpm"))
-             (image-load-path (cons (car load-path) image-load-path)))
+             (image-load-path (cons (car load-path)
+                                    (when (boundp 'image-load-path)
+                                      image-load-path))))
         (mh-tool-bar-folder-buttons-init)
         (setq mh-folder-buttons-init-flag t)))
     (set (make-local-variable 'tool-bar-map) mh-folder-tool-bar-map))
diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index a7290cf5ae9..024c1875eac 100644
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -278,7 +278,9 @@ searching for `mh-mail-header-separator' in the buffer."
 (defvar mh-letter-buttons-init-flag nil)
 
 ;; Shush compiler.
-(eval-when-compile (mh-do-in-xemacs (defvar font-lock-defaults)))
+(eval-when-compile
+  (defvar image-load-path)
+  (mh-do-in-xemacs (defvar font-lock-defaults)))
 
 ;; Ensure new buffers won't get this mode if default-major-mode is nil.
 (put 'mh-letter-mode 'mode-class 'special)
@@ -314,7 +316,9 @@ order).
   (mh-do-in-gnu-emacs
     (unless mh-letter-buttons-init-flag
       (let* ((load-path (mh-image-load-path-for-library "mh-e" "mh-logo.xpm"))
-             (image-load-path (cons (car load-path) image-load-path)))
+             (image-load-path (cons (car load-path)
+                                    (when (boundp 'image-load-path)
+                                      image-load-path))))
         (mh-tool-bar-letter-buttons-init)
         (setq mh-letter-buttons-init-flag t)))
     (set (make-local-variable 'tool-bar-map) mh-letter-tool-bar-map))
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 44e15f3cb19..e41ee0bcc4f 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -127,12 +127,17 @@ Ignores case when searching for OLD."
 
 (defvar mh-logo-cache nil)
 
+;; Shush compiler.
+(defvar image-load-path)
+
 ;;;###mh-autoload
 (defun mh-logo-display ()
   "Modify mode line to display MH-E logo."
   (mh-do-in-gnu-emacs
     (let* ((load-path (mh-image-load-path-for-library "mh-e" "mh-logo.xpm"))
-           (image-load-path (cons (car load-path) image-load-path)))
+           (image-load-path (cons (car load-path)
+                                  (when (boundp 'image-load-path)
+                                    image-load-path))))
       (add-text-properties
        0 2
        `(display ,(or mh-logo-cache
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 3a22fb49b04..c399515a3d2 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -538,19 +538,20 @@ resized by dragging their header-line."
          (echo-keystrokes 0)
          (start-event-frame (window-frame (car (car (cdr start-event)))))
          (start-event-window (car (car (cdr start-event))))
-         (start-nwindows (count-windows t))
          event mouse x left right edges wconfig growth
          (which-side
           (or (cdr (assq 'vertical-scroll-bars (frame-parameters start-event-frame)))
               'right)))
-    (if (one-window-p t)
-        (error "Attempt to resize sole ordinary window"))
-    (if (eq which-side 'right)
-        (if (= (nth 2 (window-edges start-event-window))
-               (frame-width start-event-frame))
-            (error "Attempt to drag rightmost scrollbar"))
-      (if (= (nth 0 (window-edges start-event-window)) 0)
-          (error "Attempt to drag leftmost scrollbar")))
+    (cond
+     ((one-window-p t)
+      (error "Attempt to resize sole ordinary window"))
+     ((and (eq which-side 'right)
+           (>= (nth 2 (window-inside-edges start-event-window))
+               (frame-width start-event-frame)))
+      (error "Attempt to drag rightmost scrollbar"))
+     ((and (eq which-side 'left)
+           (= (nth 0 (window-inside-edges start-event-window)) 0))
+      (error "Attempt to drag leftmost scrollbar")))
     (track-mouse
       (progn
         ;; enlarge-window only works on the selected window, so
diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index 0c9f45ab5b9..a9608b7f4f2 100644
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -51,6 +51,13 @@
   :type '(choice (const :tag "New `--recipient' option" "--recipient")
                  (const :tag "Old `--remote-user' option" "--remote-user")))
 
+(defcustom pgg-gpg-use-agent (if (getenv "GPG_AGENT_INFO") t nil)
+  "Whether to use gnupg agent for key caching.
+By default, it will be enabled iff the environment variable
+\"GPG_AGENT_INFO\" is set."
+  :group 'pgg-gpg
+  :type 'boolean)
+
 (defvar pgg-gpg-user-id nil
   "GnuPG ID of your default identity.")
 
@@ -58,7 +65,8 @@
   (let* ((output-file-name (pgg-make-temp-file "pgg-output"))
          (args
           `("--status-fd" "2"
-            ,@(if passphrase '("--passphrase-fd" "0"))
+            ,@(if pgg-gpg-use-agent '("--use-agent")
+                (if passphrase '("--passphrase-fd" "0")))
             "--yes" ; overwrite
             "--output" ,output-file-name
             ,@pgg-gpg-extra-args ,@args))
@@ -100,7 +108,8 @@
       (set-default-file-modes orig-mode))))
 
 (defun pgg-gpg-possibly-cache-passphrase (passphrase &optional key notruncate)
-  (if (and pgg-cache-passphrase
+  (if (and passphrase
+           pgg-cache-passphrase
            (progn
              (goto-char (point-min))
              (re-search-forward "^\\[GNUPG:] \\(GOOD_PASSPHRASE\\>\\)\\|\\(SIG_CREATED\\)" nil t)))
@@ -154,24 +163,22 @@ Optional ALL non-nil means search all keys, including secret keys."
   (let ((args (list "--with-colons" "--no-greeting" "--batch"
                     (if all "--list-secret-keys" "--list-keys")
                     string))
-        (key-regexp (concat "^\\(sec\\|pub\\)"
-                            ":[^:]*:[^:]*:[^:]*:\\([^:]*\\):[^:]*"
-                            ":[^:]*:[^:]*:[^:]*:\\([^:]*\\):"))
-        )
+        (key-regexp (concat "^\\(sec\\|pub\\)"
+                            ":[^:]*:[^:]*:[^:]*:\\([^:]*\\):[^:]*"
+                            ":[^:]*:[^:]*:[^:]*:\\([^:]*\\):")))
     (with-temp-buffer
       (apply #'call-process pgg-gpg-program nil t nil args)
       (goto-char (point-min))
       (if (re-search-forward key-regexp
-                             nil t)
-          (match-string 3)))))
+                             nil t)
+          (match-string 3)))))
 
 (defun pgg-gpg-key-id-from-key-owner (key-owner)
   (cond ((not key-owner) nil)
-        ;; Extract bare key id from outermost paired angle brackets, if any:
-        ((string-match "[^<]*<\\(.+\\)>[^>]*" key-owner)
-         (substring key-owner (match-beginning 1)(match-end 1)))
-        (key-owner))
-  )
+        ;; Extract bare key id from outermost paired angle brackets, if any:
+        ((string-match "[^<]*<\\(.+\\)>[^>]*" key-owner)
+         (substring key-owner (match-beginning 1)(match-end 1)))
+        (key-owner)))
 
 (defun pgg-gpg-encrypt-region (start end recipients &optional sign passphrase)
   "Encrypt the current region between START and END.
@@ -182,11 +189,11 @@ If optional PASSPHRASE is not specified, it will be obtained from the
 passphrase cache or user."
   (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
          (passphrase (or passphrase
-                         (when sign
-                           (pgg-read-passphrase
-                            (format "GnuPG passphrase for %s: "
-                                    pgg-gpg-user-id)
-                            pgg-gpg-user-id))))
+                         (when (and sign (not pgg-gpg-use-agent))
+                           (pgg-read-passphrase
+                            (format "GnuPG passphrase for %s: "
+                                    pgg-gpg-user-id)
+                            pgg-gpg-user-id))))
          (args
           (append
            (list "--batch" "--armor" "--always-trust" "--encrypt")
@@ -214,8 +221,9 @@ passphrase cache or user."
 If optional PASSPHRASE is not specified, it will be obtained from the
 passphrase cache or user."
   (let* ((passphrase (or passphrase
-                         (pgg-read-passphrase
-                          "GnuPG passphrase for symmetric encryption: ")))
+                         (when (not pgg-gpg-use-agent)
+                           (pgg-read-passphrase
+                            "GnuPG passphrase for symmetric encryption: "))))
          (args
           (append (list "--batch" "--armor" "--symmetric" )
                   (if pgg-text-mode (list "--textmode")))))
@@ -232,22 +240,23 @@ passphrase cache or user."
                          (insert-buffer-substring current-buffer)
                          (pgg-decode-armor-region (point-min) (point-max))))
          (secret-keys (pgg-gpg-lookup-all-secret-keys))
-         ;; XXX the user is stuck if they need to use the passphrase for
-         ;;     any but the first secret key for which the message is
-         ;;     encrypted.  ideally, we would incrementally give them a
-         ;;     chance with subsequent keys each time they fail with one.
+         ;; XXX the user is stuck if they need to use the passphrase for
+         ;;     any but the first secret key for which the message is
+         ;;     encrypted.  ideally, we would incrementally give them a
+         ;;     chance with subsequent keys each time they fail with one.
          (key (pgg-gpg-select-matching-key message-keys secret-keys))
-         (key-owner (and key (pgg-gpg-lookup-key-owner key t)))
+         (key-owner (and key (pgg-gpg-lookup-key-owner key t)))
          (key-id (pgg-gpg-key-id-from-key-owner key-owner))
          (pgg-gpg-user-id (or key-id key
-                              pgg-gpg-user-id pgg-default-user-id))
+                              pgg-gpg-user-id pgg-default-user-id))
          (passphrase (or passphrase
-                         (pgg-read-passphrase
-                          (format (if (pgg-gpg-symmetric-key-p message-keys)
-                                      "Passphrase for symmetric decryption: "
-                                    "GnuPG passphrase for %s: ")
-                                  (or key-owner "??"))
-                          pgg-gpg-user-id)))
+                         (when (not pgg-gpg-use-agent)
+                           (pgg-read-passphrase
+                            (format (if (pgg-gpg-symmetric-key-p message-keys)
+                                        "Passphrase for symmetric decryption: "
+                                      "GnuPG passphrase for %s: ")
+                                    (or key-owner "??"))
+                            pgg-gpg-user-id))))
          (args '("--batch" "--decrypt")))
     (pgg-gpg-process-region start end passphrase pgg-gpg-program args)
     (with-current-buffer pgg-errors-buffer
@@ -269,7 +278,7 @@ passphrase cache or user."
   (loop for message-key in message-keys
         for message-key-id = (and (equal (car message-key) 1)
                                   (cdr (assq 'key-identifier
-                                             (cdr message-key))))
+                                             (cdr message-key))))
         for key = (and message-key-id (pgg-lookup-key message-key-id 'encrypt))
         when (and key (member key secret-keys)) return key))
 
@@ -277,9 +286,11 @@ passphrase cache or user."
   "Make detached signature from text between START and END."
   (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
          (passphrase (or passphrase
-                         (pgg-read-passphrase
-                          (format "GnuPG passphrase for %s: " pgg-gpg-user-id)
-                          pgg-gpg-user-id)))
+                         (when (not pgg-gpg-use-agent)
+                           (pgg-read-passphrase
+                            (format "GnuPG passphrase for %s: "
+                                    pgg-gpg-user-id)
+                            pgg-gpg-user-id))))
          (args
           (append (list (if cleartext "--clearsign" "--detach-sign")
                         "--armor" "--batch" "--verbose"
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index db704985f2a..5b657b1555b 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -4,7 +4,7 @@
 ;; Maintainer: FSF
 ;; Keywords: unix, tools
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006
 ;; Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
@@ -125,6 +125,7 @@ and #define directives otherwise.")
 (defvar gdb-buffer-fringe-width nil)
 (defvar gdb-signalled nil)
 (defvar gdb-source-window nil)
+(defvar gdb-inferior-status nil)
 
 (defvar gdb-buffer-type nil
   "One of the symbols bound in `gdb-buffer-rules'.")
@@ -317,6 +318,16 @@ of the inferior.  Non-nil means display the layout shown for
   :group 'gud
   :version "22.1")
 
+(defun gdb-force-mode-line-update (status)
+  (let ((buffer gud-comint-buffer))
+    (if (and buffer (buffer-name buffer))
+        (with-current-buffer buffer
+          (setq mode-line-process
+                (format ":%s [%s]"
+                        (process-status (get-buffer-process buffer)) status))
+          ;; Force mode line redisplay soon.
+          (force-mode-line-update)))))
+
 (defun gdb-many-windows (arg)
   "Toggle the number of windows in the basic arrangement.
 With arg, display additional buffers iff arg is positive."
@@ -524,7 +535,9 @@ With arg, use separate IO iff arg is positive."
         gdb-buffer-fringe-width (car (window-fringes))
         gdb-debug-ring nil
         gdb-signalled nil
-        gdb-source-window nil)
+        gdb-source-window nil
+        gdb-inferior-status nil
+        gdb-continuation nil)
 
   (setq gdb-buffer-type 'gdba)
 
@@ -670,7 +683,8 @@ With arg, enter name of variable to be watched in the minibuffer."
           (require 'tooltip)
           (save-selected-window
             (let ((expr (if arg
-                            (read-string "Name of variable: ")
+                            (completing-read "Name of variable: "
+                                             'gud-gdb-complete-command)
                           (tooltip-identifier-from-point (point)))))
               (catch 'already-watched
                 (dolist (var gdb-var-list)
@@ -1064,6 +1078,7 @@ The key should be one of the cars in `gdb-buffer-rules-assoc'."
 ;;
 ;; These lists are consumed tail first.
 ;;
+(defvar gdb-continuation nil)
 
 (defun gdb-send (proc string)
   "A comint send filter for gdb.
@@ -1071,12 +1086,15 @@ This filter may simply queue input for a later time."
   (with-current-buffer gud-comint-buffer
     (let ((inhibit-read-only t))
       (remove-text-properties (point-min) (point-max) '(face))))
-  (let ((item (concat string "\n")))
-    (if gud-running
-      (progn
-        (if gdb-enable-debug (push (cons 'send item) gdb-debug-ring))
-        (process-send-string proc item))
-      (gdb-enqueue-input item))))
+  (if (string-match "\\\\$" string)
+      (setq gdb-continuation (concat gdb-continuation string "\n"))
+    (let ((item (concat gdb-continuation string "\n")))
+      (if gud-running
+          (progn
+            (if gdb-enable-debug (push (cons 'send item) gdb-debug-ring))
+            (process-send-string proc item))
+        (gdb-enqueue-input item)))
+    (setq gdb-continuation nil)))
 
 ;; Note: Stuff enqueued here will be sent to the next prompt, even if it
 ;; is a query, or other non-top-level prompt.
@@ -1152,7 +1170,7 @@ This filter may simply queue input for a later time."
     ("starting" gdb-starting)
     ("exited" gdb-exited)
     ("signalled" gdb-signalled)
-    ("signal" gdb-stopping)
+    ("signal" gdb-signal)
     ("breakpoint" gdb-stopping)
     ("watchpoint" gdb-stopping)
     ("frame-begin" gdb-frame-begin)
@@ -1164,6 +1182,7 @@ This filter may simply queue input for a later time."
 (defun gdb-resync()
   (setq gdb-flush-pending-output t)
   (setq gud-running nil)
+  (gdb-force-mode-line-update "stopped")
   (setq gdb-output-sink 'user)
   (setq gdb-input-queue nil)
   (setq gdb-pending-triggers nil)
@@ -1238,6 +1257,8 @@ not GDB."
      ((eq sink 'user)
       (progn
         (setq gud-running t)
+        (setq gdb-inferior-status "running")
+        (gdb-force-mode-line-update gdb-inferior-status)
         (gdb-remove-text-properties)
         (setq gud-overlay-arrow-position nil)
         (setq gdb-overlay-arrow-position nil)
@@ -1247,6 +1268,11 @@ not GDB."
       (gdb-resync)
       (error "Unexpected `starting' annotation")))))
 
+(defun gdb-signal (ignored)
+  (setq gdb-inferior-status "signal")
+  (gdb-force-mode-line-update gdb-inferior-status)
+  (gdb-stopping ignored))
+
 (defun gdb-stopping (ignored)
   "An annotation handler for `breakpoint' and other annotations.
 They say that I/O for the subprocess is now GDB, not the program
@@ -1269,6 +1295,8 @@ directives."
   (setq gdb-active-process nil)
   (setq gud-overlay-arrow-position nil)
   (setq gdb-overlay-arrow-position nil)
+  (setq gdb-inferior-status "exited")
+  (gdb-force-mode-line-update gdb-inferior-status)
   (gdb-stopping ignored))
 
 (defun gdb-signalled (ignored)
@@ -1290,6 +1318,11 @@ directives."
 It is just like `gdb-stopping', except that if we already set the output
 sink to `user' in `gdb-stopping', that is fine."
   (setq gud-running nil)
+  (unless (or gud-overlay-arrow-position gud-last-frame)
+    (gud-display-line (car gud-last-last-frame) (cdr gud-last-last-frame)))
+  (unless (member gdb-inferior-status '("exited" "signal"))
+    (setq gdb-inferior-status "stopped")
+    (gdb-force-mode-line-update gdb-inferior-status))
   (let ((sink gdb-output-sink))
     (cond
      ((eq sink 'inferior)
@@ -1628,10 +1661,13 @@ static char *magick[] = {
 (defvar breakpoint-disabled-icon nil
   "Icon for disabled breakpoint in display margin.")
 
-;; Bitmap for breakpoint in fringe
 (and (display-images-p)
+     ;; Bitmap for breakpoint in fringe
      (define-fringe-bitmap 'breakpoint
-       "\x3c\x7e\xff\xff\xff\xff\x7e\x3c"))
+       "\x3c\x7e\xff\xff\xff\xff\x7e\x3c")
+     ;; Bitmap for gud-overlay-arrow in fringe
+     (define-fringe-bitmap 'hollow-right-triangle
+       "\xe0\x90\x88\x84\x84\x88\x90\xe0"))
 
 (defface breakpoint-enabled
   '((t
@@ -1887,11 +1923,11 @@ static char *magick[] = {
 
 (def-gdb-auto-updated-buffer gdb-stack-buffer
   gdb-invalidate-frames
-  "server where\n"
-  gdb-info-frames-handler
-  gdb-info-frames-custom)
+  "server info stack\n"
+  gdb-info-stack-handler
+  gdb-info-stack-custom)
 
-(defun gdb-info-frames-custom ()
+(defun gdb-info-stack-custom ()
   (with-current-buffer (gdb-get-buffer 'gdb-stack-buffer)
     (save-excursion
       (let ((buffer-read-only nil)
@@ -1952,7 +1988,7 @@ static char *magick[] = {
     map))
 
 (defun gdb-frames-mode ()
-  "Major mode for gdb frames.
+  "Major mode for gdb call stack.
 
 \\{gdb-frames-mode-map}"
   (kill-all-local-variables)
@@ -2033,15 +2069,13 @@ static char *magick[] = {
     map))
 
 (defvar gdb-threads-font-lock-keywords
-  '(
-    (") +\\([^ ]+\\) ("  (1 font-lock-function-name-face))
+  '((") +\\([^ ]+\\) ("  (1 font-lock-function-name-face))
     ("in \\([^ ]+\\) ("  (1 font-lock-function-name-face))
-    ("\\(\\(\\sw\\|[_.]\\)+\\)="  (1 font-lock-variable-name-face))
-    )
+    ("\\(\\(\\sw\\|[_.]\\)+\\)="  (1 font-lock-variable-name-face)))
   "Font lock keywords used in `gdb-threads-mode'.")
 
 (defun gdb-threads-mode ()
-  "Major mode for gdb frames.
+  "Major mode for gdb threads.
 
 \\{gdb-threads-mode-map}"
   (kill-all-local-variables)
@@ -2101,7 +2135,7 @@ static char *magick[] = {
             (unless (string-equal (match-string 0) "The")
               (put-text-property start (match-end 0)
                                  'face font-lock-variable-name-face)
-              (add-text-properties start end 
+              (add-text-properties start end
                                    '(help-echo "mouse-2: edit value"
                                      mouse-face highlight))))
           (forward-line 1))))))
@@ -2754,6 +2788,7 @@ Kills the gdb buffers, and resets variables and the source buffers."
     (setq gdb-overlay-arrow-position nil))
   (setq overlay-arrow-variable-list
         (delq 'gdb-overlay-arrow-position overlay-arrow-variable-list))
+  (setq fringe-indicator-alist '((overlay-arrow . right-triangle)))
   (if (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
       (speedbar-refresh))
   (setq gud-running nil)
@@ -3079,6 +3114,17 @@ BUFFER nil or omitted means use the current buffer."
   (goto-char (point-min))
   (if (re-search-forward  "Stack level \\([0-9]+\\)" nil t)
       (setq gdb-frame-number (match-string 1)))
+  (if gud-overlay-arrow-position
+      (let ((buffer (marker-buffer gud-overlay-arrow-position))
+            (position (marker-position gud-overlay-arrow-position)))
+        (when buffer
+          (with-current-buffer buffer
+            (setq fringe-indicator-alist
+                  (if (string-equal gdb-frame-number "0")
+                      nil
+                    '((overlay-arrow . hollow-right-triangle))))
+            (setq gud-overlay-arrow-position (make-marker))
+            (set-marker gud-overlay-arrow-position position)))))
   (goto-char (point-min))
   (if (re-search-forward
        ".*=\\s-+0x0*\\(\\S-*\\)\\s-+in\\s-+\\(\\S-*?\\);? " nil t)
@@ -3123,7 +3169,7 @@ is set in them."
   (gdb-enqueue-input
    (list
     (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
-        (concat "server interpreter mi \"-var-list-children --all-values "  
+        (concat "server interpreter mi \"-var-list-children --all-values "
                 varnum "\"\n")
       (concat "-var-list-children --all-values " varnum "\n"))
     `(lambda () (gdb-var-list-children-handler-1 ,varnum)))))
@@ -3252,7 +3298,7 @@ value=\\(\".*?\"\\),type=\"\\(.+?\\)\"}")
             (unless (string-equal (match-string 0) "No registers.")
               (put-text-property start (match-end 0)
                                  'face font-lock-variable-name-face)
-              (add-text-properties start end 
+              (add-text-properties start end
                                    '(help-echo "mouse-2: edit value"
                                      mouse-face highlight))))
           (forward-line 1))))))
@@ -3334,7 +3380,7 @@ value=\\(\".*?\"\\),type=\"\\(.+?\\)\"}")
                               help-echo "mouse-2: create watch expression"
                               local-map ,gdb-locals-watch-map-1)
                             name))
-                       (insert 
+                       (insert
                         (concat name "\t" (nth 1 local)
                                 "\t" (nth 2 local) "\n")))
                    (set-window-start window start)
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 0e151ce9be2..6afa3f29348 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -33,8 +33,6 @@
 
 (require 'compile)
 
-(defvar font-lock-lines-before)
-
 
 (defgroup grep nil
   "Run compiler as inferior of Emacs, parse error messages."
@@ -536,10 +534,7 @@ temporarily highlight in visited source lines."
        grep-regexp-alist)
   (set (make-local-variable 'compilation-process-setup-function)
        'grep-process-setup)
-  (set (make-local-variable 'compilation-disable-input) t)
-  ;; Set `font-lock-lines-before' to 0 to not refontify the previous
-  ;; line where grep markers may be already removed.
-  (set (make-local-variable 'font-lock-lines-before) 0))
+  (set (make-local-variable 'compilation-disable-input) t))
 
 ;;;###autoload
 (defun grep-find (command-args)
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index f98ee3540d8..7fa5a0b6dcc 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -740,14 +740,18 @@ To run GDB in text command mode, set `gud-gdb-command-name' to
 
 (defvar gud-comint-buffer nil)
 
-(defun gud-gdb-complete-command ()
+(defun gud-gdb-complete-command (&optional command a b)
   "Perform completion on the GDB command preceding point.
 This is implemented using the GDB `complete' command which isn't
 available with older versions of GDB."
   (interactive)
-  (let* ((end (point))
-         (command (buffer-substring (comint-line-beginning-position) end))
-         (command-word
+  (if command
+      ;; Used by gud-watch in mini-buffer.
+      (setq command (concat "p " command))
+    ;; Used in GUD buffer.
+    (let ((end (point)))
+      (setq command (buffer-substring (comint-line-beginning-position) end))))
+  (let* ((command-word
           ;; Find the word break.  This match will always succeed.
           (and (string-match "\\(\\`\\| \\)\\([^ ]*\\)\\'" command)
                (substring command (match-beginning 2))))
@@ -866,13 +870,14 @@ It is passed through FILTER before we look at it."
 
 (defun gud-gdb-run-command-fetch-lines (command buffer &optional skip)
   "Run COMMAND, and return the list of lines it outputs.
-BUFFER is the GUD buffer in which to run the command.
+BUFFER is the current buffer which may be the GUD buffer in which to run.
 SKIP is the number of chars to skip on each lines, it defaults to 0."
-  (with-current-buffer buffer
-    (if (save-excursion
-          (goto-char (point-max))
-          (forward-line 0)
-          (not (looking-at comint-prompt-regexp)))
+  (with-current-buffer gud-comint-buffer
+    (if (and (eq gud-comint-buffer buffer)
+             (save-excursion
+               (goto-char (point-max))
+               (forward-line 0)
+               (not (looking-at comint-prompt-regexp))))
         nil
       ;; Much of this copied from GDB complete, but I'm grabbing the stack
       ;; frame instead.
@@ -881,12 +886,13 @@ SKIP is the number of chars to skip on each lines, it defaults to 0."
             (gud-gdb-fetch-lines-string nil)
             (gud-gdb-fetch-lines-break (or skip 0))
             (gud-marker-filter
-             `(lambda (string) (gud-gdb-fetch-lines-filter string ',gud-marker-filter))))
+             `(lambda (string)
+                (gud-gdb-fetch-lines-filter string ',gud-marker-filter))))
         ;; Issue the command to GDB.
         (gud-basic-call command)
         ;; Slurp the output.
         (while gud-gdb-fetch-lines-in-progress
-          (accept-process-output (get-buffer-process buffer)))
+          (accept-process-output (get-buffer-process gud-comint-buffer)))
         (nreverse gud-gdb-fetched-lines)))))
 
 
@@ -3270,11 +3276,10 @@ Treats actions as defuns."
     (remove-hook 'tooltip-hook 'gud-tooltip-tips)
     (define-key global-map [mouse-movement] 'ignore)))
   (gud-tooltip-activate-mouse-motions-if-enabled)
-  (if (and
-       gud-comint-buffer
-       (buffer-name gud-comint-buffer); gud-comint-buffer might be killed
-       (with-current-buffer gud-comint-buffer
-        (memq gud-minor-mode '(gdbmi gdba))))
+  (if (and gud-comint-buffer
+           (buffer-name gud-comint-buffer); gud-comint-buffer might be killed
+           (memq (buffer-local-value 'gud-minor-mode gud-comint-buffer)
+                 '(gdbmi gdba)))
       (if gud-tooltip-mode
           (progn
             (dolist (buffer (buffer-list))
diff --git a/lisp/simple.el b/lisp/simple.el
index 9b232dee4cc..812c2d1fa2e 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3188,6 +3188,9 @@ With a double \\[universal-argument] prefix argument, e.g. \\[universal-argument
 \\[universal-argument] \\[set-mark-command], unconditionally
 set mark where point is.
 
+Setting the mark also sets the \"region\", which is the closest
+equivalent in Emacs to what some editors call the \"selection\".
+
 Novice Emacs Lisp programmers often try to use the mark for the wrong
 purposes.  See the documentation of `set-mark' for more information."
   (interactive "P")
diff --git a/lisp/sort.el b/lisp/sort.el
index 5183bf65afa..c3d135f4c66 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -121,6 +121,9 @@ it defaults to `<', otherwise it defaults to `string<'."
 (defun sort-build-lists (nextrecfun endrecfun startkeyfun endkeyfun)
   (let ((sort-lists ())
         (start-rec nil)
+        ;; To avoid such functins as `end-of-line' being affected by
+        ;; fields.
+        (inhibit-field-text-motion t)
         done key)
     ;; Loop over sort records.
     ;(goto-char (point-min)) -- it is the caller's responsibility to
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 1b81ef362d2..3987ad66f6a 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1198,11 +1198,15 @@ See the documentation of `create-fontset-from-fontset-spec for the format.")
 (set-fontset-font nil (make-char 'japanese-jisx0208-1978) '("*" . "JISX0208-SJIS"))
 
 (defun mouse-set-font (&rest fonts)
-  "Select a font.
+  "Select an Emacs font from a list of known good fonts and fontsets.
+
 If `w32-use-w32-font-dialog' is non-nil (the default), use the Windows
-font dialog to get the matching FONTS. Otherwise use a pop-up menu
-\(like Emacs on other platforms) initialized with the fonts in
-`w32-fixed-font-alist'."
+font dialog to display the list of possible fonts.  Otherwise use a
+pop-up menu (like Emacs does on other platforms) initialized with
+the fonts in `w32-fixed-font-alist'.
+If `w32-list-proportional-fonts' is non-nil, add proportional fonts
+to the list in the font selection dialog (the fonts listed by the
+pop-up menu are unaffected by `w32-list-proportional-fonts')."
   (interactive
    (if w32-use-w32-font-dialog
        (let ((chosen-font (w32-select-font (selected-frame)
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index f1e055594b7..daca0502454 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -88,6 +88,7 @@ If this is a function, call it to generate the initial field text."
                  (string :tag "Initial text")
                  (function :tag "Initialize Function" :value fun)
                  (other :tag "Default" t)))
+(put 'bibtex-include-OPTkey 'risky-local-variable t)
 
 (defcustom bibtex-user-optional-fields
   '(("annote" "Personal annotation (ignored)"))
@@ -437,6 +438,7 @@ field or a function, which is called to determine the initial content
 of the field, and ALTERNATIVE-FLAG (either nil or t) marks if the
 field is an alternative.  ALTERNATIVE-FLAG may be t only in the
 REQUIRED or CROSSREF-REQUIRED lists.")
+(put 'bibtex-entry-field-alist 'risky-local-variable t)
 
 (defcustom bibtex-comment-start "@Comment"
   "String starting a BibTeX comment."
@@ -595,7 +597,7 @@ See `bibtex-generate-autokey' for details."
   :type '(repeat (cons (regexp :tag "Old")
                        (string :tag "New"))))
 
-(defcustom bibtex-autokey-name-case-convert 'downcase
+(defcustom bibtex-autokey-name-case-convert-function 'downcase
   "Function called for each name to perform case conversion.
 See `bibtex-generate-autokey' for details."
   :group 'bibtex-autokey
@@ -604,6 +606,8 @@ See `bibtex-generate-autokey' for details."
                  (const :tag "Capitalize" capitalize)
                  (const :tag "Upcase" upcase)
                  (function :tag "Conversion function")))
+(defvaralias 'bibtex-autokey-name-case-convert
+  'bibtex-autokey-name-case-convert-function)
 
 (defcustom bibtex-autokey-name-length 'infty
   "Number of characters from name to incorporate into key.
@@ -666,7 +670,7 @@ See `bibtex-generate-autokey' for details."
   :group 'bibtex-autokey
   :type '(repeat regexp))
 
-(defcustom bibtex-autokey-titleword-case-convert 'downcase
+(defcustom bibtex-autokey-titleword-case-convert-function 'downcase
   "Function called for each titleword to perform case conversion.
 See `bibtex-generate-autokey' for details."
   :group 'bibtex-autokey
@@ -675,6 +679,8 @@ See `bibtex-generate-autokey' for details."
                  (const :tag "Capitalize" capitalize)
                  (const :tag "Upcase" upcase)
                  (function :tag "Conversion function")))
+(defvaralias 'bibtex-autokey-titleword-case-convert
+  'bibtex-autokey-titleword-case-convert-function)
 
 (defcustom bibtex-autokey-titleword-abbrevs nil
   "Determines exceptions to the usual abbreviation mechanism.
@@ -847,6 +853,7 @@ The following is a complex example, see http://link.aps.org/linkfaq.html.
                                (choice (string :tag "Replacement")
                                        (integer :tag "Sub-match")
                                        (function :tag "Filter"))))))))
+(put 'bibtex-generate-url-list 'risky-local-variable t)
 
 (defcustom bibtex-expand-strings nil
   "If non-nil, expand strings when extracting the content of a BibTeX field."
@@ -1164,7 +1171,7 @@ The CDRs of the elements are t for header keys and nil for crossref keys.")
     (,(concat "^[ \t]*\\(" bibtex-field-name "\\)[ \t]*=")
      1 font-lock-variable-name-face)
     ;; url
-    bibtex-font-lock-url bibtex-font-lock-crossref)
+    (bibtex-font-lock-url) (bibtex-font-lock-crossref))
   "*Default expressions to highlight in BibTeX mode.")
 
 (defvar bibtex-font-lock-url-regexp
@@ -2085,7 +2092,7 @@ and `bibtex-autokey-names-stretch'."
                       ;; --> take the last token
                       (match-string 1 fullname))
                      (t (error "Name `%s' is incorrectly formed" fullname)))))
-    (funcall bibtex-autokey-name-case-convert
+    (funcall bibtex-autokey-name-case-convert-function
              (bibtex-autokey-abbrev name bibtex-autokey-name-length))))
 
 (defun bibtex-autokey-get-year ()
@@ -2147,7 +2154,7 @@ and `bibtex-autokey-titleword-length'."
       (setq alist (cdr alist)))
     (if alist
         (cdar alist)
-      (funcall bibtex-autokey-titleword-case-convert
+      (funcall bibtex-autokey-titleword-case-convert-function
                (bibtex-autokey-abbrev titleword bibtex-autokey-titleword-length)))))
 
 (defun bibtex-generate-autokey ()
@@ -2167,7 +2174,7 @@ The name part:
     take at least `bibtex-autokey-name-length' characters (truncate only
     after a consonant or at a word end).
  5. Convert all last names using the function
-    `bibtex-autokey-name-case-convert'.
+    `bibtex-autokey-name-case-convert-function'.
  6. Build the name part of the key by concatenating all abbreviated last
     names with the string `bibtex-autokey-name-separator' between any two.
     If there are more names in the name field than names used in the name
@@ -2199,7 +2206,7 @@ The title part
     `bibtex-autokey-titleword-length' characters (truncate only after
     a consonant or at a word end).
  5. Convert all title words using the function
-    `bibtex-autokey-titleword-case-convert'.
+    `bibtex-autokey-titleword-case-convert-function'.
  6. Build the title part by concatenating all abbreviated title words with
     the string `bibtex-autokey-titleword-separator' between any two.
 
@@ -2531,7 +2538,7 @@ Use `bibtex-summary-function' to generate summary."
 Used as default value of `bibtex-summary-function'."
   ;; It would be neat to customize this function.  How?
   (if (looking-at bibtex-entry-maybe-empty-head)
-      (let* ((bibtex-autokey-name-case-convert 'identity)
+      (let* ((bibtex-autokey-name-case-convert-function 'identity)
              (bibtex-autokey-name-length 'infty)
              (bibtex-autokey-names 1)
              (bibtex-autokey-names-stretch 0)
@@ -2542,7 +2549,7 @@ Used as default value of `bibtex-summary-function'."
              (year (bibtex-autokey-get-year))
              (bibtex-autokey-titlewords 5)
              (bibtex-autokey-titlewords-stretch 2)
-             (bibtex-autokey-titleword-case-convert 'identity)
+             (bibtex-autokey-titleword-case-convert-function 'identity)
              (bibtex-autokey-titleword-length 5)
              (bibtex-autokey-titleword-separator " ")
              (title (bibtex-autokey-get-title))
@@ -2785,7 +2792,6 @@ if that value is non-nil.
         (list (list nil bibtex-entry-head bibtex-key-in-head))
         imenu-case-fold-search t)
   (make-local-variable 'choose-completion-string-functions)
-  (make-local-variable 'completion-ignore-case)
   ;; XEmacs needs easy-menu-add, Emacs does not care
   (easy-menu-add bibtex-edit-menu)
   (easy-menu-add bibtex-entry-menu)
@@ -4155,9 +4161,9 @@ An error is signaled if point is outside key or BibTeX field."
 
     (cond ((eq compl 'key)
            ;; key completion: no cleanup needed
-           (setq choose-completion-string-functions nil
-                 completion-ignore-case nil)
-           (bibtex-complete-internal (bibtex-global-key-alist)))
+           (setq choose-completion-string-functions nil)
+           (let (completion-ignore-case)
+             (bibtex-complete-internal (bibtex-global-key-alist))))
 
           ((eq compl 'crossref-key)
            ;; crossref key completion
@@ -4167,40 +4173,35 @@ An error is signaled if point is outside key or BibTeX field."
            ;; non-nil. Therefore, `choose-completion-string-functions' is
            ;; always set (either to non-nil or nil) when a new completion
            ;; is requested.
-           ;; Also, `choose-completion-delete-max-match' requires
-           ;; that we set `completion-ignore-case' (i.e., binding via `let'
-           ;; is not sufficient).
-           (setq completion-ignore-case nil
-                 choose-completion-string-functions
-                 (lambda (choice buffer mini-p base-size)
-                   (setq choose-completion-string-functions nil)
-                   (choose-completion-string choice buffer base-size)
-                   (bibtex-complete-crossref-cleanup choice)
-                   t)) ; needed by choose-completion-string-functions
-
-           (bibtex-complete-crossref-cleanup (bibtex-complete-internal
-                                              (bibtex-global-key-alist))))
+           (let (completion-ignore-case)
+             (setq choose-completion-string-functions
+                   (lambda (choice buffer mini-p base-size)
+                     (setq choose-completion-string-functions nil)
+                     (choose-completion-string choice buffer base-size)
+                     (bibtex-complete-crossref-cleanup choice)
+                     t)) ; needed by choose-completion-string-functions
+             (bibtex-complete-crossref-cleanup
+              (bibtex-complete-internal (bibtex-global-key-alist)))))
 
           ((eq compl 'string)
            ;; string key completion: no cleanup needed
-           (setq choose-completion-string-functions nil
-                 completion-ignore-case t)
-           (bibtex-complete-internal bibtex-strings))
+           (setq choose-completion-string-functions nil)
+           (let ((completion-ignore-case t))
+             (bibtex-complete-internal bibtex-strings)))
 
           (compl
            ;; string completion
-           (setq completion-ignore-case t
-                 choose-completion-string-functions
-                 `(lambda (choice buffer mini-p base-size)
-                    (setq choose-completion-string-functions nil)
-                    (choose-completion-string choice buffer base-size)
-                    (bibtex-complete-string-cleanup choice ',compl)
-                    t)) ; needed by choose-completion-string-functions
-           (bibtex-complete-string-cleanup (bibtex-complete-internal compl)
-                                             compl))
-
-          (t (setq choose-completion-string-functions nil
-                   completion-ignore-case nil) ; default
+           (let ((completion-ignore-case t))
+             (setq choose-completion-string-functions
+                   `(lambda (choice buffer mini-p base-size)
+                      (setq choose-completion-string-functions nil)
+                      (choose-completion-string choice buffer base-size)
+                      (bibtex-complete-string-cleanup choice ',compl)
+                      t)) ; needed by choose-completion-string-functions
+             (bibtex-complete-string-cleanup (bibtex-complete-internal compl)
+                                             compl)))
+
+          (t (setq choose-completion-string-functions nil)
              (error "Point outside key or BibTeX field")))))
 
 (defun bibtex-Article ()
@@ -4334,16 +4335,16 @@ The URL is generated using the schemes defined in `bibtex-generate-url-list'
                       (dolist (step scheme)
                         (setq field (cdr (assoc-string (car step) fields-alist t)))
                         (if (string-match (nth 1 step) field)
-                            (setq field (cond ((functionp (nth 2 step))
-                                               (funcall (nth 2 step) field))
-                                              ((numberp (nth 2 step))
-                                               (match-string (nth 2 step) field))
-                                              (t
-                                               (replace-match (nth 2 step) t nil field))))
+                            (push (cond ((functionp (nth 2 step))
+                                         (funcall (nth 2 step) field))
+                                        ((numberp (nth 2 step))
+                                         (match-string (nth 2 step) field))
+                                        (t
+                                         (replace-match (nth 2 step) t nil field)))
+                                  obj)
                           ;; If the scheme is set up correctly,
                           ;; we should never reach this point
-                          (error "Match failed: %s" field))
-                        (push field obj))
+                          (error "Match failed: %s" field)))
                       (if fmt (apply 'format fmt (nreverse obj))
                         (apply 'concat (nreverse obj)))))
           (browse-url (message "%s" url))))
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 1991a73e8e2..64314c772b2 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1325,9 +1325,10 @@ The last occurring definition in the buffer will be used.")
     ("^%!PS-Adobe-[123].0"       . "\n%%EOF\n")
     ("^---* \\(Start of \\)?[Ff]orwarded [Mm]essage"
      . "^---* End of [Ff]orwarded [Mm]essage")
-    ;; Matches e-mail addresses, file names, http addresses, etc.  The `-+'
-    ;; pattern necessary for performance reasons when `-' part of word syntax.
-    ("\\(--+\\|\\(/\\w\\|\\(\\(\\w\\|[-_]\\)+[.:@]\\)\\)\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_~=?&]\\)+\\)+\\)")
+    ;; Matches e-mail addresses, file names, http addresses, etc.  The
+    ;; `-+' `_+' patterns are necessary for performance reasons when
+    ;; `-' or `_' part of word syntax.
+    ("\\(--+\\|_+\\|\\(/\\w\\|\\(\\(\\w\\|[-_]\\)+[.:@]\\)\\)\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_~=?&]\\)+\\)+\\)")
     ;; above checks /.\w sequences
     ;;("\\(--+\\|\\(/\\|\\(\\(\\w\\|[-_]\\)+[.:@]\\)\\)\\(\\w\\|[-_]\\)*\\([.:/@]+\\(\\w\\|[-_~=?&]\\)+\\)+\\)")
     ;; This is a pretty complex regexp.  It can be simplified to the following:
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 3c77560a9cc..ad4744adf15 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
-;; Version: 4.09
+;; Version: 4.10
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -81,6 +81,9 @@
 ;;
 ;; Changes since version 4.00:
 ;; ---------------------------
+;; Version 4.10
+;;    - Bug fixes.
+;;
 ;; Version 4.09
 ;;    - Bug fixes.
 ;;    - Small improvements to font-lock support.
@@ -145,7 +148,7 @@
 
 ;;; Customization variables
 
-(defvar org-version "4.09"
+(defvar org-version "4.10"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -445,7 +448,7 @@ In the calendar, the date can be selected with mouse-1.  However, the
 minibuffer will also be active, and you can simply enter the date as well.
 When nil, only the minibuffer will be available."
   :group 'org-time
-  :type 'number)
+  :type 'boolean)
 
 (defcustom org-calendar-follow-timestamp-change t
   "Non-nil means, make the calendar window follow timestamp changes.
@@ -1739,7 +1742,8 @@ Changing this variable requires a restart of Emacs to take effect."
   :type 'boolean)
 
 (defface org-hide
-  '((((type tty) (class color)) (:foreground "blue" :weight bold))
+  '(
+    (((type tty) (class color)) (:foreground "white"))
     (((class color) (background light)) (:foreground "white"))
     (((class color) (background dark)) (:foreground "black"))
 ;    (((class color) (background light)) (:foreground "grey90"))
@@ -2589,6 +2593,7 @@ Optional argument N means, put the headline into the Nth line of the window."
 (define-key org-goto-map [(?q)]     'org-goto-quit)
 (define-key org-goto-map [(control ?g)] 'org-goto-quit)
 (define-key org-goto-map "\C-i" 'org-cycle)
+(define-key org-goto-map [(tab)] 'org-cycle)
 (define-key org-goto-map [(down)] 'outline-next-visible-heading)
 (define-key org-goto-map [(up)] 'outline-previous-visible-heading)
 (define-key org-goto-map "n" 'outline-next-visible-heading)
@@ -4001,8 +4006,8 @@ used to insert the time stamp into the buffer to include the time."
                 month (string-to-number (match-string 3 ans))
                 day (string-to-number (match-string 4 ans)))
           (if (< year 100) (setq year (+ 2000 year)))
-          (setq ans (replace-match (format "%04d-%02d-%02d" year month day)
-                                   t t ans))))
+          (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day)
+                                   t nil ans))))
     (setq tl (parse-time-string ans)
           year (or (nth 5 tl) (string-to-number (format-time-string "%Y")))
           month (or (nth 4 tl) (string-to-number (format-time-string "%m")))
@@ -4377,6 +4382,7 @@ The following commands are available:
    (list 'org-agenda-mode-hook)))
 
 (define-key org-agenda-mode-map "\C-i"     'org-agenda-goto)
+(define-key org-agenda-mode-map [(tab)]    'org-agenda-goto)
 (define-key org-agenda-mode-map "\C-m"     'org-agenda-switch-to)
 (define-key org-agenda-mode-map " "        'org-agenda-show)
 (define-key org-agenda-mode-map "\C-c\C-t" 'org-agenda-todo)
@@ -6827,8 +6833,8 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file."
             (while (string-match " *\n *" link)
               (setq link (replace-match " " t t link)))
             (if (string-match org-link-regexp link)
-                (setq type (match-string 1)
-                      path (match-string 2))
+                (setq type (match-string 1 link)
+                      path (match-string 2 link))
               (setq type "thisfile"
                     path link))
             (throw 'match t)))
@@ -6887,6 +6893,10 @@ optional argument IN-EMACS is non-nil, Emacs will visit the file."
 
       (cond
 
+       ((member type '("http" "https" "ftp" "mailto" "news"))
+        ;; give these to some browser
+        (browse-url (concat type ":" path)))
+
        ((string= type "tags")
         (org-tags-view in-emacs path))
        ((or (string= type "camel")
@@ -10801,11 +10811,11 @@ underlined headlines.  The default is 3."
 
 (defun org-insert-centered (s &optional underline)
   "Insert the string S centered and underline it with character UNDERLINE."
-  (let ((ind (max (/ (- 80 (length s)) 2) 0)))
+  (let ((ind (max (/ (- 80 (string-width s)) 2) 0)))
     (insert (make-string ind ?\ ) s "\n")
     (if underline
         (insert (make-string ind ?\ )
-                (make-string (length s) underline)
+                (make-string (string-width s) underline)
                 "\n"))))
 
 (defun org-ascii-level-start (level title umax)
@@ -11915,6 +11925,7 @@ a time), or the day by one (if it does not contain a time)."
 
 ;; TAB key with modifiers
 (define-key org-mode-map "\C-i"       'org-cycle)
+(define-key org-mode-map [(tab)]      'org-cycle)
 (define-key org-mode-map [(meta tab)] 'org-complete)
 (define-key org-mode-map "\M-\C-i"    'org-complete)            ; for tty emacs
 ;; The following line is necessary under Suse GNU/Linux
@@ -12925,4 +12936,3 @@ Show the heading too, if it is currently invisible."
 
 ;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd
 ;;; org.el ends here
-