Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 320-342)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - lisp/play/cookie1.el (cookie): Work properly when there's only one entry
   - Add note about "link" button-class to etc/TODO

 * gnus--rel--5.10  (patch 108-112)

   - Merge from emacs--devo--0
   - Clean up merge mistakes
   - Update from CVS
   - Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86

53 files changed, 2143 insertions, 841 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1869e0a33f7..cb454f9a4db 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,313 @@
+2006-07-05  Richard Stallman  <rms@gnu.org>
+
+        * files.el (abbreviate-file-name): Add save-match-data.
+
+2006-07-03  Richard Stallman  <rms@gnu.org>
+
+        * faces.el (read-face-name): Doc fix.
+
+2006-07-05  Chong Yidong  <cyd@stupidchicken.com>
+
+        * net/goto-addr.el (goto-address): Mark as safe for local evals.
+
+2006-07-05  Andre Spiegel  <spiegel@gnu.org>
+
+        * vc.el (vc-diff-internal): Fix prev change.
+
+2006-07-05  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Use eval-buffer.
+        * play/dunnet.el (dun-load-d, dun-eval): Likewise.
+
+2006-07-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * thingatpt.el (symbol-at-point): Don't use `form-at-point' which
+        fails if the symbol contains chars like ( or '.
+        (bounds-of-thing-at-point): Remove unused vars `end' and `beg'.
+        (thing-at-point-bounds-of-url-at-point): Remove unused vars `url' and
+        `short'.
+
+2006-07-04  Kenichi Handa  <handa@m17n.org>
+
+        * international/mule-cmds.el (set-language-info): If LANG-ENV is
+        the current one, don't call set-language-environment, but call one
+        of set-language-environment-XXX to make INFO effective now.
+        (set-language-environment): Call set-language-environment-XXX
+        functions instead of doing the various setups directly.
+        (set-language-environment-coding-systems): Delete argument eol-type.
+        (set-language-environment-input-method)
+        (set-language-environment-nonascii-translation)
+        (set-language-environment-charset)
+        (set-language-environment-fontset)
+        (set-language-environment-unibyte): New functions.
+
+2006-07-03  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * locate.el (locate-update-when-revert): New option.
+        (locate-update-path): New option (suggested by Michael Albinus).
+        (locate-prompt-for-command): Whitespace change.
+        (locate-update): No longer offer to update the locate database by
+        default.  Implement the two new options.
+
+2006-07-04  Nick Roberts  <nickrob@snap.net.nz>
+
+        * tooltip.el: Move comment about track-mouse...
+
+        * progmodes/gud.el: ...to here.
+
+2006-07-03  Chong Yidong  <cyd@stupidchicken.com>
+
+        * facemenu.el (facemenu-listed-faces): New var.
+        (facemenu-unlisted-faces): Variable deleted.
+        (facemenu-add-new-face): Use facemenu-listed-faces.
+
+        * emulation/viper-init.el, calendar/calendar.el:
+        * progmodes/make-mode.el: Delete calls to facemenu-unlisted-faces.
+
+2006-07-03  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-mode): Remove no invalid settings for
+        calc embedded mode.
+        (org-mode-p): New defsubst.
+        (org-save-all-org-buffers): New function.
+        (org-first-headline-recenter): Enclose outline-regexp in group
+        delimiters.
+        (org-set-tags): Keep single space after stars.
+
+2006-07-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.el (set-window-text-height): Only set window-min-height to
+        1 if that's the requested size.
+
+        * diff-mode.el (diff-find-file-name): Obey cvs-pcl-cvs-dirchange-re.
+        (diff-unified->context, diff-context->unified)
+        (diff-reverse-direction): Make sure the end marker stays at the end.
+        (diff-mode): Add the keymap table at the end of docstring.
+        Use lexical-let rather than constructing a closure manually.
+
+        * files.el (find-file-noselect-1): Remove unused var assignment.
+        (hack-local-variables-confirm): Print lists of strings as lists of
+        strings rather than lists of symbols.
+        (abbreviate-file-name, hack-local-variables-prop-line):
+        Use match-string.
+        (hack-one-local-variable): Move `make-local-variable' nearer its use.
+        (recover-session-finish): Use line-end-position.
+
+2006-07-02  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-handle-shell-command): Preserve current-buffer.
+
+2006-07-02  Daniel Pfeiffer  <occitan@esperanto.org>
+
+        * progmodes/make-mode.el (makefile-macroassign-regex):
+        Accept preceding keyword.
+        (makefile-gmake-statements): Reorganize, now that makepp has
+        "override" and also handle forgotten "override define".
+        (makefile-makepp-statements): Add new "global", "override export"
+        and "override global".
+
+2006-06-30  Juanma Barranquero  <lekktu@gmail.com>
+
+        * progmodes/ada-mode.el (ada-which-compiler, ada-mode-menu)
+        (ada-compile-mouse-goto-error, ada-deactivate-properties)
+        (ada-no-auto-case): Fix typos in docstrings.
+
+2006-06-30  Nick Roberts  <nickrob@snap.net.nz>
+
+        * info.el (Info-find-node-2): Search for makeinfo version more
+        carefully.
+
+2006-06-29  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-prepare-agenda-buffers):
+        Use `invisible-OK' argument for `org-end-of-subtree'.
+        (org-export-cleanup-toc-line): Rename from `org-html-cleanup-toc-line'.
+        (org-beginning-of-item): Fix bug in regular expression for white line.
+        (org-export-as-html): Enforce space after bullet in plain list items.
+        (org-set-autofill-regexps): Require space after plain list bullet
+        for paragraph-start.
+        (org-ts-regexp3): New constant.
+        (org-at-timestamp-p): New optional argument ALSO-INACTIVE.
+        (org-timestamp-up-day, org-timestamp-down-day)
+        (org-timestamp-change): Work with inactive timestamps.
+        (org-ts-regexp1): Don't allow brackets in time stamps.
+
+2006-06-29  Nick Roberts  <nickrob@snap.net.nz>
+
+        * help-mode.el (help-xref-symbol-regexp): Add property as a keyword
+        for ignoring links.
+
+        * faces.el (read-face-name): Use it.
+
+2006-06-28  Juri Linkov  <juri@jurta.org>
+
+        * buff-menu.el (list-buffers-noselect): Compare Info file
+        with the string "dir" to detect Info directory.
+
+        * complete.el (partial-completion-mode): In lambda for
+        `choose-completion-string-functions' use full function signature
+        with 4 args, and move point to the end of the minibuffer only if arg
+        `mini-p' is non-nil.
+
+2006-06-28  John Paul Wallington  <jpw@pobox.com>
+
+        * ibuffer.el (ibuffer-mode): Doc fix.
+
+2006-06-28  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-context): New contexts :item-bullet,
+        :latex-fragment, :latex-preview.
+        (org-overlays-at, org-overlay-start, org-overlay-end):
+        New compatibility functions.
+        (org-inside-LaTeX-fragment-p): More accurate matching, using the
+        exact regexp that will be used during export.
+        (org-latex-regexps): New variable.
+        (org-cdlatex-mode): Improve advice for `texmathp'.
+        (turn-on-org-cdlatex): New function.
+
+2006-06-28  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * term/mac-win.el (mac-handle-font-selection): Change keys of
+        mac-atsu-font-table from strings to numbers.
+        (mac-ts-caret-position): Use also when cursor-type is nil.
+        (mac-ts-update-active-input-area): Add Mac OS Classic support.
+        Relax condition for using overlay strings.
+        Use mac-ts-caret-position face when cursor-type is nil.
+
+2006-06-26  Kim F. Storm  <storm@cua.dk>
+
+        * help.el (view-emacs-news): Declare `res' in the right let* form.
+
+2006-06-25  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/rcompile.el (remote-compile): Replace ange-ftp based
+        implementation by Tramp functions.  Based on a patch published by
+        Marc Abramowitz <msabramo@gmail.com>.
+
+        * net/tramp.el (tramp-unload-tramp): Provide a doc string.
+
+2006-06-24  Yoshinori Koseki  <kose@meadowy.org>
+
+        * international/fontset.el (setup-default-fontset): Fix a typo in
+        the "Oriya-Akruti" registry name.
+
+2006-06-23  Lars Hansen  <larsh@soem.dk>
+
+        * desktop.el (desktop-full-file-name): New function.
+        (desktop-kill, desktop-save, desktop-remove, desktop-read)
+        (desktop-revert): Use it.
+        (desktop-clear, desktop-save, desktop-remove): Add autoload cookie.
+        (desktop-after-read-hook): Add option list-buffers.
+        (desktop-locals-to-save): Add tab-width.
+        (desktop-save-mode, desktop-no-desktop-file-hook, desktop-save-hook):
+        Fix docstring.
+
+2006-06-23  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el (org-cdlatex-mode-map)
+        (org-cdlatex-texmathp-advice-is-done): New variables.
+        (org-cdlatex-mode): New minor mode.
+        (org-inside-LaTeX-fragment-p, org-try-cdlatex-tab): New functions.
+        (org-cdlatex-underscore-caret, org-cdlatex-math-modify): New commands.
+        (org-export-with-archived-trees): New option.
+        (org-open-file): Remove the call to `convert-standard-filename'.
+        (org-archive-tag, org-agenda-skip-archived-trees)
+        (org-cycle-open-archived-trees)
+        (org-sparse-tree-open-archived-trees): New options.
+        (org-cycle-hide-archived-subtrees, org-hide-archived-subtrees)
+        (org-toggle-tag, org-prepare-agenda-buffers, org-agenda-skip):
+        New functions.
+        (org-agenda-toggle-archive-tag, org-toggle-archive-tag): New commands.
+        (org-agenda-mode-map): Add binding of `org-agenda-toggle-archive-tag'.
+        (org-mode-map): Add binding for `org-toggle-archive-tag'.
+        (org-timeline, org-agenda-list, org-todo-list, org-tags-view):
+        Call `org-prepare-agenda-buffers'.
+        (org-occur, org-scan-tags): Call `org-hide-archived-subtrees'.
+        (org-file-apps, org-file-apps-defaults-gnu)
+        (org-file-apps-defaults-macosx, org-file-apps-defaults-windowsnt):
+        Handle remote files by forcing them to be opened in Emacs.
+
+2006-06-23  Andre Spiegel  <spiegel@gnu.org>
+
+        * vc.el (vc-diff-knows-L): New variable.
+        (vc-diff-internal): Use it to handle "diff" programs that don't
+        understand -L.  This works automatically, no user action is necessary.
+
+2006-06-23  Daniel Brockman  <daniel@brockman.se>
+
+        * net/rcirc.el (rcirc-default-user-full-name): Default to
+        `rcirc-default-user-name' instead of `rcirc-user-name' (which no
+        longer exists).
+        (rcirc-process-list): Check `buffer-live-p' before attempting to
+        switch to a buffer.
+
+2006-06-23  Ryan Yeske  <rcyeske@gmail.com>
+
+        * net/rcirc.el (rcirc-mode): Fix initialization of coding systems
+        based on rcirc-coding-system-alist.
+
+2006-06-23  Martin Rudalics  <rudalics@gmx.at>
+
+        * cus-edit.el (customize-apropos): A better error message.
+        (top level) <debug-ignored-errors>: Extend and update the list of
+        ignored error messages.
+
+2006-06-23  Michael Ernst  <mernst@alum.mit.edu>
+
+        * complete.el (PC-do-completion): Retain capitalization of user
+        input, when possible, even if completion-ignore-case is set.
+
+2006-06-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * generic-x.el (bat-generic-mode): Support .cmd files.
+
+        * dos-w32.el (top level): Use find-file-not-found-functions
+        instead of the obsolete find-file-not-found-hooks.
+
+2006-06-22  Kim F. Storm  <storm@cua.dk>
+
+        * progmodes/grep.el (grep-mode-font-lock-keywords): Correct regexps
+        to recognize mode name containing submodes, such as Grep/lw.
+
+2006-06-21  Kim F. Storm  <storm@cua.dk>
+
+        * simple.el (line-move-1): Check for move-end-of-line instead of
+        end-of-line when setting temporary-goal-column.
+
+2006-06-21  Miles Bader  <miles@gnu.org>
+
+        * play/cookie1.el (cookie): Work properly when there's only one entry.
+
+2006-06-21  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-exited): Ensure overlay arrow gets killed.
+        (gdb-frame-handler): Generalize frame regexp for templates.
+
+2006-06-20  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/appt.el (appt-display-format): Default value must be
+        one of the customize options.
+
+2006-06-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * term/xterm.el (terminal-init-xterm): Update key availability info.
+        Bind C-return.
+
+        * term.el (term-delete-lines, term-insert-lines): Clarify comments.
+
+2006-06-20  Chong Yidong  <cyd@stupidchicken.com>
+
+        * files.el (hack-local-variables): Run `hack-local-variables-hook'
+        whether or not a local variables list is defined.
+
+        * msb.el (msb): Move `sit-for' hack here to handle both
+        "mouse-down and drag" and "mouse-up and select" situations.
+        (mouse-select-buffer): Move `sit-for' hack to `msb'.
+
 2006-06-20  Kenichi Handa  <handa@m17n.org>
 
-        * international/characters.el (word-combining-categories): Add
-        entries for 2-byte Han characters.
+        * international/characters.el (word-combining-categories):
+        Add entries for 2-byte Han characters.
 
 2006-06-19  Richard Stallman  <rms@gnu.org>
 
@@ -13,7 +319,7 @@
         * mouse.el (mouse-drag-vertical-line-rightward-window): New function.
         (mouse-drag-vertical-line): Call it.
 
-        * cus-edit.el (customize-option, customize-option-other-window): 
+        * cus-edit.el (customize-option, customize-option-other-window):
         Error if SYMBOL is nil.
 
 2006-06-19  Carsten Dominik  <dominik@science.uva.nl>
@@ -26,72 +332,67 @@
         (org-update-all-dblocks, org-find-dblock): New functions.
         (org-collect-clock-time-entries): New function.
         (org-html-handle-time-stamps): Never export CLOCK timeranges.
-        (org-fixup-indentation): Modified to deadl correctly with lines
+        (org-fixup-indentation): Modify to deal correctly with lines
         starting with TAB.  Only one argument DIFF now.
         (org-demote, org-promote): Call `org-fixup-indentation' with just
         one argument, DIFF.
         (org-mode): Don't mark buffer as modified when aligning tables.
-        (org-clock-sum): Don't makr buffer modified when adding time sum
+        (org-clock-sum): Don't mark buffer modified when adding time sum
         properties.
-        (org-export-as-html): Added support for a link validation
-        function.
+        (org-export-as-html): Add support for a link validation function.
         (org-archive-all-done): New function.
         (org-archive-subtree): New prefix argument.  When set, archive all
         done subtrees in this buffer.
         (org-remove-clock-overlays)
-        (org-remove-occur-highlights): Use
-        `org-inhibit-highlight-removal'.
-        (org-inhibit-highlight-removal): New variable, for dynamic
-        scoping.
+        (org-remove-occur-highlights): Use `org-inhibit-highlight-removal'.
+        (org-inhibit-highlight-removal): New variable, for dynamic scoping.
         (org-put-clock-overlay): Don't swallow last headline character
         when displaying overlay.
         (org-store-link): Link to `image-mode' with just the file name.
-        
 
 2006-06-18  Michael Kifer  <kifer@cs.stonybrook.edu>
-        
-        * viper-cmd.el (viper-special-read-and-insert-char): use
-        read-key-sequence.
-        (viper-after-change-undo-hook): enhancements.
-        (viper-after-change-undo-hook): new hook.
-        (viper-undo): use viper-after-change-undo-hook.
-        (viper-add-newline-at-eob-if-necessary): widen before making changes.
+
+        * viper-cmd.el (viper-special-read-and-insert-char):
+        Use read-key-sequence.
+        (viper-after-change-undo-hook): Misc enhancements.
+        (viper-after-change-undo-hook): New hook.
+        (viper-undo): Use viper-after-change-undo-hook.
+        (viper-add-newline-at-eob-if-necessary): Widen before making changes.
         (viper-next-line-at-bol): If point is on a widget or a button, simulate
         clicking on that widget/button.
-        
-        * viper.el (viper-mode): allow for a separate cursor color in Emacs
-        state.
-        
-        * ediff-diff (ediff-test-patch-utility): catch errors.
-        (ediff-actual-diff-options, ediff-actual-diff3-options): new variables.
-        (ediff-set-actual-diff-options): new function.
+
+        * viper.el (viper-mode): Allow a separate cursor color in Emacs state.
+
+        * ediff-diff (ediff-test-patch-utility): Catch errors.
+        (ediff-actual-diff-options, ediff-actual-diff3-options): New variables.
+        (ediff-set-actual-diff-options): New function.
         (ediff-reset-diff-options, ediff-toggle-ignore-case):
-        use ediff-set-actual-diff-options.
-        (ediff-extract-diffs): catch errors.
-        (ediff-whitespace): add nonbreakable space.
-        (ediff-same-file-contents): catch errors.
-        
-        * ediff-mult.el (ediff-collect-custom-diffs): save
-        coding-system-for-read.
-        
-        * ediff-vers.el (ediff-keep-tmp-versions): new var.
-        (ediff-vc-internal, ediff-vc-merge-internal): use
-        ediff-delete-version-file.
-        (ediff-delete-version-file): new function.
-        
-        * ediff-wind.el (ediff-control-frame-parameters): set frame fringes.
-        
-        * ediff.el (ediff-directories, ediff-directory-revisions,
-        ediff-merge-directories, ediff-merge-directories-with-ancestor,
-        ediff-directories-internal, ediff-merge-directory-revisions,
-        ediff-merge-directory-revisions-with-ancestor,
-        ediff-directories3): use read-directory-name.
-        
+        Use ediff-set-actual-diff-options.
+        (ediff-extract-diffs): Catch errors.
+        (ediff-whitespace): Add non-breakable space.
+        (ediff-same-file-contents): Catch errors.
+
+        * ediff-mult.el (ediff-collect-custom-diffs):
+        Save coding-system-for-read.
+
+        * ediff-vers.el (ediff-keep-tmp-versions): New variable.
+        (ediff-vc-internal, ediff-vc-merge-internal):
+        Use ediff-delete-version-file.
+        (ediff-delete-version-file): New function.
+
+        * ediff-wind.el (ediff-control-frame-parameters): Set frame fringes.
+
+        * ediff.el (ediff-directories, ediff-directory-revisions)
+        (ediff-merge-directories, ediff-merge-directories-with-ancestor)
+        (ediff-directories-internal, ediff-merge-directory-revisions)
+        (ediff-merge-directory-revisions-with-ancestor)
+        (ediff-directories3): Use read-directory-name.
+
 2006-06-18  Ralf Angeli  <angeli@caeruleus.net>
 
-        * textmodes/tex-mode.el (tex-font-lock-match-suscript): Remove
-        superfluous part of regexp for brace matching which is handled by
-        `scan-lists' call.
+        * textmodes/tex-mode.el (tex-font-lock-match-suscript):
+        Remove superfluous part of regexp for brace matching which is handled
+        by `scan-lists' call.
 
 2006-06-16  Richard Stallman  <rms@gnu.org>
 
@@ -164,7 +465,7 @@
 
 2006-06-10  Carsten Dominik  <dominik@science.uva.nl>
 
-        * textmodes/org.el: (org-agenda-mode-map): Add bindings for
+        * textmodes/org.el (org-agenda-mode-map): Add bindings for
         clocking functions.
 
         (org-agenda-clock-in, org-check-running-clock)
@@ -241,7 +542,7 @@
 2006-06-06  Chong Yidong  <cyd@stupidchicken.com>
 
         * diff-mode.el (diff-mode): Set buffer-read-only to t when
-        diff-default-read-only is non-nill.
+        diff-default-read-only is non-nil.
         (diff-hunk-kill, diff-file-kill, diff-split-hunk)
         (diff-refine-hunk): Set inhibit-read-only to t.
 
@@ -252,7 +553,7 @@
 
 2006-06-06  Carsten Dominik  <dominik@science.uva.nl>
 
-        * textmodes/org.el: (org-archive-subtree): Use end-of-subtree as
+        * textmodes/org.el (org-archive-subtree): Use end-of-subtree as
         insertion point and control the number of empty lines.
         (org-paste-subtree): Limit the number of empty lines at the end of
         the inserted tree.
@@ -318,9 +619,9 @@
         (authors-canonical-file-name): Don't report error for wildcards.
 
         * help.el (view-emacs-news): Rewrite to support new NEWS,
-        NEWS.major, and NEWS.1-17 file naming.  Add more intelligense,
+        NEWS.major, and NEWS.1-17 file naming.  Add more intelligence,
         e.g. version 10 matches 1.10, and don't be confused by version 1.1
-        begin a prefix of 1.12 (etc).  A numeric prefix arg also works.
+        being a prefix of 1.12 (etc).  A numeric prefix arg also works.
 
 2006-06-03  Vivek Dasmohapatra  <vivek@etla.org>
 
@@ -394,7 +695,7 @@
 2006-06-02  Masatake YAMATO  <jet@gyve.org>
 
         * progmodes/compile.el (compilation-error-regexp-alist-alist::gcov-*):
-        Almost rewrite. Underlines over all lines of gcov output are too
+        Almost rewrite.  Underlines over all lines of gcov output are too
         uncomfortable to read.  Suggested by Dan Nicolaescu.
 
 2006-06-01  Luc Teirlinck  <teirllm@auburn.edu>
@@ -438,7 +739,7 @@
 2006-05-31  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gud.el (gud-query-cmdline, gud-common-init):
-        Revert inadvertant changes made with last commit.
+        Revert inadvertent changes made with last commit.
 
 2006-05-30  Reiner Steib  <Reiner.Steib@gmx.de>
 
@@ -449,7 +750,7 @@
 
 2006-05-30  Carsten Dominik  <dominik@science.uva.nl>
 
-        * textmodes/org.el: (org-agenda-highlight-todo): Make sure regexp
+        * textmodes/org.el (org-agenda-highlight-todo): Make sure regexp
         only matches in the right place.
         (org-upcoming-deadline): New face.
         (org-agenda-get-deadlines): Use new face `org-upcoming-deadline'.
@@ -459,9 +760,10 @@
         (org-export-as-html): Many changes to emit valid XHTML.
         (org-par-open): New variable.
         (org-open-par, org-close-par-maybe, org-close-li-maybe): New functions.
-        (org-html-do-expand, org-section-number): Fixedcase in `replace-match'.
+        (org-html-do-expand, org-section-number): Fix case in `replace-match'.
         (org-timeline): Pass `org-timeline-show-empty-dates' to
-        `org-get-all-dates'. Interpret empty dates returned by `org-get-all-dates'.
+        `org-get-all-dates'.  Interpret empty dates returned by
+        `org-get-all-dates'.
         (org-get-all-dates): New argument EMPTY.  Add dates without
         entries to the list, mark large ranges of empty dates.
         (org-point-in-group, org-context): New functions.
@@ -687,7 +989,7 @@
 
 2006-05-26  Carsten Dominik  <dominik@science.uva.nl>
 
-        * textmodes/org.el: (org-next-item, org-previous-item): Emit more
+        * textmodes/org.el (org-next-item, org-previous-item): Emit more
         compact error message.
         (org-tags-view): Refresh category table in each file.
         (org-table-justify-field-maybe): Remove superfluous arguments to
@@ -809,7 +1111,7 @@
 
 2006-05-24  Carsten Dominik  <dominik@science.uva.nl>
 
-        * textmodes/org.el: (org-open-at-point): Use renamed variable
+        * textmodes/org.el (org-open-at-point): Use renamed variable
         `org-confirm-shell-link-function'.
         (org-confirm-shell-link-function): Rename from
         `org-confirm-shell-links'.
@@ -885,7 +1187,6 @@
         make command.
         (org-shiftup, org-shiftdown): Accommodate the item-navigation commands.
 
-
 2006-05-23  Thien-Thi Nguyen  <ttn@gnu.org>
 
         * emacs-lisp/ewoc.el (ewoc-delete): New function.
@@ -1212,7 +1513,7 @@
 
 2006-05-12  Ken Manheimer  <ken.manheimer@gmail.com>
 
-        * allout.el: (allout-view-change-hook): Mark as being deprecated,
+        * allout.el (allout-view-change-hook): Mark as being deprecated,
         to be replaced by `allout-exposure-change-hook'.
         (allout-exposure-change-hook): New, replacing
         `allout-view-change-hook'.
@@ -1488,7 +1789,7 @@
 
 2006-05-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * term/mac-win.el: (mac-utxt-to-string): Don't make adjustment for
+        * term/mac-win.el (mac-utxt-to-string): Don't make adjustment for
         MacJapanese if text is ASCII-only.
 
 2006-05-06  Nick Roberts  <nickrob@snap.net.nz>
@@ -1575,7 +1876,7 @@
 
         * cus-start.el (all): Add mac-dnd-known-types.
 
-        * term/mac-win.el: (mac-utxt-to-string, mac-string-to-utxt)
+        * term/mac-win.el (mac-utxt-to-string, mac-string-to-utxt)
         (mac-TEXT-to-string, mac-string-to-TEXT, mac-furl-to-string)
         (mac-TIFF-to-string): New functions.
         (x-get-selection, x-selection-value)
@@ -1620,7 +1921,7 @@
 2006-05-03  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * isearch.el (isearch-update-ring): Take history-delete-duplicates
-        into consideration. Replace one arm ifs with whens.
+        into consideration.  Replace one arm ifs with whens.
 
 2006-05-03  Nick Roberts  <nickrob@snap.net.nz>
 
@@ -1633,7 +1934,7 @@
 
 2006-05-02  Jay Belanger  <belanger@truman.edu>
 
-        * calc/calc-embed.el: (calc-override-minor-modes-map)
+        * calc/calc-embed.el (calc-override-minor-modes-map)
         (calc-override-minor-modes): New variables.
         (calc-do-embedded): Make sure that Calc keystrokes aren't
         overwritten by minor modes.
@@ -2616,7 +2917,7 @@
         (Man-abstract-xref-man-page): If Man-target-string is a function,
         call it.
         (Man-highlight-references): Use Man-default-man-entry to get the
-        target. Deal with xrefs too.
+        target.  Deal with xrefs too.
         (Man-highlight-references0): Don't call the target function.
 
         * woman.el (WoMan-xref-man-page): Strip the section number, woman
diff --git a/lisp/allout.el b/lisp/allout.el
index d6955c52cdf..2fbef5b2cd8 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -37,7 +37,7 @@
 ;;  - Incremental search with dynamic exposure and reconcealment of text
 ;;  - Customizable bullet format - enables programming-language specific
 ;;    outlining, for code-folding editing.  (Allout code itself is to try it;
-;;    formatted as an outline - do ESC-x eval-current-buffer in allout.el; but
+;;    formatted as an outline - do ESC-x eval-buffer in allout.el; but
 ;;    emacs local file variables need to be enabled when the
 ;;    file was visited - see `enable-local-variables'.)
 ;;  - Configurable per-file initial exposure settings
@@ -72,7 +72,7 @@
 ;; 3.x, for those of you that depend on the old method.)
 ;;
 ;; Note - the lines beginning with `;;;_' are outline topic headers.
-;;        Just `ESC-x eval-current-buffer' to give it a whirl.
+;;        Just `ESC-x eval-buffer' to give it a whirl.
 
 ;; ken manheimer (ken dot manheimer at gmail dot com)
 
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 4998c1edf07..e9e7e9a2bb8 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -777,7 +777,7 @@ For more information, see the function `buffer-menu'."
                         ((eq major-mode 'Info-mode)
                          (setq file Info-current-file)
                          (cond
-                          ((eq file t)
+                          ((equal file "dir")
                            (setq file "*Info Directory*"))
                           ((eq file 'apropos)
                            (setq file "*Info Apropos*"))
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 5c862ee6c29..29e6fe56b6e 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -136,7 +136,9 @@ of the (obsolete) variables `appt-msg-window' and `appt-visible'."
   :type '(choice
           (const :tag "Separate window" window)
           (const :tag "Echo-area" echo)
-          (const :tag "No visible display" nil))
+          (const :tag "No visible display" nil)
+          (const :tag "Backwards compatibility setting - choose another value"
+                 ignore))
   :group 'appt
   :version "22.1")
 
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 6abcb74a3e2..38bcc887ec0 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -213,12 +213,6 @@ If nil, make an icon of the frame.  If non-nil, delete the frame."
 ;; backward-compatibility alias
 (put 'holiday-face 'face-alias 'holiday)
 
-(eval-after-load "facemenu"
-  '(progn
-     (add-to-list 'facemenu-unlisted-faces 'diary)
-     (add-to-list 'facemenu-unlisted-faces 'calendar-today)
-     (add-to-list 'facemenu-unlisted-faces 'holiday)))
-
 (defcustom diary-entry-marker
   (if (not (display-color-p))
       "+"
diff --git a/lisp/complete.el b/lisp/complete.el
index d0e3fbe8ddf..ca6231893c3 100644
--- a/lisp/complete.el
+++ b/lisp/complete.el
@@ -196,7 +196,7 @@ as much as possible and `*' characters are treated likewise in file names.
 For example, M-x p-c-m expands to M-x partial-completion-mode since no other
 command begins with that sequence of characters, and
 \\[find-file] f_b.c TAB might complete to foo_bar.c if that file existed and no
-other file in that directory begin with that sequence of characters.
+other file in that directory begins with that sequence of characters.
 
 Unless `PC-disable-includes' is non-nil, the `<...>' sequence is interpreted
 specially in \\[find-file].  For example,
@@ -234,7 +234,9 @@ second TAB brings up the `*Completions*' buffer."
   (funcall
    (if partial-completion-mode 'add-hook 'remove-hook)
    'choose-completion-string-functions
-   (lambda (&rest x) (goto-char (point-max)) nil))
+   (lambda (choice buffer mini-p base-size)
+     (if mini-p (goto-char (point-max)))
+     nil))
   ;; Build the env-completion and mapping table.
   (when (and partial-completion-mode (null PC-env-vars-alist))
     (setq PC-env-vars-alist
@@ -358,13 +360,36 @@ See `PC-complete' for details."
 The function takes no arguments, and typically looks at the value
 of `minibuffer-completion-table' and the minibuffer contents.")
 
+;; Returns the sequence of non-delimiter characters that follow regexp in string.
+(defun PC-chunk-after (string regexp)
+  (if (not (string-match regexp string))
+      (let ((message (format "String %s didn't match regexp %s" string regexp)))
+        (message message)
+        (error message)))
+  (let ((result (substring string (match-end 0))))
+    ;; result may contain multiple chunks
+    (if (string-match PC-delim-regex result)
+        (setq result (substring result 0 (match-beginning 0))))
+    result))
+
+(defun test-completion-ignore-case (str table pred)
+  "Like `test-completion', but ignores case when possible."
+  ;; Binding completion-ignore-case to nil ensures, for compatibility with
+  ;; standard completion, that the return value is exactly one of the
+  ;; possibilities.  Do this binding only if pred is nil, out of paranoia;
+  ;; perhaps it is safe even if pred is non-nil.
+  (if pred
+      (test-completion str table pred)
+    (let ((completion-ignore-case nil))
+      (test-completion str table pred))))
+
 (defun PC-do-completion (&optional mode beg end)
   (or beg (setq beg (minibuffer-prompt-end)))
   (or end (setq end (point-max)))
   (let* ((table minibuffer-completion-table)
          (pred minibuffer-completion-predicate)
          (filename (funcall PC-completion-as-file-name-predicate))
-         (dirname nil)
+         (dirname nil)          ; non-nil only if a filename is being completed
          (dirlength 0)
          (str (buffer-substring beg end))
          (incname (and filename (string-match "<\\([^\"<>]*\\)>?$" str)))
@@ -379,7 +404,7 @@ of `minibuffer-completion-table' and the minibuffer contents.")
 
     ;; Check if buffer contents can already be considered complete
     (if (and (eq mode 'exit)
-             (test-completion str table pred))
+             (test-completion-ignore-case str table pred))
         'complete
 
       ;; Do substitutions in directory names
@@ -598,35 +623,38 @@ of `minibuffer-completion-table' and the minibuffer contents.")
 
             ;; Check if next few letters are the same in all cases
             (if (and (not (eq mode 'help))
-                     (setq prefix (try-completion "" (mapcar 'list poss))))
+                     (setq prefix (try-completion (PC-chunk-after basestr skip) (mapcar 'list poss))))
                 (let ((first t) i)
+                  ;; Retain capitalization of user input even if
+                  ;; completion-ignore-case is set.
                   (if (eq mode 'word)
                       (setq prefix (PC-chop-word prefix basestr)))
                   (goto-char (+ beg (length dirname)))
                   (while (and (progn
-                                (setq i 0)
+                                (setq i 0) ; index into prefix string
                                 (while (< i (length prefix))
                                   (if (and (< (point) end)
-                                           (eq (aref prefix i)
-                                               (following-char)))
+                                           (eq (downcase (aref prefix i))
+                                               (downcase (following-char))))
+                                      ;; same char (modulo case); no action
                                       (forward-char 1)
                                     (if (and (< (point) end)
-                                             (or (and (looking-at " ")
+                                             (and (looking-at " ")
                                                       (memq (aref prefix i)
-                                                            PC-delims-list))
-                                                 (eq (downcase (aref prefix i))
-                                                     (downcase
-                                                      (following-char)))))
+                                                        PC-delims-list)))
+                                        ;; replace " " by the actual delimiter
                                         (progn
                                           (delete-char 1)
-                                          (setq end (1- end)))
+                                          (insert (substring prefix i (1+ i))))
+                                      ;; insert a new character
+                                      (progn
                                       (and filename (looking-at "\\*")
                                            (progn
                                              (delete-char 1)
                                              (setq end (1- end))))
-                                      (setq improved t))
+                                        (setq improved t)
                                     (insert (substring prefix i (1+ i)))
-                                    (setq end (1+ end)))
+                                        (setq end (1+ end)))))
                                   (setq i (1+ i)))
                                 (or pt (setq pt (point)))
                                 (looking-at PC-delim-regex))
@@ -634,7 +662,12 @@ of `minibuffer-completion-table' and the minibuffer contents.")
                                                  (regexp-quote prefix)
                                                  PC-ndelims-regex)
                                     prefix (try-completion
-                                            ""
+                                            (PC-chunk-after
+                                             ;; not basestr, because that does
+                                             ;; not reflect insertions
+                                             (buffer-substring
+                                              (+ beg (length dirname)) end)
+                                             skip)
                                             (mapcar
                                              (function
                                               (lambda (x)
@@ -666,7 +699,7 @@ of `minibuffer-completion-table' and the minibuffer contents.")
 
                   ;; We changed it... enough to be complete?
                   (and (eq mode 'exit)
-                       (test-completion (field-string) table pred))
+                       (test-completion-ignore-case (field-string) table pred))
 
                 ;; If totally ambiguous, display a list of completions
                 (if (or (eq completion-auto-help t)
@@ -950,11 +983,10 @@ absolute rather than relative to some directory on the SEARCH-PATH."
   (if (string-match "<\\([^\"<>]*\\)>?\\'" (ad-get-arg 0))
       (let* ((string (ad-get-arg 0))
              (action (ad-get-arg 2))
-             (name (match-string 1 string))
+             (name (substring string (match-beginning 1) (match-end 1)))
              (str2 (substring string (match-beginning 0)))
              (completion-table
-              (mapcar (lambda (x)
-                        (format (if (string-match "/\\'" x) "<%s" "<%s>") x))
+              (mapcar (lambda (x) (format "<%s>" x))
                       (PC-include-file-all-completions
                        name (PC-include-file-path)))))
         (setq ad-return-value
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 53f92f2243b..d7ffab4bc5b 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1366,10 +1366,10 @@ that are not customizable options, as well as faces and groups
                                       (get symbol 'variable-documentation))))
                     (push (list symbol 'custom-variable) found)))))
     (if (not found)
-        (error "No matches")
-      (custom-buffer-create (custom-sort-items found t
-                                               custom-buffer-order-groups)
-                            "*Customize Apropos*"))))
+        (error "No customizable items matching %s" regexp)
+      (custom-buffer-create
+       (custom-sort-items found t custom-buffer-order-groups)
+       "*Customize Apropos*"))))
 
 ;;;###autoload
 (defun customize-apropos-options (regexp &optional arg)
@@ -4520,9 +4520,18 @@ if that value is non-nil."
 
 (put 'custom-mode 'mode-class 'special)
 
-(add-to-list
- 'debug-ignored-errors
- "^No user options have changed defaults in recent Emacs versions$")
+(dolist (regexp
+         '("^No user option defaults have been changed since Emacs "
+           "^Invalid face:? "
+           "^No \\(?:customized\\|rogue\\|saved\\) user options"
+           "^No customizable items matching "
+           "^There are unset changes"
+           "^Cannot set hidden variable"
+           "^No \\(?:saved\\|backup\\) value for "
+           "^No standard setting known for "
+           "^No standard setting for this face"
+           "^Saving settings from \"emacs -q\" would overwrite existing customizations"))
+  (add-to-list 'debug-ignored-errors regexp))
 
 ;;; The End.
 
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 69815117bc2..ded83bc8944 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -153,8 +153,9 @@ backward compatibility.")
 (define-minor-mode desktop-save-mode
   "Toggle desktop saving mode.
 With numeric ARG, turn desktop saving on if ARG is positive, off
-otherwise.  See variable `desktop-save' for a description of when the
-desktop is saved."
+otherwise.  If desktop saving is turned on, the state of Emacs is
+saved from one session to another.  See variable `desktop-save'
+and function `desktop-read' for details."
   :global t
   :group 'desktop)
 
@@ -175,7 +176,8 @@ Possible values are:
 The desktop is never saved when `desktop-save-mode' is nil.
 The variables `desktop-dirname' and `desktop-base-file-name'
 determine where the desktop is saved."
-  :type '(choice
+  :type
+  '(choice
     (const :tag "Always save" t)
     (const :tag "Always ask" ask)
     (const :tag "Ask if desktop file is new, else do save" ask-if-new)
@@ -212,6 +214,7 @@ If nil, just print error messages in the message buffer."
 
 (defcustom desktop-no-desktop-file-hook nil
   "Normal hook run when `desktop-read' can't find a desktop file.
+Run in the directory in which the desktop file was sought.
 May be used to show a dired buffer."
   :type 'hook
   :group 'desktop
@@ -222,11 +225,14 @@ May be used to show a dired buffer."
 May be used to show a buffer list."
   :type 'hook
   :group 'desktop
+  :options '(list-buffers)
   :version "22.1")
 
 (defcustom desktop-save-hook nil
   "Normal hook run before the desktop is saved in a desktop file.
-This is useful for truncating history lists, for example."
+Run with the desktop buffer current with only the header present.
+May be used to add to the desktop code or to truncate history lists,
+for example."
   :type 'hook
   :group 'desktop)
 
@@ -282,6 +288,7 @@ these won't be deleted."
     size-indication-mode
     buffer-file-coding-system
     indent-tabs-mode
+    tab-width
     indicate-buffer-boundaries
     indicate-empty-lines
     show-trailing-whitespace)
@@ -475,6 +482,11 @@ See also `desktop-minor-mode-table'.")
 (defvar desktop-dirname nil
   "The directory in which the desktop file should be saved.")
 
+(defun desktop-full-file-name (&optional dirname)
+  "Return the full name of the desktop file in DIRNAME.
+DIRNAME omitted or nil means use `desktop-dirname'."
+  (expand-file-name desktop-base-file-name (or dirname desktop-dirname)))
+
 (defconst desktop-header
 ";; --------------------------------------------------------------------------
 ;; Desktop File for Emacs
@@ -492,6 +504,7 @@ See also `desktop-minor-mode-table'.")
         (setcdr here nil))))
 
 ;; ----------------------------------------------------------------------------
+;;;###autoload
 (defun desktop-clear ()
   "Empty the Desktop.
 This kills all buffers except for internal ones and those with names matched by
@@ -528,29 +541,26 @@ Furthermore, it clears the variables listed in `desktop-globals-to-clear'."
   "If `desktop-save-mode' is non-nil, do what `desktop-save' says to do.
 If the desktop should be saved and `desktop-dirname'
 is nil, ask the user where to save the desktop."
-  (when
-    (and
-      desktop-save-mode
-      (let ((exists (file-exists-p (expand-file-name desktop-base-file-name desktop-dirname))))
-        (or
-          (eq desktop-save t)
-          (and exists (memq desktop-save '(ask-if-new if-exists)))
-          (and
-            (or
-              (memq desktop-save '(ask ask-if-new))
-              (and exists (eq desktop-save 'ask-if-exists)))
-            (y-or-n-p "Save desktop? ")))))
+  (when (and desktop-save-mode
+             (let ((exists (file-exists-p (desktop-full-file-name))))
+               (or (eq desktop-save t)
+                   (and exists (memq desktop-save '(ask-if-new if-exists)))
+                   (and
+                    (or (memq desktop-save '(ask ask-if-new))
+                        (and exists (eq desktop-save 'ask-if-exists)))
+                    (y-or-n-p "Save desktop? ")))))
     (unless desktop-dirname
       (setq desktop-dirname
-        (file-name-as-directory
-          (expand-file-name
-            (call-interactively
-              (lambda (dir) (interactive "DDirectory for desktop file: ") dir))))))
+            (file-name-as-directory
+             (expand-file-name
+              (call-interactively
+               (lambda (dir)
+                 (interactive "DDirectory for desktop file: ") dir))))))
     (condition-case err
-      (desktop-save desktop-dirname)
+        (desktop-save desktop-dirname)
       (file-error
-        (unless (yes-or-no-p "Error while saving the desktop.  Ignore? ")
-          (signal (car err) (cdr err)))))))
+       (unless (yes-or-no-p "Error while saving the desktop.  Ignore? ")
+         (signal (car err) (cdr err)))))))
 
 ;; ----------------------------------------------------------------------------
 (defun desktop-list* (&rest args)
@@ -715,6 +725,7 @@ DIRNAME must be the directory in which the desktop file will be saved."
     (t (expand-file-name filename))))
 
 ;; ----------------------------------------------------------------------------
+;;;###autoload
 (defun desktop-save (dirname)
   "Save the desktop in a desktop file.
 Parameter DIRNAME specifies where to save the desktop file.
@@ -723,7 +734,7 @@ See also `desktop-base-file-name'."
   (run-hooks 'desktop-save-hook)
   (setq dirname (file-name-as-directory (expand-file-name dirname)))
   (save-excursion
-    (let ((filename (expand-file-name desktop-base-file-name dirname))
+    (let ((filename (desktop-full-file-name dirname))
           (info
             (mapcar
               #'(lambda (b)
@@ -802,12 +813,13 @@ See also `desktop-base-file-name'."
   (setq desktop-dirname dirname))
 
 ;; ----------------------------------------------------------------------------
+;;;###autoload
 (defun desktop-remove ()
   "Delete desktop file in `desktop-dirname'.
 This function also sets `desktop-dirname' to nil."
   (interactive)
   (when desktop-dirname
-    (let ((filename (expand-file-name desktop-base-file-name desktop-dirname)))
+    (let ((filename (desktop-full-file-name)))
       (setq desktop-dirname nil)
       (when (file-exists-p filename)
         (delete-file filename)))))
@@ -830,32 +842,30 @@ It returns t if a desktop file was loaded, nil otherwise."
   (interactive)
   (unless noninteractive
     (setq desktop-dirname
-      (file-name-as-directory
-        (expand-file-name
-          (or
-            ;; If DIRNAME is specified, use it.
-            (and (< 0 (length dirname)) dirname)
-            ;; Otherwise search desktop file in desktop-path.
-            (let ((dirs desktop-path))
-              (while
-                (and
-                  dirs
-                  (not
-                    (file-exists-p (expand-file-name desktop-base-file-name (car dirs)))))
-                (setq dirs (cdr dirs)))
-              (and dirs (car dirs)))
-            ;; If not found and `desktop-path' is non-nil, use its first element.
-            (and desktop-path (car desktop-path))
-            ;; Default: Home directory.
-            "~"))))
-    (if (file-exists-p (expand-file-name desktop-base-file-name desktop-dirname))
+          (file-name-as-directory
+           (expand-file-name
+            (or
+             ;; If DIRNAME is specified, use it.
+             (and (< 0 (length dirname)) dirname)
+             ;; Otherwise search desktop file in desktop-path.
+             (let ((dirs desktop-path))
+               (while (and dirs
+                           (not (file-exists-p
+                                 (desktop-full-file-name (car dirs)))))
+                 (setq dirs (cdr dirs)))
+               (and dirs (car dirs)))
+             ;; If not found and `desktop-path' is non-nil, use its first element.
+             (and desktop-path (car desktop-path))
+             ;; Default: Home directory.
+             "~"))))
+    (if (file-exists-p (desktop-full-file-name))
       ;; Desktop file found, process it.
       (let ((desktop-first-buffer nil)
             (desktop-buffer-ok-count 0)
             (desktop-buffer-fail-count 0))
         (setq desktop-lazy-timer nil)
         ;; Evaluate desktop buffer.
-        (load (expand-file-name desktop-base-file-name desktop-dirname) t t t)
+        (load (desktop-full-file-name) t t t)
         ;; `desktop-create-buffer' puts buffers at end of the buffer list.
         ;; We want buffers existing prior to evaluating the desktop (and not reused)
         ;; to be placed at the end of the buffer list, so we move them here.
@@ -925,7 +935,7 @@ directory DIRNAME."
   (interactive)
   (unless desktop-dirname
     (error "Unknown desktop directory"))
-  (unless (file-exists-p (expand-file-name desktop-base-file-name desktop-dirname))
+  (unless (file-exists-p (desktop-full-file-name))
     (error "No desktop file found"))
   (desktop-clear)
   (desktop-read desktop-dirname))
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 7ea02352b0b..16bdaf152f7 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -46,13 +46,15 @@
 ;;   of a hunk.  Show then the changes between <file> and <hunk> and make it
 ;;   possible to apply them to <file>, <hunk-src>, or <hunk-dst>.
 ;;   Or maybe just make it into a ".rej to diff3-markers converter".
+;;   Maybe just use `wiggle' (by Neil Brown) to do it for us.
 ;;
 ;; - Refine hunk on a word-by-word basis.
-;;
+;; 
+;; - in diff-apply-hunk, strip context in replace-match to better
+;;   preserve markers and spacing.
 ;; - Handle `diff -b' output in context->unified.
 
 ;;; Code:
-
 (eval-when-compile (require 'cl))
 
 (defvar add-log-buffer-file-name-function)
@@ -128,14 +130,14 @@ when editing big diffs)."
     ;;("h" . diff-show-header)
     ;;("j" . diff-show-difference)      ;jump to Nth diff
     ;;("q" . diff-quit)
-;; Not useful if you have to metafy them.
-;;    (" " . scroll-up)
-;;    ("\177" . scroll-down)
-;; Standard M-a is useful, so don't change M-A.
-;;    ("A" . diff-ediff-patch)
-;; Standard M-r is useful, so don't change M-r or M-R.
-;;    ("r" . diff-restrict-view)
-;;    ("R" . diff-reverse-direction)
+    ;; Not useful if you have to metafy them.
+    ;;(" " . scroll-up)
+    ;;("\177" . scroll-down)
+    ;; Standard M-a is useful, so don't change M-A.
+    ;;("A" . diff-ediff-patch)
+    ;; Standard M-r is useful, so don't change M-r or M-R.
+    ;;("r" . diff-restrict-view)
+    ;;("R" . diff-reverse-direction)
     ("q" . quit-window))
   "Basic keymap for `diff-mode', bound to various prefix keys.")
 
@@ -581,14 +583,16 @@ If the OLD prefix arg is passed, tell the file NAME of the old file."
                (list (if old (match-string 2) (match-string 4))
                      (if old (match-string 4) (match-string 2)))))))))
 
-(defun diff-find-file-name (&optional old)
+(defun diff-find-file-name (&optional old prefix)
   "Return the file corresponding to the current patch.
-Non-nil OLD means that we want the old file."
+Non-nil OLD means that we want the old file.
+PREFIX is only used internally: don't use it."
   (save-excursion
     (unless (looking-at diff-file-header-re)
       (or (ignore-errors (diff-beginning-of-file))
           (re-search-forward diff-file-header-re nil t)))
     (let ((fs (diff-hunk-file-names old)))
+      (if prefix (setq fs (mapcar (lambda (f) (concat prefix f)) fs)))
       (or
        ;; use any previously used preference
        (cdr (assoc fs diff-remembered-files-alist))
@@ -610,6 +614,13 @@ Non-nil OLD means that we want the old file."
        (and (string-match "\\.rej\\'" (or buffer-file-name ""))
             (let ((file (substring buffer-file-name 0 (match-beginning 0))))
               (when (file-exists-p file) file)))
+       ;; If we haven't found the file, maybe it's because we haven't paid
+       ;; attention to the PCL-CVS hint.
+       (and (not prefix)
+            (boundp 'cvs-pcl-cvs-dirchange-re)
+            (save-excursion
+              (re-search-backward cvs-pcl-cvs-dirchange-re nil t))
+            (diff-find-file-name old (match-string 1)))
        ;; if all else fails, ask the user
        (let ((file (read-file-name (format "Use file %s: " (or (first fs) ""))
                                    nil (first fs) t (first fs))))
@@ -639,7 +650,7 @@ else cover the whole bufer."
   (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
                    (list (region-beginning) (region-end))
                  (list (point-min) (point-max))))
-  (unless (markerp end) (setq end (copy-marker end)))
+  (unless (markerp end) (setq end (copy-marker end t)))
   (let (;;(diff-inhibit-after-change t)
         (inhibit-read-only t))
     (save-excursion
@@ -729,7 +740,7 @@ With a prefix argument, convert unified format to context format."
                  (list (point-min) (point-max) current-prefix-arg)))
   (if to-context
       (diff-unified->context start end)
-    (unless (markerp end) (setq end (copy-marker end)))
+    (unless (markerp end) (setq end (copy-marker end t)))
     (let ( ;;(diff-inhibit-after-change t)
           (inhibit-read-only t))
       (save-excursion
@@ -801,7 +812,7 @@ else cover the whole bufer."
   (interactive (if (or current-prefix-arg (and transient-mark-mode mark-active))
                    (list (region-beginning) (region-end))
                  (list (point-min) (point-max))))
-  (unless (markerp end) (setq end (copy-marker end)))
+  (unless (markerp end) (setq end (copy-marker end t)))
   (let (;;(diff-inhibit-after-change t)
         (inhibit-read-only t))
     (save-excursion
@@ -979,7 +990,8 @@ headers for you on-the-fly.
 
 You can also switch between context diff and unified diff with \\[diff-context->unified],
 or vice versa with \\[diff-unified->context] and you can also reverse the direction of
-a diff with \\[diff-reverse-direction]."
+a diff with \\[diff-reverse-direction].
+\\{diff-mode-map}"
   (set (make-local-variable 'font-lock-defaults) diff-font-lock-defaults)
   (set (make-local-variable 'outline-regexp) diff-outline-regexp)
   (set (make-local-variable 'imenu-generic-expression)
@@ -1004,13 +1016,13 @@ a diff with \\[diff-reverse-direction]."
     (add-hook 'after-change-functions 'diff-after-change-function nil t)
     (add-hook 'post-command-hook 'diff-post-command-hook nil t))
   ;; Neat trick from Dave Love to add more bindings in read-only mode:
-  (let ((ro-bind (cons 'buffer-read-only diff-mode-shared-map)))
+  (lexical-let ((ro-bind (cons 'buffer-read-only diff-mode-shared-map)))
     (add-to-list 'minor-mode-overriding-map-alist ro-bind)
     ;; Turn off this little trick in case the buffer is put in view-mode.
     (add-hook 'view-mode-hook
-              `(lambda ()
-                 (setq minor-mode-overriding-map-alist
-                       (delq ',ro-bind minor-mode-overriding-map-alist)))
+              (lambda ()
+                (setq minor-mode-overriding-map-alist
+                      (delq ro-bind minor-mode-overriding-map-alist)))
               nil t))
   ;; add-log support
   (set (make-local-variable 'add-log-current-defun-function)
@@ -1031,7 +1043,7 @@ a diff with \\[diff-reverse-direction]."
     (add-hook 'after-change-functions 'diff-after-change-function nil t)
     (add-hook 'post-command-hook 'diff-post-command-hook nil t)))
 
-;;; Handy hook functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Handy hook functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defun diff-delete-if-empty ()
   ;; An empty diff file means there's no more diffs to integrate, so we
diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el
index ae2bd8052bb..2d730c8af0f 100644
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -186,7 +186,7 @@ set to the appropriate coding system, and the value of
       (setq buffer-file-type (eq buffer-file-coding-system 'no-conversion)))))
 
 ;;; To set the default coding system on new files.
-(add-hook 'find-file-not-found-hooks
+(add-hook 'find-file-not-found-functions
           'find-file-not-found-set-buffer-file-coding-system)
 
 ;;; To accomodate filesystems that do not require CR/LF translation.
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index d5588f3811f..a58ecb256ac 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -291,7 +291,7 @@ All commands in `lisp-mode-shared-map' are inherited by this map.")
     (define-key map [byte-compile]
       '("Byte-compile This File" . emacs-lisp-byte-compile))
     (define-key map [separator-eval] '("--"))
-    (define-key map [eval-buffer] '("Evaluate Buffer" . eval-current-buffer))
+    (define-key map [eval-buffer] '("Evaluate Buffer" . eval-buffer))
     (define-key map [eval-region] '("Evaluate Region" . eval-region))
     (define-key map [eval-sexp] '("Evaluate Last S-expression" . eval-last-sexp))
     (define-key map [separator-format] '("--"))
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 661fc6ede7f..80938b0282a 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -854,11 +854,6 @@ Related buffers can be cycled through via :R and :P commands."
 
 ;;; Face-saving tricks
 
-(defun viper-hide-face (face)
-  (if (and (viper-has-face-support-p) viper-emacs-p)
-      (add-to-list 'facemenu-unlisted-faces face)))
-
-
 (defgroup viper-highlighting nil
   "Hilighting of replace region, search pattern, minibuffer, etc."
   :prefix "viper-"
@@ -876,8 +871,6 @@ Related buffers can be cycled through via :R and :P commands."
 DO NOT CHANGE this variable.  Instead, use the customization widget
 to customize the actual face object `viper-search'
 this variable represents.")
-(viper-hide-face viper-search-face)
-
 
 (defface viper-replace-overlay
   '((((class color)) (:foreground "Black" :background "darkseagreen2"))
@@ -890,8 +883,6 @@ this variable represents.")
 DO NOT CHANGE this variable.  Instead, use the customization widget
 to customize the actual face object `viper-replace-overlay'
 this variable represents.")
-(viper-hide-face viper-replace-overlay-face)
-
 
 (defface viper-minibuffer-emacs
   '((((class color)) (:foreground "Black" :background "darkseagreen2"))
@@ -904,8 +895,6 @@ this variable represents.")
 DO NOT CHANGE this variable.  Instead, use the customization widget
 to customize the actual face object `viper-minibuffer-emacs'
 this variable represents.")
-(viper-hide-face viper-minibuffer-emacs-face)
-
 
 (defface viper-minibuffer-insert
   '((((class color)) (:foreground "Black" :background "pink"))
@@ -918,8 +907,6 @@ this variable represents.")
 DO NOT CHANGE this variable.  Instead, use the customization widget
 to customize the actual face object `viper-minibuffer-insert'
 this variable represents.")
-(viper-hide-face viper-minibuffer-insert-face)
-
 
 (defface viper-minibuffer-vi
   '((((class color)) (:foreground "DarkGreen" :background "grey"))
@@ -932,7 +919,6 @@ this variable represents.")
 DO NOT CHANGE this variable.  Instead, use the customization widget
 to customize the actual face object `viper-minibuffer-vi'
 this variable represents.")
-(viper-hide-face viper-minibuffer-vi-face)
 
 ;; the current face to be used in the minibuffer
 (viper-deflocalvar
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 5478cf12b8c..a8d8ea9a4b5 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -67,8 +67,8 @@
 ;;
 ;; The order of the faces that appear in the menu and their keybindings can be
 ;; controlled by setting the variables `facemenu-keybindings' and
-;; `facemenu-new-faces-at-end'.  List faces that you don't use in documents
-;; (eg, `region') in `facemenu-unlisted-faces'.
+;; `facemenu-new-faces-at-end'.  List faces that you want to use in documents
+;; in `facemenu-listed-faces'.
 
 ;;; Known Problems:
 ;; Bold and Italic do not combine to create bold-italic if you select them
@@ -116,9 +116,9 @@ the next element is the key to use as a keyboard equivalent of the menu item;
 the binding is made in `facemenu-keymap'.
 
 The faces specifically mentioned in this list are put at the top of
-the menu, in the order specified.  All other faces which are defined,
-except for those in `facemenu-unlisted-faces', are listed after them,
-but get no keyboard equivalents.
+the menu, in the order specified.  All other faces which are defined
+in `facemenu-listed-faces' are listed after them, but get no
+keyboard equivalents.
 
 If you change this variable after loading facemenu.el, you will need to call
 `facemenu-update' to make it take effect."
@@ -132,28 +132,25 @@ just before \"Other\" at the end."
   :type 'boolean
   :group 'facemenu)
 
-(defcustom facemenu-unlisted-faces
-  `(modeline region secondary-selection highlight scratch-face
-    ,(purecopy "^font-lock-") ,(purecopy "^gnus-") ,(purecopy "^message-")
-    ,(purecopy "^ediff-") ,(purecopy "^term-") ,(purecopy "^vc-")
-    ,(purecopy "^widget-") ,(purecopy "^custom-") ,(purecopy "^vm-"))
-  "*List of faces not to include in the Face menu.
-Each element may be either a symbol, which is the name of a face, or a string,
-which is a regular expression to be matched against face names.  Matching
-faces will not be added to the menu.
+(defcustom facemenu-listed-faces nil
+  "*List of faces to include in the Face menu.
+Each element should be a symbol, which is the name of a face.
+The \"basic \" faces in `facemenu-keybindings' are automatically
+added to the Face menu, and are not included in this list.
 
 You can set this list before loading facemenu.el, or add a face to it before
-creating that face if you do not want it to be listed.  If you change the
+creating that face if you want it to be listed.  If you change the
 variable so as to eliminate faces that have already been added to the menu,
 call `facemenu-update' to recalculate the menu contents.
 
-If this variable is t, no faces will be added to the menu.  This is useful for
-temporarily turning off the feature that automatically adds faces to the menu
-when they are created."
-  :type '(choice (const :tag "Don't add faces" t)
-                 (const :tag "None (do add any face)" nil)
-                 (repeat (choice symbol regexp)))
-  :group 'facemenu)
+If this variable is t, all faces will be added to the menu.  This
+is useful for setting temporarily if you want to add faces to the
+menu when they are created."
+  :type '(choice (const :tag "List all faces" t)
+                 (const :tag "None" nil)
+                 (repeat symbol))
+  :group 'facemenu
+  :version "22.1")
 
 ;;;###autoload
 (defvar facemenu-face-menu
@@ -675,18 +672,13 @@ This is called whenever you create a new face."
     (setq docstring
           (format "Select face `%s' for subsequent insertion."
                   name))
-    (cond ((eq t facemenu-unlisted-faces))
-          ((memq symbol facemenu-unlisted-faces))
-          ;; test against regexps in facemenu-unlisted-faces
-          ((let ((unlisted facemenu-unlisted-faces)
-                 (matched nil))
-             (while (and unlisted (not matched))
-               (if (and (stringp (car unlisted))
-                        (string-match (car unlisted) name))
-                   (setq matched t)
-                 (setq unlisted (cdr unlisted))))
-             matched))
-          (key ; has a keyboard equivalent.  These go at the front.
+    (cond ((facemenu-iterate ; check if equivalent face is already in the menu
+            (lambda (m) (and (listp m)
+                             (symbolp (car m))
+                             (face-equal (car m) symbol)))
+            (cdr (symbol-function menu))))
+          ;; Faces with a keyboard equivalent.  These go at the front.
+          (key
            (setq function (intern (concat "facemenu-set-" name)))
            (fset function
                  `(lambda ()
@@ -700,17 +692,14 @@ This is called whenever you create a new face."
                          (region-end)))))
            (define-key 'facemenu-keymap key (cons name function))
            (define-key menu key (cons name function)))
-          ((facemenu-iterate ; check if equivalent face is already in the menu
-            (lambda (m) (and (listp m)
-                             (symbolp (car m))
-                             (face-equal (car m) symbol)))
-            (cdr (symbol-function menu))))
-          (t   ; No keyboard equivalent.  Figure out where to put it:
+          ;; Faces with no keyboard equivalent.  Figure out where to put it:
+          ((or (eq t facemenu-listed-faces)
+               (memq symbol facemenu-listed-faces))
            (setq key (vector symbol)
                  function 'facemenu-set-face-from-menu
                  menu-val (symbol-function menu))
            (if (and facemenu-new-faces-at-end
-                   (> (length menu-val) 3))
+                    (> (length menu-val) 3))
                (define-key-after menu-val key (cons name function)
                  (car (nth (- (length menu-val) 3) menu-val)))
              (define-key menu key (cons name function))))))
diff --git a/lisp/faces.el b/lisp/faces.el
index 6ae0bca663f..4627b5ff594 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -916,10 +916,11 @@ of the default face.  Value is FACE."
 
 (defun read-face-name (prompt &optional string-describing-default multiple)
   "Read a face, defaulting to the face or faces on the char after point.
-If it has a `read-face-name' property, that overrides the `face' property.
-PROMPT describes what you will do with the face (don't end in a space).
-STRING-DESCRIBING-DEFAULT describes what default you will use
-if this function returns nil.
+If it has the property `read-face-name', that overrides the `face' property.
+PROMPT should be a string that describes what the caller will do with the face;
+it should not end in a space.
+STRING-DESCRIBING-DEFAULT should describe what default the caller will use if
+the user just types RET; you can omit it.
 If MULTIPLE is non-nil, return a list of faces (possibly only one).
 Otherwise, return a single face."
   (let ((faceprop (or (get-char-property (point) 'read-face-name)
diff --git a/lisp/files.el b/lisp/files.el
index 8a5a331da71..750cb36068a 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -488,7 +488,7 @@ This variable does not affect the use of major modes
 specified in a -*- line.")
 
 (defcustom enable-local-eval 'maybe
-  "*Control processing of the \"variable\" `eval' in a file's local variables.
+  "Control processing of the \"variable\" `eval' in a file's local variables.
 The value can be t, nil or something else.
 A value of t means obey `eval' variables;
 nil means ignore them; anything else means query."
@@ -1275,48 +1275,49 @@ Choose the buffer's name using `generate-new-buffer-name'."
 This also substitutes \"~\" for the user's home directory and
 removes automounter prefixes (see the variable `automount-dir-prefix')."
   ;; Get rid of the prefixes added by the automounter.
-  (if (and automount-dir-prefix
-           (string-match automount-dir-prefix filename)
-           (file-exists-p (file-name-directory
-                           (substring filename (1- (match-end 0))))))
-      (setq filename (substring filename (1- (match-end 0)))))
-  (let ((tail directory-abbrev-alist))
-    ;; If any elt of directory-abbrev-alist matches this name,
-    ;; abbreviate accordingly.
-    (while tail
-      (if (string-match (car (car tail)) filename)
+  (save-match-data
+    (if (and automount-dir-prefix
+             (string-match automount-dir-prefix filename)
+             (file-exists-p (file-name-directory
+                             (substring filename (1- (match-end 0))))))
+        (setq filename (substring filename (1- (match-end 0)))))
+    (let ((tail directory-abbrev-alist))
+      ;; If any elt of directory-abbrev-alist matches this name,
+      ;; abbreviate accordingly.
+      (while tail
+        (if (string-match (car (car tail)) filename)
+            (setq filename
+                  (concat (cdr (car tail)) (substring filename (match-end 0)))))
+        (setq tail (cdr tail)))
+      ;; Compute and save the abbreviated homedir name.
+      ;; We defer computing this until the first time it's needed, to
+      ;; give time for directory-abbrev-alist to be set properly.
+      ;; We include a slash at the end, to avoid spurious matches
+      ;; such as `/usr/foobar' when the home dir is `/usr/foo'.
+      (or abbreviated-home-dir
+          (setq abbreviated-home-dir
+                (let ((abbreviated-home-dir "$foo"))
+                  (concat "^" (abbreviate-file-name (expand-file-name "~"))
+                          "\\(/\\|$\\)"))))
+
+      ;; If FILENAME starts with the abbreviated homedir,
+      ;; make it start with `~' instead.
+      (if (and (string-match abbreviated-home-dir filename)
+               ;; If the home dir is just /, don't change it.
+               (not (and (= (match-end 0) 1)
+                         (= (aref filename 0) ?/)))
+               ;; MS-DOS root directories can come with a drive letter;
+               ;; Novell Netware allows drive letters beyond `Z:'.
+               (not (and (or (eq system-type 'ms-dos)
+                             (eq system-type 'cygwin)
+                             (eq system-type 'windows-nt))
+                         (save-match-data
+                           (string-match "^[a-zA-`]:/$" filename)))))
           (setq filename
-                (concat (cdr (car tail)) (substring filename (match-end 0)))))
-      (setq tail (cdr tail)))
-    ;; Compute and save the abbreviated homedir name.
-    ;; We defer computing this until the first time it's needed, to
-    ;; give time for directory-abbrev-alist to be set properly.
-    ;; We include a slash at the end, to avoid spurious matches
-    ;; such as `/usr/foobar' when the home dir is `/usr/foo'.
-    (or abbreviated-home-dir
-        (setq abbreviated-home-dir
-              (let ((abbreviated-home-dir "$foo"))
-                (concat "^" (abbreviate-file-name (expand-file-name "~"))
-                        "\\(/\\|$\\)"))))
-
-    ;; If FILENAME starts with the abbreviated homedir,
-    ;; make it start with `~' instead.
-    (if (and (string-match abbreviated-home-dir filename)
-             ;; If the home dir is just /, don't change it.
-             (not (and (= (match-end 0) 1)
-                       (= (aref filename 0) ?/)))
-             ;; MS-DOS root directories can come with a drive letter;
-             ;; Novell Netware allows drive letters beyond `Z:'.
-             (not (and (or (eq system-type 'ms-dos)
-                           (eq system-type 'cygwin)
-                           (eq system-type 'windows-nt))
-                       (save-match-data
-                         (string-match "^[a-zA-`]:/$" filename)))))
-        (setq filename
-              (concat "~"
-                      (substring filename (match-beginning 1) (match-end 1))
-                      (substring filename (match-end 0)))))
-    filename))
+                (concat "~"
+                        (match-string 1 filename)
+                        (substring filename (match-end 0)))))
+      filename)))
 
 (defcustom find-file-not-true-dirname-list nil
   "*List of logical names for which visiting shouldn't save the true dirname.
@@ -1607,7 +1608,7 @@ Do you want to revisit the file normally now? ")
              (kill-buffer buf)
              (signal 'file-error (list "File is not readable"
                                        filename)))
-           ;; Run find-file-not-found-hooks until one returns non-nil.
+           ;; Run find-file-not-found-functions until one returns non-nil.
            (or (run-hook-with-args-until-success 'find-file-not-found-functions)
                ;; If they fail too, set error.
                (setq error t)))))
@@ -1627,9 +1628,7 @@ Do you want to revisit the file normally now? ")
              (not (member logical find-file-not-true-dirname-list)))
            (setq buffer-file-name buffer-file-truename))
       (if find-file-visit-truename
-          (setq buffer-file-name
-                (setq filename
-                      (expand-file-name buffer-file-truename))))
+          (setq buffer-file-name (expand-file-name buffer-file-truename)))
       ;; Set buffer's default directory to that of the file.
       (setq default-directory (file-name-directory buffer-file-name))
       ;; Turn off backup files for certain file names.  Since
@@ -2436,11 +2435,9 @@ n  -- to ignore the local variables list.")
                    (insert "    ")))
             (princ (car elt) buf)
             (insert " : ")
-            (if (stringp (cdr elt))
-                ;; Make strings with embedded whitespace easier to read.
-                (let ((print-escape-newlines t))
-                  (prin1 (cdr elt) buf))
-              (princ (cdr elt) buf))
+            ;; Make strings with embedded whitespace easier to read.
+            (let ((print-escape-newlines t))
+              (prin1 (cdr elt) buf))
             (insert "\n"))
           (setq prompt
                 (format "Please type %s%s: "
@@ -2511,9 +2508,7 @@ and VAL is the specified value."
                ;; There used to be a downcase here,
                ;; but the manual didn't say so,
                ;; and people want to set var names that aren't all lc.
-               (let ((key (intern (buffer-substring
-                                   (match-beginning 1)
-                                   (match-end 1))))
+               (let ((key (intern (match-string 1)))
                      (val (save-restriction
                             (narrow-to-region (point) end)
                             (read (current-buffer)))))
@@ -2665,8 +2660,8 @@ is specified, returning t if it is specified."
                       (hack-local-variables-confirm
                        result unsafe-vars risky-vars))
                   (dolist (elt result)
-                    (hack-one-local-variable (car elt) (cdr elt))))))
-          (run-hooks 'hack-local-variables-hook))))))
+                    (hack-one-local-variable (car elt) (cdr elt)))))))
+        (run-hooks 'hack-local-variables-hook)))))
 
 (defun safe-local-variable-p (sym val)
   "Non-nil if SYM is safe as a file-local variable with value VAL.
@@ -2752,17 +2747,16 @@ It is dangerous if either of these conditions are met:
 (defun hack-one-local-variable (var val)
   "Set local variable VAR with value VAL."
   (cond ((eq var 'mode)
-         (funcall (intern (concat (downcase (symbol-name val))
-                                  "-mode"))))
+         (funcall (intern (concat (downcase (symbol-name val)) "-mode"))))
         ((eq var 'eval)
          (save-excursion (eval val)))
-        (t (make-local-variable var)
-           ;; Make sure the string has no text properties.
-           ;; Some text properties can get evaluated in various ways,
-           ;; so it is risky to put them on with a local variable list.
-           (if (stringp val)
-               (set-text-properties 0 (length val) nil val))
-           (set var val))))
+        (t
+         ;; Make sure the string has no text properties.
+         ;; Some text properties can get evaluated in various ways,
+         ;; so it is risky to put them on with a local variable list.
+         (if (stringp val)
+             (set-text-properties 0 (length val) nil val))
+         (set (make-local-variable var) val))))
 
 
 (defcustom change-major-mode-with-file-name t
@@ -4220,9 +4214,7 @@ This command is used in the special Dired buffer created by
                       (setq autofile
                             (buffer-substring-no-properties
                              (point)
-                             (save-excursion
-                               (end-of-line)
-                               (point))))
+                             (line-end-position)))
                       (setq thisfile
                             (expand-file-name
                              (substring
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index 55c4e482803..609d076d8a2 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -512,10 +512,11 @@ like an INI file.  You can add this hook to `find-file-hook'."
        (1 font-lock-builtin-face)
        (2 font-lock-variable-name-face t t))))
   '("\\.[bB][aA][tT]\\'"
+    "\\.[cC][mM][dD]\\'"
     "\\`[cC][oO][nN][fF][iI][gG]\\."
     "\\`[aA][uU][tT][oO][eE][xX][eE][cC]\\.")
   '(generic-bat-mode-setup-function)
-  "Generic mode for MS-Windows BAT files.")
+  "Generic mode for MS-Windows batch files.")
 
 (defvar bat-generic-mode-syntax-table nil
   "Syntax table in use in `bat-generic-mode' buffers.")
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 60a7e6b1e8b..d1f63c63324 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,17 @@
+2006-06-26  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-diary.el (gnus-user-format-function-d)
+        (gnus-user-format-function-D): Autoload.
+
+2006-06-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-group.el (gnus-group-select-group): Doc fix.
+        [ See 2004-05-19 change on the trunk. ]
+
+2006-06-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * rfc2231.el (rfc2231-parse-string): Allow `*'s in parameter values.
+
 2006-06-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * message.el (message-syntax-checks): Doc fix.
diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index 5dfbd56af24..e4834131aa7 100644
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -213,6 +213,7 @@ There are currently two built-in format functions:
 ;; #### NOTE: Gnus sometimes gives me a HEADER not corresponding to any
 ;; message, with all fields set to nil here. I don't know what it is for, and
 ;; I just ignore it.
+;;;###autoload
 (defun gnus-user-format-function-d (header)
   ;; Returns an aproximative delay string for the next occurence of this
   ;; message. The delay is given only in the first non zero unit.
@@ -249,6 +250,7 @@ There are currently two built-in format functions:
 ;; #### NOTE: Gnus sometimes gives me a HEADER not corresponding to any
 ;; message, with all fields set to nil here. I don't know what it is for, and
 ;; I just ignore it.
+;;;###autoload
 (defun gnus-user-format-function-D (header)
   ;; Returns a formatted time string for the next occurence of this message.
   (let* ((extras (mail-header-extra header))
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index f3ca6248811..c34e339c5b1 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2039,7 +2039,10 @@ group."
 No article is selected automatically.
 If the group is opened, just switch the summary buffer.
 If ALL is non-nil, already read articles become readable.
-If ALL is a number, fetch this number of articles."
+If ALL is a positive number, fetch this number of the latest
+articles in the group.
+If ALL is a negative number, fetch this number of the earliest
+articles in the group."
   (interactive "P")
   (when (and (eobp) (not (gnus-group-group-name)))
     (forward-line -1))
diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el
index a5827ecb70c..284c95fc151 100644
--- a/lisp/gnus/rfc2231.el
+++ b/lisp/gnus/rfc2231.el
@@ -176,14 +176,14 @@ must never cause a Lisp error."
                           (buffer-substring
                            (point)
                            (progn
-                             (forward-sexp)
-                             ;; We might not have reached at the end of
-                             ;; the value because of non-ascii chars,
-                             ;; so we should jump over them if any.
-                             (while (and (not (eobp))
-                                         (> (char-after) ?\177))
+                             ;; Jump over asterisk, non-ASCII
+                             ;; and non-boundary characters.
+                             (while (and c
+                                         (or (eq c ?*)
+                                             (> c ?\177)
+                                             (not (eq (char-syntax c) ? ))))
                                (forward-char 1)
-                               (forward-sexp))
+                               (setq c (char-after)))
                              (point)))))
                    (t
                     (error "Invalid header: %s" string)))
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 0c6e0f47453..f4ab3de5a4a 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -238,9 +238,9 @@ Commands:
 
 (defconst help-xref-symbol-regexp
   (purecopy (concat "\\(\\<\\(\\(variable\\|option\\)\\|"  ; Link to var
-                    "\\(function\\|command\\)\\|"          ; Link to function
-                    "\\(face\\)\\|"                        ; Link to face
-                    "\\(symbol\\|program\\)\\|"            ; Don't link
+                    "\\(function\\|command\\)\\|"          ; Link to function
+                    "\\(face\\)\\|"                        ; Link to face
+                    "\\(symbol\\|program\\|property\\)\\|" ; Don't link
                     "\\(source \\(?:code \\)?\\(?:of\\|for\\)\\)\\)"
                     "[ \t\n]+\\)?"
                     ;; Note starting with word-syntax character:
diff --git a/lisp/help.el b/lisp/help.el
index 0caf018c2e9..4d92f69cebd 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -346,8 +346,7 @@ With argument, display info only for the selected version."
                      (directory-files data-directory nil
                                       "^NEWS\\.[0-9][-0-9]*$" nil)))
               (sort (delete-dups res) (lambda (a b) (string< b a)))))
-           (current (car all-versions))
-           res)
+           (current (car all-versions)))
       (setq version (completing-read
                      (format "Read NEWS for the version (default %s): " current)
                      all-versions nil nil nil nil current))
@@ -369,7 +368,8 @@ With argument, display info only for the selected version."
          (file (cond
                 ((>= vn emacs-major-version) "NEWS")
                 ((< vn 18) "NEWS.1-17")
-                (t (format "NEWS.%d" vn)))))
+                (t (format "NEWS.%d" vn))))
+         res)
     (view-file (expand-file-name file data-directory))
     (widen)
     (goto-char (point-min))
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 6264d2e56b5..b5f9c4f1bcf 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -2457,10 +2457,13 @@ Sorting commands:
 
 Other commands:
 
+  '\\[ibuffer-update]' - Regenerate the list of all buffers.
+          Prefix arg means to toggle whether buffers that match
+          `ibuffer-maybe-show-predicates' should be displayed.
+
   '\\[ibuffer-switch-format]' - Change the current display format.
   '\\[forward-line]' - Move point to the next line.
   '\\[previous-line]' - Move point to the previous line.
-  '\\[ibuffer-update]' - As above, but add new buffers to the list.
   '\\[ibuffer-quit]' - Bury the Ibuffer buffer.
   '\\[describe-mode]' - This help.
   '\\[ibuffer-diff-with-file]' - View the differences between this buffer
diff --git a/lisp/info.el b/lisp/info.el
index 107dbb72d95..21d4bbc238d 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -844,7 +844,7 @@ a case-insensitive match is tried."
                 (goto-char (point-min))
                 (condition-case ()
                     (if (and (re-search-forward
-                              "makeinfo version \\([0-9]+.[0-9]+\\)"
+                              "makeinfo[ \n]version[ \n]\\([0-9]+.[0-9]+\\)"
                               (line-beginning-position 3) t)
                              (not (version< (match-string 1) "4.7")))
                         (setq found t))
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 77ef9f07d59..dc3d1171cb2 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1088,7 +1088,19 @@ see `language-info-alist'."
       (setq lang-env (symbol-name lang-env)))
   (set-language-info-internal lang-env key info)
   (if (equal lang-env current-language-environment)
-      (set-language-environment lang-env)))
+      (cond ((eq key 'coding-priority)
+             (set-language-environment-coding-systems lang-env))
+            ((eq key 'input-method)
+             (set-language-environment-input-method lang-env))
+            ((eq key 'nonascii-translation)
+             (set-language-environment-nonascii-translation lang-env))
+            ((eq key 'charset)
+             (set-language-environment-charset lang-env))
+            ((eq key 'overriding-fontspec)
+             (set-language-environment-fontset lang-env))
+            ((and (not default-enable-multibyte-characters)
+                  (or (eq key 'unibyte-syntax) (eq key 'unibyte-display)))
+             (set-language-environment-unibyte lang-env)))))
 
 (defun set-language-info-internal (lang-env key info)
   "Internal use only.
@@ -1921,6 +1933,80 @@ of `buffer-file-coding-system' set by this function."
       (setq default-sendmail-coding-system default-coding)
       (apply 'set-coding-system-priority priority))))
 
+(defun set-language-environment-input-method (language-name)
+  "Do various input method setups for language environment LANGUAGE-NAME."
+  (let ((input-method (get-language-info language-name 'input-method)))
+    (when input-method
+      (setq default-input-method input-method)
+      (if input-method-history
+          (setq input-method-history
+                (cons input-method
+                      (delete input-method input-method-history)))))))
+
+(defun set-language-environment-nonascii-translation (language-name)
+  "Do unibyte/multibyte translation setup for language environment LANGUAGE-NAME."
+  (let ((nonascii (get-language-info language-name 'nonascii-translation))
+        (dos-table
+         (if (eq window-system 'pc)
+             (intern
+              (format "cp%d-nonascii-translation-table" dos-codepage)))))
+    (cond
+     ((char-table-p nonascii)
+      (setq nonascii-translation-table nonascii))
+     ((and (eq window-system 'pc) (boundp dos-table))
+      ;; DOS terminals' default is to use a special non-ASCII translation
+      ;; table as appropriate for the installed codepage.
+      (setq nonascii-translation-table (symbol-value dos-table)))
+     ((charsetp nonascii)
+      (setq nonascii-insert-offset (- (make-char nonascii) 128))))))
+
+(defun set-language-environment-charset (language-name)
+  "Do various charset setups for language environment LANGUAGE-NAME."
+  (if (and utf-translate-cjk-mode
+           (not (eq utf-translate-cjk-lang-env language-name))
+           (catch 'tag
+             (dolist (charset (get-language-info language-name 'charset))
+               (if (memq charset utf-translate-cjk-charsets)
+                   (throw 'tag t)))
+             nil))
+      (utf-translate-cjk-load-tables)))
+
+(defun set-language-environment-fontset (language-name)
+  "Do various fontset setups for language environment LANGUAGE-NAME."
+  ;; Don't invoke fontset-related functions if fontsets aren't
+  ;; supported in this build of Emacs.
+  (if (fboundp 'fontset-list)
+      (set-overriding-fontspec-internal
+       (get-language-info language-name 'overriding-fontspec))))
+
+(defun set-language-environment-unibyte (language-name)
+  "Do various unibyte-mode setups for language environment LANGUAGE-NAME."
+  ;; Syntax and case table.
+  (let ((syntax (get-language-info language-name 'unibyte-syntax)))
+    (if syntax
+        (let ((set-case-syntax-set-multibyte nil))
+          (load syntax nil t))
+      ;; No information for syntax and case.  Reset to the defaults.
+      (let ((syntax-table (standard-syntax-table))
+            (standard-table (standard-case-table))
+            (case-table (make-char-table 'case-table))
+            (ch (if (eq window-system 'pc) 128 160)))
+        (while (< ch 256)
+          (modify-syntax-entry ch " " syntax-table)
+          (setq ch (1+ ch)))
+        (dotimes (i 128)
+          (aset case-table i (aref standard-table i)))
+        (set-char-table-extra-slot case-table 0 nil)
+        (set-char-table-extra-slot case-table 1 nil)
+        (set-char-table-extra-slot case-table 2 nil)
+        (set-standard-case-table case-table))
+      (let ((list (buffer-list)))
+        (while list
+          (with-current-buffer (car list)
+            (set-case-table (standard-case-table)))
+          (setq list (cdr list))))))
+  (set-display-table-and-terminal-coding-system language-name))
+
 (defsubst princ-list (&rest args)
   "Print all arguments with `princ', then print \"\n\"."
   (while args (princ (car args)) (setq args (cdr args)))
diff --git a/lisp/locate.el b/lisp/locate.el
index 702ae98ecd6..5df695d59b9 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -191,17 +191,37 @@ This should contain the \"-l\" switch, but not the \"-F\" or \"-b\" switches."
   :group 'locate
   :version "22.1")
 
+(defcustom locate-update-when-revert nil
+  "This option affects how the *Locate* buffer gets reverted.
+If non-nil, offer to update the locate database when reverting that buffer.
+\(Normally, you need to have root privileges for this to work.  See the
+option `locate-update-path'.)
+If nil, reverting does not update the locate database."
+  :type 'boolean
+  :group 'locate
+  :version "22.1")
+
 (defcustom locate-update-command "updatedb"
   "The executable program used to update the locate database."
   :type 'string
   :group 'locate)
 
+(defcustom locate-update-path "/"
+  "The default directory from where `locate-update-command' is called.
+Usually, root permissions are required to run that command.  This
+can be achieved by setting this option to \"/su::\" or \"/sudo::\"
+\(if you have the appropriate authority).  If your current user
+permissions are sufficient to run the command, you can set this
+option to \"/\"."
+  :type 'string
+  :group 'locate
+  :version "22.1")
+
 (defcustom locate-prompt-for-command nil
   "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
-  )
+  :type 'boolean)
 
 ;; Functions
 
@@ -557,12 +577,18 @@ do not work in subdirectories.
 
 ;; From Stephen Eglen <stephen@cns.ed.ac.uk>
 (defun locate-update (ignore1 ignore2)
-  "Update the locate database.
-Database is updated using the shell command in `locate-update-command'."
+  "Revert the *Locate* buffer.
+If `locate-update-when-revert' is non-nil, offer to update the
+locate database using the shell command in `locate-update-command'."
   (let ((str (car locate-history-list)))
-    (cond ((yes-or-no-p "Update locate database (may take a few seconds)? ")
-           (shell-command locate-update-command)
-           (locate str)))))
+    (and locate-update-when-revert
+         (yes-or-no-p "Update locate database (may take a few seconds)? ")
+         ;; `expand-file-name' is used in order to autoload Tramp if
+         ;; necessary.  It cannot be loaded when `default-directory'
+         ;; is remote.
+         (let ((default-directory (expand-file-name locate-update-path)))
+           (shell-command locate-update-command)))
+    (locate str)))
 
 ;;; Modified three functions from `dired.el':
 ;;;   dired-find-directory,
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index a679b5d65eb..a49e3b2a4a3 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,48 @@
+2006-07-03  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 8.0.2.
+
+        * mh-e.el (Version, mh-version): Update for release 8.0.2.
+
+2006-07-03  Ted Phelps  <phelps@gnusto.com>  (tiny change)
+
+        * mh-tool-bar.el (mh-tool-bar-define): Fix XEmacs' vector-list so
+        it refers to the icons in mh-xemacs-icon-map instead of trying to
+        declare the icons in situ. This allows mh-tool-bar.el to be
+        compiled under XEmacs. Remove initial value for
+        mh-tool-bar-folder-buttons, mh-tool-bar-show-buttons,
+        mh-tool-bar-letter-buttons. The MH-E icons now appear in XEmacs.
+        In mh-tool-bar-init, check for mh-xemacs-use-tool-bar-flag sooner.
+        This allows MH-E to be used in XEmacs in a tty (closes SF
+        #1506846).
+
+2006-07-03  Bill Wohler  <wohler@newt.com>
+
+        * mh-e.el: Require mh-buffers and mh-compat before mh-xemacs now
+        that mh-xemacs needs functions in mh-compat.
+
+2006-06-29  Bill Wohler  <wohler@newt.com>
+
+        * mh-search.el (mh-search, mh-index-group-by-folder): Add "the" in
+        loop construct to be consistent with other loops, and because
+        edebug doesn't work without it.
+        
+2006-06-29  Ted Phelps  <phelps@gnusto.com>  (tiny change)
+
+        * mh-search.el (mh-folder-exists-p): Strip + from folder to avoid
+        redundant +s in regexp (closes SF #1514424).
+
+2006-06-29  Sergey Poznyakoff  <gray@Mirddin.farlep.net>  (tiny change)
+
+        * mh-mime.el (mh-mime-save-parts): Add -store option to
+        mhn (closes SF #1513140).
+
+2006-06-20  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 8.0.1.
+
+        * mh-e.el (Version, mh-version): Update for release 8.0.1.
+
 2006-06-15  Bill Wohler  <wohler@newt.com>
 
         * mh-search.el (mh-index-new-folder): Use -2 suffix instead of <2>
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 28fff81e93b..ba48a84ad99 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -6,7 +6,7 @@
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
-;; Version: 8.0
+;; Version: 8.0.2
 ;; Keywords: mail
 
 ;; This file is part of GNU Emacs.
@@ -96,6 +96,9 @@
 
 (mh-require-cl)
 
+(require 'mh-buffers)
+(require 'mh-compat)
+
 (eval-and-compile
   (defvar mh-xemacs-flag (featurep 'xemacs)
     "Non-nil means the current Emacs is XEmacs."))
@@ -103,9 +106,6 @@
 (mh-do-in-xemacs
   (require 'mh-xemacs))
 
-(require 'mh-buffers)
-(require 'mh-compat)
-
 (mh-font-lock-add-keywords
  'emacs-lisp-mode
  (eval-when-compile
@@ -133,7 +133,7 @@
 ;; Try to keep variables local to a single file. Provide accessors if
 ;; variables are shared. Use this section as a last resort.
 
-(defconst mh-version "8.0" "Version number of MH-E.")
+(defconst mh-version "8.0.2" "Version number of MH-E.")
 
 ;; Variants
 
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index c05e867a2b4..a66db002b6a 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -415,7 +415,9 @@ do the work."
         (let ((initial-size (mh-truncate-log-buffer)))
           (apply 'call-process
                  (expand-file-name command mh-progs) nil t nil
-                 (mh-list-to-string (list folder msg "-auto")))
+                 (mh-list-to-string (list folder msg "-auto"
+                                          (if (not (mh-variant-p 'nmh))
+                                              "-store"))))
           (if (> (buffer-size) initial-size)
               (save-window-excursion
                 (switch-to-buffer-other-window mh-log-buffer)
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index 62c130bb90f..191e42f734a 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -318,9 +318,9 @@ folder containing the index search results."
 
         (message "%s found %s matches in %s folders"
                  (upcase-initials (symbol-name mh-searcher))
-                 (loop for msg-hash being hash-values of mh-index-data
+                 (loop for msg-hash being the hash-values of mh-index-data
                        sum (hash-table-count msg-hash))
-                 (loop for msg-hash being hash-values of mh-index-data
+                 (loop for msg-hash being the hash-values of mh-index-data
                        count (> (hash-table-count msg-hash) 0)))))))
 
 ;; Shush compiler.
@@ -1362,7 +1362,7 @@ being the list of messages originally from that folder."
   (save-excursion
     (goto-char (point-min))
     (let ((result-table (make-hash-table :test #'equal)))
-      (loop for msg being hash-keys of mh-index-msg-checksum-map
+      (loop for msg being the hash-keys of mh-index-msg-checksum-map
             do (push msg (gethash (car (gethash
                                         (gethash msg mh-index-msg-checksum-map)
                                         mh-index-checksum-origin-map))
@@ -1524,7 +1524,8 @@ construct the base name."
          (with-temp-buffer
            (mh-exec-cmd-output "folder" nil "-fast" "-nocreate" folder)
            (goto-char (point-min))
-           (looking-at (format "+?%s" folder))))))
+           ;; Strip + from folder; use optional + in regexp.
+           (looking-at (format "+?%s" (substring folder 1)))))))
 
 (defun mh-msg-exists-p (msg folder)
   "Check if MSG exists in FOLDER."
diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el
index 9b18848bd12..a5131420753 100644
--- a/lisp/mh-e/mh-tool-bar.el
+++ b/lisp/mh-e/mh-tool-bar.el
@@ -149,7 +149,7 @@ where,
              (name-str (symbol-name name))
              (icon (nth 2 button))
              (xemacs-icon (mh-do-in-xemacs
-                            (cdr (assoc (intern icon) mh-xemacs-icon-map))))
+                            `(cdr (assoc (quote ,(intern icon)) mh-xemacs-icon-map))))
              (full-doc (nth 3 button))
              (doc (if (string-match "\\(.*\\)\n" full-doc)
                       (match-string 1 full-doc)
@@ -189,7 +189,7 @@ where,
                                  (t 'folder-buttons)))
                  (docs (cond ((eq mbuttons 'letter-buttons) 'letter-docs)
                              ((eq mbuttons 'folder-buttons) 'folder-docs))))
-            (add-to-list vector-list `[,xemacs-icon ,function t ,full-doc])
+            (add-to-list vector-list `(vector ,xemacs-icon ',function t ,full-doc))
             (add-to-list
              setter `(when (member ',name ,list)
                        (mh-funcall-if-exists
@@ -288,27 +288,28 @@ Use SEQUENCE-MAP if display is limited; DEFAULT-MAP otherwise."
        ;; XEmacs specific code
        (mh-do-in-xemacs
          (defvar mh-tool-bar-folder-vector-map
-           ',(loop for button in folder-buttons
-                   for vector in folder-vectors
-                   collect (cons button vector)))
+           (list ,@(loop for button in folder-buttons
+                     for vector in folder-vectors
+                     collect `(cons ',button ,vector))))
          (defvar mh-tool-bar-show-vector-map
-           ',(loop for button in show-buttons
-                   for vector in show-vectors
-                   collect (cons button vector)))
+           (list ,@(loop for button in show-buttons
+                     for vector in show-vectors
+                     collect `(cons ',button ,vector))))
          (defvar mh-tool-bar-letter-vector-map
-           ',(loop for button in letter-buttons
-                   for vector in letter-vectors
-                   collect (cons button vector)))
-         (defvar mh-tool-bar-folder-buttons nil)
-         (defvar mh-tool-bar-show-buttons nil)
-         (defvar mh-tool-bar-letter-buttons nil)
+           (list ,@(loop for button in letter-buttons
+                     for vector in letter-vectors
+                     collect `(cons ',button ,vector))))
+         (defvar mh-tool-bar-folder-buttons)
+         (defvar mh-tool-bar-show-buttons)
+         (defvar mh-tool-bar-letter-buttons)
          ;; Custom setter functions
          (defun mh-tool-bar-letter-buttons-set (symbol value)
            (set-default symbol value)
            (when mh-xemacs-has-tool-bar-flag
              (setq mh-tool-bar-letter-buttons
                    (loop for b in value
-                         collect (cdr (assoc b mh-tool-bar-letter-vector-map))))))
+                         collect (cdr
+                                  (assoc b mh-tool-bar-letter-vector-map))))))
          (defun mh-tool-bar-folder-buttons-set (symbol value)
            (set-default symbol value)
            (when mh-xemacs-has-tool-bar-flag
@@ -320,13 +321,16 @@ Use SEQUENCE-MAP if display is limited; DEFAULT-MAP otherwise."
                          collect (cdr (assoc b mh-tool-bar-show-vector-map))))))
          (defun mh-tool-bar-init (mode)
            "Install tool bar in MODE."
-           (let ((tool-bar (cond ((eq mode :folder) mh-tool-bar-folder-buttons)
-                                ((eq mode :letter) mh-tool-bar-letter-buttons)
-                                ((eq mode :show) mh-tool-bar-show-buttons)))
-                 (height 37)
-                 (width 40)
-                 (buffer (current-buffer)))
-             (when mh-xemacs-use-tool-bar-flag
+           (when mh-xemacs-use-tool-bar-flag
+             (let ((tool-bar (cond ((eq mode :folder)
+                                    mh-tool-bar-folder-buttons)
+                                   ((eq mode :letter)
+                                    mh-tool-bar-letter-buttons)
+                                   ((eq mode :show)
+                                    mh-tool-bar-show-buttons)))
+                   (height 37)
+                   (width 40)
+                   (buffer (current-buffer)))
                (cond
                 ((eq mh-xemacs-tool-bar-position 'top)
                  (set-specifier top-toolbar tool-bar buffer)
@@ -367,8 +371,9 @@ Use SEQUENCE-MAP if display is limited; DEFAULT-MAP otherwise."
                             for y in letter-docs
                             collect `(const :tag ,y ,x)))
         ;;:package-version '(MH-E "7.1")
-       ))))
+        ))))
 
+;; The icon names are duplicated in the Makefile and mh-xemacs.el.
 (mh-tool-bar-define
  ((:folder mh-inc-folder mh-mime-save-parts
            mh-previous-undeleted-msg mh-page-msg
diff --git a/lisp/msb.el b/lisp/msb.el
index d5f32486971..aa42e183007 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -473,18 +473,21 @@ selects that window.
 See the function `mouse-select-buffer' and the variable
 `msb-menu-cond' for more information about how the menus are split."
   (interactive "e")
-  ;; If EVENT is a down-event, read and discard the
-  ;; corresponding up-event.
-  (and (eventp event)
-       (memq 'down (event-modifiers event))
-       (read-event))
   (let ((old-window (selected-window))
-        (window (posn-window (event-start event))))
+        (window (posn-window (event-start event)))
+        early-release)
     (unless (framep window) (select-window window))
+    ;; This `sit-for' magically makes the menu stay up if the mouse
+    ;; button is released within 0.1 second.
+    (setq early-release (not (sit-for 0.1 t)))
     (let ((buffer (mouse-select-buffer event)))
       (if buffer
           (switch-to-buffer buffer)
-        (select-window old-window))))
+        (select-window old-window)))
+    ;; If the above `sit-for' was interrupted by a mouse-up, avoid
+    ;; generating a drag event.
+    (if (and early-release (memq 'down (event-modifiers last-input-event)))
+        (discard-input)))
   nil)
 
 ;;;
@@ -995,9 +998,6 @@ variable `msb-menu-cond'."
         ;; adjust position
         (setq posX (- posX (funcall msb-horizontal-shift-function))
               position (list (list posX posY) posWind))))
-    ;; This `sit-for' magically makes the menu stay up if the mouse
-    ;; button is released within 0.1 second.
-    (sit-for 0 100)
     ;; Popup the menu
     (setq choice (x-popup-menu position msb--last-buffer-menu))
     (cond
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 89695b61b36..44970f7aaf3 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -250,6 +250,7 @@ Also fontifies the buffer appropriately (see `goto-address-fontify-p' and
   (interactive)
   (if goto-address-highlight-p
       (goto-address-fontify)))
+;;;###autoload(put 'goto-address 'safe-local-eval-function t)
 
 (provide 'goto-addr)
 
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index a0b328413b0..1f051ffa9f2 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -74,7 +74,7 @@
   :group 'rcirc)
 
 (defcustom rcirc-default-user-full-name (if (string= (user-full-name) "")
-                                            rcirc-user-name
+                                            rcirc-default-user-name
                                           (user-full-name))
   "The full name sent to the server when connecting."
   :type 'string
@@ -469,7 +469,7 @@ Functions are called with PROCESS and SENTINEL arguments.")
   "Return a list of rcirc processes."
   (let (ps)
     (mapc (lambda (p)
-            (when (process-buffer p)
+            (when (buffer-live-p (process-buffer p))
               (with-rcirc-process-buffer p
                 (when (eq major-mode 'rcirc-mode)
                   (setq ps (cons p ps))))))
@@ -719,8 +719,8 @@ If NOTICEP is non-nil, send a notice instead of privmsg."
           (serv (if (consp (car i)) (cdar i) "")))
       (when (and (string-match chan (or target ""))
                  (string-match serv (rcirc-server-name process)))
-        (setq rcirc-decode-coding-system (if (consp (cdr i)) (cadr i) i)
-              rcirc-encode-coding-system (if (consp (cdr i)) (cddr i) i)))))
+        (setq rcirc-decode-coding-system (if (consp (cdr i)) (cadr i) (cdr i))
+              rcirc-encode-coding-system (if (consp (cdr i)) (cddr i) (cdr i))))))
 
   ;; setup the prompt and markers
   (make-local-variable 'rcirc-prompt-start-marker)
diff --git a/lisp/net/rcompile.el b/lisp/net/rcompile.el
index 469f268fb9c..158069986d2 100644
--- a/lisp/net/rcompile.el
+++ b/lisp/net/rcompile.el
@@ -115,17 +115,25 @@ nil means run no commands."
 
 ;;;; entry point
 
+;; We use the Tramp internal functions `with-parsed-tramp-file-name'
+;; and `tramp-make-tramp-file-name'.  Better would be, if there are
+;; functions to provide user, host and localname of a remote filename,
+;; independent of Tramp's implementation.  The function calls are
+;; wrapped by `funcall' in order to pacify the byte compiler.
+;; ange-ftp check removed, because it is handled also by Tramp.
 ;;;###autoload
 (defun remote-compile (host user command)
   "Compile the current buffer's directory on HOST.  Log in as USER.
 See \\[compile]."
   (interactive
-   (let ((parsed (or (and (featurep 'ange-ftp)
-                          (ange-ftp-ftp-name default-directory))))
-         host user command prompt)
+   (let ((parsed (and (featurep 'tramp)
+                      (file-remote-p default-directory)))
+         host user command prompt l l-host l-user)
      (if parsed
-         (setq host (nth 0 parsed)
-               user (nth 1 parsed))
+         (funcall (symbol-function 'with-parsed-tramp-file-name)
+                  default-directory l
+                  (setq host l-host
+                        user l-user))
        (setq prompt (if (stringp remote-compile-host)
                         (format "Compile on host (default %s): "
                                 remote-compile-host)
@@ -155,8 +163,9 @@ See \\[compile]."
          (setq remote-compile-user user))
         ((null remote-compile-user)
          (setq remote-compile-user (user-login-name))))
-  (let* ((parsed (and (featurep 'ange-ftp)
-                      (ange-ftp-ftp-name default-directory)))
+  (let* (localname ;; Pacify byte-compiler.
+         (parsed (and (featurep 'tramp)
+                      (file-remote-p default-directory)))
          (compile-command
           (format "%s %s -l %s \"(%scd %s; %s)\""
                   remote-shell-program
@@ -165,16 +174,25 @@ See \\[compile]."
                   (if remote-compile-run-before
                       (concat remote-compile-run-before "; ")
                     "")
-                  (if parsed (nth 2 parsed) default-directory)
+                  (if parsed
+                      (funcall (symbol-function 'with-parsed-tramp-file-name)
+                               default-directory nil localname)
+                    "")
                   compile-command)))
     (setq remote-compile-host host)
     (save-some-buffers nil nil)
     (compilation-start compile-command)
     ;; Set comint-file-name-prefix in the compilation buffer so
-    ;; compilation-parse-errors will find referenced files by ange-ftp.
+    ;; compilation-parse-errors will find referenced files by Tramp.
     (with-current-buffer compilation-last-buffer
-      (set (make-local-variable 'comint-file-name-prefix)
-           (concat "/" host ":")))))
+      (when (featurep 'tramp)
+        (set (make-local-variable 'comint-file-name-prefix)
+             (funcall (symbol-function 'tramp-make-tramp-file-name)
+              nil ;; multi-method.  To be removed with Tramp 2.1.
+              nil
+              remote-compile-user
+              remote-compile-host
+              ""))))))
 
 ;;; arch-tag: 2866a132-ece4-4ce9-9f91-ec147f803f73
 ;;; rcompile.el ends here
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index c4166bb6d24..cb5a6d75331 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3572,7 +3572,8 @@ This will break if COMMAND prints a newline, followed by the value of
   ;; for `find-grep-dired' and `find-name-dired' in Emacs 22.
   (if (tramp-tramp-file-p default-directory)
       (with-parsed-tramp-file-name default-directory nil
-        (let ((asynchronous (string-match "[ \t]*&[ \t]*\\'" command))
+        (let ((curbuf (current-buffer))
+              (asynchronous (string-match "[ \t]*&[ \t]*\\'" command))
               status)
           (unless output-buffer
             (setq output-buffer
@@ -3674,6 +3675,7 @@ This will break if COMMAND prints a newline, followed by the value of
           (unless (zerop (buffer-size))
             (when tramp-display-shell-command-buffer
               (display-buffer output-buffer)))
+          (set-buffer curbuf)
           status))
     ;; The following is only executed if something strange was
     ;; happening.  Emit a helpful message and do it anyway.
@@ -7591,6 +7593,7 @@ Therefore, the contents of files might be included in the debug buffer(s).")
 ;; - Cleanup autoloads
 ;;;###autoload
 (defun tramp-unload-tramp ()
+  "Discard Tramp from loading remote files."
   (interactive)
   ;; When Tramp is not loaded yet, its autoloads are still active.
   (tramp-unload-file-name-handlers)
diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index bc4ee84da2f..7a2e6c602ea 100644
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -1,6 +1,6 @@
 ;;; cookie1.el --- retrieve random phrases from fortune cookie files
 
-;; Copyright (C) 1993, 2002, 2003, 2004, 2005,
+;; Copyright (C) 1993, 2002, 2003, 2004, 2005, 2006,
 ;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
@@ -75,7 +75,7 @@ When the phrase file is read in, display STARTMSG at the beginning
 of load, ENDMSG at the end."
   (let ((cookie-vector (cookie-snarf phrase-file startmsg endmsg)))
     (shuffle-vector cookie-vector)
-    (aref cookie-vector 1)))
+    (aref cookie-vector 0)))
 
 ;;;###autoload
 (defun cookie-insert (phrase-file &optional count startmsg endmsg)
diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el
index 2c6a75da03e..ae8a62c48f1 100644
--- a/lisp/play/dunnet.el
+++ b/lisp/play/dunnet.el
@@ -1304,7 +1304,7 @@ for a moment, then straighten yourself up.
       (condition-case nil
           (dun-rot13)
         (error (yank)))
-      (eval-current-buffer)
+      (eval-buffer)
       (kill-buffer (current-buffer)))
       (switch-to-buffer old-buffer)
     result))
@@ -2576,7 +2576,7 @@ treasures for points?" "4" "four")
     (insert ")")
     (setq eval-error nil)
     (condition-case nil
-        (eval-current-buffer)
+        (eval-buffer)
       (error (setq eval-error t)))
     (kill-buffer (current-buffer))
     (switch-to-buffer "*dungeon*")
diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el
index 7ec6f9bb187..1bd1c7ec48a 100644
--- a/lisp/play/landmark.el
+++ b/lisp/play/landmark.el
@@ -9,7 +9,7 @@
 
 ;;;_* Usage
 ;;; Just type
-;;;   M-x eval-current-buffer
+;;;   M-x eval-buffer
 ;;;   M-x lm-test-run
 
 
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index d7e1ecb67e1..9dc74264da8 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -438,7 +438,7 @@ An example is:
 
 (defcustom ada-which-compiler 'gnat
   "*Name of the compiler to use.
-This will determine what features are made available through the ada-mode.
+This will determine what features are made available through the Ada mode.
 The possible choices are :
 `gnat': Use Ada Core Technologies' Gnat compiler.  Add some cross-referencing
     features
@@ -460,7 +460,7 @@ The extensions should include a `.' if needed.")
 The extensions should include a `.' if needed.")
 
 (defvar ada-mode-menu (make-sparse-keymap "Ada")
-  "Menu for ada-mode.")
+  "Menu for Ada mode.")
 
 (defvar ada-mode-map (make-sparse-keymap)
   "Local keymap used for Ada mode.")
@@ -728,7 +728,7 @@ each type of entity that can be found in an Ada file.")
 ;;------------------------------------------------------------
 
 (defun ada-compile-mouse-goto-error ()
-  "Mouse interface for ada-compile-goto-error."
+  "Mouse interface for `ada-compile-goto-error'."
   (interactive)
   (mouse-set-point last-input-event)
   (ada-compile-goto-error (point))
@@ -906,7 +906,7 @@ declares it as a word constituent."
             (setq change (cdr change)))))))
 
 (defun ada-deactivate-properties ()
-  "Deactivate ada-mode's properties handling.
+  "Deactivate Ada mode's properties handling.
 This would be a duplicate of font-lock if both are used at the same time."
   (remove-hook 'after-change-functions 'ada-after-change-function t))
 
@@ -977,7 +977,7 @@ If parse-result is non-nil, use is instead of calling `parse-partial-sexp'."
 
 ;;------------------------------------------------------------------
 ;; Contextual menus
-;; The Ada-mode comes with contextual menus, bound by default to the right
+;; The Ada mode comes with contextual menus, bound by default to the right
 ;; mouse button.
 ;; Add items to this menu by modifying `ada-contextual-menu'. Note that the
 ;; variable `ada-contextual-menu-on-identifier' is set automatically to t
@@ -1419,7 +1419,7 @@ If you use ada-xref.el:
 
 ;;-----------------------------------------------------------------
 ;;                      auto-casing
-;; Since Ada is case-insensitive, the Ada-mode provides an extensive set of
+;; Since Ada is case-insensitive, the Ada mode provides an extensive set of
 ;; functions to auto-case identifiers, keywords, ...
 ;; The basic rules for autocasing are defined through the variables
 ;; `ada-case-attribute', `ada-case-keyword' and `ada-case-identifier'. These
@@ -1766,7 +1766,7 @@ ARG is ignored, and is there for compatibility with `capitalize-word' only."
 
 (defun ada-no-auto-case (&optional arg)
   "Do nothing.
-This function can be used for the auto-casing variables in the ada-mode, to
+This function can be used for the auto-casing variables in the Ada mode, to
 adapt to unusal auto-casing schemes. Since it does nothing, you can for
 instance use it for `ada-case-identifier' if you don't want any special
 auto-casing for identifiers, whereas keywords have to be lower-cased.
@@ -2122,7 +2122,7 @@ Return the equivalent internal parameter list."
 ;;       that are evaluated)
 ;;  Thus the total indentation for a line is the column number of the reference
 ;;  position plus whatever value the evaluation of the second element provides.
-;;  This mechanism is used so that the ada-mode can "explain" how the
+;;  This mechanism is used so that the Ada mode can "explain" how the
 ;;  indentation was calculated, by showing which variables were used.
 ;;
 ;;  The indentation itself is done in only one pass: first we try to guess in
@@ -5268,7 +5268,7 @@ Use `M-x widen' to go back to the full visibility for the buffer."
 
 ;; ---------------------------------------------------------
 ;;    Automatic generation of code
-;; The Ada-mode has a set of function to automatically generate a subprogram
+;; The Ada mode has a set of function to automatically generate a subprogram
 ;; or package body from its spec.
 ;; These function only use a primary and basic algorithm, this could use a
 ;; lot of improvement.
@@ -5440,7 +5440,7 @@ This function typically is to be hooked into `ff-file-created-hooks'."
 ;;  Read the special cases for exceptions
 (ada-case-read-exceptions)
 
-;;  Setup auto-loading of the other ada-mode files.
+;;  Setup auto-loading of the other Ada mode files.
 (if (equal ada-which-compiler 'gnat)
     (progn
       (autoload 'ada-change-prj                   "ada-xref" nil t)
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index f3144cbb84a..684102015cc 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -1325,6 +1325,7 @@ directives."
   (setq gdb-active-process nil)
   (setq gud-overlay-arrow-position nil)
   (setq gdb-overlay-arrow-position nil)
+  (setq gud-old-arrow nil)
   (setq gdb-inferior-status "exited")
   (gdb-force-mode-line-update gdb-inferior-status)
   (gdb-stopping ignored))
@@ -3217,8 +3218,8 @@ BUFFER nil or omitted means use the current buffer."
     (setq gdb-frame-number (match-string 1))
     (setq gdb-frame-address (match-string 2)))
   (goto-char (point-min))
-  (when (re-search-forward ".*=\\s-+0x0*\\(\\S-*\\)\\s-+in\\s-+\\(\\S-+?\\)\
-\\(?: (\\(\\S-+?\\):[0-9]+?)\\)*;? "
+  (when (re-search-forward ".*=\\s-+0x0*\\(\\S-*\\)\\s-+in\\s-+\\(.*?\\)\
+\\(?: (\\(\\S-+?\\):[0-9]+?)\\)*; "
      nil t)
     (setq gdb-selected-frame (match-string 2))
     (if (gdb-get-buffer 'gdb-locals-buffer)
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index d207094cafe..eb803422027 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -282,13 +282,13 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
      (": \\(.+\\): \\(?:Permission denied\\|No such \\(?:file or directory\\|device or address\\)\\)$"
       1 grep-error-face)
      ;; remove match from grep-regexp-alist before fontifying
-     ("^Grep started.*"
+     ("^Grep[/a-zA-z]* started.*"
       (0 '(face nil message nil help-echo nil mouse-face nil) t))
-     ("^Grep finished \\(?:(\\(matches found\\))\\|with \\(no matches found\\)\\).*"
+     ("^Grep[/a-zA-z]* finished \\(?:(\\(matches found\\))\\|with \\(no matches found\\)\\).*"
       (0 '(face nil message nil help-echo nil mouse-face nil) t)
       (1 compilation-info-face nil t)
       (2 compilation-warning-face nil t))
-     ("^Grep \\(exited abnormally\\|interrupt\\|killed\\|terminated\\)\\(?:.*with code \\([0-9]+\\)\\)?.*"
+     ("^Grep[/a-zA-z]* \\(exited abnormally\\|interrupt\\|killed\\|terminated\\)\\(?:.*with code \\([0-9]+\\)\\)?.*"
       (0 '(face nil message nil help-echo nil mouse-face nil) t)
       (1 grep-error-face)
       (2 grep-error-face nil t))
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 1ce5d404a80..c57c88d3ece 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -3366,6 +3366,12 @@ only tooltips in the buffer containing the overlay arrow."
 (defvar gud-tooltip-mouse-motions-active nil
   "Locally t in a buffer if tooltip processing of mouse motion is enabled.")
 
+;; We don't set track-mouse globally because this is a big redisplay
+;; problem in buffers having a pre-command-hook or such installed,
+;; which does a set-buffer, like the summary buffer of Gnus.  Calling
+;; set-buffer prevents redisplay optimizations, so every mouse motion
+;; would be accompanied by a full redisplay.
+
 (defun gud-tooltip-activate-mouse-motions (activatep)
   "Activate/deactivate mouse motion events for the current buffer.
 ACTIVATEP non-nil means activate mouse motion events."
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index a3146df3e45..109455e9e61 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -294,7 +294,8 @@ not be enclosed in { } or ( )."
   ;; We used to match not just the varname but also the whole value
   ;; (spanning potentially several lines).
   ;; "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)\\|[*:+]?[:?]?=[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)\\)"
-  "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=\\|[*:+]?[:?]?=\\)"
+  ;; What about the define statement?  What about differentiating this for makepp?
+  "\\(?:^\\|^export\\|^override\\|:\\|: *override\\) *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=\\|[*:+]?[:?]?=\\)"
   "Regex used to find macro assignment lines in a makefile.")
 
 (defconst makefile-var-use-regex
@@ -305,8 +306,6 @@ not be enclosed in { } or ( )."
   "\\(^\\..*\\)\\|\\(.*~$\\)\\|\\(.*,v$\\)\\|\\(\\.[chy]\\)"
   "Regex for filenames that will NOT be included in the target list.")
 
-(if (fboundp 'facemenu-unlisted-faces)
-    (add-to-list 'facemenu-unlisted-faces 'makefile-space))
 (defvar makefile-space 'makefile-space
   "Face to use for highlighting leading spaces in Font-Lock mode.")
 
@@ -320,9 +319,9 @@ not be enclosed in { } or ( )."
   "List of keywords understood by automake.")
 
 (defconst makefile-gmake-statements
-  `("-sinclude" "sinclude" "override" "vpath"
+  `("-sinclude" "sinclude" "vpath"      ; makefile-makepp-statements takes rest
     "ifdef" "ifndef" "ifeq" "ifneq" "-include" "define" "endef" "export"
-    "unexport"
+    "override define" "override" "unexport"
     ,@(cdr makefile-automake-statements))
   "List of keywords understood by gmake.")
 
@@ -331,13 +330,14 @@ not be enclosed in { } or ( )."
   `("and ifdef" "and ifndef" "and ifeq" "and ifneq" "and ifperl"
     "and ifmakeperl" "and ifsys" "and ifnsys" "build_cache" "build_check"
     "else ifdef" "else ifndef" "else ifeq" "else ifneq" "else ifperl"
-    "else ifmakeperl" "else ifsys" "else ifnsys" "enddef" "load_makefile"
-    "ifperl" "ifmakeperl" "ifsys" "ifnsys" "_include"  "makeperl" "makesub"
-    "no_implicit_load" "perl" "perl-begin" "perl_begin" "perl-end" "perl_end"
-    "prebuild" "or ifdef" "or ifndef" "or ifeq" "or ifneq" "or ifperl"
-    "or ifmakeperl" "or ifsys" "or ifnsys" "register_command_parser"
+    "else ifmakeperl" "else ifsys" "else ifnsys" "enddef" "global"
+    "load_makefile" "ifperl" "ifmakeperl" "ifsys" "ifnsys" "_include"
+    "makeperl" "makesub" "no_implicit_load" "perl" "perl-begin" "perl_begin"
+    "perl-end" "perl_end" "prebuild" "or ifdef" "or ifndef" "or ifeq"
+    "or ifneq" "or ifperl" "or ifmakeperl" "or ifsys" "or ifnsys"
+    "override export" "override global" "register_command_parser"
     "register_scanner" "repository" "runtime" "signature" "sub"
-    ,@(nthcdr 4 makefile-gmake-statements))
+    ,@(nthcdr 3 makefile-gmake-statements))
   "List of keywords understood by gmake.")
 
 (defconst makefile-bsdmake-statements
diff --git a/lisp/simple.el b/lisp/simple.el
index b023a7b780f..1778c15acfc 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1043,7 +1043,7 @@ display the result of expression evaluation."
           (format " (#o%o, #x%x)" value value)))))
 
 ;; We define this, rather than making `eval' interactive,
-;; for the sake of completion of names like eval-region, eval-current-buffer.
+;; for the sake of completion of names like eval-region, eval-buffer.
 (defun eval-expression (eval-expression-arg
                         &optional eval-expression-insert-value)
   "Evaluate EVAL-EXPRESSION-ARG and print value in the echo area.
@@ -3529,7 +3529,7 @@ Outline mode sets this."
                     (if (and track-eol (eolp)
                              ;; Don't count beg of empty line as end of line
                              ;; unless we just did explicit end-of-line.
-                             (or (not (bolp)) (eq last-command 'end-of-line)))
+                             (or (not (bolp)) (eq last-command 'move-end-of-line)))
                         9999
                       (current-column))))
 
diff --git a/lisp/term.el b/lisp/term.el
index cdaa72b7d94..5cf0887163d 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -3766,6 +3766,9 @@ Should only be called when point is at the start of a screen line."
         (save-start-line-column term-start-line-column)
         (save-current-row (term-current-row)))
     ;; The number of inserted lines shouldn't exceed the scroll region end.
+    ;; The `term-scroll-end' line is part of the scrolling region, so
+    ;; we need to go one line past it in order to ensure correct
+    ;; scrolling.
     (when (> (+ save-current-row lines) (1+ term-scroll-end))
       (setq lines (- lines (- (+ save-current-row lines) (1+ term-scroll-end)))))
     (term-down lines)
@@ -3784,6 +3787,9 @@ Should only be called when point is at the start of a screen line."
         (save-start-line-column term-start-line-column)
         (save-current-row (term-current-row)))
     ;; Inserting lines should take into account the scroll region.
+    ;; The `term-scroll-end' line is part of the scrolling region, so
+    ;; we need to go one line past it in order to ensure correct
+    ;; scrolling.
     (if (< save-current-row term-scroll-start)
         ;; If point is before scroll start, 
         (progn 
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 9843d984e34..70ff213dc6c 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1834,7 +1834,7 @@ With numeric ARG, display the font panel if and only if ARG is positive."
   (interactive "e")
   (let* ((ae (mac-event-ae event))
          (fm-font-size (mac-ae-number ae "fmsz"))
-         (atsu-font-id (cdr (mac-ae-parameter ae "auid")))
+         (atsu-font-id (mac-ae-number ae "auid"))
          (attribute-values (gethash atsu-font-id mac-atsu-font-table)))
     (if fm-font-size
         (setq attribute-values
@@ -1865,8 +1865,8 @@ With numeric ARG, display the font panel if and only if ARG is positive."
 (defface mac-ts-caret-position
   '((t :inverse-video t))
   "Face for caret position in Mac TSM active input area.
-This is used only when the active input area is displayed in the
-echo area."
+This is used when the active input area is displayed either in
+the echo area or in a buffer where the cursor is not displayed."
   :group 'mac)
 
 (defface mac-ts-raw-text
@@ -2013,7 +2013,10 @@ into `unread-command-events'.  The unconfirmed text is displayed
 either in the current buffer or in the echo area."
   (interactive "e")
   (let* ((ae (mac-event-ae event))
-         (text (or (cdr (mac-ae-parameter ae "tstx" "utxt")) ""))
+         (type-text (mac-ae-parameter ae "tstx"))
+         (text (or (cdr type-text) ""))
+         (decode-fun (if (equal (car type-text) "TEXT")
+                         'mac-TEXT-to-string 'mac-utxt-to-string))
          (script-language (mac-ae-script-language ae "tssl"))
          (coding (or (cdr (assq (car script-language)
                                 mac-script-code-coding-systems))
@@ -2035,22 +2038,27 @@ either in the current buffer or in the echo area."
            (or isearch-mode
                (and cursor-in-echo-area (current-message))
                ;; Overlay strings are not shown in some cases.
-               (get-char-property (point) 'display)
                (get-char-property (point) 'invisible)
-               (get-char-property (point) 'composition)))
+               (and (not (bobp))
+                    (or (and (get-char-property (point) 'display)
+                             (eq (get-char-property (1- (point)) 'display)
+                                 (get-char-property (point) 'display)))
+                        (and (get-char-property (point) 'composition)
+                             (eq (get-char-property (1- (point)) 'composition)
+                                 (get-char-property (point) 'composition)))))))
           active-input-string caret-seen)
       ;; Decode the active input area text with inheriting faces and
       ;; the caret position.
       (setq active-input-string
             (mapconcat
              (lambda (str)
-               (let ((decoded (mac-utxt-to-string str coding)))
+               (let ((decoded (funcall decode-fun str coding)))
                  (put-text-property 0 (length decoded) 'face
                                     (get-text-property 0 'face str) decoded)
                  (when (and (not caret-seen)
                             (get-text-property 0 'cursor str))
                    (setq caret-seen t)
-                   (if use-echo-area
+                   (if (or use-echo-area (null cursor-type))
                        (put-text-property 0 1 'face 'mac-ts-caret-position
                                           decoded)
                      (put-text-property 0 1 'cursor t decoded)))
@@ -2080,7 +2088,7 @@ either in the current buffer or in the echo area."
       ;; macro being defined.
       (apply 'isearch-unread
              (append (mac-replace-untranslated-utf-8-chars
-                      (mac-utxt-to-string confirmed coding)) '())))
+                      (funcall decode-fun confirmed coding)) '())))
     ;; The event is successfully processed.  Sync the sequence number.
     (setq mac-ts-update-active-input-area-seqno (1+ seqno))))
 
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 6e6c75ade42..0da804a56af 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -228,9 +228,10 @@
       (define-key map "\e[4~" [select])
       (define-key map "\e[29~" [print])
       
-      ;; These keys will be available xterm starting probably from
-      ;; version 214.
+      ;; These keys are available in xterm starting from version 214
+      ;; if the modifyOtherKeys resource is set.
       (define-key map "\e[27;5;9~"  [(control ?\t)])
+      (define-key map "\e[27;5;13~" [C-return])
       (define-key map "\e[27;5;44~" [(control ?\,)])
       (define-key map "\e[27;5;46~" [(control ?\.)])
       (define-key map "\e[27;5;47~" [(control ?\/)])
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index c4e739fdf77..79d526cbe76 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.38
+;; Version: 4.42
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -90,6 +90,26 @@
 ;;
 ;; Recent changes
 ;; --------------
+;; Version 4.42
+;;    - Bug fixes
+;;    - `s' key in the agenda saves all org-mode buffers.
+;;
+;; Version 4.41
+;;    - Shift-curser keys can modify inactive time stamps (inactive time
+;;      stamps are the ones in [...] brackets.
+;;    - Toggle all checkboxes in a region/below a headline.
+;;    - Bug fixes.
+;;
+;; Version 4.40
+;;    - Bug fixes.
+;;
+;; Version 4.39
+;;    - Special tag ARCHIVE keeps a subtree closed and away from agenda lists.
+;;    - LaTeX code in Org-mode files can be converted to images for HTML.
+;;    - Bug fixes.
+;;    - CDLaTeX-mode features can be used in Org-mode to help inserting
+;;      LaTeX environment and math.
+;;
 ;; Version 4.38
 ;;    - noutline.el is now required (important for XEmacs users only).
 ;;    - Dynamic blocks.
@@ -189,7 +209,7 @@
 
 ;;; Customization variables
 
-(defvar org-version "4.38"
+(defvar org-version "4.42"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -409,7 +429,8 @@ visibility is cycled."
                  (const :tag "Everywhere except in headlines" t)
                  ))
 
-(defcustom org-cycle-hook '(org-optimize-window-after-visibility-change)
+(defcustom org-cycle-hook '(org-cycle-hide-archived-subtrees
+                            org-optimize-window-after-visibility-change)
   "Hook that is run after `org-cycle' has changed the buffer visibility.
 The function(s) in this hook must accept a single argument which indicates
 the new state that was set by the most recent `org-cycle' command.  The
@@ -537,6 +558,38 @@ use \\[org-ctrl-c-ctrl-c] to trigger renumbering."
   :tag "Org Archive"
   :group 'org-structure)
 
+(defcustom org-archive-tag "ARCHIVE"
+  "The tag that marks a subtree as archived.
+An archived subtree does not open during visibility cycling, and does
+not contribute to the agenda listings."
+  :group 'org-archive
+  :group 'org-keywords
+  :type 'string)
+
+(defcustom org-agenda-skip-archived-trees t
+  "Non-nil means, the agenda will skip any items located in archived trees.
+An archived tree is a tree marked with the tag ARCHIVE."
+  :group 'org-archive
+  :group 'org-agenda-display
+  :type 'boolean)
+
+(defcustom org-cycle-open-archived-trees nil
+  "Non-nil means, `org-cycle' will open archived trees.
+An archived tree is a tree marked with the tag ARCHIVE.
+When nil, archived trees will stay folded.  You can still open them with
+normal outline commands like `show-all', but not with the cycling commands."
+  :group 'org-archive
+  :group 'org-cycle
+  :type 'boolean)
+
+(defcustom org-sparse-tree-open-archived-trees nil
+  "Non-nil means sparse tree construction shows matches in archived trees.
+When nil, matches in these trees are highlighted, but the trees are kept in
+collapsed state."
+  :group 'org-archive
+  :group 'org-sparse-trees
+  :type 'boolean)
+
 (defcustom org-archive-location "%s_archive::"
   "The location where subtrees should be archived.
 This string consists of two parts, separated by a double-colon.
@@ -574,12 +627,12 @@ line like
   :type 'string)
 
 (defcustom org-archive-mark-done t
-  "Non-nil means, mark archived entries as DONE."
+  "Non-nil means, mark entries as DONE when they are moved to the archive file."
   :group 'org-archive
   :type 'boolean)
 
 (defcustom org-archive-stamp-time t
-  "Non-nil means, add a time stamp to archived entries.
+  "Non-nil means, add a time stamp to entries moved to an archive file.
 The time stamp will be added directly after the TODO state keyword in the
 first line, so it is probably best to use this in combinations with
 `org-archive-mark-done'."
@@ -1028,12 +1081,14 @@ rather than having to type \"yes\"."
           (const :tag "no confirmation (dangerous)" nil)))
 
 (defconst org-file-apps-defaults-gnu
-  '((t . mailcap))
+  '((remote . emacs)
+    (t . mailcap))
   "Default file applications on a UNIX or GNU/Linux system.
 See `org-file-apps'.")
 
 (defconst org-file-apps-defaults-macosx
-  '((t        . "open %s")
+  '((remote . emacs)
+    (t        . "open %s")
     ("ps"     . "gv %s")
     ("ps.gz"  . "gv %s")
     ("eps"    . "gv %s")
@@ -1046,11 +1101,13 @@ for some files for which the OS does not have a good default.
 See `org-file-apps'.")
 
 (defconst org-file-apps-defaults-windowsnt
-  (list (cons t
-              (list (if (featurep 'xemacs)
-                        'mswindows-shell-execute
-                      'w32-shell-execute)
-                      "open" 'file)))
+  (list 
+   '(remote . emacs)
+   (cons t
+         (list (if (featurep 'xemacs)
+                   'mswindows-shell-execute
+                 'w32-shell-execute)
+               "open" 'file)))
   "Default file applications on a Windows NT system.
 The system \"open\" is used for most files.
 See `org-file-apps'.")
@@ -1072,6 +1129,9 @@ files and the cdr the corresponding command.  Possible values for the
 file identifier are
  \"ext\"         A string identifying an extension
  `directory'   Matches a directory
+ `remote'      Matches a remove file, accessible through tramp or efs.
+               Remote files most likely should be visited through emacs
+               because external applications cannot handle such paths.
  t             Default for all remaining files
 
 Possible values for the command are:
@@ -1090,6 +1150,7 @@ For more examples, see the system specific constants
           (cons (choice :value ""
                         (string :tag "Extension")
                         (const :tag "Default for unrecognized files" t)
+                        (const :tag "Remote file" remote)
                         (const :tag "Links to a directory" directory))
                 (choice :value ""
                         (const :tag "Visit with Emacs" emacs)
@@ -1715,6 +1776,29 @@ N days, just insert a special line indicating the size of the gap."
           (const :tag "All" t)
           (number :tag "at most")))
 
+(defgroup org-latex nil
+  "Options for embedding LaTeX code into Org-mode"
+  :tag "Org LaTeX"
+  :group 'org)
+
+(defcustom org-format-latex-options
+  '(:foreground "Black" :background "Transparent" :scale 1.0
+                :matchers ("begin" "$" "$$" "\\(" "\\["))
+  "Options for creating images from LaTeX fragments.
+This is a property list with the following properties:
+:foreground  the foreground color, for example \"Black\".
+:background  the background color, or \"Transparent\".
+:scale       a scaling factor for the size of the images
+:matchers    a list indicating which matchers should be used to
+             find LaTeX fragments.  Valid members of this list are:
+             \"begin\"  find environments
+             \"$\"      find math expressions surrounded by $...$
+             \"$$\"     find math expressions surrounded by $$....$$
+             \"\\(\"     find math expressions surrounded by \\(...\\)
+             \"\\ [\"    find math expressions surrounded by \\ [...\\]"
+  :group 'org-latex
+  :type 'plist)
+
 (defgroup org-export nil
   "Options for exporting org-listings."
   :tag "Org Export"
@@ -1813,11 +1897,29 @@ This option can also be set with the +OPTIONS line, e.g. \"\\n:t\"."
   :group 'org-export-general
   :type 'boolean)
 
+(defcustom org-export-with-archived-trees 'headline
+  "Whether subtrees with the ARCHIVE tag should be exported.
+This can have three different values
+nil       Do not export, pretend this tree is not present
+t         Do export the entire tree
+headline  Only export the headline, but skip the tree below it."
+  :group 'org-export-general
+  :group 'org-archive
+  :type '(choice
+          (const :tag "not at all" nil)
+          (const :tag "headline only" 'headline)
+          (const :tag "entirely" t)))
+
 (defcustom org-export-with-timestamps t
   "Nil means, do not export time stamps and associated keywords."
   :group 'org-export
   :type 'boolean)
 
+(defcustom org-export-remove-timestamps-from-toc t
+  "Nil means, remove timestamps from the table of contents entries."
+  :group 'org-export
+  :type 'boolean)
+
 (defcustom org-export-with-tags t
   "Nil means, do not export tags, just remove them from headlines."
   :group 'org-export-general
@@ -1876,6 +1978,19 @@ Not all export backends support this.
 
 This option can also be set with the +OPTIONS line, e.g. \"TeX:nil\"."
   :group 'org-export-translation
+  :group 'org-latex
+  :type 'boolean)
+
+(defcustom org-export-with-LaTeX-fragments nil
+  "Non-nil means, convert LaTeX fragments to images when exporting to HTML.
+When set, the exporter will find LaTeX environments if the \\begin line is
+the first non-white thing on a line.  It will also find the math delimiters
+like $a=b$ and \\( a=b \\) for inline math,  $$a=b$$ and \\[ a=b \\] for
+display math.
+
+This option can also be set with the +OPTIONS line, e.g. \"LaTeX:t\"."
+  :group 'org-export-translation
+  :group 'org-latex
   :type 'boolean)
 
 (defcustom org-export-with-fixed-width t
@@ -2387,6 +2502,19 @@ color of the frame."
 This face is only used if `org-fontify-done-headline' is set."
   :group 'org-faces)
 
+(defface org-archived    ; similar to shadow
+  (org-compatible-face
+   '((((class color grayscale) (min-colors 88) (background light))
+      (:foreground "grey50"))
+     (((class color grayscale) (min-colors 88) (background dark))
+      (:foreground "grey70"))
+     (((class color) (min-colors 8) (background light))
+      (:foreground "green"))
+     (((class color) (min-colors 8) (background dark))
+      (:foreground "yellow"))))
+   "Face for headline with the ARCHIVE tag."
+   :group 'org-faces)
+
 (defface org-link
   '((((class color) (background light)) (:foreground "Purple" :underline t))
     (((class color) (background dark)) (:foreground "Cyan" :underline t))
@@ -2563,9 +2691,13 @@ Also put tags into group 4 if tags are present.")
   (remove-text-properties 0 (length s) org-rm-props s)
   s)
 
+(defsubst org-mode-p ()
+  "Check if the current buffer is in Org-mode."
+  (eq major-mode 'org-mode))
+
 (defun org-set-regexps-and-options ()
   "Precompute regular expressions for current buffer."
-  (when (eq major-mode 'org-mode)
+  (when (org-mode-p)
     (let ((re (org-make-options-regexp
                '("CATEGORY" "SEQ_TODO" "PRI_TODO" "TYP_TODO"
                  "STARTUP" "ARCHIVE" "TAGS")))
@@ -2625,7 +2757,7 @@ Also put tags into group 4 if tags are present.")
       (and arch (set (make-local-variable 'org-archive-location) arch))
       (and int (set (make-local-variable 'org-todo-interpretation) int))
       (when tags
-        (let (e tg c tgs)
+        (let (e tgs)
           (while (setq e (pop tags))
             (cond
              ((equal e "{") (push '(:startgroup) tgs))
@@ -2707,6 +2839,8 @@ Also put tags into group 4 if tags are present.")
 (defvar org-goto-start-pos) ; dynamically scoped parameter
 (defvar org-time-was-given) ; dynamically scoped parameter
 (defvar org-ts-what) ; dynamically scoped parameter
+(defvar org-current-export-file) ; dynamically scoped parameter
+(defvar org-current-export-dir) ; dynamically scoped parameter
 (defvar mark-active) ; Emacs only, not available in XEmacs.
 (defvar timecnt) ; dynamically scoped parameter
 (defvar levels-open) ; dynamically scoped parameter
@@ -2741,6 +2875,8 @@ Also put tags into group 4 if tags are present.")
 (defvar orgtbl-mode) ; defined later in this file
 (defvar Info-current-file) ; from info.el
 (defvar Info-current-node) ; from info.el
+(defvar texmathp-why) ; from texmathp.el
+(defvar org-latex-regexps)
 
 ;;; Define the mode
 
@@ -2832,9 +2968,7 @@ The following commands are available:
   ;; Paragraphs and auto-filling
   (org-set-autofill-regexps)
   (org-update-radio-target-regexp)
-  ;; Settings for Calc embedded mode
-  (set (make-local-variable 'calc-embedded-open-formula) "|\\|\n")
-  (set (make-local-variable 'calc-embedded-close-formula) "|\\|\n")
+
   (if (and org-insert-mode-line-in-empty-file
            (interactive-p)
            (= (point-min) (point-max)))
@@ -2958,10 +3092,12 @@ that will be added to PLIST.  Returns the string that was modified."
   "Regular expression for fast time stamp matching.")
 (defconst org-ts-regexp-both "[[<]\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}[^\r\n>]*?\\)[]>]"
   "Regular expression for fast time stamp matching.")
-(defconst org-ts-regexp1 "\\(\\([0-9]\\{4\\}\\)-\\([0-9]\\{2\\}\\)-\\([0-9]\\{2\\}\\)\\([^0-9>\r\n]*\\)\\(\\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\)\\)?\\)"
+(defconst org-ts-regexp1 "\\(\\([0-9]\\{4\\}\\)-\\([0-9]\\{2\\}\\)-\\([0-9]\\{2\\}\\)\\([^]0-9>\r\n]*\\)\\(\\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\)\\)?\\)"
   "Regular expression matching time strings for analysis.")
 (defconst org-ts-regexp2 (concat "<" org-ts-regexp1 ">")
   "Regular expression matching time stamps, with groups.")
+(defconst org-ts-regexp3 (concat "[[<]" org-ts-regexp1 "[]>]")
+  "Regular expression matching time stamps (also [..]), with groups.")
 (defconst org-tr-regexp (concat org-ts-regexp "--?-?" org-ts-regexp)
   "Regular expression matching a time stamp range.")
 (defconst org-tsr-regexp (concat org-ts-regexp "\\(--?-?"
@@ -3197,6 +3333,7 @@ between words."
            '("^[ \t]*| *\\([#!$*_^]\\) *|" (1 'org-formula t))
            (if org-format-transports-properties-p
                '("| *\\(<[0-9]+>\\) *" (1 'org-formula t)))
+           '("^\\*+ \\(.*:ARCHIVE:.*\\)" (1 'org-archived prepend))
            )))
     (setq org-font-lock-extra-keywords (delq nil org-font-lock-extra-keywords))
     ;; Now set the full font-lock-keywords
@@ -3273,7 +3410,11 @@ between words."
             outline-regexp))
          (bob-special (and org-cycle-global-at-bob (bobp)
                            (not (looking-at outline-regexp))))
-         (org-cycle-hook (if bob-special nil org-cycle-hook))
+         (org-cycle-hook
+          (if bob-special
+              (delq 'org-optimize-window-after-visibility-change
+                    (copy-sequence org-cycle-hook))
+            org-cycle-hook))
          (pos (point)))
 
     (if (or bob-special (equal arg '(4)))
@@ -3291,7 +3432,7 @@ between words."
               (call-interactively 'org-table-next-field)))))
 
      ((eq arg t) ;; Global cycling
-
+      
       (cond
        ((and (eq last-command this-command)
              (eq org-cycle-global-status 'overview))
@@ -3370,6 +3511,9 @@ between words."
 
      ;; TAB emulation
      (buffer-read-only (org-back-to-heading))
+
+     ((org-try-cdlatex-tab))
+
      ((if (and (memq org-cycle-emulate-tab '(white whitestart))
                (save-excursion (beginning-of-line 1) (looking-at "[ \t]*"))
                (or (and (eq org-cycle-emulate-tab 'white)
@@ -3454,7 +3598,7 @@ This function is the default value of the hook `org-cycle-hook'."
   "Move cursor to the first headline and recenter the headline.
 Optional argument N means, put the headline into the Nth line of the window."
   (goto-char (point-min))
-  (when (re-search-forward (concat "^" outline-regexp) nil t)
+  (when (re-search-forward (concat "^\\(" outline-regexp "\\)") nil t)
     (beginning-of-line)
     (recenter (prefix-numeric-value N))))
 
@@ -3637,10 +3781,8 @@ Return t when things worked, nil when we are not in an item."
                 t)
             (error nil)))
     (let* ((bul (match-string 0))
-           (end (match-end 0))
            (eow (save-excursion (beginning-of-line 1) (looking-at "[ \t]*")
                                 (match-end 0)))
-           (eowcol (save-excursion (goto-char eow) (current-column)))
            pos)
       (cond
        ((and (org-at-item-p) (<= (point) eow))
@@ -4034,12 +4176,31 @@ If optional TXT is given, check this string instead of the current kill."
          (skip-chars-forward " \t")
          (looking-at "\\[[ X]\\]"))))
 
-(defun org-toggle-checkbox ()
+(defun org-toggle-checkbox (&optional arg)
   "Toggle the checkbox in the current line."
-  (interactive)
-  (save-excursion
-    (if (org-at-item-checkbox-p)
-        (replace-match (if (equal (match-string 0) "[ ]") "[X]" "[ ]") t t))))
+  (interactive "P")
+  (catch 'exit
+    (let (beg end status (firstnew 'unknown))
+      (cond
+       ((org-region-active-p)
+        (setq beg (region-beginning) end (region-end)))
+       ((org-on-heading-p)
+        (setq beg (point) end (save-excursion (outline-next-heading) (point))))
+       ((org-at-item-checkbox-p)
+        (save-excursion
+          (replace-match (if (equal (match-string 0) "[ ]") "[X]" "[ ]") t t))
+        (throw 'exit t))
+       (t (error "Not at a checkbox or heading, and no active region")))
+      (save-excursion
+        (goto-char beg)
+        (while (< (point) end)
+          (when (org-at-item-checkbox-p)
+            (setq status (equal (match-string 0) "[X]"))
+            (when (eq firstnew 'unknown)
+              (setq firstnew (not status)))
+            (replace-match 
+             (if (if arg (not status) firstnew) "[X]" "[ ]") t t))
+          (beginning-of-line 2))))))
 
 (defun org-get-indentation (&optional line)
   "Get the indentation of the current line, interpreting tabs.
@@ -4093,7 +4254,7 @@ If the cursor is not in an item, throw an error."
             (while t
               (beginning-of-line 0)
               (if (< (point) limit) (throw 'exit nil))
-              (unless (looking-at " \t]*$")
+              (unless (looking-at "[ \t]*$")
                 (skip-chars-forward " \t")
                 (setq ind1 (current-column))
                 (if (< ind1 ind)
@@ -4129,12 +4290,10 @@ If the cursor is not in an item, throw an error."
   "Move to the beginning of the next item in the current plain list.
 Error if not at a plain list, or if this is the last item in the list."
   (interactive)
-  (let (beg end ind ind1 (pos (point)) txt)
+  (let (ind ind1 (pos (point)))
     (org-beginning-of-item)
-    (setq beg (point))
     (setq ind (org-get-indentation))
     (org-end-of-item)
-    (setq end (point))
     (setq ind1 (org-get-indentation))
     (unless (and (org-at-item-p) (= ind ind1))
       (goto-char pos)
@@ -4144,7 +4303,7 @@ Error if not at a plain list, or if this is the last item in the list."
   "Move to the beginning of the previous item in the current plain list.
 Error if not at a plain list, or if this is the last item in the list."
   (interactive)
-  (let (beg end ind ind1 (pos (point)) txt)
+  (let (beg ind (pos (point)))
     (org-beginning-of-item)
     (setq beg (point))
     (setq ind (org-get-indentation))
@@ -4154,7 +4313,7 @@ Error if not at a plain list, or if this is the last item in the list."
         (beginning-of-line 0)
         (if (looking-at "[ \t]*$")
             nil
-          (if (<= (setq ind1 (org-get-indentation)) ind)
+          (if (<= (org-get-indentation) ind)
               (throw 'exit t)))))
     (condition-case nil
         (org-beginning-of-item)
@@ -4367,7 +4526,7 @@ this heading. "
         (let (this-command) (org-copy-subtree))
         (set-buffer buffer)
         ;; Enforce org-mode for the archive buffer
-        (if (not (eq major-mode 'org-mode))
+        (if (not (org-mode-p))
             ;; Force the mode for future visits.
             (let ((org-insert-mode-line-in-empty-file t))
               (call-interactively 'org-mode)))
@@ -4427,13 +4586,17 @@ this heading. "
                    (concat "under heading: " heading)
                  (concat "in file: " (abbreviate-file-name file)))))))
 
-(defun org-archive-all-done ()
+(defun org-archive-all-done (&optional tag)
   "Archive sublevels of the current tree without open TODO items.
 If the cursor is not on a headline, try all level 1 trees.  If
-it is on a headline, try all direct children."
+it is on a headline, try all direct children.
+When TAG is non-nil, don't move trees, but mark them with the ARCHIVE tag."
   (let ((re (concat "^\\*+ +" org-not-done-regexp)) re1
+        (rea (concat ".*:" org-archive-tag ":"))
         (begm (make-marker))
         (endm (make-marker))
+        (question (if tag "Set ARCHIVE tag (no open TODO items)? "
+                    "Move subtree to archive (no open TODO items)? "))
         beg end (cntarch 0))
     (if (org-on-heading-p)
         (progn
@@ -4450,19 +4613,148 @@ it is on a headline, try all direct children."
     (save-excursion
       (goto-char begm)
       (while (re-search-forward re1 endm t)
-              beg (match-beginning 0)
+        (setq beg (match-beginning 0)
               end (save-excursion (org-end-of-subtree t) (point)))
         (goto-char beg)
         (if (re-search-forward re end t)
             (goto-char end)
           (goto-char beg)
-          (if (y-or-n-p "Archive this subtree (no open TODO items)? ")
+          (if (and (or (not tag) (not (looking-at rea)))
+                   (y-or-n-p question))
               (progn
-                (org-archive-subtree)
+                (if tag
+                    (org-toggle-tag org-archive-tag 'on)
+                  (org-archive-subtree))
                 (setq cntarch (1+ cntarch)))
-            (goto-char end))))
+            (goto-char end)))))
     (message "%d trees archived" cntarch)))
 
+(defun org-cycle-hide-archived-subtrees (state)
+  "Re-hide all archived subtrees after a visibility state change."
+  (when (and (not org-cycle-open-archived-trees)
+             (not (memq state '(overview folded))))
+    (save-excursion
+      (let* ((globalp (memq state '(contents all)))
+             (beg (if globalp (point-min) (point)))
+             (end (if globalp (point-max) (org-end-of-subtree))))
+        (org-hide-archived-subtrees beg end)))))
+
+(defun org-hide-archived-subtrees (beg end)
+  "Re-hide all archived subtrees after a visibility state change."
+  (save-excursion
+    (let* ((re (concat ":" org-archive-tag ":")))
+      (goto-char beg)
+      (while (re-search-forward re end t)
+        (and (org-on-heading-p) (hide-subtree))
+        (org-end-of-subtree)))))
+
+(defun org-toggle-tag (tag &optional onoff)
+  "Toggle the tag TAG for the current line.
+If ONOFF is `on' or `off', don't toggle but set to this state."
+  (unless (org-on-heading-p) (error "Not on headling"))
+  (let (res current)
+    (save-excursion
+      (beginning-of-line)
+      (if (re-search-forward "[ \t]:\\([a-zA-Z0-9_@:]+\\):[ \t]*$"
+                             (point-at-eol) t)
+          (progn
+            (setq current (match-string 1))
+            (replace-match ""))
+        (setq current ""))
+      (setq current (nreverse (org-split-string current ":")))
+      (cond
+       ((eq onoff 'on)
+        (setq res t)
+        (or (member tag current) (push tag current)))
+       ((eq onoff 'off)
+        (or (not (member tag current)) (setq current (delete tag current))))
+       (t (if (member tag current)
+              (setq current (delete tag current))
+            (setq res t)
+            (push tag current))))
+      (end-of-line 1)
+      (when current
+        (insert " :" (mapconcat 'identity (nreverse current) ":") ":"))
+      (org-set-tags nil t))
+    res))
+
+(defun org-toggle-archive-tag (&optional arg)
+  "Toggle the archive tag for the current headline.
+With prefix ARG, check all children of current headline and offer tagging
+the children that do not contain any open TODO items."
+  (interactive "P")
+  (if arg
+      (org-archive-all-done 'tag)
+    (let (set)
+      (save-excursion
+        (org-back-to-heading t)
+        (setq set (org-toggle-tag org-archive-tag))
+        (when set (hide-subtree)))
+      (and set (beginning-of-line 1))
+      (message "Subtree %s" (if set "archived" "unarchived")))))
+
+(defun org-prepare-agenda-buffers (files)
+  "Create buffers for all agenda files, protect archived trees and comments."
+  (interactive)
+  (let ((pa '(:org-archived t))
+        (pc '(:org-comment t))
+        (pall '(:org-archived t :org-comment t))
+        (rea (concat ":" org-archive-tag ":"))
+        file re)
+    (save-excursion
+      (while (setq file (pop files))
+        (org-check-agenda-file file)
+        (set-buffer (org-get-agenda-file-buffer file))
+        (widen)
+        (save-excursion
+          (remove-text-properties (point-min) (point-max) pall)
+          (when org-agenda-skip-archived-trees
+            (goto-char (point-min))
+            (while (re-search-forward rea nil t)
+              (if (org-on-heading-p)
+                  (add-text-properties (point-at-bol) (org-end-of-subtree t) pa))))
+          (goto-char (point-min))
+          (setq re (concat "^\\*+ +" org-comment-string "\\>"))
+          (while (re-search-forward re nil t)
+            (add-text-properties
+             (match-beginning 0) (org-end-of-subtree t) pc)))))))
+
+(defun org-agenda-skip ()
+  "Throw to `:skip' in places that should be skipped."
+  (let ((p (point-at-bol)))
+    (and org-agenda-skip-archived-trees
+         (get-text-property p :org-archived)
+         (org-end-of-subtree)
+         (throw :skip t))
+    (and (get-text-property p :org-comment)
+         (org-end-of-subtree)
+         (throw :skip t))
+    (if (equal (char-after p) ?#) (throw :skip t))))
+  
+(defun org-agenda-toggle-archive-tag ()
+  "Toggle the archive tag for the current entry."
+  (interactive)
+  (org-agenda-check-no-diary)
+  (org-agenda-show)   ;;; FIXME This is a stupid hack and should not be needed
+  (let* ((hdmarker (or (get-text-property (point) 'org-hd-marker)
+                       (org-agenda-error)))
+         (buffer (marker-buffer hdmarker))
+         (pos (marker-position hdmarker))
+         (buffer-read-only nil)
+         newhead)
+    (with-current-buffer buffer
+      (widen)
+      (goto-char pos)
+      (org-show-hidden-entry)
+      (save-excursion
+        (and (outline-next-heading)
+             (org-flag-heading nil)))   ; show the next heading
+      (call-interactively 'org-toggle-archive-tag)
+      (end-of-line 1)
+      (setq newhead (org-get-heading)))
+    (org-agenda-change-all-lines newhead hdmarker)
+    (beginning-of-line 1)))
+
 ;;; Dynamic blocks
 
 (defun org-find-dblock (name)
@@ -4503,8 +4795,7 @@ This empties the block, puts the cursor at the insert position and returns
 the property list including an extra property :name with the block name."
   (unless (looking-at org-dblock-start-re)
     (error "Not at a dynamic block"))
-  (let* ((beg (match-beginning 0))
-         (begdel (1+ (match-end 0)))
+  (let* ((begdel (1+ (match-end 0)))
          (name (match-string 1))
          (params (append (list :name name)
                          (read (concat "(" (match-string 2) ")")))))
@@ -4557,7 +4848,7 @@ the correct writing function."
   "Find the beginning of the dynamic block at point.
 Error if there is no scuh block at point."
   (let ((pos (point))
-        beg end)
+        beg)
     (end-of-line 1)
     (if (and (re-search-backward org-dblock-start-re nil t)
              (setq beg (match-beginning 0))
@@ -4570,7 +4861,7 @@ Error if there is no scuh block at point."
 (defun org-update-all-dblocks ()
   "Update all dynamic blocks in the buffer.
 This function can be used in a hook."
-  (when (eq major-mode 'org-mode)
+  (when (org-mode-p)
     (org-map-dblocks 'org-update-dblock)))
 
 
@@ -4846,9 +5137,8 @@ be removed."
      (format-time-string (car org-time-stamp-formats) time))
     (setq what nil))
   (save-excursion
-    (let (beg end col list elt (buffer-invisibility-spec nil) ts)
+    (let (col list elt (buffer-invisibility-spec nil) ts)
       (org-back-to-heading t)
-      (setq beg (point))
       (looking-at (concat outline-regexp "\\( *\\)[^\r\n]*"))
       (goto-char (match-end 1))
       (setq col (current-column))
@@ -4918,6 +5208,8 @@ that the match should indeed be shown."
           (org-show-hierarchy-above))))
     (org-add-hook 'before-change-functions 'org-remove-occur-highlights
                   nil 'local)
+    (unless org-sparse-tree-open-archived-trees
+      (org-hide-archived-subtrees (point-min) (point-max)))
     (run-hooks 'org-occur-hook)
     (if (interactive-p)
         (message "%d match(es) for regexp %s" cnt regexp))
@@ -4959,8 +5251,15 @@ that the match should indeed be shown."
   (if (featurep 'xemacs)
       (set-extent-property ovl prop value)
     (overlay-put ovl prop value)))
+(defun org-overlays-at (pos)
+  (if (featurep 'xemacs) (extents-at pos) (overlays-at pos)))
+(defun org-overlay-start (o)
+  (if (featurep 'xemacs) (extent-start-position o) (overlay-start o)))
+(defun org-overlay-end (o)
+  (if (featurep 'xemacs) (extent-end-position o) (overlay-end o)))
 
 (defvar org-occur-highlights nil)
+(make-variable-buffer-local 'org-occur-highlights)
 (defun org-highlight-new-match (beg end)
   "Highlight from BEG to END and mark the highlight is an occur headline."
   (let ((ov (org-make-overlay beg end)))
@@ -5425,7 +5724,7 @@ With prefix ARG, change by that many units."
   "Increase the date in the time stamp by one day.
 With prefix ARG, change that many days."
   (interactive "p")
-  (if (and (not (org-at-timestamp-p))
+  (if (and (not (org-at-timestamp-p t))
            (org-on-heading-p))
       (org-todo 'up)
     (org-timestamp-change (prefix-numeric-value arg) 'day)))
@@ -5434,7 +5733,7 @@ With prefix ARG, change that many days."
   "Decrease the date in the time stamp by one day.
 With prefix ARG, change that many days."
   (interactive "p")
-  (if (and (not (org-at-timestamp-p))
+  (if (and (not (org-at-timestamp-p t))
            (org-on-heading-p))
       (org-todo 'down)
     (org-timestamp-change (- (prefix-numeric-value arg)) 'day)))
@@ -5444,14 +5743,14 @@ With prefix ARG, change that many days."
        (<= (match-beginning n) pos)
        (>= (match-end n) pos)))
 
-(defun org-at-timestamp-p ()
+(defun org-at-timestamp-p (&optional also-inactive)
   "Determine if the cursor is in or at a timestamp."
   (interactive)
-  (let* ((tsr org-ts-regexp2)
+  (let* ((tsr (if also-inactive org-ts-regexp3 org-ts-regexp2))
          (pos (point))
          (ans (or (looking-at tsr)
                   (save-excursion
-                    (skip-chars-backward "^<\n\r\t")
+                    (skip-chars-backward "^[<\n\r\t")
                     (if (> (point) 1) (backward-char 1))
                     (and (looking-at tsr)
                          (> (- (match-end 0) pos) -1))))))
@@ -5476,7 +5775,7 @@ in the timestamp determines what will be changed."
         org-ts-what
         (pos (point))
         ts time time0)
-    (if (not (org-at-timestamp-p))
+    (if (not (org-at-timestamp-p t))
         (error "Not at a timestamp"))
     (setq org-ts-what (or what org-ts-what))
     (setq fmt (if (<= (abs (- (cdr org-ts-lengths)
@@ -5484,6 +5783,8 @@ in the timestamp determines what will be changed."
                       1)
                   (cdr org-time-stamp-formats)
                 (car org-time-stamp-formats)))
+    (if (= (char-after (match-beginning 0)) ?\[)
+        (setq fmt (concat "[" (substring fmt 1 -1) "]")))
     (setq ts (match-string 0))
     (replace-match "")
     (setq time0 (org-parse-time-string ts))
@@ -5643,7 +5944,7 @@ Puts the resulting times in minutes as a text property on each headline."
          (ltimes (make-vector lmax 0))
          (t1 0)
          (level 0)
-         (lastlevel 0) time)
+         time)
     (remove-text-properties (point-min) (point-max) '(:org-clock-minutes t))
     (save-excursion
       (goto-char (point-max))
@@ -5688,6 +5989,8 @@ in the echo area."
   (message "Total file time: %d:%02d (%d hours and %d minutes)" h m h m)))
 
 (defvar org-clock-overlays nil)
+(make-variable-buffer-local 'org-clock-overlays)
+
 (defun org-put-clock-overlay (time &optional level)
   "Put an overlays on the current line, displaying TIME.
 If LEVEL is given, prefix time with a corresponding number of stars.
@@ -5769,9 +6072,8 @@ The BEGIN line can contain parameters.  Allowed are:
   "Write the standard clocktable."
   (let ((hlchars '((1 . "*") (2 . ?/)))
         (emph nil)
-        (pos (point)) ipos
         (ins (make-marker))
-        time h m p level hlc hdl maxlevel)
+        ipos time h m p level hlc hdl maxlevel)
     (setq maxlevel (or (plist-get params :maxlevel) 3)
           emph (plist-get params :emphasize))
     (move-marker ins (point))
@@ -5912,6 +6214,7 @@ The following commands are available:
 (define-key org-agenda-mode-map "o"        'delete-other-windows)
 (define-key org-agenda-mode-map "L"        'org-agenda-recenter)
 (define-key org-agenda-mode-map "t"        'org-agenda-todo)
+(define-key org-agenda-mode-map "a"        'org-agenda-toggle-archive-tag)
 (define-key org-agenda-mode-map ":"        'org-agenda-set-tags)
 (define-key org-agenda-mode-map "."        'org-agenda-goto-today)
 (define-key org-agenda-mode-map "d"        'org-agenda-day-view)
@@ -5935,6 +6238,7 @@ The following commands are available:
 (define-key org-agenda-mode-map "r" 'org-agenda-redo)
 (define-key org-agenda-mode-map "q" 'org-agenda-quit)
 (define-key org-agenda-mode-map "x" 'org-agenda-exit)
+(define-key org-agenda-mode-map "s" 'org-save-all-org-buffers)
 (define-key org-agenda-mode-map "P" 'org-agenda-show-priority)
 (define-key org-agenda-mode-map "T" 'org-agenda-show-tags)
 (define-key org-agenda-mode-map "n" 'next-line)
@@ -5951,7 +6255,6 @@ The following commands are available:
 (define-key org-agenda-mode-map "C" 'org-agenda-convert-date)
 (define-key org-agenda-mode-map "m" 'org-agenda-phases-of-moon)
 (define-key org-agenda-mode-map "M" 'org-agenda-phases-of-moon)
-(define-key org-agenda-mode-map "s" 'org-agenda-sunrise-sunset)
 (define-key org-agenda-mode-map "S" 'org-agenda-sunrise-sunset)
 (define-key org-agenda-mode-map "h" 'org-agenda-holidays)
 (define-key org-agenda-mode-map "H" 'org-agenda-holidays)
@@ -6005,6 +6308,7 @@ The following commands are available:
     "--"
     ;; ["New agenda command" org-agenda t]
     ["Rebuild buffer" org-agenda-redo t]
+    ["Save all Org-mode Buffers" org-save-all-org-buffers t]
     "--"
     ["Goto Today" org-agenda-goto-today (org-agenda-check-type nil 'agenda 'timeline)]
     ["Next Dates" org-agenda-later (org-agenda-check-type nil 'agenda)]
@@ -6058,7 +6362,7 @@ first press `1' to indicate that the agenda should be temporarily (until the
 next use of \\[org-agenda]) restricted to the current file."
   (interactive "P")
   (catch 'exit
-    (let ((restrict-ok (and buffer-file-name (eq major-mode 'org-mode)))
+    (let ((restrict-ok (and buffer-file-name (org-mode-p)))
           (bfn buffer-file-name)
           (custom org-agenda-custom-commands)
           c entry key type string)
@@ -6133,7 +6437,7 @@ C   Configure your own agenda commands")
 
 (defun org-check-for-org-mode ()
   "Make sure current buffer is in org-mode.  Error if not."
-  (or (eq major-mode 'org-mode)
+  (or (org-mode-p)
       (error "Cannot execute org-mode agenda command on buffer in %s."
              major-mode)))
 
@@ -6279,6 +6583,7 @@ dates."
          (past t)
          args
          s e rtn d emptyp)
+    (org-prepare-agenda-buffers org-agenda-files)
     (setq org-agenda-redo-command
           (list 'progn
                 (list 'switch-to-buffer-other-window (current-buffer))
@@ -6373,6 +6678,7 @@ NDAYS defaults to `org-agenda-ndays'."
          (day-numbers (list start))
          (inhibit-redisplay t)
          s e rtn rtnall file date d start-pos end-pos todayp nd)
+    (org-prepare-agenda-buffers files)
     (setq org-agenda-redo-command
           (list 'org-agenda-list (list 'quote include-all) start-day ndays t))
     ;; Make the list of days
@@ -6508,6 +6814,7 @@ for a keyword.  A numeric prefix directly selects the Nth keyword in
          '(org-todo-list (or current-prefix-arg last-arg) t))
     (setq files (org-agenda-files)
           rtnall nil)
+    (org-prepare-agenda-buffers files)
     (while (setq file (pop files))
       (catch 'nextfile
         (org-check-agenda-file file)
@@ -6573,6 +6880,14 @@ Org-mode buffers visited directly by the user will not be touched."
   (setq org-agenda-new-buffers nil)
   (org-agenda-quit))
 
+;; FIXME: move this function.
+(defun org-save-all-org-buffers ()
+  "Save all Org-mode buffers without user confirmation."
+  (interactive)
+  (message "Saving all Org-mode buffers...")
+  (save-some-buffers t 'org-mode-p)
+  (message "Saving all Org-mode buffers... done"))
+
 (defun org-agenda-redo ()
   "Rebuild Agenda.
 When this is the global TODO list, a prefix argument will be interpreted."
@@ -7034,7 +7349,7 @@ the documentation of `org-diary'."
         ;; If file does not exist, make sure an error message ends up in diary
         (list (format "ORG-AGENDA-ERROR: No such org-file %s" file))
       (with-current-buffer buffer
-        (unless (eq major-mode 'org-mode)
+        (unless (org-mode-p)
           (error "Agenda file %s is not in `org-mode'" file))
         (setq org-category-table (org-get-category-table))
         (let ((case-fold-search nil))
@@ -7116,8 +7431,11 @@ the documentation of `org-diary'."
          ee txt)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
-      (when (not (and org-agenda-todo-ignore-scheduled
-                      (save-match-data (looking-at sched-re))))
+      (catch :skip
+        (and org-agenda-todo-ignore-scheduled
+             (looking-at sched-re)
+             (throw :skip nil))
+        (org-agenda-skip)
         (goto-char (match-beginning 1))
         (setq marker (org-agenda-new-marker (1+ (match-beginning 0)))
               category (org-get-category)
@@ -7129,14 +7447,14 @@ the documentation of `org-diary'."
                      (- org-todo-kwd-max-priority -2
                         (length
                          (member (match-string 2) org-todo-keywords)))
-                   1)))
+                     1)))
         (org-add-props txt props
           'org-marker marker 'org-hd-marker marker
           'priority priority 'category category)
-        (push txt ee))
-      (if org-agenda-todo-list-sublevels
-          (goto-char (match-end 1))
-        (org-end-of-subtree 'invisible)))
+        (push txt ee)
+        (if org-agenda-todo-list-sublevels
+            (goto-char (match-end 1))
+          (org-end-of-subtree 'invisible))))
     (nreverse ee)))
 
 (defconst org-agenda-no-heading-message
@@ -7162,50 +7480,51 @@ the documentation of `org-diary'."
          ee txt timestr tags)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
-      (if (not (save-match-data (org-at-date-range-p)))
-          (progn
-            (setq marker (org-agenda-new-marker (match-beginning 0))
-                  category (org-get-category (match-beginning 0))
-                  tmp (buffer-substring (max (point-min)
-                                             (- (match-beginning 0)
-                                                org-ds-keyword-length))
-                                        (match-beginning 0))
-                  timestr (buffer-substring (match-beginning 0) (point-at-eol))
-                  deadlinep (string-match org-deadline-regexp tmp)
-                  scheduledp (string-match org-scheduled-regexp tmp)
-                  donep (org-entry-is-done-p))
-            (if (string-match ">" timestr)
-                ;; substring should only run to end of time stamp
-                (setq timestr (substring timestr 0 (match-end 0))))
-            (save-excursion
-              (if (re-search-backward "\\(^\\|\r\\)\\*+" nil t)
-                  (progn
-                    (goto-char (match-end 1))
-                    (setq hdmarker (org-agenda-new-marker)
-                          tags (org-get-tags-at))
-                    (looking-at "\\*+[ \t]*\\([^\r\n]+\\)")
-                    (setq txt (org-format-agenda-item
-                               (format "%s%s"
-                                       (if deadlinep  "Deadline:  " "")
-                                       (if scheduledp "Scheduled: " ""))
-                               (match-string 1) category tags timestr)))
-                (setq txt org-agenda-no-heading-message))
-              (setq priority (org-get-priority txt))
-              (org-add-props txt props
-                'org-marker marker 'org-hd-marker hdmarker)
-              (if deadlinep
-                  (org-add-props txt nil
-                    'face (if donep 'org-done 'org-warning)
-                    'undone-face 'org-warning 'done-face 'org-done
-                    'category category 'priority (+ 100 priority))
-                (if scheduledp
-                    (org-add-props txt nil
-                      'face 'org-scheduled-today
-                      'undone-face 'org-scheduled-today 'done-face 'org-done
-                      'category category 'priority (+ 99 priority))
-                  (org-add-props txt nil 'priority priority 'category category)))
-              (push txt ee))
-            (outline-next-heading))))
+      (catch :skip
+        (and (save-match-data (org-at-date-range-p)) (throw :skip nil))
+        (org-agenda-skip)
+        (setq marker (org-agenda-new-marker (match-beginning 0))
+              category (org-get-category (match-beginning 0))
+              tmp (buffer-substring (max (point-min)
+                                         (- (match-beginning 0)
+                                            org-ds-keyword-length))
+                                    (match-beginning 0))
+              timestr (buffer-substring (match-beginning 0) (point-at-eol))
+              deadlinep (string-match org-deadline-regexp tmp)
+              scheduledp (string-match org-scheduled-regexp tmp)
+              donep (org-entry-is-done-p))
+        (if (string-match ">" timestr)
+            ;; substring should only run to end of time stamp
+            (setq timestr (substring timestr 0 (match-end 0))))
+        (save-excursion
+          (if (re-search-backward "\\(^\\|\r\\)\\*+" nil t)
+              (progn
+                (goto-char (match-end 1))
+                (setq hdmarker (org-agenda-new-marker)
+                      tags (org-get-tags-at))
+                (looking-at "\\*+[ \t]*\\([^\r\n]+\\)")
+                (setq txt (org-format-agenda-item
+                           (format "%s%s"
+                                   (if deadlinep  "Deadline:  " "")
+                                   (if scheduledp "Scheduled: " ""))
+                           (match-string 1) category tags timestr)))
+            (setq txt org-agenda-no-heading-message))
+          (setq priority (org-get-priority txt))
+          (org-add-props txt props
+            'org-marker marker 'org-hd-marker hdmarker)
+          (if deadlinep
+              (org-add-props txt nil
+                'face (if donep 'org-done 'org-warning)
+                'undone-face 'org-warning 'done-face 'org-done
+                'category category 'priority (+ 100 priority))
+            (if scheduledp
+                (org-add-props txt nil
+                  'face 'org-scheduled-today
+                  'undone-face 'org-scheduled-today 'done-face 'org-done
+                  'category category 'priority (+ 99 priority))
+              (org-add-props txt nil 'priority priority 'category category)))
+          (push txt ee))
+        (outline-next-heading)))
     (nreverse ee)))
 
 (defun org-agenda-get-closed ()
@@ -7229,35 +7548,35 @@ the documentation of `org-diary'."
          ee txt timestr)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
-      (if (not (save-match-data (org-at-date-range-p)))
-          (progn
-            (setq marker (org-agenda-new-marker (match-beginning 0))
-                  closedp (equal (match-string 1) org-closed-string)
-                  category (org-get-category (match-beginning 0))
-                  timestr (buffer-substring (match-beginning 0) (point-at-eol))
-                  ;; donep (org-entry-is-done-p)
-                  )
-            (if (string-match "\\]" timestr)
-                ;; substring should only run to end of time stamp
-                (setq timestr (substring timestr 0 (match-end 0))))
-            (save-excursion
-              (if (re-search-backward "\\(^\\|\r\\)\\*+" nil t)
-                  (progn
-                    (goto-char (match-end 1))
-                    (setq hdmarker (org-agenda-new-marker)
-                          tags (org-get-tags-at))
-                    (looking-at "\\*+[ \t]*\\([^\r\n]+\\)")
-                    (setq txt (org-format-agenda-item
-                               (if closedp "Closed:    " "Clocked:   ")
-                               (match-string 1) category tags timestr)))
-                (setq txt org-agenda-no-heading-message))
-              (setq priority 100000)
-              (org-add-props txt props
-                'org-marker marker 'org-hd-marker hdmarker 'face 'org-done
-                'priority priority 'category category
-                'undone-face 'org-warning 'done-face 'org-done)
-              (push txt ee))
-            (outline-next-heading))))
+      (catch :skip
+        (org-agenda-skip)
+        (setq marker (org-agenda-new-marker (match-beginning 0))
+              closedp (equal (match-string 1) org-closed-string)
+              category (org-get-category (match-beginning 0))
+              timestr (buffer-substring (match-beginning 0) (point-at-eol))
+              ;; donep (org-entry-is-done-p)
+              )
+        (if (string-match "\\]" timestr)
+            ;; substring should only run to end of time stamp
+            (setq timestr (substring timestr 0 (match-end 0))))
+        (save-excursion
+          (if (re-search-backward "\\(^\\|\r\\)\\*+" nil t)
+              (progn
+                (goto-char (match-end 1))
+                (setq hdmarker (org-agenda-new-marker)
+                      tags (org-get-tags-at))
+                (looking-at "\\*+[ \t]*\\([^\r\n]+\\)")
+                (setq txt (org-format-agenda-item
+                           (if closedp "Closed:    " "Clocked:   ")
+                           (match-string 1) category tags timestr)))
+            (setq txt org-agenda-no-heading-message))
+          (setq priority 100000)
+          (org-add-props txt props
+            'org-marker marker 'org-hd-marker hdmarker 'face 'org-done
+            'priority priority 'category category
+            'undone-face 'org-warning 'done-face 'org-done)
+          (push txt ee))
+        (outline-next-heading)))
     (nreverse ee)))
 
 (defun org-agenda-get-deadlines ()
@@ -7276,41 +7595,43 @@ the documentation of `org-diary'."
          ee txt head face)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
-      (setq pos (1- (match-beginning 1))
-            d2 (time-to-days
-                (org-time-string-to-time (match-string 1)))
-            diff (- d2 d1))
-      ;; When to show a deadline in the calendar:
-      ;; If the expiration is within wdays warning time.
-      ;; Past-due deadlines are only shown on the current date
-      (if (and (< diff wdays) todayp (not (= diff 0)))
-          (save-excursion
-            (setq category (org-get-category))
-            (if (re-search-backward "\\(^\\|\r\\)\\*+[ \t]*" nil t)
-                (progn
-                  (goto-char (match-end 0))
-                  (setq pos1 (match-end 1))
-                  (setq tags (org-get-tags-at pos1))
-                  (setq head (buffer-substring-no-properties
-                              (point)
-                              (progn (skip-chars-forward "^\r\n")
-                                     (point))))
-                  (if (string-match org-looking-at-done-regexp head)
-                      (setq txt nil)
-                    (setq txt (org-format-agenda-item
-                               (format "In %3d d.: " diff) head category tags))))
-              (setq txt org-agenda-no-heading-message))
-            (when txt
-              (setq face (cond ((<= diff 0) 'org-warning)
-                               ((<= diff 5) 'org-upcoming-deadline)
-                               (t nil)))
-              (org-add-props txt props
-                'org-marker (org-agenda-new-marker pos)
-                'org-hd-marker (org-agenda-new-marker pos1)
-                'priority (+ (- 10 diff) (org-get-priority txt))
-                'category category
-                'face face 'undone-face face 'done-face 'org-done)
-              (push txt ee)))))
+      (catch :skip
+        (org-agenda-skip)
+        (setq pos (1- (match-beginning 1))
+              d2 (time-to-days
+                  (org-time-string-to-time (match-string 1)))
+              diff (- d2 d1))
+        ;; When to show a deadline in the calendar:
+        ;; If the expiration is within wdays warning time.
+        ;; Past-due deadlines are only shown on the current date
+        (if (and (< diff wdays) todayp (not (= diff 0)))
+            (save-excursion
+              (setq category (org-get-category))
+              (if (re-search-backward "\\(^\\|\r\\)\\*+[ \t]*" nil t)
+                  (progn
+                    (goto-char (match-end 0))
+                    (setq pos1 (match-end 1))
+                    (setq tags (org-get-tags-at pos1))
+                    (setq head (buffer-substring-no-properties
+                                (point)
+                                (progn (skip-chars-forward "^\r\n")
+                                       (point))))
+                    (if (string-match org-looking-at-done-regexp head)
+                        (setq txt nil)
+                      (setq txt (org-format-agenda-item
+                                 (format "In %3d d.: " diff) head category tags))))
+                (setq txt org-agenda-no-heading-message))
+              (when txt
+                (setq face (cond ((<= diff 0) 'org-warning)
+                                 ((<= diff 5) 'org-upcoming-deadline)
+                                 (t nil)))
+                (org-add-props txt props
+                  'org-marker (org-agenda-new-marker pos)
+                  'org-hd-marker (org-agenda-new-marker pos1)
+                  'priority (+ (- 10 diff) (org-get-priority txt))
+                  'category category
+                  'face face 'undone-face face 'done-face 'org-done)
+                (push txt ee))))))
     ee))
 
 (defun org-agenda-get-scheduled ()
@@ -7331,36 +7652,38 @@ the documentation of `org-diary'."
          ee txt head)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
-      (setq pos (1- (match-beginning 1))
-            d2 (time-to-days
-                (org-time-string-to-time (match-string 1)))
-            diff (- d2 d1))
-      ;; When to show a scheduled item in the calendar:
-      ;; If it is on or past the date.
-      (if (and (< diff 0) todayp)
-          (save-excursion
-            (setq category (org-get-category))
-            (if (re-search-backward "\\(^\\|\r\\)\\*+[ \t]*" nil t)
-                (progn
-                  (goto-char (match-end 0))
-                  (setq pos1 (match-end 1))
-                  (setq tags (org-get-tags-at))
-                  (setq head (buffer-substring-no-properties
-                              (point)
-                              (progn (skip-chars-forward "^\r\n") (point))))
-                  (if (string-match org-looking-at-done-regexp head)
-                      (setq txt nil)
-                    (setq txt (org-format-agenda-item
-                               (format "Sched.%2dx: " (- 1 diff)) head
-                               category tags))))
-              (setq txt org-agenda-no-heading-message))
-            (when txt
-              (org-add-props txt props
-                'org-marker (org-agenda-new-marker pos)
-                'org-hd-marker (org-agenda-new-marker pos1)
-                'priority (+ (- 5 diff) (org-get-priority txt))
-                'category category)
-              (push txt ee)))))
+      (catch :skip
+        (org-agenda-skip)
+        (setq pos (1- (match-beginning 1))
+              d2 (time-to-days
+                  (org-time-string-to-time (match-string 1)))
+              diff (- d2 d1))
+        ;; When to show a scheduled item in the calendar:
+        ;; If it is on or past the date.
+        (if (and (< diff 0) todayp)
+            (save-excursion
+              (setq category (org-get-category))
+              (if (re-search-backward "\\(^\\|\r\\)\\*+[ \t]*" nil t)
+                  (progn
+                    (goto-char (match-end 0))
+                    (setq pos1 (match-end 1))
+                    (setq tags (org-get-tags-at))
+                    (setq head (buffer-substring-no-properties
+                                (point)
+                                (progn (skip-chars-forward "^\r\n") (point))))
+                    (if (string-match org-looking-at-done-regexp head)
+                        (setq txt nil)
+                      (setq txt (org-format-agenda-item
+                                 (format "Sched.%2dx: " (- 1 diff)) head
+                                 category tags))))
+                (setq txt org-agenda-no-heading-message))
+              (when txt
+                (org-add-props txt props
+                  'org-marker (org-agenda-new-marker pos)
+                  'org-hd-marker (org-agenda-new-marker pos1)
+                  'priority (+ (- 5 diff) (org-get-priority txt))
+                  'category category)
+                (push txt ee))))))
     ee))
 
 (defun org-agenda-get-blocks ()
@@ -7377,34 +7700,36 @@ the documentation of `org-diary'."
          marker hdmarker ee txt d1 d2 s1 s2 timestr category tags)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
-      (setq timestr (match-string 0)
-            s1 (match-string 1)
-            s2 (match-string 2)
-            d1 (time-to-days (org-time-string-to-time s1))
-            d2 (time-to-days (org-time-string-to-time s2)))
-      (if (and (> (- d0 d1) -1) (> (- d2 d0) -1))
-          ;; Only allow days between the limits, because the normal
-          ;; date stamps will catch the limits.
-          (save-excursion
-            (setq marker (org-agenda-new-marker (point)))
-            (setq category (org-get-category))
-            (if (re-search-backward "\\(^\\|\r\\)\\*+" nil t)
-                (progn
-                  (setq hdmarker (org-agenda-new-marker (match-end 1)))
-                  (goto-char (match-end 1))
-                  (setq tags (org-get-tags-at))
-                  (looking-at "\\*+[ \t]*\\([^\r\n]+\\)")
-                  (setq txt (org-format-agenda-item
-                             (format (if (= d1 d2) "" "(%d/%d): ")
-                                     (1+ (- d0 d1)) (1+ (- d2 d1)))
-                             (match-string 1) category tags
-                             (if (= d0 d1) timestr))))
-              (setq txt org-agenda-no-heading-message))
-            (org-add-props txt props
-              'org-marker marker 'org-hd-marker hdmarker
-              'priority (org-get-priority txt) 'category category)
-            (push txt ee)))
-      (outline-next-heading))
+      (catch :skip
+        (org-agenda-skip)
+        (setq timestr (match-string 0)
+              s1 (match-string 1)
+              s2 (match-string 2)
+              d1 (time-to-days (org-time-string-to-time s1))
+              d2 (time-to-days (org-time-string-to-time s2)))
+        (if (and (> (- d0 d1) -1) (> (- d2 d0) -1))
+            ;; Only allow days between the limits, because the normal
+            ;; date stamps will catch the limits.
+            (save-excursion
+              (setq marker (org-agenda-new-marker (point)))
+              (setq category (org-get-category))
+              (if (re-search-backward "\\(^\\|\r\\)\\*+" nil t)
+                  (progn
+                    (setq hdmarker (org-agenda-new-marker (match-end 1)))
+                    (goto-char (match-end 1))
+                    (setq tags (org-get-tags-at))
+                    (looking-at "\\*+[ \t]*\\([^\r\n]+\\)")
+                    (setq txt (org-format-agenda-item
+                               (format (if (= d1 d2) "" "(%d/%d): ")
+                                       (1+ (- d0 d1)) (1+ (- d2 d1)))
+                               (match-string 1) category tags
+                               (if (= d0 d1) timestr))))
+                (setq txt org-agenda-no-heading-message))
+              (org-add-props txt props
+                'org-marker marker 'org-hd-marker hdmarker
+                'priority (org-get-priority txt) 'category category)
+              (push txt ee)))
+        (outline-next-heading)))
     ;; Sort the entries by expiration date.
     (nreverse ee)))
 
@@ -7696,7 +8021,7 @@ and by additional input from the age of a schedules or deadline entry."
     (switch-to-buffer-other-window buffer)
     (widen)
     (goto-char pos)
-    (when (eq major-mode 'org-mode)
+    (when (org-mode-p)
       (org-show-hidden-entry)
       (save-excursion
         (and (outline-next-heading)
@@ -7714,7 +8039,7 @@ and by additional input from the age of a schedules or deadline entry."
     (delete-other-windows)
     (widen)
     (goto-char pos)
-    (when (eq major-mode 'org-mode)
+    (when (org-mode-p)
       (org-show-hidden-entry)
       (save-excursion
         (and (outline-next-heading)
@@ -8005,9 +8330,7 @@ be used to request time specification in the time stamp."
   (org-agenda-check-no-diary)
   (let* ((marker (or (get-text-property (point) 'org-marker)
                      (org-agenda-error)))
-         (buffer (marker-buffer marker))
-         (pos (marker-position marker))
-         (hdmarker (get-text-property (point) 'org-hd-marker)))
+         (pos (marker-position marker)))
     (with-current-buffer (marker-buffer marker)
       (widen)
       (goto-char pos)
@@ -8173,53 +8496,59 @@ are included in the output."
          lspos
          tags tags-list tags-alist (llast 0) rtn level category i txt
          todo marker)
-
     (save-excursion
       (goto-char (point-min))
       (when (eq action 'sparse-tree) (org-overview))
       (while (re-search-forward re nil t)
-        (setq todo (if (match-end 1) (match-string 2))
-              tags (if (match-end 4) (match-string 4)))
-        (goto-char (setq lspos (1+ (match-beginning 0))))
-        (setq level (funcall outline-level)
-              category (org-get-category))
-        (setq i llast llast level)
-        ;; remove tag lists from same and sublevels
-        (while (>= i level)
-          (when (setq entry (assoc i tags-alist))
-            (setq tags-alist (delete entry tags-alist)))
-          (setq i (1- i)))
-        ;; add the nex tags
-        (when tags
-          (setq tags (mapcar 'downcase (org-split-string tags ":"))
-                tags-alist
-                (cons (cons level tags) tags-alist)))
-        ;; compile tags for current headline
-        (setq tags-list
-              (if org-use-tag-inheritance
-                  (apply 'append (mapcar 'cdr tags-alist))
-                tags))
-        (when (and (or (not todo-only) todo)
-                   (eval matcher))
-          ;; list this headline
-          (if (eq action 'sparse-tree)
-              (progn
-                (org-show-hierarchy-above))
-            (setq txt (org-format-agenda-item
-                       ""
-                       (concat
-                        (if org-tags-match-list-sublevels
-                            (make-string (1- level) ?.) "")
-                        (org-get-heading))
-                       category tags-list))
-            (goto-char lspos)
-            (setq marker (org-agenda-new-marker))
-            (org-add-props txt props
-              'org-marker marker 'org-hd-marker marker 'category category)
-            (push txt rtn))
-          ;; if we are to skip sublevels, jump to end of subtree
-          (point)
-          (or org-tags-match-list-sublevels (org-end-of-subtree)))))
+        (catch :skip
+          (and (eq action 'agenda) (org-agenda-skip))
+          (setq todo (if (match-end 1) (match-string 2))
+                tags (if (match-end 4) (match-string 4)))
+          (goto-char (setq lspos (1+ (match-beginning 0))))
+          (setq level (funcall outline-level)
+                category (org-get-category))
+          (setq i llast llast level)
+          ;; remove tag lists from same and sublevels
+          (while (>= i level)
+            (when (setq entry (assoc i tags-alist))
+              (setq tags-alist (delete entry tags-alist)))
+            (setq i (1- i)))
+          ;; add the nex tags
+          (when tags
+            (setq tags (mapcar 'downcase (org-split-string tags ":"))
+                  tags-alist
+                  (cons (cons level tags) tags-alist)))
+          ;; compile tags for current headline
+          (setq tags-list
+                (if org-use-tag-inheritance
+                    (apply 'append (mapcar 'cdr tags-alist))
+                  tags))
+          (when (and (or (not todo-only) todo)
+                     (eval matcher)
+                     (or (not org-agenda-skip-archived-trees)
+                         (not (member org-archive-tag tags-list))))
+            ;; list this headline
+            (if (eq action 'sparse-tree)
+                (progn
+                  (org-show-hierarchy-above))
+              (setq txt (org-format-agenda-item
+                         ""
+                         (concat
+                          (if org-tags-match-list-sublevels
+                              (make-string (1- level) ?.) "")
+                          (org-get-heading))
+                         category tags-list))
+              (goto-char lspos)
+              (setq marker (org-agenda-new-marker))
+              (org-add-props txt props
+                'org-marker marker 'org-hd-marker marker 'category category)
+              (push txt rtn))
+            ;; if we are to skip sublevels, jump to end of subtree
+            (point)
+            (or org-tags-match-list-sublevels (org-end-of-subtree))))))
+    (when (and (eq action 'sparse-tree)
+               (not org-sparse-tree-open-archived-trees))
+      (org-hide-archived-subtrees (point-min) (point-max)))
     (nreverse rtn)))
 
 (defun org-tags-sparse-tree (&optional arg match)
@@ -8290,6 +8619,7 @@ The prefix arg TODO-ONLY limits the search to TODO entries."
                (list 'if 'current-prefix-arg nil match) t))
     (setq files (org-agenda-files)
           rtnall nil)
+    (org-prepare-agenda-buffers files)
     (while (setq file (pop files))
       (catch 'nextfile
         (org-check-agenda-file file)
@@ -8302,7 +8632,7 @@ The prefix arg TODO-ONLY limits the search to TODO entries."
                        (format "ORG-AGENDA-ERROR: No such org-file %s" file))
                   rtnall (append rtnall rtn))
           (with-current-buffer buffer
-            (unless (eq major-mode 'org-mode)
+            (unless (org-mode-p)
               (error "Agenda file %s is not in `org-mode'" file))
             (setq org-category-table (org-get-category-table))
             (save-excursion
@@ -8380,7 +8710,13 @@ With prefix ARG, realign all tags in headings in the current buffer."
         (setq hd (match-string 1))
         (delete-region (match-beginning 0) (match-end 0))
         (insert-before-markers (org-trim hd) (if empty "" " ")))
-      (unless (equal tags "")
+      (if (equal tags "")
+          (save-excursion
+            (beginning-of-line 1)
+            (skip-chars-forward "*")
+            (if (= (char-after) ?\ ) (forward-char 1))
+            (and (re-search-forward "[ \t]+$" (point-at-eol) t)
+                 (replace-match "")))
         (move-to-column (max (current-column)
                              (if (> org-tags-column 0)
                                  org-tags-column
@@ -8825,7 +9161,7 @@ in all files."
      ((string-match "^/\\(.*\\)/$" s)
       ;; A regular expression
       (cond
-       ((eq major-mode 'org-mode)
+       ((org-mode-p)
         (org-occur (match-string 1 s)))
        ;;((eq major-mode 'dired-mode)
        ;; (grep (concat "grep -n -e '" (match-string 1 s) "' *")))
@@ -8881,12 +9217,12 @@ in all files."
       (if (search-forward s nil t)
           (goto-char (match-beginning 0))
         (error "No match"))))
-    (and (eq major-mode 'org-mode) (org-show-hierarchy-above))))
+    (and (org-mode-p) (org-show-hierarchy-above))))
 
 (defun org-search-not-link (&rest args)
   "Execute `re-search-forward', but only accept matches that are not a link."
   (catch 'exit
-    (let ((pos (point)) p1)
+    (let (p1)
       (while (apply 're-search-forward args)
         (setq p1 (point))
         (if (not (save-match-data
@@ -9286,24 +9622,23 @@ If the file does not exist, an error is thrown."
   (setq in-emacs (or in-emacs line search))
   (let* ((file (if (equal path "")
                    buffer-file-name
-                 (convert-standard-filename (org-expand-file-name path))))
-         (dirp (file-directory-p file))
+                 path))
+         (apps (append org-file-apps (org-default-apps)))
+         (remp (and (assq 'remote apps) (org-file-remote-p file)))
+         (dirp (if remp nil (file-directory-p file)))
          (dfile (downcase file))
          (old-buffer (current-buffer))
          (old-pos (point))
          (old-mode major-mode)
-         ext cmd apps)
-    (if (and (not (file-exists-p file))
-             (not org-open-non-existing-files))
-        (error "No such file: %s" file))
+         ext cmd)
     (if (string-match "^.*\\.\\([a-zA-Z0-9]+\\.gz\\)$" dfile)
         (setq ext (match-string 1 dfile))
       (if (string-match "^.*\\.\\([a-zA-Z0-9]+\\)$" dfile)
           (setq ext (match-string 1 dfile))))
-    (setq apps (append org-file-apps (org-default-apps)))
     (if in-emacs
         (setq cmd 'emacs)
-      (setq cmd (or (and dirp (cdr (assoc 'directory apps)))
+      (setq cmd (or (and remp (cdr (assoc 'remote apps)))
+                    (and dirp (cdr (assoc 'directory apps)))
                     (cdr (assoc ext apps))
                     (cdr (assoc t apps)))))
     (when (eq cmd 'mailcap)
@@ -9314,6 +9649,10 @@ If the file does not exist, an error is thrown."
         (if (stringp command)
             (setq cmd command)
           (setq cmd 'emacs))))
+    (if (and (not (eq cmd 'emacs)) ; Emacs has not problems with non-ex files
+             (not (file-exists-p file))
+             (not org-open-non-existing-files))
+        (error "No such file: %s" file))
     (cond
      ((and (stringp cmd) (not (string-match "^\\s-*$" cmd)))
       ;; Normalize use of quote, this can vary.
@@ -9324,14 +9663,15 @@ If the file does not exist, an error is thrown."
         (shell-command (concat cmd " &"))))
      ((or (stringp cmd)
           (eq cmd 'emacs))
-      (unless (equal (file-truename file) (file-truename (or buffer-file-name "")))
-        (funcall (cdr (assq 'file org-link-frame-setup)) file))
+;      (unless (equal (file-truename file) (file-truename (or buffer-file-name "")))
+;       (funcall (cdr (assq 'file org-link-frame-setup)) file))
+      (funcall (cdr (assq 'file org-link-frame-setup)) file)
       (if line (goto-line line)
         (if search (org-link-search search))))
      ((consp cmd)
       (eval cmd))
      (t (funcall (cdr (assq 'file org-link-frame-setup)) file)))
-    (and (eq major-mode 'org-mode) (eq old-mode 'org-mode)
+    (and (org-mode-p) (eq old-mode 'org-mode)
          (or (not (equal old-buffer (current-buffer)))
              (not (equal old-pos (point))))
          (org-mark-ring-push old-pos old-buffer))))
@@ -9349,6 +9689,20 @@ If the file does not exist, an error is thrown."
   "Replace special path abbreviations and expand the file name."
   (expand-file-name path))
 
+(defun org-file-remote-p (file)
+  "Test whether FILE specifies a location on a remote system.
+Return non-nil if the location is indeed remote.
+
+For example, the filename \"/user@host:/foo\" specifies a location
+on the system \"/user@host:\"."
+  (cond ((fboundp 'file-remote-p)
+         (file-remote-p file))
+        ((fboundp 'tramp-handle-file-remote-p)
+         (tramp-handle-file-remote-p file))
+        ((and (boundp 'ange-ftp-name-format)
+              (string-match ange-ftp-name-format file))
+         t)
+        (t nil)))
 
 (defvar org-insert-link-history nil
   "Minibuffer history for links inserted with `org-insert-link'.")
@@ -9496,7 +9850,7 @@ For file links, arg negates `org-context-in-file-links'."
                            (abbreviate-file-name buffer-file-name))
             link (org-make-link cpltxt)))      
 
-     ((eq major-mode 'org-mode)
+     ((org-mode-p)
       ;; Just link to current headline
       (setq cpltxt (concat "file:"
                            (abbreviate-file-name buffer-file-name)))
@@ -10212,7 +10566,7 @@ This is being used to correctly align a single field after TAB or RET.")
          (linepos (+ (if (bolp) 1 0) (count-lines (point-min) (point))))
          (colpos (org-table-current-column))
          (winstart (window-start))
-         text lines (new "") lengths l typenums ty fields maxfields i
+         lines (new "") lengths l typenums ty fields maxfields i
          column
          (indent "") cnt frac
          rfmt hfmt
@@ -10223,7 +10577,7 @@ This is being used to correctly align a single field after TAB or RET.")
                  (make-string sp2 ?\ ) "%%%s%ds" (make-string sp1 ?\ ) "|"))
          (hfmt1 (concat
                  (make-string sp2 ?-) "%s" (make-string sp1 ?-) "+"))
-         emptystrings xx links narrow fmax fmin f1 len c e)
+         emptystrings links narrow fmax f1 len c e)
     (untabify beg end)
     (remove-text-properties beg end '(org-cwidth t display t))
     ;; Check if we have links
@@ -10341,7 +10695,7 @@ This is being used to correctly align a single field after TAB or RET.")
     (move-marker org-table-aligned-begin-marker (point))
     (insert new)
     (move-marker org-table-aligned-end-marker (point))
-    (when (and orgtbl-mode (not (eq major-mode 'org-mode)))
+    (when (and orgtbl-mode (not (org-mode-p)))
       (goto-char org-table-aligned-begin-marker)
       (while (org-hide-wide-columns org-table-aligned-end-marker)))
     ;; Try to move to the old location (approximately)
@@ -11781,10 +12135,10 @@ not overwrite the stored one."
       ;; Insert ranges in current column
       (while (string-match "\\&[-I0-9]+" form)
         (setq form (replace-match
-                     (save-match-data
-                       (org-table-get-vertical-vector (match-string 0 form)
-                                                      nil n0))
-                     t t form)))
+                    (save-match-data
+                      (org-table-get-vertical-vector (match-string 0 form)
+                                                     nil n0))
+                    t t form)))
       (if lispp
           (setq ev (eval (eval (read form)))
                 ev (if (numberp ev) (number-to-string ev) ev))
@@ -12107,7 +12461,7 @@ table editor in arbitrary modes.")
 (defun orgtbl-mode (&optional arg)
   "The `org-mode' table editor as a minor mode for use in other modes."
   (interactive)
-  (if (eq major-mode 'org-mode)
+  (if (org-mode-p)
       ;; Exit without error, in case some hook functions calls this
       ;; by accident in org-mode.
       (message "Orgtbl-mode is not useful in org-mode, command ignored")
@@ -12359,9 +12713,11 @@ overwritten, and the table is not marked as requiring realignment."
     (:headline-levels      . org-export-headline-levels)
     (:section-numbers      . org-export-with-section-numbers)
     (:table-of-contents    . org-export-with-toc)
+    (:archived-trees       . org-export-with-archived-trees)
     (:emphasize            . org-export-with-emphasize)
     (:sub-superscript      . org-export-with-sub-superscripts)
     (:TeX-macros           . org-export-with-TeX-macros)
+    (:LaTeX-fragments      . org-export-with-LaTeX-fragments)
     (:fixed-width          . org-export-with-fixed-width)
     (:timestamps           . org-export-with-timestamps)
     (:tables               . org-export-with-tables)
@@ -12392,7 +12748,6 @@ overwritten, and the table is not marked as requiring realignment."
     (goto-char 0)
     (let ((re (org-make-options-regexp
                '("TITLE" "AUTHOR" "EMAIL" "TEXT" "OPTIONS" "LANGUAGE")))
-          (text nil)
           p key val text options)
       (while (re-search-forward re nil t)
         (setq key (org-match-string-no-properties 1)
@@ -12416,7 +12771,8 @@ overwritten, and the table is not marked as requiring realignment."
                     ("|"     . :tables)
                     ("^"     . :sub-superscript)
                     ("*"     . :emphasize)
-                    ("TeX"   . :TeX-macros)))
+                    ("TeX"   . :TeX-macros)
+                    ("LaTeX" . :LaTeX-fragments)))
               o)
           (while (setq o (pop op))
             (if (string-match (concat (regexp-quote (car o))
@@ -12831,32 +13187,56 @@ translations.  There is currently no way for users to extend this.")
 (defun org-cleaned-string-for-export (string &rest parameters)
   "Cleanup a buffer substring so that links can be created safely."
   (interactive)
-  (let* ((cb (current-buffer))
-         (re-radio (and org-target-link-regexp
+  (let* ((re-radio (and org-target-link-regexp
                         (concat "\\([^<]\\)\\(" org-target-link-regexp "\\)")))
          (re-plain-link (concat "\\([^[<]\\)" org-plain-link-re))
          (re-angle-link (concat "\\([^[]\\)" org-angle-link-re))
+         (re-archive (concat ":" org-archive-tag ":"))
          rtn)
     (save-excursion
       (set-buffer (get-buffer-create " org-mode-tmp"))
       (erase-buffer)
       (insert string)
-      (org-mode)
+      (let ((org-inhibit-startup t)) (org-mode))
+
+      ;; Get rid of archived trees
+      (when (not (eq org-export-with-archived-trees t))
+        (goto-char (point-min))
+        (while (re-search-forward re-archive nil t)
+          (if (not (org-on-heading-p))
+              (org-end-of-subtree t)
+            (beginning-of-line 1)
+            (delete-region
+             (if org-export-with-archived-trees (1+ (point-at-eol)) (point))
+             (org-end-of-subtree)))))
+
       ;; Find targets in comments and move them out of comments,
       ;; but mark them as targets that should be invisible
       (goto-char (point-min))
       (while (re-search-forward "^#.*?\\(<<<?[^>\r\n]+>>>?\\).*" nil t)
         (replace-match "\\1(INVISIBLE)"))
+
       ;; Find matches for radio targets and turn them into internal links
       (goto-char (point-min))
       (when re-radio
         (while (re-search-forward re-radio nil t)
           (replace-match "\\1[[\\2]]")))
+
       ;; Find all links that contain a newline and put them into a single line
       (goto-char (point-min))
       (while (re-search-forward "\\(\\(\\[\\|\\]\\)\\[[^]]*?\\)[ \t]*\n[ \t]*\\([^]]*\\]\\(\\[\\|\\]\\)\\)" nil t)
         (replace-match "\\1 \\3")
         (goto-char (match-beginning 0)))
+
+      ;; Convert LaTeX fragments to images
+      (when (memq :LaTeX-fragments parameters)
+        (org-format-latex 
+         (concat "ltxpng/" (file-name-sans-extension
+                            (file-name-nondirectory
+                             org-current-export-file)))
+         org-current-export-dir nil "Creating LaTeX image %s"))
+      (message "Exporting...")
+
       ;; Normalize links: Convert angle and plain links into bracket links
       (goto-char (point-min))
       (while (re-search-forward re-plain-link nil t)
@@ -12870,6 +13250,7 @@ translations.  There is currently no way for users to extend this.")
          (concat
           (match-string 1) "[[" (match-string 2) ":" (match-string 3) "]]")
          t t))
+
       ;; Find multiline emphasis and put them into single line
       (when (memq :emph-multiline parameters)
         (goto-char (point-min))
@@ -12976,7 +13357,6 @@ underlined headlines.  The default is 3."
          (title       (or (plist-get opt-plist :title)
                           (file-name-sans-extension
                            (file-name-nondirectory buffer-file-name))))
-         (options     nil)
          (email       (plist-get opt-plist :email))
          (language    (plist-get opt-plist :language))
          (text        nil)
@@ -13077,7 +13457,7 @@ underlined headlines.  The default is 3."
     (normal-mode)
     (save-buffer)
     ;; remove display and invisible chars
-    (let (beg end s)
+    (let (beg end)
       (goto-char (point-min))
       (while (setq beg (next-single-property-change (point) 'display))
         (setq end (next-single-property-change beg 'display))
@@ -13154,9 +13534,9 @@ underlined headlines.  The default is 3."
 (defun org-export-visible (type arg)
   "Create a copy of the visible part of the current buffer, and export it.
 The copy is created in a temporary buffer and removed after use.
-TYPE is the final key (as a string) of the `C-c C-x' key sequence that will
-run the export command - in interactive use, the command prompts for this
-key.  As a special case, if the you type SPC at the prompt, the temporary
+TYPE is the final key (as a string) that also select the export command in
+the `C-c C-e' export dispatcher.
+As a special case, if the you type SPC at the prompt, the temporary
 org-mode file will not be removed but presented to you so that you can
 continue to use it.  The prefix arg ARG is passed through to the exporting
 command."
@@ -13235,7 +13615,7 @@ Does include HTML export options as well as TODO and CATEGORY stuff."
 #+EMAIL:     %s
 #+LANGUAGE:  %s
 #+TEXT:      Some descriptive text to be emitted.  Several lines OK.
-#+OPTIONS:   H:%d num:%s toc:%s \\n:%s @:%s ::%s |:%s ^:%s *:%s TeX:%s
+#+OPTIONS:   H:%d num:%s toc:%s \\n:%s @:%s ::%s |:%s ^:%s *:%s TeX:%s LaTeX:%s
 #+CATEGORY:  %s
 #+SEQ_TODO:  %s
 #+TYP_TODO:  %s
@@ -13254,6 +13634,7 @@ Does include HTML export options as well as TODO and CATEGORY stuff."
    org-export-with-sub-superscripts
    org-export-with-emphasize
    org-export-with-TeX-macros
+   org-export-with-LaTeX-fragments
    (file-name-nondirectory buffer-file-name)
    (if (equal org-todo-interpretation 'sequence)
        (mapconcat 'identity org-todo-keywords " ")
@@ -13351,6 +13732,7 @@ When HIDDEN is non-nil, don't display the HTML buffer.
 EXT-PLIST is a property list with external parameters overriding
 org-mode's default settings, but still inferior to file-local settings."
   (interactive "P")
+  (message "Exporting...")
   (setq-default org-todo-line-regexp org-todo-line-regexp)
   (setq-default org-deadline-line-regexp org-deadline-line-regexp)
   (setq-default org-done-string org-done-string)
@@ -13367,10 +13749,16 @@ org-mode's default settings, but still inferior to file-local settings."
           (buffer-substring
            (if region-p (region-beginning) (point-min))
            (if region-p (region-end) (point-max))))
+         ;; The following two are dynamically scoped into other
+         ;; routines below.
+         (org-current-export-dir (org-export-directory :html opt-plist))
+         (org-current-export-file buffer-file-name)
          (all_lines
           (org-skip-comments (org-split-string
                               (org-cleaned-string-for-export
-                               region :emph-multiline)
+                               region :emph-multiline 
+                               (if (plist-get opt-plist :LaTeX-fragments)
+                                   :LaTeX-fragments))
                               "[\r\n]")))
          (lines (org-export-find-first-heading-line all_lines))
          (level 0) (line "") (origline "") txt todo
@@ -13482,7 +13870,7 @@ lang=\"%s\" xml:lang=\"%s\">
                                    level (org-tr-level level)
                                    txt (save-match-data
                                          (org-html-expand
-                                          (org-html-cleanup-toc-line
+                                          (org-export-cleanup-toc-line
                                            (match-string 3 line))))
                                    todo
                                    (or (and org-export-mark-todo-in-toc
@@ -13718,9 +14106,9 @@ lang=\"%s\" xml:lang=\"%s\">
             ;; Normal lines
             (when (string-match
                    (cond
-                    ((eq llt t) "^\\([ \t]*\\)\\(\\([-+*]\\)\\|\\([0-9]+[.)]\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)")
-                    ((= llt ?.) "^\\([ \t]*\\)\\(\\([-+*]\\)\\|\\([0-9]+\\.\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)")
-                    ((= llt ?\)) "^\\( \t]*\\)\\(\\([-+*]\\)\\|\\([0-9]+)\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)")
+                    ((eq llt t) "^\\([ \t]*\\)\\(\\([-+*] \\)\\|\\([0-9]+[.)]\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)")
+                    ((= llt ?.) "^\\([ \t]*\\)\\(\\([-+*] \\)\\|\\([0-9]+\\.\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)")
+                    ((= llt ?\)) "^\\( \t]*\\)\\(\\([-+*] \\)\\|\\([0-9]+)\\) \\)?\\( *[^ \t\n\r]\\|[ \t]*$\\)")
                     (t (error "Invalid value of `org-plain-list-ordered-item-terminator'")))
                    line)
               (setq ind (org-get-string-indentation line)
@@ -13815,7 +14203,9 @@ lang=\"%s\" xml:lang=\"%s\">
       (while (re-search-forward "<li>[ \r\n\t]*</li>\n?" nil t)
         (replace-match ""))
       (save-buffer)
-      (goto-char (point-min)))))
+      (goto-char (point-min))
+      (message "Exporting... done"))))
+
 
 (defun org-format-table-html (lines olines)
   "Find out which HTML converter to use and return the HTML code."
@@ -14006,12 +14396,13 @@ But it has the disadvantage, that Org-mode's HTML conversions cannot be used."
       (setq s (replace-match "&gt;" t t s))))
   s)
 
-(defun org-html-cleanup-toc-line (s)
+(defun org-export-cleanup-toc-line (s)
   "Remove tags and time staps from lines going into the toc."
   (if (string-match " +:[a-zA-Z0-9_@:]+: *$" s)
       (setq s (replace-match "" t t s)))
-  (while (string-match org-maybe-keyword-time-regexp s)
-    (setq s (replace-match "" t t s)))
+  (when org-export-remove-timestamps-from-toc
+    (while (string-match org-maybe-keyword-time-regexp s)
+      (setq s (replace-match "" t t s))))
   s)
 
 (defun org-html-expand (string)
@@ -14469,6 +14860,293 @@ a time), or the day by one (if it does not contain a time)."
     (setq fmt (if have-time ":%Y%m%dT%H%M%S" ";VALUE=DATE:%Y%m%d"))
     (concat keyword (format-time-string fmt time))))
 
+;;; LaTeX stuff
+
+(defvar org-cdlatex-mode-map (make-sparse-keymap)
+  "Keymap for the minor `org-cdlatex-mode'.")
+
+(define-key org-cdlatex-mode-map "_" 'org-cdlatex-underscore-caret)
+(define-key org-cdlatex-mode-map "^" 'org-cdlatex-underscore-caret)
+(define-key org-cdlatex-mode-map "`" 'cdlatex-math-symbol)
+(define-key org-cdlatex-mode-map "'" 'org-cdlatex-math-modify)
+(define-key org-cdlatex-mode-map "\C-c{" 'cdlatex-environment)
+
+(defvar org-cdlatex-texmathp-advice-is-done nil
+  "Flag remembering if we have applied the advice to texmathp already.")
+
+(define-minor-mode org-cdlatex-mode 
+  "Toggle the minor `org-cdlatex-mode'.
+This mode supports entering LaTeX environment and math in LaTeX fragments
+in Org-mode.
+\\{org-cdlatex-mode-map}"
+  nil " OCDL" nil
+  (when org-cdlatex-mode (require 'cdlatex))
+  (unless org-cdlatex-texmathp-advice-is-done
+    (setq org-cdlatex-texmathp-advice-is-done t)
+    (defadvice texmathp (around org-math-always-on activate)
+      "Always return t in org-mode buffers.
+This is because we want to insert math symbols without dollars even outside
+the LaTeX math segments.  If Orgmode thinks that point is actually inside
+en embedded LaTeX fragement, let texmathp do its job.
+\\[org-cdlatex-mode-map]"
+      (interactive)
+      (let (p)
+        (cond
+         ((not (org-mode-p)) ad-do-it)
+         ((eq this-command 'cdlatex-math-symbol)
+          (setq ad-return-value t
+                texmathp-why '("cdlatex-math-symbol in org-mode" . 0)))
+         (t
+          (let ((p (org-inside-LaTeX-fragment-p)))
+            (if (and p (member (car p) (plist-get org-format-latex-options :matchers)))
+                (setq ad-return-value t
+                      texmathp-why '("Org-mode embedded math" . 0))
+              (if p ad-do-it)))))))))
+
+(defun turn-on-org-cdlatex ()
+  "Unconditionally turn on `org-cdlatex-mode'."
+  (org-cdlatex-mode 1))
+
+(defun org-inside-LaTeX-fragment-p ()
+  "Test if point is inside a LaTeX fragment.
+I.e. after a \\begin, \\(, \\[, $, or $$, without the corresponding closing
+sequence appearing also before point.
+Even though the matchers for math are configurable, this function assumes
+that \\begin, \\(, \\[, and $$ are always used.  Only the single dollar
+delimiters are skipped when they have been removed by customization.
+The return value is nil, or a cons cell with the delimiter and
+and the position of this delimiter.
+
+This function does a reasonably good job, but can locally be fooled by
+for example currency specifications.  For example it will assume being in
+inline math after \"$22.34\".  The LaTeX fragment formatter will only format
+fragments that are properly closed, but during editing, we have to live
+with the uncertainty caused by missing closing delimiters.  This function
+looks only before point, not after."
+  (catch 'exit
+    (let ((pos (point))
+          (dodollar (member "$" (plist-get org-format-latex-options :matchers)))
+          (lim (progn
+                 (re-search-backward (concat "^\\(" paragraph-start "\\)") nil t)
+                 (point)))
+          dd-on str (start 0) m re)
+      (goto-char pos)
+      (when dodollar
+        (setq str (concat (buffer-substring lim (point)) "\000 X$.")
+              re (nth 1 (assoc "$" org-latex-regexps)))
+        (while (string-match re str start)
+          (cond
+           ((= (match-end 0) (length str))
+            (throw 'exit (cons "$" (+ lim (match-beginning 0)))))
+           ((= (match-end 0) (- (length str) 5))
+            (throw 'exit nil))
+           (t (setq start (match-end 0))))))
+      (when (setq m (re-search-backward "\\(\\\\begin{[^}]*}\\|\\\\(\\|\\\\\\[\\)\\|\\(\\\\end{[^}]*}\\|\\\\)\\|\\\\\\]\\)\\|\\(\\$\\$\\)" lim t))
+        (goto-char pos)
+        (and (match-beginning 1) (throw 'exit (cons (match-string 1) m)))
+        (and (match-beginning 2) (throw 'exit nil))
+        ;; count $$
+        (while (re-search-backward "\\$\\$" lim t)
+          (setq dd-on (not dd-on)))
+        (goto-char pos)
+        (if dd-on (cons "$$" m))))))
+
+
+(defun org-try-cdlatex-tab ()
+  "Check if it makes sense to execute `cdlatex-tab', and do it if yes.
+It makes sense to do so if `org-cdlatex-mode' is active and if the cursor is
+  - inside a LaTeX fragment, or
+  - after the first word in a line, where an abbreviation expansion could
+    insert a LaTeX environment."
+  ;; FIXME:  This may still need refinement.
+  (when org-cdlatex-mode
+    (cond
+     ((save-excursion
+        (skip-chars-backward "a-zA-Z0-9*")
+        (skip-chars-backward " \t")
+        (bolp))
+      (cdlatex-tab) t)
+     ((org-inside-LaTeX-fragment-p)
+      (cdlatex-tab) t)
+     (t nil))))
+
+(defun org-cdlatex-underscore-caret (&optional arg)
+  "Execute `cdlatex-sub-superscript' in LaTeX fragments.
+Revert to the normal definition outside of these fragments."
+  (interactive "P")
+  (if (org-inside-LaTeX-fragment-p)
+      (call-interactively 'cdlatex-sub-superscript)
+    (let (org-cdlatex-mode)
+      (call-interactively (key-binding (vector last-input-event))))))
+
+(defun org-cdlatex-math-modify (&optional arg)
+  "Execute `cdlatex-math-modify' in LaTeX fragments.
+Revert to the normal definition outside of these fragments."
+  (interactive "P")
+  (if (org-inside-LaTeX-fragment-p)
+      (call-interactively 'cdlatex-math-modify)
+    (let (org-cdlatex-mode)
+      (call-interactively (key-binding (vector last-input-event))))))
+
+(defvar org-latex-fragment-image-overlays nil
+  "List of overlays carrying the images of latex fragments.")
+(make-variable-buffer-local 'org-latex-fragment-image-overlays)
+
+(defun org-remove-latex-fragment-image-overlays ()
+  "Remove all overlays with LaTeX fragment images in current buffer."
+  (mapc 'org-delete-overlay org-latex-fragment-image-overlays)
+  (setq org-latex-fragment-image-overlays nil))
+
+(defun org-preview-latex-fragment (&optional subtree)
+  "Preview the LaTeX fragment at point, or all locally or globally.
+If the cursor is in a LaTeX fragment, create the image and overlay
+it over the source code.  If there is no fragment at point, display
+all fragments in the current text, from one headline to the next.  With
+prefix SUBTREE, display all fragments in the current subtree.  With a 
+double prefix `C-u C-u', or when the cursor is before the first headline,
+display all fragments in the buffer.
+The images can be removed again with \\[org-ctrl-c-ctrl-c]."
+  (interactive "P")
+  (org-remove-latex-fragment-image-overlays)
+  (save-excursion
+    (save-restriction
+      (let (beg end at msg)
+        (cond
+         ((or (equal subtree '(16))
+              (not (save-excursion
+                     (re-search-backward (concat "^" outline-regexp) nil t))))
+          (setq beg (point-min) end (point-max)
+                msg "Creating images for buffer...%s"))
+         ((equal subtree '(4))
+          (org-back-to-heading)
+          (setq beg (point) end (org-end-of-subtree)
+                msg "Creating images for subtree...%s"))
+         (t
+          (if (setq at (org-inside-LaTeX-fragment-p))
+              (goto-char (max (point-min) (- (cdr at) 2)))
+            (org-back-to-heading))
+          (setq beg (point) end (progn (outline-next-heading) (point))
+                msg (if at "Creating image...%s"
+                      "Creating images for entry...%s"))))
+        (message msg "")
+        (narrow-to-region beg end)
+        (org-format-latex
+         (concat "ltxpng/" (file-name-sans-extension
+                            (file-name-nondirectory
+                             buffer-file-name)))
+         default-directory 'overlays msg at)
+      (message msg "done.  Use `C-c C-c' to remove images.")))))
+
+(defvar org-latex-regexps
+  '(("begin" "^[ \t]*\\(\\\\begin{\\([a-zA-Z0-9\\*]+\\)[^\000]+?\\\\end{\\2}\\)" 1 t)
+    ;; ("$" "\\([       (]\\|^\\)\\(\\(\\([$]\\)\\([^   \r\n,.$].*?\\(\n.*?\\)\\{0,5\\}[^       \r\n,.$]\\)\\4\\)\\)\\([        .,?;:'\")]\\|$\\)" 2 nil)
+    ;; \000 in the following regex is needed for org-inside-LaTeX-fragment-p
+    ("$" "\\([^$]\\)\\(\\(\\$\\([^      \r\n,;.$][^$\n\r]*?\\(\n[^$\n\r]*?\\)\\{0,2\\}[^        \r\n,.$]\\)\\$\\)\\)\\([        .,?;:'\")\000]\\|$\\)" 2 nil)
+    ("\\(" "\\\\([^\000]*?\\\\)" 0 nil)
+    ("\\[" "\\\\\\[[^\000]*?\\\\\\]" 0 t)
+    ("$$" "\\$\\$[^\000]*?\\$\\$" 0 t))
+  "Regular expressions for matching embedded LaTeX.")
+
+(defun org-format-latex (prefix &optional dir overlays msg at)
+  "Replace LaTeX fragments with links to an image, and produce images."
+  (if (and overlays (fboundp 'clear-image-cache)) (clear-image-cache))
+  (let* ((prefixnodir (file-name-nondirectory prefix))
+         (absprefix (expand-file-name prefix dir))
+         (todir (file-name-directory absprefix))
+         (opt org-format-latex-options)
+         (matchers (plist-get opt :matchers))
+         (re-list org-latex-regexps)
+         (cnt 0) txt link beg end re e oldfiles
+         m n block linkfile movefile ov)
+    ;; Make sure the directory exists
+    (or (file-directory-p todir) (make-directory todir))
+    ;; Check if there are old images files with this prefix, and remove them
+    (setq oldfiles (directory-files
+                    todir 'full
+                    (concat (regexp-quote prefixnodir) "_[0-9]+\\.png$")))
+    (while oldfiles (delete-file (pop oldfiles)))
+    ;; Check the different regular expressions
+    (while (setq e (pop re-list))
+      (setq m (car e) re (nth 1 e) n (nth 2 e)
+            block (if (nth 3 e) "\n\n" ""))
+      (when (member m matchers)
+        (goto-char (point-min))
+        (while (re-search-forward re nil t)
+          (when (or (not at) (equal (cdr at) (match-beginning n)))
+            (setq txt (match-string n)
+                  beg (match-beginning n) end (match-end n)
+                  cnt (1+ cnt)
+                  linkfile (format "%s_%04d.png" prefix cnt)
+                  movefile (format "%s_%04d.png" absprefix cnt)
+                  link (concat block "[[file:" linkfile "]]" block))
+            (if msg (message msg cnt))
+            (goto-char beg)
+            (org-create-formula-image
+             txt movefile opt)
+            (if overlays
+                (progn
+                  (setq ov (org-make-overlay beg end))
+                  (if (featurep 'xemacs)
+                      (progn
+                        (org-overlay-put ov 'invisible t)
+                        (org-overlay-put
+                         ov 'end-glyph 
+                         (make-glyph (vector 'png :file movefile))))
+                    (org-overlay-put 
+                     ov 'display 
+                     (list 'image :type 'png :file movefile :ascent 'center)))
+                  (push ov org-latex-fragment-image-overlays)
+                  (goto-char end))
+              (delete-region beg end)
+              (insert link))))))))
+    
+;; This function borrows from Ganesh Swami's latex2png.el
+(defun org-create-formula-image (string tofile options)
+  (let* ((tmpdir (if (featurep 'xemacs)
+                     (temp-directory)
+                   temporary-file-directory))
+         (texfilebase (make-temp-name
+                       (expand-file-name "orgtex" tmpdir)))
+
+;(texfilebase (make-temp-file "orgtex"))
+;        (dummy (delete-file texfilebase))
+         (texfile (concat texfilebase ".tex"))
+         (dvifile (concat texfilebase ".dvi"))
+         (pngfile (concat texfilebase ".png"))
+         (scale (number-to-string (* 1000 (or (plist-get options :scale) 1.0))))
+         (fg (or (plist-get options :foreground) "Black"))
+         (bg (or (plist-get options :background) "Transparent")))
+    (with-temp-file texfile
+      (insert "\\documentclass{article}
+\\usepackage{fullpage}
+\\usepackage{amssymb}
+\\usepackage[usenames]{color}
+\\usepackage{amsmath}
+\\usepackage{latexsym}
+\\usepackage[mathscr]{eucal}
+\\pagestyle{empty}
+\\begin{document}\n" string "\n\\end{document}\n"))
+    (let ((dir default-directory))
+      (condition-case nil
+          (progn
+            (cd tmpdir)
+            (call-process "latex" nil nil nil texfile))
+        (error nil))
+      (cd dir))
+    (if (not (file-exists-p dvifile))
+        (progn (message "Failed to create dvi file from %s" texfile) nil)
+      (call-process "dvipng" nil nil nil
+                    "-E" "-fg" fg "-bg" bg
+                    "-x" scale "-y" scale "-T" "tight"
+                    "-o" pngfile
+                    dvifile)
+      (if (not (file-exists-p pngfile))
+          (progn (message "Failed to create png file from %s" texfile) nil)
+        ;; Use the requested file name and clean up
+        (copy-file pngfile tofile 'replace)
+        (loop for e in '(".dvi" ".tex" ".aux" ".log" ".png") do
+              (delete-file (concat texfilebase e)))
+        pngfile))))
 
 ;;; Key bindings
 
@@ -14536,6 +15214,7 @@ a time), or the day by one (if it does not contain a time)."
 (define-key org-mode-map "\C-c\C-a" 'show-all)  ; in case allout messed up.
 (define-key org-mode-map "\C-xns" 'org-narrow-to-subtree)
 (define-key org-mode-map "\C-c$"    'org-archive-subtree)
+(define-key org-mode-map "\C-c\C-x\C-a" 'org-toggle-archive-tag)
 (define-key org-mode-map "\C-c\C-j" 'org-goto)
 (define-key org-mode-map "\C-c\C-t" 'org-todo)
 (define-key org-mode-map "\C-c\C-s" 'org-schedule)
@@ -14590,8 +15269,9 @@ a time), or the day by one (if it does not contain a time)."
 (define-key org-mode-map "\C-c\C-x\C-x" 'org-clock-cancel)
 (define-key org-mode-map "\C-c\C-x\C-d" 'org-clock-display)
 (define-key org-mode-map "\C-c\C-x\C-r" 'org-clock-report)
-
 (define-key org-mode-map "\C-c\C-x\C-u" 'org-dblock-update)
+(define-key org-mode-map "\C-c\C-x\C-l" 'org-preview-latex-fragment)
+(define-key org-mode-map "\C-c\C-x\C-b" 'org-toggle-checkbox)
 
 (when (featurep 'xemacs)
   (define-key org-mode-map 'button3   'popup-mode-menu))
@@ -14808,7 +15488,7 @@ Calls `org-timestamp-up' or `org-priority-up', depending on context.
 See the individual commands for more information."
   (interactive "P")
   (cond
-   ((org-at-timestamp-p) (call-interactively 'org-timestamp-up))
+   ((org-at-timestamp-p t) (call-interactively 'org-timestamp-up))
    ((org-on-heading-p) (call-interactively 'org-priority-up))
    ((org-at-item-p) (call-interactively 'org-previous-item))
    (t (call-interactively 'org-beginning-of-item) (beginning-of-line 1))))
@@ -14819,7 +15499,7 @@ Calls `org-timestamp-down' or `org-priority-down', depending on context.
 See the individual commands for more information."
   (interactive "P")
   (cond
-   ((org-at-timestamp-p) (call-interactively 'org-timestamp-down))
+   ((org-at-timestamp-p t) (call-interactively 'org-timestamp-down))
    ((org-on-heading-p) (call-interactively 'org-priority-down))
    (t (call-interactively 'org-next-item))))
 
@@ -14827,7 +15507,7 @@ See the individual commands for more information."
   "Next TODO keyword or timestamp one day later, depending on context."
   (interactive)
   (cond
-   ((org-at-timestamp-p) (call-interactively 'org-timestamp-up-day))
+   ((org-at-timestamp-p t) (call-interactively 'org-timestamp-up-day))
    ((org-on-heading-p) (org-call-with-arg 'org-todo 'right))
    (t (org-shiftcursor-error))))
 
@@ -14835,7 +15515,7 @@ See the individual commands for more information."
   "Previous TODO keyword or timestamp one day earlier, depending on context."
   (interactive)
   (cond
-   ((org-at-timestamp-p) (call-interactively 'org-timestamp-down-day))
+   ((org-at-timestamp-p t) (call-interactively 'org-timestamp-down-day))
    ((org-on-heading-p) (org-call-with-arg 'org-todo 'left))
    (t (org-shiftcursor-error))))
 
@@ -14898,12 +15578,12 @@ This command does many different things, depending on context:
   (interactive "P")
   (let  ((org-enable-table-editor t))
     (cond
-     (org-clock-overlays 
+     ((or org-clock-overlays org-occur-highlights
+          org-latex-fragment-image-overlays)
       (org-remove-clock-overlays)
-      (message "Clock overlays removed"))
-     (org-occur-highlights
       (org-remove-occur-highlights)
-      (message "occur highlights removed"))
+      (org-remove-latex-fragment-image-overlays)
+      (message "Temporary highlights/overlays removed from current buffer"))
      ((and (local-variable-p 'org-finish-function (current-buffer))
            (fboundp org-finish-function))
       (funcall org-finish-function))
@@ -15053,10 +15733,26 @@ See the individual commands for more information."
      ["Demote Heading"  org-metaright (not (org-at-table-p))]
      ["Demote Subtree"  org-shiftmetaright (not (org-at-table-p))]
      "--"
-     ["Archive Subtree" org-archive-subtree t]
-     "--"
      ["Convert to odd levels" org-convert-to-odd-levels t]
      ["Convert to odd/even levels" org-convert-to-oddeven-levels t])
+    ("Archive"
+     ["Toggle ARCHIVE tag" org-toggle-archive-tag t]
+     ["Check and Tag Children" (org-toggle-archive-tag (4))
+      :active t :keys "C-u C-c C-x C-a"]
+     ["Sparse trees open ARCHIVE trees"
+      (setq org-sparse-tree-open-archived-trees
+            (not org-sparse-tree-open-archived-trees))
+      :style toggle :selected org-sparse-tree-open-archived-trees]
+     ["Cycling opens ARCHIVE trees"
+      (setq org-cycle-open-archived-trees (not org-cycle-open-archived-trees))
+      :style toggle :selected org-cycle-open-archived-trees]
+     ["Agenda includes ARCHIVE trees"
+      (setq org-agenda-skip-archived-trees (not org-agenda-skip-archived-trees))
+      :style toggle :selected (not org-agenda-skip-archived-trees)]
+     "--"
+     ["Move Subtree to Archive" org-archive-subtree t]
+     ["Check and Move Children" (org-archive-subtree '(4)) 
+      :active t :keys "C-u C-c $"])
     "--"
     ("TODO Lists"
      ["TODO/DONE/-" org-todo t]
@@ -15120,6 +15816,16 @@ See the individual commands for more information."
                       (re-search-forward "<[a-z]+:" nil t))])
     "--"
     ["Export/Publish" org-export t]
+    ("LaTeX"
+     ["Org CDLaTeX mode" org-cdlatex-mode :style toggle 
+      :selected org-cdlatex-mode]
+     ["Insert Environment" cdlatex-environment (fboundp 'cdlatex-environment)]
+     ["Insert math symbol" cdlatex-math-symbol (fboundp 'cdlatex-math-symbol)]
+     ["Modify math symbol" org-cdlatex-math-modify
+      (org-inside-LaTeX-fragment-p)]
+     ["Export LaTeX fragments as images"
+      (setq org-export-with-LaTeX-fragments (not org-export-with-LaTeX-fragments)) 
+      :style toggle :selected org-export-with-LaTeX-fragments])
     "--"
     ("Documentation"
      ["Show Version" org-version t]
@@ -15145,8 +15851,8 @@ With optional NODE, go directly to that node."
     (save-excursion
       (while bl
         (set-buffer (pop bl))
-        (if (eq major-mode 'org-mode) (setq bl nil)))
-      (when (eq major-mode 'org-mode)
+        (if (org-mode-p) (setq bl nil)))
+      (when (org-mode-p)
         (easy-menu-change
          '("Org") "File List for Agenda"
          (append
@@ -15198,6 +15904,7 @@ contexts are:
 :tags             on the TAGS in a headline
 :priority         on the priority cookie in a headline
 :item             on the first line of a plain list item
+:item-bullet      on the bullet/number of a plain list item
 :checkbox         on the checkbox in a plain list item
 :table            in an org-mode table
 :table-special    on a special filed in a table
@@ -15206,13 +15913,15 @@ contexts are:
 :keyword          on a keyword: SCHEDULED, DEADLINE, CLOSE,COMMENT, QUOTE.
 :target           on a <<target>>
 :radio-target     on a <<<radio-target>>>
+:latex-fragment   on a LaTeX fragment
+:latex-preview    on a LaTeX fragment with overlayed preview image
 
 This function expects the position to be visible because it uses font-lock
 faces as a help to recognize the following contexts: :table-special, :link,
 and :keyword."
   (let* ((f (get-text-property (point) 'face))
          (faces (if (listp f) f (list f)))
-         (p (point)) clist)
+         (p (point)) clist o)
     ;; First the large context
     (cond
      ((org-on-heading-p)
@@ -15229,6 +15938,7 @@ and :keyword."
           (push (org-point-in-group p 0 :priority) clist)))
 
      ((org-at-item-p)
+      (push (org-point-in-group p 2 :item-bullet) clist)
       (push (list :item (point-at-bol)
                   (save-excursion (org-end-of-item) (point)))
             clist)
@@ -15262,7 +15972,19 @@ and :keyword."
       (goto-char (1- (match-beginning 0)))
       (if (looking-at org-radio-target-regexp)
           (push (org-point-in-group p 0 :radio-target) clist))
-      (goto-char p)))
+      (goto-char p))
+     ((setq o (car (delq nil
+                         (mapcar 
+                          (lambda (x)
+                            (if (memq x org-latex-fragment-image-overlays) x))
+                          (org-overlays-at (point))))))
+      (push (list :latex-fragment 
+                  (org-overlay-start o) (org-overlay-end o)) clist)
+      (push (list :latex-preview 
+                  (org-overlay-start o) (org-overlay-end o)) clist))
+     ((org-inside-LaTeX-fragment-p)
+      ;; FIXME: positions wring.
+      (push (list :latex-fragment (point) (point)) clist)))
 
     (setq clist (nreverse (delq nil clist)))
     clist))
@@ -15313,10 +16035,11 @@ return nil."
   ;; In the paragraph separator we include headlines, because filling
   ;; text in a line directly attached to a headline would otherwise
   ;; fill the headline as well.
+  (set (make-local-variable 'comment-start-skip) "^#+[ \t]*")
   (set (make-local-variable 'paragraph-separate) "\f\\|\\*\\|[  ]*$\\|[ \t]*[:|]")
   ;; The paragraph starter includes hand-formatted lists.
   (set (make-local-variable 'paragraph-start)
-       "\f\\|[  ]*$\\|\\([*\f]+\\)\\|[ \t]*\\([-+*]\\|[0-9]+[.)][ \t]+\\)\\|[ \t]*[:|]")
+       "\f\\|[  ]*$\\|\\([*\f]+\\)\\|[ \t]*\\([-+*][ \t]+\\|[0-9]+[.)][ \t]+\\)\\|[ \t]*[:|]")
   ;; Inhibit auto-fill for headers, tables and fixed-width lines.
   ;; But only if the user has not turned off tables or fixed-width regions
   (set (make-local-variable 'auto-fill-inhibit-regexp)
@@ -15630,13 +16353,12 @@ Show the heading too, if it is currently invisible."
 
 (defun org-bookmark-jump-unhide ()
   "Unhide the current position, to show the bookmark location."
-  (and (eq major-mode 'org-mode)
+  (and (org-mode-p)
        (or (org-invisible-p)
            (save-excursion (goto-char (max (point-min) (1- (point))))
                            (org-invisible-p)))
        (org-show-hierarchy-above)))
 
-
 ;;; Experimental code
 
 
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 27fecacdd36..c0aa80ef1ae 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -53,7 +53,7 @@
 
 ;;;###autoload
 (defun forward-thing (thing &optional n)
-  "Move forward to the end of the next THING."
+  "Move forward to the end of the Nth next THING."
   (let ((forward-op (or (get thing 'forward-op)
                         (intern-soft (format "forward-%s" thing)))))
     (if (functionp forward-op)
@@ -80,16 +80,13 @@ of the textual entity that was found."
       (condition-case nil
           (save-excursion
             ;; Try moving forward, then back.
-            (let ((end (progn
-                         (funcall
-                          (or (get thing 'end-op)
-                              (function (lambda () (forward-thing thing 1)))))
-                         (point)))
-                  (beg (progn
-                         (funcall
-                          (or (get thing 'beginning-op)
-                              (function (lambda () (forward-thing thing -1)))))
-                         (point))))
+            (funcall ;; First move to end.
+             (or (get thing 'end-op)
+                 (lambda () (forward-thing thing 1))))
+            (funcall ;; Then move to beg.
+             (or (get thing 'beginning-op)
+                 (lambda () (forward-thing thing -1))))
+            (let ((beg (point)))
               (if (not (and beg (> beg orig)))
                   ;; If that brings us all the way back to ORIG,
                   ;; it worked.  But END may not be the real end.
@@ -98,28 +95,25 @@ of the textual entity that was found."
                          (progn
                            (funcall
                             (or (get thing 'end-op)
-                                (function (lambda () (forward-thing thing 1)))))
+                                (lambda () (forward-thing thing 1))))
                            (point))))
                     (if (and beg real-end (<= beg orig) (<= orig real-end))
                         (cons beg real-end)))
                 (goto-char orig)
                 ;; Try a second time, moving backward first and then forward,
                 ;; so that we can find a thing that ends at ORIG.
-                (let ((beg (progn
-                             (funcall
-                              (or (get thing 'beginning-op)
-                                  (function (lambda () (forward-thing thing -1)))))
-                             (point)))
-                      (end (progn
-                             (funcall
-                              (or (get thing 'end-op)
-                                  (function (lambda () (forward-thing thing 1)))))
-                             (point)))
-                      (real-beg
+                (funcall ;; First, move to beg.
+                 (or (get thing 'beginning-op)
+                     (lambda () (forward-thing thing -1))))
+                (funcall ;; Then move to end.
+                 (or (get thing 'end-op)
+                     (lambda () (forward-thing thing 1))))
+                (let ((end (point))
+                      (real-beg
                        (progn
                          (funcall
                           (or (get thing 'beginning-op)
-                              (function (lambda () (forward-thing thing -1)))))
+                              (lambda () (forward-thing thing -1))))
                          (point))))
                   (if (and real-beg end (<= real-beg orig) (<= orig end))
                       (cons real-beg end))))))
@@ -160,7 +154,7 @@ a symbol as a valid THING."
 ;; and it has no final newline.
 
 (put 'line 'beginning-op
-     (function (lambda () (if (bolp) (forward-line -1) (beginning-of-line)))))
+     (lambda () (if (bolp) (forward-line -1) (beginning-of-line))))
 
 ;;  Sexps
 
@@ -190,7 +184,7 @@ a symbol as a valid THING."
 
 ;;  Lists
 
-(put 'list 'end-op (function (lambda () (up-list 1))))
+(put 'list 'end-op (lambda () (up-list 1)))
 (put 'list 'beginning-op 'backward-sexp)
 
 ;;  Filenames and URLs  www.com/foo%32bar
@@ -229,7 +223,7 @@ Hostname matching is stricter in this case than for
     "afs:" "tn3270:" "mailserver:"
   ;; Compatibility
     "snews:")
-  "Uniform Resource Identifier (URI) Schemes")
+  "Uniform Resource Identifier (URI) Schemes.")
 
 (defvar thing-at-point-url-regexp
   (concat "\\<\\(" (mapconcat 'identity thing-at-point-uri-schemes "\\|") "\\)"
@@ -243,18 +237,19 @@ This may contain whitespace (including newlines) .")
 
 (put 'url 'bounds-of-thing-at-point 'thing-at-point-bounds-of-url-at-point)
 (defun thing-at-point-bounds-of-url-at-point ()
-  (let ((url "") short strip)
-    (if (or (setq strip (thing-at-point-looking-at
-                         thing-at-point-markedup-url-regexp))
-            (thing-at-point-looking-at thing-at-point-url-regexp)
+  (let ((strip (thing-at-point-looking-at
+                         thing-at-point-markedup-url-regexp))) ;; (url "") short
+    (if (or strip
+`           (thing-at-point-looking-at thing-at-point-url-regexp)
             ;; Access scheme omitted?
-            (setq short (thing-at-point-looking-at
-                         thing-at-point-short-url-regexp)))
+            ;; (setq short (thing-at-point-looking-at
+            ;;           thing-at-point-short-url-regexp))
+            )
         (let ((beginning (match-beginning 0))
               (end (match-end 0)))
-          (cond (strip
-                 (setq beginning (+ beginning 5))
-                 (setq end (- end 1))))
+          (when strip
+            (setq beginning (+ beginning 5))
+            (setq end (- end 1)))
           (cons beginning end)))))
 
 (put 'url 'thing-at-point 'thing-at-point-url-at-point)
@@ -327,17 +322,17 @@ point."
         (looking-at regexp)))))
 
 (put 'url 'end-op
-     (function (lambda ()
-                 (let ((bounds (thing-at-point-bounds-of-url-at-point)))
-                   (if bounds
-                       (goto-char (cdr bounds))
-                     (error "No URL here"))))))
+     (lambda ()
+       (let ((bounds (thing-at-point-bounds-of-url-at-point)))
+         (if bounds
+             (goto-char (cdr bounds))
+           (error "No URL here")))))
 (put 'url 'beginning-op
-     (function (lambda ()
-                 (let ((bounds (thing-at-point-bounds-of-url-at-point)))
-                   (if bounds
-                       (goto-char (car bounds))
-                     (error "No URL here"))))))
+     (lambda ()
+       (let ((bounds (thing-at-point-bounds-of-url-at-point)))
+         (if bounds
+             (goto-char (car bounds))
+           (error "No URL here")))))
 
 ;;  Whitespace
 
@@ -385,7 +380,7 @@ point."
 (defun sentence-at-point () (thing-at-point 'sentence))
 
 (defun read-from-whole-string (str)
-  "Read a lisp expression from STR.
+  "Read a Lisp expression from STR.
 Signal an error if the entire string was not used."
   (let* ((read-data (read-from-string str))
          (more-left
@@ -407,11 +402,13 @@ Signal an error if the entire string was not used."
 ;;;###autoload
 (defun sexp-at-point ()   (form-at-point 'sexp))
 ;;;###autoload
-(defun symbol-at-point () (form-at-point 'sexp 'symbolp))
+(defun symbol-at-point ()
+  (let ((thing (thing-at-point 'symbol)))
+    (if thing (intern thing))))
 ;;;###autoload
 (defun number-at-point () (form-at-point 'sexp 'numberp))
 ;;;###autoload
 (defun list-at-point ()   (form-at-point 'list 'listp))
 
-;;; arch-tag: bb65a163-dae2-4055-aedc-fe11f497f698
+;; arch-tag: bb65a163-dae2-4055-aedc-fe11f497f698
 ;;; thingatpt.el ends here
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index cacd6f59670..596db839e84 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -40,12 +40,6 @@
 
 ;;; Switching tooltips on/off
 
-;; We don't set track-mouse globally because this is a big redisplay
-;; problem in buffers having a pre-command-hook or such installed,
-;; which does a set-buffer, like the summary buffer of Gnus.  Calling
-;; set-buffer prevents redisplay optimizations, so every mouse motion
-;; would be accompanied by a full redisplay.
-
 (define-minor-mode tooltip-mode
   "Toggle Tooltip mode.
 With ARG, turn Tooltip mode on if and only if ARG is positive.
diff --git a/lisp/vc.el b/lisp/vc.el
index 54237800e3c..8290fd5b943 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -567,6 +567,13 @@ specific to any particular backend."
   :group 'vc
   :version "21.1")
 
+(defcustom vc-diff-knows-L nil
+  "*Indicates whether diff understands the -L option.
+The value is either `yes', `no', or nil.  If it is nil, VC tries
+to use -L and sets this variable to remember whether it worked."
+  :type '(choice (const :tag "Work out" nil) (const yes) (const no))
+  :group 'vc)
+
 (defcustom vc-allow-async-revert nil
   "Specifies whether the diff during \\[vc-revert-buffer] may be asynchronous.
 Enabling this option means that you can confirm a revert operation even
@@ -1837,18 +1844,36 @@ actually call the backend, but performs a local diff."
                      (vc-version-backup-file file rev2)))
         (coding-system-for-read (vc-coding-system-for-diff file)))
     (if (and file-rev1 file-rev2)
-        (apply 'vc-do-command "*vc-diff*" 1 "diff" nil
-               (append (vc-switches nil 'diff)
-                       ;; Provide explicit labels like RCS or CVS would do
-                       ;; so diff-mode refers to `file' rather than to
-                       ;; `file-rev1' when trying to find/apply/undo hunks.
-                       (list "-L" (vc-diff-label file file-rev1 rev1)
-                             "-L" (vc-diff-label file file-rev2 rev2)
-                             (file-relative-name file-rev1)
-                             (file-relative-name file-rev2))))
+        (let ((status
+               (if (eq vc-diff-knows-L 'no)
+                   (apply 'vc-do-command "*vc-diff*" 1 "diff" nil
+                          (append (vc-switches nil 'diff)
+                                  (list (file-relative-name file-rev1)
+                                        (file-relative-name file-rev2))))
+                 (apply 'vc-do-command "*vc-diff*" 2 "diff" nil
+                        (append (vc-switches nil 'diff)
+                                ;; Provide explicit labels like RCS or
+                                ;; CVS would do so diff-mode refers to
+                                ;; `file' rather than to `file-rev1'
+                                ;; when trying to find/apply/undo
+                                ;; hunks.
+                                (list "-L" (vc-diff-label file file-rev1 rev1)
+                                      "-L" (vc-diff-label file file-rev2 rev2)
+                                      (file-relative-name file-rev1)
+                                      (file-relative-name file-rev2)))))))
+          (if (eq status 2)
+              (if (not vc-diff-knows-L)
+                  (setq vc-diff-knows-L 'no
+                        status (apply 'vc-do-command "*vc-diff*" 1 "diff" nil
+                                      (append 
+                                       (vc-switches nil 'diff)
+                                       (list (file-relative-name file-rev1)
+                                             (file-relative-name file-rev2)))))
+                (error "diff failed"))
+            (if (not vc-diff-knows-L) (setq vc-diff-knows-L 'yes)))
+          status)
       (vc-call diff file rev1 rev2))))
 
-
 (defun vc-switches (backend op)
   (let ((switches
          (or (if backend
diff --git a/lisp/window.el b/lisp/window.el
index ef9dd5d896d..2ae1a2c9e79 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -532,7 +532,11 @@ the height exactly, but attempts to be conservative, by allocating more
 lines than are actually needed in the case where some error may be present."
   (let ((delta (- height (window-text-height window))))
     (unless (zerop delta)
-      (let ((window-min-height 1))
+      ;; Setting window-min-height to a value like 1 can lead to very
+      ;; bizarre displays because it also allows Emacs to make *other*
+      ;; windows 1-line tall, which means that there's no more space for
+      ;; the modeline.
+      (let ((window-min-height (min 2 height))) ;One text line plus a modeline.
         (if (and window (not (eq window (selected-window))))
             (save-selected-window
               (select-window window)