38 files changed, 935 insertions, 514 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6e9c40d2cca..b3b1757b2e4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,85 @@
+2005-12-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * log-view.el (log-view-file-re, log-view-message-re): Use shy groups.
+        (log-view-font-lock-keywords): Ajust subgroup numbers.
+        (log-view-current-tag): Don't hard code the number of subgroups.
+
+2005-12-20  Juri Linkov  <juri@jurta.org>
+
+        * tooltip.el (tooltip): Move defgroup before define-minor-mode.
+        (tooltip-x-offset, tooltip-y-offset): Doc fix.
+
+        * menu-bar.el (menu-bar-menu-frame-live-and-visible-p)
+        (menu-bar-non-minibuffer-window-p): Instead of checking
+        display-multi-frame-p, use selected-frame when menu-updating-frame
+        is nil.
+
+2005-12-20  Davis Herring  <herring@lanl.gov>  (tiny change)
+
+        * align.el (align-rules-list): Use [ \t] instead of \s-
+        for column separators in text mode.
+
+2005-12-20  Nick Roberts  <nickrob@snap.net.nz>
+
+        * help-mode.el (help-customize-variable, help-customize-face):
+        Don't pop help-xref-stack as help-follow no longer pushes
+        anything on to it.
+
+2005-12-20  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el: (org-agenda-custom-commands): New option.
+        (org-agenda): Offer custom commands on splash screen.
+        (org-make-tags-matcher): Parser for Boolean logic added.
+        (org-agenda-set-tags): New command.
+        (org-agenda-menu, org-agenda-mode-map): Add `org-agenda-set-tags'.
+        (org-set-tags): Efficiency improvements.
+        (org-auto-align-tags): New option.
+        (org-todo, org-demote, org-promote): Realign tags.
+        (org-tags-completion-function): Use also "&" and "|" as separators.
+        (org-org-menu): Agenda commands simplified.
+
+2005-12-19  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * cus-edit.el (customize-apropos, customize-apropos-options):
+        Docstring changes.
+
+        * font-lock.el (font-lock): Add tags to the links in the defgroup.
+
+2005-12-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * longlines.el (longlines-mode): Wrap while widened.
+        (longlines-decode-region, longlines-encode-region): Compute max
+        just once.
+
+2005-12-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * cus-edit.el (mac): New group.
+
+        * cus-start.el (all): Add user options in macterm.c.  Add test for
+        Mac-related built-ins.  Fix test for GTK-related built-ins.
+
+        * term/mac-win.el (mac-handle-language-change)
+        (mac-ae-open-documents, mac-ae-get-url, mac-services-open-file)
+        (mac-services-open-selection, mac-services-mail-selection)
+        (mac-services-mail-to, mac-services-insert-text)
+        (mac-dispatch-apple-event): Add docstrings.
+        (x-get-selection, mac-select-convert-to-string): Select coding
+        system from `utf-16be' and `utf-16le' using `byteorder'.
+
+2005-12-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * subr.el (lazy-completion-table): Don't be fooled if the var holds
+        a "list" (lambda ...) rather than a real completion list.
+
+        * emacs-lisp/cl-extra.el (cl-macroexpand-all): Fix code-walk for
+        lexical-let when encountering ((lambda (...) ...) ...).
+
+2005-12-17  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/sh-script.el (sh-mode):
+        * language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
+        * textmodes/picture.el (picture-mode): Update docstrings.
+
 2005-12-17  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (autoloads, custom-deps): Warn that parts of
@@ -9,8 +91,8 @@
 
 2005-12-17  Chong Yidong  <cyd@stupidchicken.com>
 
-        * emacs-lisp/edebug.el (edebug-safe-prin1-to-string): Capture
-        error from printing circular structures.
+        * emacs-lisp/edebug.el (edebug-safe-prin1-to-string):
+        Capture error from printing circular structures.
 
 2005-12-17  Martin Rudalics  <rudalics@gmx.at>  (tiny change)
 
@@ -7215,7 +7297,7 @@
 2005-08-26  Kim F. Storm  <storm@cua.dk>
 
         * subr.el (version-list-<, version-list-<=, version-list-=):
-        Renamed from integer-list-*.
+        Rename from integer-list-*.
         (version-list-not-zero): Likewise.  Fix while loop.
         (version=): Use version-list-= instead of string-equal.
 
@@ -12362,8 +12444,7 @@
         (multiple-value-bind, multiple-value-setq, shiftf):
         Improve argument/docstring consistency.
 
-        * subr.el (focus-frame, unfocus-frame):
-        Revert deletion on 2005-05-01.
+        * subr.el (focus-frame, unfocus-frame): Revert deletion on 2005-05-01.
 
 2005-05-22  Andre Spiegel  <spiegel@gnu.org>
 
@@ -12496,8 +12577,7 @@
         (subst-if-not, nsubst, nsubst-if, nsubst-if-not, sublis)
         (nsublis, tree-equal): Improve argument/docstring consistency.
 
-        * subr.el (send-string, send-region):
-        Remove obsolescence declaration.
+        * subr.el (send-string, send-region): Remove obsolescence declaration.
         (window-dot, set-window-dot, read-input, show-buffer)
         (eval-current-buffer, string-to-int):
         Add release number to obsolescence declarations.
@@ -12574,8 +12654,8 @@
         * emacs-lisp/byte-run.el (eval-when-compile): Doc fix.
 
         * emacs-lisp/bytecomp.el
-        (byte-compile-file-form-custom-declare-variable): Call
-        byte-compile-nogroup-warn if appropriate.
+        (byte-compile-file-form-custom-declare-variable):
+        Call byte-compile-nogroup-warn if appropriate.
 
         * progmodes/compile.el (compilation-finish-function): Mark obsolete.
         (compilation-set-window): Don't call left-fringe-p; do it directly.
diff --git a/lisp/align.el b/lisp/align.el
index 122ce2f0f88..f63085011b7 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -559,7 +559,7 @@ The possible settings for `align-region-separate' are:
     ;; With a numeric prefix argument, or C-u, space delimited text
     ;; tables will be aligned.
     (text-column
-     (regexp   . "\\(^\\|\\S-\\)\\(\\s-+\\)\\(\\S-\\|$\\)")
+     (regexp   . "\\(^\\|\\S-\\)\\([ \t]+\\)\\(\\S-\\|$\\)")
      (group    . 2)
      (modes    . align-text-modes)
      (repeat   . t)
diff --git a/lisp/composite.el b/lisp/composite.el
index 452a9cebca9..a1c84e7b22a 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -1,7 +1,8 @@
 ;;; composite.el --- support character composition
 
-;; Copyright (C) 1999 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1999, 2000
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: mule, multilingual, character composition
 
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 20a023dee75..43c38e172b5 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -459,6 +459,13 @@
   :link '(custom-manual "(emacs)Windows")
   :group 'environment)
 
+(defgroup mac nil
+  "Mac specific features."
+  :link '(custom-manual "(emacs)Mac OS")
+  :group 'environment
+  :version "22.1"
+  :prefix "mac-")
+
 ;;; Utilities.
 
 (defun custom-quote (sexp)
@@ -1258,7 +1265,8 @@ If ALL is `options', include only options.
 If ALL is `faces', include only faces.
 If ALL is `groups', include only groups.
 If ALL is t (interactively, with prefix arg), include variables
-that are not customizable options, as well as faces and groups."
+that are not customizable options, as well as faces and groups
+\(but we recommend using `apropos-variable' instead)."
   (interactive "sCustomize regexp: \nP")
   (let ((found nil))
     (mapatoms (lambda (symbol)
@@ -1286,7 +1294,8 @@ that are not customizable options, as well as faces and groups."
 ;;;###autoload
 (defun customize-apropos-options (regexp &optional arg)
   "Customize all loaded customizable options matching REGEXP.
-With prefix arg, include variables that are not customizable options."
+With prefix arg, include variables that are not customizable options
+\(but we recommend using `apropos-variable' instead)."
   (interactive "sCustomize regexp: \nP")
   (customize-apropos regexp (or arg 'options)))
 
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 73e1dff5a44..65f9c0812fd 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -194,6 +194,33 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
              (suggest-key-bindings keyboard (choice (const :tag "off" nil)
                                                     (integer :tag "time" 2)
                                                     (other :tag "on")))
+             ;; macterm.c
+             (mac-control-modifier mac (choice (const :tag "No modifier" nil)
+                                               (const control) (const meta)
+                                               (const alt) (const hyper)
+                                               (const super)) "22.1")
+             (mac-command-modifier mac (choice (const :tag "No modifier" nil)
+                                               (const control) (const meta)
+                                               (const alt) (const hyper)
+                                               (const super)) "22.1")
+             (mac-option-modifier mac (choice (const :tag "No modifier (work as option)" nil)
+                                              (const control) (const meta)
+                                              (const alt) (const hyper)
+                                              (const super)) "22.1")
+             (mac-function-modifier mac
+                                    (choice (const :tag "No modifier (work as function)" nil)
+                                            (const control) (const meta)
+                                            (const alt) (const hyper)
+                                            (const super)) "22.1")
+             (mac-emulate-three-button-mouse mac
+                                             (choice (const :tag "No emulation" nil)
+                                                     (const :tag "Option->2, Command->3" t)
+                                                     (const :tag "Command->2, Option->3" reverse))
+                                    "22.1")
+             (mac-wheel-button-is-mouse-2 mac boolean "22.1")
+             (mac-pass-command-to-system mac boolean "22.1")
+             (mac-pass-control-to-system mac boolean "22.1")
+             (mac-allow-anti-aliasing mac boolean "22.1")
 
 ;; This is not good news because it will use the wrong
 ;; version-specific directories when you upgrade.  We need
@@ -366,6 +393,8 @@ since it could result in memory overflow and make Emacs crash."
                        (eq system-type 'ms-dos))
                       ((string-match "\\`w32-" (symbol-name symbol))
                        (eq system-type 'windows-nt))
+                      ((string-match "\\`mac-" (symbol-name symbol))
+                       (eq window-system 'mac))
                       ((string-match "\\`x-.*gtk" (symbol-name symbol))
                        (featurep 'gtk))
                       ((string-match "\\`x-" (symbol-name symbol))
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index 4ac1a72b0d7..c5a006912df 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -743,6 +743,11 @@ This also does some trivial optimizations to make the form prettier."
          (let* ((args (cl-macroexpand-body (cdr form) env)) (p args))
            (while (and p (symbolp (car p))) (setq p (cddr p)))
            (if p (cl-macroexpand-all (cons 'setf args)) (cons 'setq args))))
+        ((consp (car form))
+         (cl-macroexpand-all (list* 'funcall
+                                    (list 'function (car form))
+                                    (cdr form))
+                             env))
         (t (cons (car form) (cl-macroexpand-body (cdr form) env)))))
 
 (defun cl-macroexpand-body (body &optional env)
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 58fdf6dd809..45feee19744 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -212,8 +212,8 @@
 ;; Define core `font-lock' group.
 (defgroup font-lock '((jit-lock custom-group))
   "Font Lock mode text highlighting package."
-  :link '(custom-manual "(emacs)Font Lock")
-  :link '(custom-manual "(elisp)Font Lock Mode")
+  :link '(custom-manual :tag "Emacs Manual" "(emacs)Font Lock")
+  :link '(custom-manual :tag "Elisp Manual" "(elisp)Font Lock Mode")
   :group 'faces)
 
 (defgroup font-lock-faces nil
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index b7cea179aea..9941f0604bd 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -136,16 +136,12 @@ The format is (FUNCTION ARGS...).")
 (define-button-type 'help-customize-variable
   :supertype 'help-xref
   'help-function (lambda (v)
-                   (if help-xref-stack
-                       (pop help-xref-stack))
                    (customize-variable v))
   'help-echo (purecopy "mouse-2, RET: customize variable"))
 
 (define-button-type 'help-customize-face
   :supertype 'help-xref
   'help-function (lambda (v)
-                   (if help-xref-stack
-                       (pop help-xref-stack))
                    (customize-face v))
   'help-echo (purecopy "mouse-2, RET: customize face"))
 
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index fb70b2641d0..413ad3c3183 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -824,7 +824,7 @@ Delete the escape even it is not recognized."
 
 ;;;###autoload
 (defun ethio-sera-to-fidel-mail-or-marker (&optional arg)
-  "Execute ethio-sera-to-fidel-mail or ethio-sera-to-fidel-marker depending on the current major mode.
+  "Execute `ethio-sera-to-fidel-mail' or `ethio-sera-to-fidel-marker' depending on the current major mode.
 If in rmail-mode or in mail-mode, execute the former; otherwise latter."
 
   (interactive "P")
@@ -1214,7 +1214,7 @@ See also the descriptions of the variables
 
 ;;;###autoload
 (defun ethio-fidel-to-sera-mail-or-marker (&optional arg)
-  "Execute ethio-fidel-to-sera-mail or ethio-fidel-to-sera-marker depending on the current major mode.
+  "Execute `ethio-fidel-to-sera-mail' or `ethio-fidel-to-sera-marker' depending on the current major mode.
 If in rmail-mode or in mail-mode, execute the former; otherwise latter."
 
   (interactive "P")
diff --git a/lisp/log-view.el b/lisp/log-view.el
index 6a9464005fb..9249531129b 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -25,11 +25,36 @@
 
 ;;; Commentary:
 
-;; Todo:
+;; Major mode to browse revision log histories.
+;; Currently supports the format output by:
+;;  RCS, SCCS, CVS, Subversion.
+
+;; Examples of log output:
+
+;;;; RCS/CVS:
+
+;; ----------------------------
+;; revision 1.35        locked by: turlutut
+;; date: 2005-03-22 18:48:38 +0000;  author: monnier;  state: Exp;  lines: +6 -8
+;; (gnus-display-time-event-handler):
+;; Check display-time-timer at runtime rather than only at load time
+;; in case display-time-mode is turned off in the mean time.
+;; ----------------------------
+;; revision 1.34
+;; date: 2005-02-09 15:50:38 +0000;  author: kfstorm;  state: Exp;  lines: +7 -7
+;; branches:  1.34.2;
+;; Change release version from 21.4 to 22.1 throughout.
+;; Change development version from 21.3.50 to 22.0.50.
+
+;;;; SCCS:
+
+;;;; Subversion:
+
+;;; Todo:
 
-;; - add compatibility with cvs-log.el
 ;; - add ability to modify a log-entry (via cvs-mode-admin ;-)
 ;; - remove references to cvs-*
+;; - make it easier to add support for new backends without changing the code.
 
 ;;; Code:
 
@@ -87,17 +112,20 @@
 (defvar log-view-message-face 'log-view-message)
 
 (defconst log-view-file-re
-  (concat "^\\("
-          "Working file: \\(.+\\)"
-          "\\|SCCS/s\\.\\(.+\\):"
-          "\\)\n"))
-;; In RCS, a locked revision will look like "revision N.M\tlocked by: FOO".
-(defconst log-view-message-re "^\\(revision \\([.0-9]+\\)\\(?:\t.*\\)?\\|r\\([0-9]+\\) | .* | .*\\|D \\([.0-9]+\\) .*\\)$")
+  (concat "^\\(?:Working file: \\(.+\\)"                ;RCS and CVS.
+          "\\|SCCS/s\\.\\(.+\\):"                       ;SCCS.
+          "\\)\n"))                   ;Include the \n for font-lock reasons.
+
+(defconst log-view-message-re
+  (concat "^\\(?:revision \\([.0-9]+\\)\\(?:\t.*\\)?" ; RCS and CVS.
+          "\\|r\\([0-9]+\\) | .* | .*"                ; Subversion.
+          "\\|D \\([.0-9]+\\) .*"                     ; SCCS.
+          "\\)$"))
 
 (defconst log-view-font-lock-keywords
   `((,log-view-file-re
+     (1 (if (boundp 'cvs-filename-face) cvs-filename-face) nil t)
      (2 (if (boundp 'cvs-filename-face) cvs-filename-face) nil t)
-     (3 (if (boundp 'cvs-filename-face) cvs-filename-face) nil t)
      (0 log-view-file-face append))
     (,log-view-message-re . log-view-message-face)))
 (defconst log-view-font-lock-defaults
@@ -158,10 +186,17 @@
     (forward-line 1)
     (let ((pt (point)))
       (when (re-search-backward log-view-message-re nil t)
-        (let ((rev (or (match-string 2) (match-string 3) (match-string 4))))
+        (let (rev)
+          ;; Find the subgroup that matched.
+          (dotimes (i (/ (match-data 'integers) 2))
+            (setq rev (or rev (match-string (1+ i)))))
           (unless (re-search-forward log-view-file-re pt t)
             rev))))))
 
+(defvar cvs-minor-current-files)
+(defvar cvs-branch-prefix)
+(defvar cvs-secondary-branch-prefix)
+
 (defun log-view-minor-wrap (buf f)
   (let ((data (with-current-buffer buf
                 (cons
diff --git a/lisp/longlines.el b/lisp/longlines.el
index a3912a26ca7..dadd8a5d58f 100644
--- a/lisp/longlines.el
+++ b/lisp/longlines.el
@@ -1,6 +1,6 @@
 ;;; longlines.el --- automatically wrap long lines
 
-;; Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Authors:    Kai Grossjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 ;;             Alex Schroeder <alex@gnu.org>
@@ -111,7 +111,7 @@ are indicated with a symbol."
         (add-hook 'before-revert-hook 'longlines-before-revert-hook nil t)
         (make-local-variable 'buffer-substring-filters)
         (set (make-local-variable 'isearch-search-fun-function)
-             'longlinges-search-function)
+             'longlines-search-function)
         (add-to-list 'buffer-substring-filters 'longlines-encode-string)
         (when longlines-wrap-follows-window-size
           (set (make-local-variable 'fill-column)
@@ -127,8 +127,8 @@ are indicated with a symbol."
           ;; longlines-wrap-lines that we'll never encounter from here
           (save-restriction
             (widen)
-            (longlines-decode-buffer))
-          (longlines-wrap-region (point-min) (point-max))
+            (longlines-decode-buffer)
+            (longlines-wrap-region (point-min) (point-max)))
           (set-buffer-modified-p mod))
         (when (and longlines-show-hard-newlines
                    (not longlines-showing))
@@ -166,7 +166,6 @@ are indicated with a symbol."
         (widen)
         (longlines-encode-region (point-min) (point-max))))
     (remove-hook 'change-major-mode-hook 'longlines-mode-off t)
-    (remove-hook 'before-kill-functions 'longlines-encode-region t)
     (remove-hook 'after-change-functions 'longlines-after-change-function t)
     (remove-hook 'post-command-hook 'longlines-post-command-function t)
     (remove-hook 'before-revert-hook 'longlines-before-revert-hook t)
@@ -327,10 +326,11 @@ If BEG and END are nil, the point and mark are used."
   (if (null beg) (setq beg (point)))
   (if (null end) (setq end (mark t)))
   (save-excursion
-    (goto-char (min beg end))
-    (while (search-forward "\n" (max beg end) t)
-      (set-hard-newline-properties
-       (match-beginning 0) (match-end 0)))))
+    (let ((reg-max (max beg end)))
+      (goto-char (min beg end))
+      (while (search-forward "\n" reg-max t)
+        (set-hard-newline-properties
+         (match-beginning 0) (match-end 0))))))
 
 (defun longlines-decode-buffer ()
   "Turn all newlines in the buffer into hard newlines."
@@ -341,9 +341,10 @@ If BEG and END are nil, the point and mark are used."
 Hard newlines are left intact.  The optional argument BUFFER exists for
 compatibility with `format-alist', and is ignored."
   (save-excursion
-    (let ((mod (buffer-modified-p)))
+    (let ((reg-max (max beg end))
+          (mod (buffer-modified-p)))
       (goto-char (min beg end))
-      (while (search-forward "\n" (max (max beg end)) t)
+      (while (search-forward "\n" reg-max t)
         (unless (get-text-property (match-beginning 0) 'hard)
           (replace-match " ")))
       (set-buffer-modified-p mod)
@@ -422,7 +423,7 @@ This is called by `window-size-change-functions'."
 
 ;; Isearch
 
-(defun longlinges-search-function ()
+(defun longlines-search-function ()
   (cond
    (isearch-word
     (if isearch-forward 'word-search-forward 'word-search-backward))
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 6fa8c8b0f03..afc207bc9f0 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1418,8 +1418,7 @@ key, a click, or a menu-item"))
 (defun menu-bar-menu-frame-live-and-visible-p ()
   "Return non-nil if the menu frame is alive and visible.
 The menu frame is the frame for which we are updating the menu."
-  (let ((menu-frame (if (display-multi-frame-p) menu-updating-frame
-                      (selected-frame))))
+  (let ((menu-frame (or menu-updating-frame (selected-frame))))
     (and (frame-live-p menu-frame)
          (frame-visible-p menu-frame))))
 
@@ -1428,8 +1427,7 @@ The menu frame is the frame for which we are updating the menu."
 
 See the documentation of `menu-bar-menu-frame-live-and-visible-p'
 for the definition of the menu frame."
-  (let ((menu-frame (if (display-multi-frame-p) menu-updating-frame
-                      (selected-frame))))
+  (let ((menu-frame (or menu-updating-frame (selected-frame))))
     (not (window-minibuffer-p (frame-selected-window menu-frame)))))
 
 (defun kill-this-buffer ()      ; for the menu bar
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 33f016bb2f9..dce4b1def32 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,68 @@
+2005-12-19  Stephen Gildea
+
+        * mh-customize.el (mh-after-commands-processed-hook): New variable.
+        (mh-before-commands-processed-hook): mh-folder-updated-hook, renamed.
+
+        * mh-e.el (mh-process-commands): Rename mh-folder-updated-hook 
+        to mh-before-commands-processed-hook, call new
+        mh-after-commands-processed-hook.
+        (mh-folders-changed): New variable (for use in
+        mh-after-commands-processed-hook).
+
+2005-12-19  Bill Wohler  <wohler@newt.com>
+
+        * mh-acros.el:
+        * mh-alias.el:
+        * mh-comp.el:
+        * mh-customize.el:
+        * mh-e.el:
+        * mh-funcs.el:
+        * mh-gnus.el:
+        * mh-identity.el:
+        * mh-inc.el:
+        * mh-index.el:
+        * mh-init.el:
+        * mh-junk.el:
+        * mh-mime.el:
+        * mh-pick.el:
+        * mh-print.el:
+        * mh-seq.el:
+        * mh-speed.el:
+        * mh-utils.el:
+        Follow commenting conventions. Don't use ;;; form so much, except
+        for headings. Precede headings with page feed. This was mostly
+        already done, so I made it a convention. Did not update copyright
+        on a couple of files since this was an insignificant change.
+
+2005-12-18  Bill Wohler  <wohler@newt.com>
+
+        * mh-customize.el (mh-toolbar): Rename to mh-tool-bar.
+        (mh-tool-bar-search-function): Sync docstrings with manual.
+        (mh-tool-bar-customize): Replace toolbar with tool bar in
+        docstring.
+        (mh-tool-bar-letter-help): Fix manual reference.
+        (mh-xemacs-use-toolbar-flag): Rename to
+        mh-xemacs-use-tool-bar-flag. Initialize to
+        mh-xemacs-has-tool-bar-flag. Sync docstrings with manual.
+        (mh-xemacs-toolbar-position): Rename to
+        mh-xemacs-tool-bar-position. Initialize to nil. Drop "no tool bar"
+        option (redundant) and change "Same As Default Tool Bar" setting
+        to nil. Sync docstrings with manual.
+        (mh-tool-bar-define): Replace toolbar with tool-bar or tool bar
+        depending on context.
+        (mh-toolbar-init): Rename to mh-tool-bar-init. Simplified
+        condition for calling set-specifier. Only look at the value of
+        mh-xemacs-use-tool-bar-flag.
+        (mh-tool-bar-folder-buttons, mh-tool-bar-letter-buttons): Sync
+        docstrings with manual.
+
+        * mh-comp.el (mh-letter-mode): Use mh-tool-bar-init instead of
+        mh-toolbar-init.
+
+        * mh-e.el (mh-folder-mode): Ditto.
+
+        * mh-utils.el (mh-show-mode): Ditto.
+
 2005-12-15  Bill Wohler  <wohler@newt.com>
 
         * mh-e.el (mh-delete-msg): Sync docstrings with manual.
diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index 8136c56ca90..5523f1cf46b 100644
--- a/lisp/mh-e/mh-acros.el
+++ b/lisp/mh-e/mh-acros.el
@@ -55,7 +55,7 @@ recognizes that and loads `cl' where appropriate."
       `(require 'cl)
     `(eval-when-compile (require 'cl))))
 
-;;; Macros to generate correct code for different emacs variants
+;; Macros to generate correct code for different emacs variants
 
 (defmacro mh-do-in-gnu-emacs (&rest body)
   "Execute BODY if in GNU Emacs."
@@ -144,11 +144,11 @@ Emacs 22."
 
 (provide 'mh-acros)
 
-;;; Local Variables:
-;;; no-byte-compile: t
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; no-byte-compile: t
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
 ;; arch-tag: b383b49a-494f-4ed0-a30a-cb6d5d2da4ff
 ;;; mh-acros.el ends here
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index 5367d2cbc18..f82a0ea24dc 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -38,7 +38,10 @@
                                         ; completing-read-multiple.
 (eval-when-compile (defvar mail-abbrev-syntax-table))
 
+
+
 ;;; Autoloads
+
 (eval-when (compile load eval)
   (ignore-errors
     (require 'mailabbrev)
@@ -71,6 +74,7 @@ listed in your `Aliasfile:' MH profile component are automatically included.
 You can update the alias list manually using \\[mh-alias-reload].")
 
 
+
 ;;; Alias Loading
 
 (defun mh-alias-tstamp (arg)
@@ -228,6 +232,7 @@ with no arguments, after the aliases have been loaded."
       (mh-alias-reload)))
 
 
+
 ;;; Alias Expansion
 
 (defun mh-alias-ali (alias &optional user)
@@ -312,6 +317,7 @@ Blind aliases or users from /etc/passwd are not expanded."
         (delete-region begin end)
         (insert expansion)))))
 
+
 ;;; Adding addresses to alias file.
 
 (defun mh-alias-suggest-alias (string &optional no-comma-swap)
@@ -653,10 +659,10 @@ name hint when filing messages."
 
 (provide 'mh-alias)
 
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
-;;; arch-tag: 49879e46-5aa3-4569-bece-e5a58731d690
+;; arch-tag: 49879e46-5aa3-4569-bece-e5a58731d690
 ;;; mh-alias.el ends here
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 5cac13d265b..47999fbbeff 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -52,7 +52,9 @@
 (defvar mh-mml-mode-default)
 (defvar mh-identity-menu)
 
+
 ;;; Autoloads
+
 (autoload 'mail-mode-fill-paragraph "sendmail")
 (autoload 'mm-handle-displayed-p "mm-decode")
 
@@ -80,6 +82,8 @@ For Emacs 19's, the region need not be active (and typically isn't
 when this function is called.  Also, the hook `sc-pre-hook' is run
 before, and `sc-post-hook' is run after the guts of this function.")
 
+
+
 ;;; Site customization (see also mh-utils.el):
 
 (defvar mh-send-prog "send"
@@ -91,6 +95,8 @@ Some sites need to change this because of a name conflict.")
 This allows transaction log to be visible if -watch, -verbose or -snoop are
 used.")
 
+
+
 ;;; Scan Line Formats
 
 (defvar mh-note-repl ?-
@@ -824,7 +830,7 @@ Returns t if found, nil if not."
 
 (put 'mh-letter-mode 'mode-class 'special)
 
-;;; Menu extracted from mh-menubar.el V1.1 (31 July 2001)
+;; Menu extracted from mh-menubar.el V1.1 (31 July 2001)
 (eval-when-compile (defvar mh-letter-menu nil))
 (easy-menu-define
   mh-letter-menu mh-letter-mode-map "Menu for MH-E letter mode."
@@ -874,8 +880,11 @@ Returns t if found, nil if not."
      mh-mh-to-mime-undo (equal mh-compose-insertion 'mh)]
     ["Kill This Draft"          mh-fully-kill-draft t]))
 
+
+
 ;;; Help Messages
-;;; Group messages logically, more or less.
+
+;; Group messages logically, more or less.
 (defvar mh-letter-mode-help-messages
   '((nil
      "Send letter:          \\[mh-send-letter]"
@@ -994,7 +1003,7 @@ When a message is composed, the hooks `text-mode-hook' and
   ;; Enable undo since a show-mode buffer might have been reused.
   (buffer-enable-undo)
   (set (make-local-variable 'tool-bar-map) mh-letter-tool-bar-map)
-  (mh-funcall-if-exists mh-toolbar-init :letter)
+  (mh-funcall-if-exists mh-tool-bar-init :letter)
   (make-local-variable 'font-lock-defaults)
   (cond
    ((or (equal mh-highlight-citation-style 'font-lock)
@@ -2026,8 +2035,11 @@ Otherwise return the empty string."
     (goto-char (point-max))
     (mh-letter-next-header-field)))
 
-;;; Build the letter-mode keymap:
-;;; If this changes, modify mh-letter-mode-help-messages accordingly, above.
+
+
+;;; Build mh-letter-mode keymap
+
+;; If this changes, modify mh-letter-mode-help-messages accordingly, above.
 (gnus-define-keys  mh-letter-mode-map
   " "                   mh-letter-complete-or-space
   ","                   mh-letter-confirm-address
@@ -2089,10 +2101,10 @@ Otherwise return the empty string."
 
 (provide 'mh-comp)
 
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
-;;; arch-tag: 62865511-e610-4923-b0b5-f45a8ab70a34
+;; arch-tag: 62865511-e610-4923-b0b5-f45a8ab70a34
 ;;; mh-comp.el ends here
diff --git a/lisp/mh-e/mh-customize.el b/lisp/mh-e/mh-customize.el
index e07603f69ba..0e22e38a742 100644
--- a/lisp/mh-e/mh-customize.el
+++ b/lisp/mh-e/mh-customize.el
@@ -83,6 +83,11 @@
   (require 'mh-init)
   (require 'mh-identity))
 
+;; For compiler warnings...
+(eval-when-compile
+  (defvar mh-show-buffer)
+  (defvar mh-show-folder-buffer))
+
 (defun mh-customize (&optional delete-other-windows-flag)
   "Customize MH-E variables.
 If optional argument DELETE-OTHER-WINDOWS-FLAG is non-nil, other windows in
@@ -94,11 +99,6 @@ the frame are removed."
 
 
 
-;;; For compiler warnings...
-(eval-when-compile
-  (defvar mh-show-buffer)
-  (defvar mh-show-folder-buffer))
-
 ;;; MH-E Customization Groups
 
 (defgroup mh-e nil
@@ -198,9 +198,9 @@ mailutils."
   :link '(custom-manual "(mh-e)Threading")
   :group 'mh-e)
 
-(defgroup mh-toolbar nil
-  "The toolbar"
-  :link '(custom-manual "(mh-e)Toolbar")
+(defgroup mh-tool-bar nil
+  "The tool bar"
+  :link '(custom-manual "(mh-e)Tool Bar")
   :prefix "mh-"
   :group 'mh-e)
 
@@ -217,6 +217,8 @@ mailutils."
   :prefix "mh-"
   :group 'mh-e)
 
+
+
 ;;; Faces
 
 (defgroup mh-folder-faces nil
@@ -998,7 +1000,7 @@ default). If you need to scan just the message 200, then use the range
 
 ;;; Scan Line Formats (:group 'mh-scan-line-formats)
 
-;;; Forward definition to avoid compiler and runtime error.
+;; Forward definition to avoid compiler and runtime error.
 (defvar mh-scan-format-file t)
 
 (defun mh-adaptive-cmd-note-flag-check (symbol value)
@@ -1163,9 +1165,9 @@ See also `mh-reply'."
 
 ;;; Sequences (:group 'mh-sequences)
 
-;;; If `mh-unpropagated-sequences' becomes a defcustom, add the following to
-;;; the docstring: "Additional sequences that should not to be preserved can be
-;;; specified by setting `mh-unpropagated-sequences' appropriately." XXX
+;; If `mh-unpropagated-sequences' becomes a defcustom, add the following to
+;; the docstring: "Additional sequences that should not to be preserved can be
+;; specified by setting `mh-unpropagated-sequences' appropriately." XXX
 
 (defcustom mh-refile-preserves-sequences-flag t
   "*Non-nil means that sequences are preserved when messages are refiled.
@@ -1801,15 +1803,18 @@ only if the number of messages being threaded is less than `mh-large-folder'."
 
 
 
-;;; The Toolbar (:group 'mh-toolbar)
+;;; The Tool Bar (:group 'mh-tool-bar)
 
 (defcustom mh-tool-bar-search-function 'mh-search-folder
-  "*Function called by the tool-bar search button.
-See `mh-search-folder' and `mh-index-search' for details."
+  "*Function called by the tool bar search button.
+
+Available functions include `mh-search-folder', the default, and
+`mh-index-search'. You can also choose \"Other Function\" from the \"Value
+Menu\" and enter a function of your own choosing."
   :type '(choice (const mh-search-folder)
                  (const mh-index-search)
-                 (function :tag "Other function"))
-  :group 'mh-toolbar)
+                 (function :tag "Other Function"))
+  :group 'mh-tool-bar)
 
 ;; Functions called from the tool bar
 (defun mh-tool-bar-search (&optional arg)
@@ -1819,7 +1824,7 @@ Optional argument ARG is not used."
   (call-interactively mh-tool-bar-search-function))
 
 (defun mh-tool-bar-customize ()
-  "Call `mh-customize' from the toolbar."
+  "Call `mh-customize' from the tool bar."
   (interactive)
   (mh-customize t))
 
@@ -1830,9 +1835,9 @@ Optional argument ARG is not used."
   (delete-other-windows))
 
 (defun mh-tool-bar-letter-help ()
-  "Visit \"(mh-e)Draft Editing\"."
+  "Visit \"(mh-e)Editing Drafts\"."
   (interactive)
-  (info "(mh-e)Draft Editing")
+  (info "(mh-e)Editing Drafts")
   (delete-other-windows))
 
 (defmacro mh-tool-bar-reply-generator (function recipient folder-buffer-flag)
@@ -1855,45 +1860,35 @@ When INCLUDE-FLAG is non-nil, include message body being replied to."
 
 ;; XEmacs has a couple of extra customizations...
 (mh-do-in-xemacs
-  (defcustom mh-xemacs-use-toolbar-flag (if (and (featurep 'toolbar)
-                                                 (featurep 'xpm)
-                                                 (device-on-window-system-p))
-                                            t
-                                          nil)
-    "*If non-nil, use toolbar.
-
-This will default to t if you are in an environment that supports
-toolbars and xpm."
+  (defcustom mh-xemacs-use-tool-bar-flag mh-xemacs-has-tool-bar-flag
+    "*If non-nil, use tool bar.
+
+This option controls whether to show the MH-E icons at all. By default, this
+option is turned on if the window system supports tool bars. If your system
+doesn't support tool bars, then you won't be able to turn on this option."
     :type 'boolean
-    :group 'mh-toolbar)
-
-  (defcustom mh-xemacs-toolbar-position (if mh-xemacs-use-toolbar-flag
-                                            'default
-                                          nil)
-    "*Where to put the toolbar.
-
-Valid non-nil values are \"default\", \"top\", \"bottom\", \"left\",
-\"right\".  These match the four edges of the frame, with \"default\"
-meaning \"use the same position as the default-toolbar\".
-
-A nil value means do not use a toolbar.
-
-If this variable is set to anything other than \"default\" and the
-default-toolbar has a different positional setting from the value of
-this variable, then two toolbars will be displayed.  The MH-E toolbar
-and the default-toolbar."
-    :type '(radio (const :tag "Same position as the \"default-toolbar\""
-                         :value default)
-                  (const :tag "Along the top edge of the frame"
-                         :value top)
-                  (const :tag "Along the bottom edge of the frame"
-                         :value bottom)
-                  (const :tag "Along the left edge of the frame"
-                         :value left)
-                  (const :tag "Along the right edge of the frame"
-                         :value right)
-                  (const :tag "Don't use a toolbar" nil))
-    :group 'mh-toolbar))
+    :group 'mh-tool-bar
+    :set (lambda (symbol value)
+           (if (and (eq value t)
+                    (not mh-xemacs-has-tool-bar-flag))
+               (error "Tool bar not supported"))
+           (set-default symbol value)))
+
+  (defcustom mh-xemacs-tool-bar-position nil
+    "*Tool bar location.
+
+This option controls the placement of the tool bar along the four edges of the
+frame. You can choose from one of \"Same As Default Tool Bar\", \"Top\",
+\"Bottom\", \"Left\", or \"Right\". If this variable is set to anything other
+than \"Same As Default Tool Bar\" and the default tool bar is in a different
+location, then two tool bars will be displayed: the MH-E tool bar and the
+default tool bar."
+    :type '(radio (const :tag "Same As Default Tool Bar" :value nil)
+                  (const :tag "Top" :value top)
+                  (const :tag "Bottom" :value bottom)
+                  (const :tag "Left" :value left)
+                  (const :tag "Right" :value right))
+    :group 'mh-tool-bar))
 
 (defun mh-buffer-exists-p (mode)
   "Test whether a buffer with major mode MODE is present."
@@ -1996,7 +1991,7 @@ where,
                                     (t 'folder-vectors)))
                  (list (cond ((eq type :letter) 'mh-tool-bar-letter-buttons)
                              (t 'mh-tool-bar-folder-buttons)))
-                 (key (intern (concat "mh-" type1 "toolbar-" name-str)))
+                 (key (intern (concat "mh-" type1 "tool-bar-" name-str)))
                  (setter (intern (concat type1 "-button-setter")))
                  (mbuttons (cond ((eq type :letter) 'letter-buttons)
                                  ((eq type :show) 'show-buttons)
@@ -2063,89 +2058,87 @@ where,
                      tool-bar-map))))
          ;; Custom setter functions
          (defun mh-tool-bar-folder-buttons-set (symbol value)
-           "Construct toolbar for `mh-folder-mode' and `mh-show-mode'."
+           "Construct tool bar for `mh-folder-mode' and `mh-show-mode'."
            (set-default symbol value)
            (mh-tool-bar-folder-buttons-init))
          (defun mh-tool-bar-letter-buttons-set (symbol value)
-           "Construct toolbar for `mh-letter-mode'."
+           "Construct tool bar for `mh-letter-mode'."
            (set-default symbol value)
            (mh-tool-bar-letter-buttons-init)))
        ;; XEmacs specific code
        (mh-do-in-xemacs
-         (defvar mh-toolbar-folder-vector-map
+         (defvar mh-tool-bar-folder-vector-map
            ',(loop for button in folder-buttons
                    for vector in folder-vectors
                    collect (cons button vector)))
-         (defvar mh-toolbar-show-vector-map
+         (defvar mh-tool-bar-show-vector-map
            ',(loop for button in show-buttons
                    for vector in show-vectors
                    collect (cons button vector)))
-         (defvar mh-toolbar-letter-vector-map
+         (defvar mh-tool-bar-letter-vector-map
            ',(loop for button in letter-buttons
                    for vector in letter-vectors
                    collect (cons button vector)))
-         (defvar mh-toolbar-folder-buttons nil)
-         (defvar mh-toolbar-show-buttons nil)
-         (defvar mh-toolbar-letter-buttons nil)
+         (defvar mh-tool-bar-folder-buttons nil)
+         (defvar mh-tool-bar-show-buttons nil)
+         (defvar mh-tool-bar-letter-buttons nil)
          ;; Custom setter functions
          (defun mh-tool-bar-letter-buttons-set (symbol value)
            (set-default symbol value)
-           (when mh-xemacs-has-toolbar-flag
-             (setq mh-toolbar-letter-buttons
+           (when mh-xemacs-has-tool-bar-flag
+             (setq mh-tool-bar-letter-buttons
                    (loop for b in value
-                         collect (cdr (assoc b mh-toolbar-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-toolbar-flag
-             (setq mh-toolbar-folder-buttons
+           (when mh-xemacs-has-tool-bar-flag
+             (setq mh-tool-bar-folder-buttons
                    (loop for b in value
-                         collect (cdr (assoc b mh-toolbar-folder-vector-map))))
-             (setq mh-toolbar-show-buttons
+                         collect (cdr (assoc b mh-tool-bar-folder-vector-map))))
+             (setq mh-tool-bar-show-buttons
                    (loop for b in value
-                         collect (cdr (assoc b mh-toolbar-show-vector-map))))))
-         ;; Initialize toolbar
-         (defun mh-toolbar-init (mode)
-           "Install toolbar in MODE."
-           (let ((toolbar (cond ((eq mode :folder) mh-toolbar-folder-buttons)
-                                ((eq mode :letter) mh-toolbar-letter-buttons)
-                                ((eq mode :show) mh-toolbar-show-buttons)))
+                         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 (and mh-xemacs-toolbar-position mh-xemacs-use-toolbar-flag
-                        mh-xemacs-has-toolbar-flag)
+             (when mh-xemacs-use-tool-bar-flag
                (cond
-                ((eq mh-xemacs-toolbar-position 'top)
-                 (set-specifier top-toolbar toolbar buffer)
+                ((eq mh-xemacs-tool-bar-position 'top)
+                 (set-specifier top-toolbar tool-bar buffer)
                  (set-specifier top-toolbar-visible-p t)
                  (set-specifier top-toolbar-height height))
-                ((eq mh-xemacs-toolbar-position 'bottom)
-                 (set-specifier bottom-toolbar toolbar buffer)
+                ((eq mh-xemacs-tool-bar-position 'bottom)
+                 (set-specifier bottom-toolbar tool-bar buffer)
                  (set-specifier bottom-toolbar-visible-p t)
                  (set-specifier bottom-toolbar-height height))
-                ((eq mh-xemacs-toolbar-position 'left)
-                 (set-specifier left-toolbar toolbar buffer)
+                ((eq mh-xemacs-tool-bar-position 'left)
+                 (set-specifier left-toolbar tool-bar buffer)
                  (set-specifier left-toolbar-visible-p t)
                  (set-specifier left-toolbar-width width))
-                ((eq mh-xemacs-toolbar-position 'right)
-                 (set-specifier right-toolbar toolbar buffer)
+                ((eq mh-xemacs-tool-bar-position 'right)
+                 (set-specifier right-toolbar tool-bar buffer)
                  (set-specifier right-toolbar-visible-p t)
                  (set-specifier right-toolbar-width width))
-                (t (set-specifier default-toolbar toolbar buffer)))))))
-       ;; Declare customizable toolbars
+                (t (set-specifier default-toolbar tool-bar buffer)))))))
+       ;; Declare customizable tool bars
        (custom-declare-variable
         'mh-tool-bar-folder-buttons
         '(list ,@(mapcar (lambda (x) `(quote ,x)) folder-defaults))
-        "Choose buttons to include in MH-E folder/show toolbar."
-        :group 'mh-toolbar :set 'mh-tool-bar-folder-buttons-set
+        "List of buttons to include in MH-Folder tool bar."
+        :group 'mh-tool-bar :set 'mh-tool-bar-folder-buttons-set
         :type '(set ,@(loop for x in folder-buttons
                             for y in folder-docs
                             collect `(const :tag ,y ,x))))
        (custom-declare-variable
         'mh-tool-bar-letter-buttons
         '(list ,@(mapcar (lambda (x) `(quote ,x)) letter-defaults))
-        "Choose buttons to include in MH-E letter toolbar."
-        :group 'mh-toolbar :set 'mh-tool-bar-letter-buttons-set
+        "List of buttons to include in MH-Letter tool bar."
+        :group 'mh-tool-bar :set 'mh-tool-bar-letter-buttons-set
         :type '(set ,@(loop for x in letter-buttons
                             for y in letter-docs
                             collect `(const :tag ,y ,x)))))))
@@ -2301,15 +2294,24 @@ on his mail usage."
   :group 'mh-hooks
   :group 'mh-folder)
 
-(defcustom mh-folder-updated-hook nil
-  "Invoked when the folder actions (such as moves and deletes) are performed.
+(defcustom mh-before-commands-processed-hook nil
+  "Invoked before the folder actions (such as moves and deletes) are performed.
 Variables that are useful in this hook include `mh-delete-list' and
-`mh-refile-list' which can be used to see which changes are being made to
+`mh-refile-list' which can be used to see which changes will be made to
 current folder, `mh-current-folder'."
   :type 'hook
   :group 'mh-hooks
   :group 'mh-folder)
 
+(defcustom mh-after-commands-processed-hook nil
+  "Invoked after the folder actions (such as moves and deletes) are performed.
+Variables that are useful in this hook include `mh-folders-changed',
+which lists which folders were affected by deletes and refiles.  This
+list will always include the current folder, which is also available
+in `mh-current-folder'."
+  :type 'hook
+  :group 'mh-hooks)
+
 (defcustom mh-forward-hook nil
   "Invoked on the forwarded letter by \\<mh-folder-mode-map>\\[mh-forward]."
   :type 'hook
@@ -2403,6 +2405,8 @@ will be removed from the unseen sequence."
 
 ;;; Faces (:group 'mh-*-faces + group where faces described)
 
+
+
 ;;; Faces Used in Scan Listing (:group 'mh-folder-faces)
 
 (defvar mh-folder-body-face 'mh-folder-body
@@ -2767,10 +2771,10 @@ The background and foreground is used in the image."
   "Face used for the current folder when it has unread messages."
   :group 'mh-speed-faces)
 
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
-;;; arch-tag: 778d2a20-82e2-4276-be9d-309386776a68
+;; arch-tag: 778d2a20-82e2-4276-be9d-309386776a68
 ;;; mh-customize.el ends here
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index b87fa4c2e3d..0c8c3346ecb 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -105,11 +105,12 @@
 The string is displayed after the folder's name.  nil for no annotation.")
 
 
+
 ;;; Scan Line Formats
 
-;;; Parameterize MH-E to work with different scan formats.  The defaults work
-;;; with the standard MH scan listings, in which the first 4 characters on
-;;; the line are the message number, followed by two places for notations.
+;; Parameterize MH-E to work with different scan formats.  The defaults work
+;; with the standard MH scan listings, in which the first 4 characters on
+;; the line are the message number, followed by two places for notations.
 
 ;; The following scan formats are passed to the scan program if the setting of
 ;; `mh-scan-format-file' is t. They are identical except the later one makes
@@ -459,6 +460,8 @@ is done highlighting.")
 
 (defvar mh-refile-list nil)             ;List of folder names in mh-seq-list.
 
+(defvar mh-folders-changed nil)         ;For mh-after-commands-processed-hook.
+
 (defvar mh-next-direction 'forward)     ;Direction to move to next message.
 
 (defvar mh-view-ops ())                 ;Stack of ops that change the folder
@@ -483,6 +486,8 @@ is done highlighting.")
 
 (defvar mh-colors-available-flag nil)   ;Are colors available?
 
+
+
 ;;; Macros and generic functions:
 
 (defun mh-mapc (function list)
@@ -1507,14 +1512,16 @@ Make it the current folder."
     (mh-index-read-data))
   (mh-make-folder-mode-line))
 
-;;; Ensure new buffers won't get this mode if default-major-mode is nil.
+;; Ensure new buffers won't get this mode if default-major-mode is nil.
 (put 'mh-folder-mode 'mode-class 'special)
 
 
 
-;;; Menu extracted from mh-menubar.el V1.1 (31 July 2001)
-;;; Menus for folder mode: folder, message, sequence (in that order)
-;;; folder-mode "Sequence" menu
+;;; Build mh-folder-mode menu
+
+;; Menu extracted from mh-menubar.el V1.1 (31 July 2001)
+;; Menus for folder mode: folder, message, sequence (in that order)
+;; folder-mode "Sequence" menu
 (easy-menu-define
   mh-folder-sequence-menu mh-folder-mode-map "Menu for MH-E folder-sequence."
   '("Sequence"
@@ -1535,7 +1542,7 @@ Make it the current folder."
     "--"
     ["Push State Out to MH"             mh-update-sequences t]))
 
-;;; folder-mode "Message" menu
+;; folder-mode "Message" menu
 (easy-menu-define
   mh-folder-message-menu mh-folder-mode-map "Menu for MH-E folder-message."
   '("Message"
@@ -1568,7 +1575,7 @@ Make it the current folder."
     ["Unpack Uuencoded Message..."      mh-store-msg (mh-get-msg-num nil)]
     ["Burst Digest Message"             mh-burst-digest (mh-get-msg-num nil)]))
 
-;;; folder-mode "Folder" menu
+;; folder-mode "Folder" menu
 (easy-menu-define
   mh-folder-folder-menu mh-folder-mode-map  "Menu for MH-E folder."
   '("Folder"
@@ -1742,7 +1749,7 @@ messages in that region.
   (easy-menu-add mh-folder-message-menu)
   (easy-menu-add mh-folder-folder-menu)
   (set (make-local-variable 'tool-bar-map) mh-folder-tool-bar-map)
-  (mh-funcall-if-exists mh-toolbar-init :folder)
+  (mh-funcall-if-exists mh-tool-bar-init :folder)
   (if (and mh-xemacs-flag
            font-lock-auto-fontify)
       (turn-on-font-lock)))             ; Force font-lock in XEmacs.
@@ -1786,7 +1793,7 @@ DESKTOP-BUFFER-MISC holds a list of miscellaneous info used by the
   (mh-visit-folder desktop-buffer-name)
   (current-buffer))
 
-;;; desktop-buffer-mode-handlers appeared in Emacs 22.
+;; desktop-buffer-mode-handlers appeared in Emacs 22.
 (if (fboundp 'desktop-buffer-mode-handlers)
     (add-to-list 'desktop-buffer-mode-handlers
                  '(mh-folder-mode . mh-restore-desktop-buffer)))
@@ -2144,13 +2151,15 @@ Called by functions like `mh-sort-folder', so also invalidate show buffer."
 
 (defun mh-process-commands (folder)
   "Process outstanding commands for FOLDER.
-The value of `mh-folder-updated-hook' is a list of functions to be called,
-with no arguments, before the commands are processed."
+The value of `mh-before-commands-processed-hook' is a list of functions
+to be called, with no arguments, before the commands are processed.
+After all cammands are processed, the functions in
+`mh-after-commands-processed-hook' are called with no arguments."
   (message "Processing deletes and refiles for %s..." folder)
   (set-buffer folder)
   (with-mh-folder-updating (nil)
-    ;; Run the hook while the lists are still valid
-    (run-hooks 'mh-folder-updated-hook)
+    ;; Run the before hook -- the refile and delete lists are still valid
+    (run-hooks 'mh-before-commands-processed-hook)
 
     ;; Update the unseen sequence if it exists
     (mh-update-unseen)
@@ -2217,17 +2226,23 @@ with no arguments, before the commands are processed."
         (when (mh-speed-flists-active-p)
           (apply #'mh-speed-flists t folders-changed))
         (cond ((memq 'unthread mh-view-ops) (mh-thread-inc folder (point-max)))
-              (mh-index-data (mh-index-insert-folder-headers)))))
+              (mh-index-data (mh-index-insert-folder-headers))))
 
-    (and (buffer-file-name (get-buffer mh-show-buffer))
-         (not (file-exists-p (buffer-file-name (get-buffer mh-show-buffer))))
-         ;; If "inc" were to put a new msg in this file,
-         ;; we would not notice, so mark it invalid now.
-         (mh-invalidate-show-buffer))
+      (and (buffer-file-name (get-buffer mh-show-buffer))
+           (not (file-exists-p (buffer-file-name (get-buffer mh-show-buffer))))
+           ;; If "inc" were to put a new msg in this file,
+           ;; we would not notice, so mark it invalid now.
+           (mh-invalidate-show-buffer))
+
+      (setq mh-seq-list (mh-read-folder-sequences mh-current-folder nil))
+      (mh-remove-all-notation)
+      (mh-notate-user-sequences)
+
+      ;; Run the after hook -- now folders-changed is valid, 
+      ;; but not the lists of specific messages.
+      (let ((mh-folders-changed folders-changed))
+        (run-hooks 'mh-after-commands-processed-hook)))
 
-    (setq mh-seq-list (mh-read-folder-sequences mh-current-folder nil))
-    (mh-remove-all-notation)
-    (mh-notate-user-sequences)
     (message "Processing deletes and refiles for %s...done" folder)))
 
 (defun mh-update-unseen ()
@@ -2478,7 +2493,7 @@ If INCLUDE-INTERNAL-FLAG non-nil, include MH-E internal sequences in list."
 
 
 
-;;; Build the folder-mode keymap:
+;;; Build mh-folder-mode keymap:
 
 (suppress-keymap mh-folder-mode-map)
 
@@ -2631,15 +2646,15 @@ If INCLUDE-INTERNAL-FLAG non-nil, include MH-E internal sequences in list."
 
 ;;; Help Messages
 
-;;; If you add a new prefix, add appropriate text to the nil key.
-;;;
-;;; In general, messages are grouped logically. Taking the main commands for
-;;; example, the first line is "ways to view messages," the second line is
-;;; "things you can do with messages", and the third is "composing" messages.
-;;;
-;;; When adding a new prefix, ensure that the help message contains "what" the
-;;; prefix is for. For example, if the word "folder" were not present in the
-;;; `F' entry, it would not be clear what these commands operated upon.
+;; If you add a new prefix, add appropriate text to the nil key.
+;;
+;; In general, messages are grouped logically. Taking the main commands for
+;; example, the first line is "ways to view messages," the second line is
+;; "things you can do with messages", and the third is "composing" messages.
+;;
+;; When adding a new prefix, ensure that the help message contains "what" the
+;; prefix is for. For example, if the word "folder" were not present in the
+;; `F' entry, it would not be clear what these commands operated upon.
 (defvar mh-help-messages
   '((nil "[i]nc, [.]show, [,]show all, [n]ext, [p]revious,\n"
          "[d]elete, [o]refile, e[x]ecute,\n"
@@ -2682,10 +2697,10 @@ well.")
 
 (provide 'mh-e)
 
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
-;;; arch-tag: cce884de-bd37-4104-9963-e4439d5ed22b
+;; arch-tag: cce884de-bd37-4104-9963-e4439d5ed22b
 ;;; mh-e.el ends here
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index ca2f7333eb8..813d8a07b6c 100644
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -39,6 +39,8 @@
 (mh-require-cl)
 (require 'mh-e)
 
+
+
 ;;; Scan Line Formats
 
 (defvar mh-note-copied "C"
@@ -47,6 +49,8 @@
 (defvar mh-note-printed "P"
   "Messages that have been printed are marked by this character.")
 
+
+
 ;;; Functions
 
 ;;;###mh-autoload
@@ -411,10 +415,10 @@ Default directory is the last directory used, or initially the value of
 
 (provide 'mh-funcs)
 
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
-;;; arch-tag: 1936c4f1-4843-438e-bc4b-a63bb75a7762
+;; arch-tag: 1936c4f1-4843-438e-bc4b-a63bb75a7762
 ;;; mh-funcs.el ends here
diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el
index 23209275d12..71220e2dd3d 100644
--- a/lisp/mh-e/mh-gnus.el
+++ b/lisp/mh-e/mh-gnus.el
@@ -30,8 +30,8 @@
 
 ;;; Code:
 
-;;; Load libraries in a non-fatal way in order to see if certain functions are
-;;; pre-defined.
+;; Load libraries in a non-fatal way in order to see if certain functions are
+;; pre-defined.
 (load "mailabbrev" t t)
 (load "mailcap" t t)
 (load "mm-decode" t t)
@@ -147,10 +147,10 @@ BODY."
         disposition
       default)))
 
-;;; This is mm-save-part from Gnus 5.10 since that function in emacs21.2 is
-;;; buggy (the args to read-file-name are incorrect). When all supported
-;;; versions of Emacs come with at least Gnus 5.10, we can delete this
-;;; function and rename calls to mh-mm-save-part to mm-save-part.
+;; This is mm-save-part from Gnus 5.10 since that function in emacs21.2 is
+;; buggy (the args to read-file-name are incorrect). When all supported
+;; versions of Emacs come with at least Gnus 5.10, we can delete this
+;; function and rename calls to mh-mm-save-part to mm-save-part.
 (defun mh-mm-save-part (handle)
   "Write HANDLE to a file."
   (let ((name (mail-content-type-get (mm-handle-type handle) 'name))
@@ -181,12 +181,12 @@ BODY."
 
 (provide 'mh-gnus)
 
-;;; Local Variables:
-;;; no-byte-compile: t
-;;; no-update-autoloads: t
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
 ;; arch-tag: 1e3638af-cad3-4c69-8427-bc8eb6e5e4fa
 ;;; mh-gnus.el ends here
diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el
index 9d81a2acbe2..1e621af7df9 100644
--- a/lisp/mh-e/mh-identity.el
+++ b/lisp/mh-e/mh-identity.el
@@ -282,10 +282,10 @@ If the field wasn't present, it is added to the bottom of the header."
 
 (provide 'mh-identity)
 
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
-;;; arch-tag: 07d66ef6-8726-4ac6-9ecf-e566cd5bfb45
+;; arch-tag: 07d66ef6-8726-4ac6-9ecf-e566cd5bfb45
 ;;; mh-identity.el ends here
diff --git a/lisp/mh-e/mh-inc.el b/lisp/mh-e/mh-inc.el
index 9ccec70e969..d5becd26ce4 100644
--- a/lisp/mh-e/mh-inc.el
+++ b/lisp/mh-e/mh-inc.el
@@ -98,10 +98,10 @@ This is called after 'customize is used to alter `mh-inc-spool-list'."
 
 (provide 'mh-inc)
 
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
-;;; arch-tag: 3713cf2a-6082-4cb4-8ce2-99d9acaba835
+;; arch-tag: 3713cf2a-6082-4cb4-8ce2-99d9acaba835
 ;;; mh-inc.el ends here
diff --git a/lisp/mh-e/mh-index.el b/lisp/mh-e/mh-index.el
index 6b429773945..e261b47b753 100644
--- a/lisp/mh-e/mh-index.el
+++ b/lisp/mh-e/mh-index.el
@@ -26,18 +26,18 @@
 
 ;;; Commentary:
 
-;;;  (1) The following search engines are supported:
-;;;        swish++
-;;;        swish-e
-;;;        mairix
-;;;        namazu
-;;;        pick
-;;;        grep
-;;;
-;;;  (2) To use this package, you first have to build an index. Please read
-;;;      the documentation for `mh-index-search' to get started. That
-;;;      documentation will direct you to the specific instructions for your
-;;;      particular indexer.
+;;  (1) The following search engines are supported:
+;;        swish++
+;;        swish-e
+;;        mairix
+;;        namazu
+;;        pick
+;;        grep
+;;
+;;  (2) To use this package, you first have to build an index. Please read
+;;      the documentation for `mh-index-search' to get started. That
+;;      documentation will direct you to the specific instructions for your
+;;      particular indexer.
 
 ;;; Change Log:
 
@@ -91,17 +91,17 @@
 
 
 
-;;; A few different checksum programs are supported. The supported programs
-;;; are:
-;;;   1. md5sum
-;;;   2. md5
-;;;   3. openssl
-;;;
-;;; To add support for your favorite checksum program add a clause to the cond
-;;; statement in mh-checksum-choose. This should set the variable
-;;; mh-checksum-cmd to the command line needed to run the checsum program and
-;;; should set mh-checksum-parser to a function which returns a cons cell
-;;; containing the message number and checksum string.
+;; A few different checksum programs are supported. The supported programs
+;; are:
+;;   1. md5sum
+;;   2. md5
+;;   3. openssl
+;;
+;; To add support for your favorite checksum program add a clause to the cond
+;; statement in mh-checksum-choose. This should set the variable
+;; mh-checksum-cmd to the command line needed to run the checsum program and
+;; should set mh-checksum-parser to a function which returns a cons cell
+;; containing the message number and checksum string.
 
 (defvar mh-checksum-cmd)
 (defvar mh-checksum-parser)
@@ -152,8 +152,7 @@
 
 
 
-;;; Make sure that we don't produce too long a command line.
-
+;; Make sure that we don't produce too long a command line.
 (defvar mh-index-max-cmdline-args 500
   "Maximum number of command line args.")
 
@@ -1653,10 +1652,10 @@ system."
 
 (provide 'mh-index)
 
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
-;;; arch-tag: 607762ad-0dff-4fe1-a27e-6c0dde0dcc47
+;; arch-tag: 607762ad-0dff-4fe1-a27e-6c0dde0dcc47
 ;;; mh-index ends here
diff --git a/lisp/mh-e/mh-init.el b/lisp/mh-e/mh-init.el
index 79f779810e2..1bafe960eff 100644
--- a/lisp/mh-e/mh-init.el
+++ b/lisp/mh-e/mh-init.el
@@ -1,4 +1,4 @@
-;;; mh-init.el --- MH-E initialization.
+;;; mh-init.el --- MH-E initialization
 
 ;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
@@ -43,14 +43,14 @@
 (mh-require-cl)
 (require 'mh-utils)
 
-;;; Avoid compiler warnings.
+;; Avoid compiler warnings.
 (eval-when-compile (defvar image-load-path))
 
-;;; Set for local environment:
-;;; mh-progs and mh-lib used to be set in paths.el, which tried to
-;;; figure out at build time which of several possible directories MH
-;;; was installed into.  But if you installed MH after building Emacs,
-;;; this would almost certainly be wrong, so now we do it at run time.
+;; Set for local environment:
+;; mh-progs and mh-lib used to be set in paths.el, which tried to
+;; figure out at build time which of several possible directories MH
+;; was installed into.  But if you installed MH after building Emacs,
+;; this would almost certainly be wrong, so now we do it at run time.
 
 (defvar mh-progs nil
   "Directory containing MH commands, such as inc, repl, and rmm.")
@@ -350,10 +350,10 @@ single \"class\" requirement with a \"color\" item, renames the requirement to
 
 (provide 'mh-init)
 
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
 ;; arch-tag: e8372aeb-d803-42b1-9c95-3c93ad22f63c
 ;;; mh-init.el ends here
diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el
index 5cbc7b77b47..29caef6cae7 100644
--- a/lisp/mh-e/mh-junk.el
+++ b/lisp/mh-e/mh-junk.el
@@ -420,10 +420,10 @@ See `mh-spamprobe-blacklist' for more information."
 
 (provide 'mh-junk)
 
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
-;;; arch-tag: 603335f1-77ff-4306-8828-5d3dad51abe1
+;; arch-tag: 603335f1-77ff-4306-8828-5d3dad51abe1
 ;;; mh-junk.el ends here
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 3d55c5cded1..bb2fc2b8f50 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -219,9 +219,9 @@ Obsolete; use `mailcap-mime-types'.
 
 See also \\[mh-mh-to-mime].")
 
-;;; Delete mh-minibuffer-read-type and mh-mime-content-types and use
-;;; mml-minibuffer-read-type when Emacs20 is no longer supported unless we
-;;; think (mh-file-mime-type) is better than (mm-default-file-encoding).
+;; Delete mh-minibuffer-read-type and mh-mime-content-types and use
+;; mml-minibuffer-read-type when Emacs20 is no longer supported unless we
+;; think (mh-file-mime-type) is better than (mm-default-file-encoding).
 
 (defun mh-minibuffer-read-type (filename &optional default)
   "Return the content type associated with the given FILENAME.
@@ -1347,9 +1347,9 @@ Parameter EL is unused."
     (mm-set-handle-multipart-parameter
      handle 'mh-region (cons (point-min-marker) (point-max-marker)))))
 
-;;; I rewrote the security part because Gnus doesn't seem to ever minimize
-;;; the button. That is once the mime-security button is pressed there seems
-;;; to be no way of getting rid of the inserted text.
+;; I rewrote the security part because Gnus doesn't seem to ever minimize
+;; the button. That is once the mime-security button is pressed there seems
+;; to be no way of getting rid of the inserted text.
 (defun mh-mime-security-show-details (handle)
   "Toggle display of detailed security info for HANDLE."
   (let ((details (mm-handle-multipart-ctl-parameter handle 'gnus-details)))
@@ -1509,10 +1509,10 @@ message multiple times."
 
 (provide 'mh-mime)
 
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
-;;; arch-tag: 0dd36518-1b64-4a84-8f4e-59f422d3f002
+;; arch-tag: 0dd36518-1b64-4a84-8f4e-59f422d3f002
 ;;; mh-mime.el ends here
diff --git a/lisp/mh-e/mh-pick.el b/lisp/mh-e/mh-pick.el
index eb825fe462f..a20172ba6f3 100644
--- a/lisp/mh-e/mh-pick.el
+++ b/lisp/mh-e/mh-pick.el
@@ -158,15 +158,22 @@ is used when the search folder is dismissed."
   (add-text-properties (point) (1- (line-end-position)) '(read-only t))
   (goto-char (point-max)))
 
-;;; Menu extracted from mh-menubar.el V1.1 (31 July 2001)
+
+
+;;; Build mh-pick-mode menu
+
+;; Menu extracted from mh-menubar.el V1.1 (31 July 2001)
 (easy-menu-define
   mh-pick-menu mh-pick-mode-map "Menu for MH-E pick-mode"
   '("Pick"
     ["Execute the Search"       mh-pick-do-search t]))
 
 
+
+
 ;;; Help Messages
-;;; Group messages logically, more or less.
+
+;; Group messages logically, more or less.
 (defvar mh-pick-mode-help-messages
   '((nil
      "Search messages using pick:  \\[mh-pick-do-search]\n"
@@ -351,7 +358,8 @@ COMPONENT is the component to search."
 
 
 ;;; Build the pick-mode keymap:
-;;; If this changes, modify mh-pick-mode-help-messages accordingly, above.
+
+;; If this changes, modify mh-pick-mode-help-messages accordingly, above.
 (gnus-define-keys  mh-pick-mode-map
   "\C-c?"               mh-help
   "\C-c\C-i"            mh-index-do-search
@@ -374,10 +382,10 @@ COMPONENT is the component to search."
 
 (provide 'mh-pick)
 
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
-;;; arch-tag: aef2b271-7768-42bd-a782-9a14ba9f83f7
+;; arch-tag: aef2b271-7768-42bd-a782-9a14ba9f83f7
 ;;; mh-pick.el ends here
diff --git a/lisp/mh-e/mh-print.el b/lisp/mh-e/mh-print.el
index cc35926aecc..acca58c494f 100644
--- a/lisp/mh-e/mh-print.el
+++ b/lisp/mh-e/mh-print.el
@@ -183,7 +183,7 @@ best. You change this setting permanently by customizing the option
      (setq mh-ps-print-color-option nil)
      (message "Colors will not be printed"))))
 
-;;; Old non-PS based printing
+;; Old non-PS based printing
 ;;;###mh-autoload
 (defun mh-print-msg (range)
   "Print RANGE the old fashioned way\\<mh-folder-mode-map>.
@@ -242,10 +242,10 @@ Consider using \\[mh-ps-print-msg] instead."
 
 (provide 'mh-print)
 
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
 ;; arch-tag: 8d84d50b-2a49-4d0d-b51e-ba9c9b6fc679
 ;;; mh-print.el ends here
diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el
index 795970d3739..4942df58f71 100644
--- a/lisp/mh-e/mh-seq.el
+++ b/lisp/mh-e/mh-seq.el
@@ -78,7 +78,10 @@
 ;; Shush the byte-compiler
 (defvar tool-bar-mode)
 
+
+
 ;;; Data structures (used in message threading)...
+
 (mh-defstruct (mh-thread-message (:conc-name mh-message-)
                                  (:constructor mh-thread-make-message))
   (id nil)
@@ -91,15 +94,20 @@
   message parent children
   (real-child-p t))
 
+
 
 ;;; Internal variables:
+
 (defvar mh-last-seq-used nil
   "Name of seq to which a msg was last added.")
 
 (defvar mh-non-seq-mode-line-annotation nil
   "Saved value of `mh-mode-line-annotation' when narrowed to a seq.")
 
+
+
 ;;; Maps and hashes...
+
 (defvar mh-thread-id-hash nil
   "Hashtable used to canonicalize message identifiers.")
 (defvar mh-thread-subject-hash nil
@@ -377,9 +385,10 @@ refiled are present in `mh-refile-list'."
 
 
 
-;;; Commands to manipulate sequences.  Sequences are stored in an alist
-;;; of the form:
-;;;     ((seq-name msgs ...) (seq-name msgs ...) ...)
+;;; Commands to manipulate sequences.
+
+;; Sequences are stored in an alist of the form:
+;;     ((seq-name msgs ...) (seq-name msgs ...) ...)
 
 (defvar mh-sequence-history ())
 
@@ -412,7 +421,10 @@ defaults to the first sequence containing the current message."
         (error "No messages in sequence `%s'" seq))
     seq))
 
+
+
 ;;; Functions to read ranges with completion...
+
 (defvar mh-range-seq-names)
 (defvar mh-range-history ())
 (defvar mh-range-completion-map (copy-keymap minibuffer-local-completion-map))
@@ -702,11 +714,10 @@ a uniform interface to MH-E functions."
 
 
 
-;;; Commands to handle new 'subject sequence.
-;;; Or "Poor man's threading" by psg.
+;;; Commands to handle new 'subject sequence ("Poor man's threading" by psg)
 
-;;; XXX: The function mh-subject-to-sequence-unthreaded uses the magic number
-;;;  41 for the max size of the subject part. Avoiding this would be desirable.
+;; XXX: The function mh-subject-to-sequence-unthreaded uses the magic number
+;;  41 for the max size of the subject part. Avoiding this would be desirable.
 (defun mh-subject-to-sequence (all)
   "Put all following messages with same subject in sequence 'subject.
 If arg ALL is t, move to beginning of folder buffer to collect all messages.
@@ -970,6 +981,8 @@ command behaves like \\[mh-thread-delete]."
       (mh-thread-delete)
     (mh-delete-subject)))
 
+
+
 ;;; Message threading:
 
 (defmacro mh-thread-initialize-hash (var test)
@@ -1745,10 +1758,10 @@ messages. When you want to widen the view to all your messages again, use
 
 (provide 'mh-seq)
 
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
-;;; arch-tag: 8e952711-01a2-485b-bf21-c9e3ad4de942
+;; arch-tag: 8e952711-01a2-485b-bf21-c9e3ad4de942
 ;;; mh-seq.el ends here
diff --git a/lisp/mh-e/mh-speed.el b/lisp/mh-e/mh-speed.el
index 4b33a81a7e9..64aa84fa8d8 100644
--- a/lisp/mh-e/mh-speed.el
+++ b/lisp/mh-e/mh-speed.el
@@ -558,10 +558,10 @@ The function invalidates the latest ancestor that is present."
 
 (provide 'mh-speed)
 
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
-;;; arch-tag: d38ddcd4-3c00-4e37-99bf-8b89dda7b32c
+;; arch-tag: d38ddcd4-3c00-4e37-99bf-8b89dda7b32c
 ;;; mh-speed.el ends here
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index cc48b1248d4..e39d141b70b 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -62,7 +62,10 @@
 (defvar font-lock-defaults)
 (defvar mark-active)
 
+
+
 ;;; Autoloads
+
 (autoload 'gnus-article-highlight-citation "gnus-cite")
 (autoload 'message-fetch-field "message")
 (autoload 'message-tokenize-header "message")
@@ -70,7 +73,10 @@
 (unless (fboundp 'make-hash-table)
   (autoload 'make-hash-table "cl"))
 
+
+
 ;;; CL Replacements
+
 (defun mh-search-from-end (char string)
   "Return the position of last occurrence of CHAR in STRING.
 If CHAR is not present in STRING then return nil. The function is used in lieu
@@ -79,10 +85,11 @@ of `search' in the CL package."
         when (equal (aref string index) char) return index
         finally return nil))
 
-;;; Additional header fields that might someday be added:
-;;; "Sender: " "Reply-to: "
+;; Additional header fields that might someday be added:
+;; "Sender: " "Reply-to: "
 
 
+
 ;;; Scan Line Formats
 
 (defvar mh-scan-msg-number-regexp "^ *\\([0-9]+\\)"
@@ -171,7 +178,8 @@ Use `mh-signature-separator-regexp' when searching for a separator.")
                                         ; this number
   (part-index-hash (make-hash-table)))  ; Avoid incrementing the part number
                                         ; for nested messages
-;;; This has to be a macro, since we do: (setf (mh-buffer-data) ...)
+
+;; This has to be a macro, since we do: (setf (mh-buffer-data) ...)
 (defmacro mh-buffer-data ()
   "Convenience macro to get the MIME data structures of the current buffer."
   `(gethash (current-buffer) mh-globals-hash))
@@ -457,6 +465,8 @@ about the fontification operation."
       (gnus-article-highlight-citation t)
       (set-buffer-modified-p modified))))
 
+
+
 ;;; Internal bookkeeping variables:
 
 ;; Cached value of the `Path:' component in the user's MH profile.
@@ -510,6 +520,8 @@ about the fontification operation."
 ;;Non-nil means next SPC or whatever goes to next undeleted message.
 (defvar mh-page-to-next-msg-flag nil)
 
+
+
 ;;; Internal variables local to a folder.
 
 ;; Name of current folder, a string.
@@ -554,7 +566,7 @@ about the fontification operation."
             (cons modeline-buffer-id-left-extent "XEmacs%N:"))
           (cons modeline-buffer-id-right-extent " %17b")))))
 
-;;; This holds a documentation string used by describe-mode.
+;; This holds a documentation string used by describe-mode.
 (defun mh-showing-mode (&optional arg)
   "Change whether messages should be displayed.
 With arg, display messages iff ARG is positive."
@@ -574,6 +586,8 @@ With arg, display messages iff ARG is positive."
 ;; Showing message with headers or normally.
 (defvar mh-showing-with-headers nil)
 
+
+
 ;;; MH-E macros
 
 (defmacro with-mh-folder-updating (save-modification-flag &rest body)
@@ -740,10 +754,10 @@ See `expand-file-name' for description of DEFAULT."
                         (mh-expand-file-name folder)
                       mh-folder-filename)))
 
-;;; Infrastructure to generate show-buffer functions from folder functions
-;;; XEmacs does not have deactivate-mark? What is the equivalent of
-;;; transient-mark-mode for XEmacs? Should we be restoring the mark in the
-;;; folder buffer after the operation has been carried out.
+;; Infrastructure to generate show-buffer functions from folder functions
+;; XEmacs does not have deactivate-mark? What is the equivalent of
+;; transient-mark-mode for XEmacs? Should we be restoring the mark in the
+;; folder buffer after the operation has been carried out.
 (defmacro mh-defun-show-buffer (function original-function
                                          &optional dont-return)
   "Define FUNCTION to run ORIGINAL-FUNCTION in folder buffer.
@@ -784,8 +798,8 @@ still visible.\n")
                                            (get-buffer cur-buffer-name))))
                       (pop-to-buffer (get-buffer cur-buffer-name) nil)))))))))
 
-;;; Generate interactive functions for the show buffer from the corresponding
-;;; folder functions.
+;; Generate interactive functions for the show buffer from the corresponding
+;; folder functions.
 (mh-defun-show-buffer mh-show-previous-undeleted-msg
                       mh-previous-undeleted-msg)
 (mh-defun-show-buffer mh-show-next-undeleted-msg
@@ -883,7 +897,10 @@ still visible.\n")
 (mh-defun-show-buffer mh-show-display-with-external-viewer
                       mh-display-with-external-viewer)
 
-;;; Populate mh-show-mode-map
+
+
+;;; Build mh-show-mode keymaps
+
 (gnus-define-keys mh-show-mode-map
   " "    mh-show-page-msg
   "!"    mh-show-refile-or-write-again
@@ -1081,7 +1098,7 @@ still visible.\n")
     ["Quit MH-E"                        mh-quit t]))
 
 
-;;; Ensure new buffers won't get this mode if default-major-mode is nil.
+;; Ensure new buffers won't get this mode if default-major-mode is nil.
 (put 'mh-show-mode 'mode-class 'special)
 
 ;; Avoid compiler warnings in XEmacs and Emacs 20
@@ -1120,7 +1137,7 @@ See also `mh-folder-mode'.
            font-lock-auto-fontify)
       (turn-on-font-lock))
   (set (make-local-variable 'tool-bar-map) mh-show-tool-bar-map)
-  (mh-funcall-if-exists mh-toolbar-init :show)
+  (mh-funcall-if-exists mh-tool-bar-init :show)
   (when mh-decode-mime-flag
     (mh-make-local-hook 'kill-buffer-hook)
     (add-hook 'kill-buffer-hook 'mh-mime-cleanup nil t))
@@ -1260,10 +1277,10 @@ is used."
 
 
 
-;; Picon display
+;;; Picon display
 
-;;; XXX: This should be customizable. As a side-effect of setting this
-;;;   variable, arrange to reset mh-picon-existing-directory-list to 'unset.
+;; XXX: This should be customizable. As a side-effect of setting this
+;;   variable, arrange to reset mh-picon-existing-directory-list to 'unset.
 (defvar mh-picon-directory-list
   '("~/.picons" "~/.picons/users" "~/.picons/usenix" "~/.picons/news"
     "~/.picons/domains" "~/.picons/misc"
@@ -2388,6 +2405,8 @@ The function returns the size of the final size of the log buffer."
       (insert "\n\n"))
     (buffer-size)))
 
+
+
 ;;; Issue commands to MH.
 
 (defun mh-exec-cmd (command &rest args)
@@ -2593,10 +2612,10 @@ older versions of Gnus."
 
 (provide 'mh-utils)
 
-;;; Local Variables:
-;;; indent-tabs-mode: nil
-;;; sentence-end-double-space: nil
-;;; End:
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; sentence-end-double-space: nil
+;; End:
 
-;;; arch-tag: 1af39fdf-f66f-4b06-9b48-18a7656c8e36
+;; arch-tag: 1af39fdf-f66f-4b06-9b48-18a7656c8e36
 ;;; mh-utils.el ends here
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 5728499db43..51291d717b6 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1336,7 +1336,7 @@ shell-specific features.
 The default style of this mode is that of Rosenblatt's Korn shell book.
 The syntax of the statements varies with the shell being used.  The
 following commands are available, based on the current shell's syntax:
-
+\\<sh-mode-map>
 \\[sh-case]      case statement
 \\[sh-for]       for loop
 \\[sh-function]  function definition
diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index 6cc23f7bf6b..090f0431218 100644
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -1,7 +1,9 @@
 ;;; ps-bdf.el --- BDF font file handler for ps-print
 
-;; Copyright (C) 1998, 1999, 2001, 2003 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1998, 1999, 2001  Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2001, 2003
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: wp, BDF, font, PostScript
 ;; Maintainer: Kenichi Handa <handa@etl.go.jp>
diff --git a/lisp/subr.el b/lisp/subr.el
index e55858e42d8..01444481b22 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2280,7 +2280,7 @@ from which the minibuffer was entered.  The return value of
   (let ((str (make-symbol "string")))
     `(dynamic-completion-table
       (lambda (,str)
-        (unless (listp ,var)
+        (when (functionp ,var)
           (setq ,var (,fun ,@args)))
         ,var))))
 
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index c4ccc9588ed..6feaa347c8b 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1140,6 +1140,7 @@ correspoinding TextEncodingBase value."
 
 ;;;; Keyboard layout/language change events
 (defun mac-handle-language-change (event)
+  "Set keyboard coding system to what is specified in EVENT."
   (interactive "e")
   (let ((coding-system
          (cdr (assq (car (cadr event)) mac-script-code-coding-systems))))
@@ -1201,21 +1202,14 @@ in `selection-converter-alist', which see."
     (when (and (stringp data)
                (setq data-type (get-text-property 0 'foreign-selection data)))
       (cond ((eq data-type 'public.utf16-plain-text)
-             (if (fboundp 'mac-code-convert-string)
-                 (let ((s (mac-code-convert-string data nil coding)))
-                   (if s
-                       (setq data (decode-coding-string s coding))
-                     (setq data
-                           ;; (decode-coding-string data 'utf-16) is
-                           ;; not correct because
-                           ;; public.utf16-plain-text is defined as
-                           ;; native byte order, no BOM.
-                           (decode-coding-string
-                            (mac-code-convert-string data nil 'utf-8)
-                            'utf-8))))
-               ;; No `mac-code-convert-string' means non-Carbon, which
-               ;; implies big endian.
-               (setq data (decode-coding-string data 'utf-16be))))
+             (let ((encoded (and (fboundp 'mac-code-convert-string)
+                                 (mac-code-convert-string data nil coding))))
+               (if encoded
+                   (setq data (decode-coding-string encoded coding))
+                 (setq data
+                       (decode-coding-string data
+                                             (if (eq (byteorder) ?B)
+                                                 'utf-16be 'utf-16le))))))
             ((eq data-type 'com.apple.traditional-mac-plain-text)
              (setq data (decode-coding-string data coding)))
             ((eq data-type 'public.file-url)
@@ -1332,25 +1326,17 @@ in `selection-converter-alist', which see."
           (remove-text-properties 0 (length str) '(composition nil) str)
           (cond
            ((eq type 'public.utf16-plain-text)
-            (if (fboundp 'mac-code-convert-string)
-                (let (s)
-                  (when (memq coding (find-coding-systems-string str))
-                    (setq coding
-                          (coding-system-change-eol-conversion coding 'mac))
-                    (setq s (mac-code-convert-string
-                             (encode-coding-string str coding)
-                             coding nil)))
-                  (setq str (or s
-                                ;; (encode-coding-string str
-                                ;; 'utf-16-mac) is not correct because
-                                ;; public.utf16-plain-text is defined
-                                ;; as native byte order, no BOM.
-                                (mac-code-convert-string
-                                 (encode-coding-string str 'utf-8-mac)
-                                 'utf-8 nil))))
-              ;; No `mac-code-convert-string' means non-Carbon, which
-              ;; implies big endian.
-              (setq str (encode-coding-string str 'utf-16be-mac))))
+            (let (s)
+              (when (and (fboundp 'mac-code-convert-string)
+                         (memq coding (find-coding-systems-string str)))
+                (setq coding (coding-system-change-eol-conversion coding 'mac))
+                (setq s (mac-code-convert-string
+                         (encode-coding-string str coding)
+                         coding nil)))
+              (setq str (or s
+                            (encode-coding-string str
+                                                  (if (eq (byteorder) ?B)
+                                                      'utf-16be 'utf-16le))))))
            ((eq type 'com.apple.traditional-mac-plain-text)
             (let ((encodables (find-coding-systems-string str))
                   (rest mac-script-code-coding-systems))
@@ -1484,6 +1470,7 @@ in `selection-converter-alist', which see."
          (decode-coding-string utf8-text 'utf-8))))
 
 (defun mac-ae-open-documents (event)
+  "Open the documents specified by the Apple event EVENT."
   (interactive "e")
   (let ((ae (mac-event-ae event)))
     (dolist (file-name (mac-ae-list ae nil 'undecoded-file-name))
@@ -1511,6 +1498,8 @@ in `selection-converter-alist', which see."
       (error "No text in Apple event.")))
 
 (defun mac-ae-get-url (event)
+  "Open the URL specified by the Apple event EVENT.
+Currently the `mailto' scheme is supported."
   (interactive "e")
   (let* ((ae (mac-event-ae event))
          (parsed-url (url-generic-parse-url (mac-ae-text ae))))
@@ -1541,10 +1530,12 @@ in `selection-converter-alist', which see."
 (define-key mac-apple-event-map [hicommand about] 'display-splash-screen)
 
 (defun mac-services-open-file ()
+  "Open the file specified by the selection value for Services."
   (interactive)
   (find-file-existing (x-selection-value mac-services-selection)))
 
 (defun mac-services-open-selection ()
+  "Create a new buffer containing the selection value for Services."
   (interactive)
   (switch-to-buffer (generate-new-buffer "*untitled*"))
   (insert (x-selection-value mac-services-selection))
@@ -1553,6 +1544,7 @@ in `selection-converter-alist', which see."
   )
 
 (defun mac-services-mail-selection ()
+  "Prepare a mail buffer containing the selection value for Services."
   (interactive)
   (compose-mail)
   (rfc822-goto-eoh)
@@ -1560,10 +1552,12 @@ in `selection-converter-alist', which see."
   (insert (x-selection-value mac-services-selection) "\n"))
 
 (defun mac-services-mail-to ()
+  "Prepare a mail buffer to be sent to the selection value for Services."
   (interactive)
   (compose-mail (x-selection-value mac-services-selection)))
 
 (defun mac-services-insert-text ()
+  "Insert the selection value for Services."
   (interactive)
   (let ((text (x-selection-value mac-services-selection)))
     (if (not buffer-read-only)
@@ -1584,6 +1578,7 @@ in `selection-converter-alist', which see."
   'mac-services-mail-to)
 
 (defun mac-dispatch-apple-event (event)
+  "Dispatch EVENT according to the keymap `mac-apple-event-map'."
   (interactive "e")
   (let* ((binding (lookup-key mac-apple-event-map (mac-event-spec event)))
          (service-message
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 2e79be9e4cc..3cdc40b9f32 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.00
+;; Version: 4.01
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -81,6 +81,13 @@
 ;;
 ;; Changes:
 ;; -------
+;; Version 4.01
+;;    - Tags can also be set remotely from agenda buffer.
+;;    - Boolean logic for tag searches.
+;;    - Additional agenda commands can be configured through the variable
+;;      `org-agenda-custom-commands'.
+;;    - Minor bug fixes.
+;;
 ;; Version 4.00
 ;;    - Headlines can contain TAGS, and Org-mode can produced a list
 ;;      of matching headlines based on a TAG search expression.
@@ -199,7 +206,7 @@
 ;;    - Cleanup.
 ;;
 ;; Version 3.07
-;;    - Some folding incinsistencies removed.
+;;    - Some folding inconsistencies removed.
 ;;    - BBDB links to company-only entries.
 ;;    - Bug fixes and global cleanup.
 ;;
@@ -266,7 +273,7 @@
 
 ;;; Customization variables
 
-(defvar org-version "4.00"
+(defvar org-version "4.01"
   "The version number of the file org.el.")
 (defun org-version ()
   (interactive)
@@ -594,6 +601,23 @@ Entries are added to this list with \\[org-agenda-file-to-front] and removed wit
   :group 'org-agenda
   :type '(repeat file))
 
+(defcustom org-agenda-custom-commands
+  '(("w" todo "WAITING")
+    ("u" tags "+WORK+URGENT-BOSS"))
+  "Custom commands for the agenda.
+These commands will be offered on the splash screen displayed by the
+agenda dispatcher \\[org-agenda].  Each entry is a list of 3 items:
+
+key    The key (as a string) to be associated with the command.
+type   The command type, either `todo' for a todo list with a specific
+       todo keyword, or `tags' for a tags search.
+match  What to search for.  Either a TODO keyword, or a tags match query."
+  :group 'org-agenda
+  :type '(repeat
+          (list (string :tag "Key")
+                (choice :tag "Type" (const tags) (const todo))
+                (string :tag "Match"))))
+
 (defcustom org-select-timeline-window t
   "Non-nil means, after creating a timeline, move cursor into Timeline window.
 When nil, cursor will remain in the current window."
@@ -981,7 +1005,7 @@ first line, so it is probably best to use this in combinations with
   :tag "Org Tags"
   :group 'org)
 
-(defcustom org-tags-column 40
+(defcustom org-tags-column 48
   "The column to which tags should be indented in a headline.
 If this number is positive, it specified the column.  If it is negative,
 it means that the tags should be flushright to that column.  For example,
@@ -989,9 +1013,19 @@ it means that the tags should be flushright to that column.  For example,
   :group 'org-tags
   :type 'integer)
 
+(defcustom org-auto-align-tags t
+  "Non-nil means, realign tags after pro/demotion of TODO state change.
+These operations change the length of a headline and therefore shift
+the tags around.  With this options turned on, after each such operation
+the tags are again aligned to `org-tags-column'."
+  :group 'org-tags
+  :type 'boolean)
+
 (defcustom org-use-tag-inheritance t
   "Non-nil means, tags in levels apply also for sublevels.
-When nil, only the tags directly give in a specific line apply there."
+When nil, only the tags directly give in a specific line apply there.
+If you turn off this option, you very likely want to turn on the
+companion option `org-tags-match-list-sublevels'."
   :group 'org-tags
   :type 'boolean)
 
@@ -1000,7 +1034,9 @@ When nil, only the tags directly give in a specific line apply there."
 Because of tag inheritance (see variable `org-use-tag-inheritance'),
 the sublevels of a headline matching a tag search often also match
 the same search.  Listing all of them can create very long lists.
-Setting this variable to nil causes subtrees to be skipped."
+Setting this variable to nil causes subtrees to be skipped.
+This option is off by default, because inheritance in on.  If you turn
+inheritance off, you very likely want to turn this option on."
   :group 'org-tags
   :type 'boolean)
 
@@ -2721,6 +2757,8 @@ in the region."
          (up-head (make-string (1- level) ?*)))
     (if (= level 1) (error "Cannot promote to level 0. UNDO to recover"))
     (replace-match up-head nil t)
+    ;; Fixup tag positioning
+    (and org-auto-align-tags (org-set-tags nil t))
     (if org-adapt-indentation
         (org-fixup-indentation "^ " "" "^ ?\\S-"))))
 
@@ -2732,6 +2770,8 @@ in the region."
   (let* ((level (save-match-data (funcall outline-level)))
          (down-head (make-string (1+ level) ?*)))
     (replace-match down-head nil t)
+    ;; Fixup tag positioning
+    (and org-auto-align-tags (org-set-tags nil t))
     (if org-adapt-indentation
         (org-fixup-indentation "^ " "  " "^\\S-"))))
 
@@ -3467,6 +3507,8 @@ prefix arg, switch to that state."
             (org-log-done)
           (if (not this)
               (org-log-done t))))
+      ;; Fixup tag positioning
+      (and org-auto-align-tags (org-set-tags nil t))
       (run-hooks 'org-after-todo-state-change-hook)))
   ;; Fixup cursor location if close to the keyword
   (if (and (outline-on-heading-p)
@@ -4226,6 +4268,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 ":"        '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)
 (define-key org-agenda-mode-map "w"        'org-agenda-week-view)
@@ -4293,6 +4336,7 @@ The following commands are available:
      :style toggle :selected org-agenda-follow-mode :active t]
     "--"
     ["Cycle TODO" org-agenda-todo t]
+    ["Set Tags" org-agenda-set-tags t]
     ("Reschedule"
      ["Reschedule +1 day" org-agenda-date-later t]
      ["Reschedule -1 day" org-agenda-date-earlier t]
@@ -4338,7 +4382,7 @@ The following commands are available:
 (defun org-agenda (arg)
   "Dispatch agenda commands to collect entries to the agenda buffer.
 Prompts for a character to select a command.  Any prefix arg will be passed
-on to the selected command.  Possible selections are:
+on to the selected command.  The default selections are:
 
 a     Call `org-agenda' to display the agenda for the current day or week.
 t     Call `org-todo-list' to display the global todo list.
@@ -4349,35 +4393,70 @@ m     Call `org-tags-view' to display headlines with tags matching
       selections, like `+WORK+URGENT-WITHBOSS'.
 M     like `m', but select only TODO entries, no ordinary headlines.
 
+More commands can be added by configuring the variable
+`org-agenda-custom-commands'.
+
 If the current buffer is in Org-mode and visiting a file, you can also
 first press `1' to indicate that the agenda should be temporarily
 restricted to the current file."
   (interactive "P")
-  (let ((restrict-ok (and (buffer-file-name) (eq major-mode 'org-mode)))
-        c)
-    (put 'org-agenda-files 'org-restrict nil)
-    (message"[a]genda [t]odoList [T]odoKwd [m]atchTags [M]atchTagsTodo%s"
-            (if restrict-ok " [1]JustThisFile" ""))
-    (setq c (read-char-exclusive))
-    (message "")
-    (when (equal c ?1)
-      (if restrict-ok
-          (put 'org-agenda-files 'org-restrict (list (buffer-file-name)))
-        (error "Cannot restrict agenda to current buffer"))
-      (message "Single file: [a]genda [t]odoList [T]odoKwd [m]atchTags [M]atchTagsTodo")
-      (setq c (read-char-exclusive))
-      (message ""))
-    (cond
-     ((equal c ?a) (call-interactively 'org-agenda-list))
-     ((equal c ?t) (call-interactively 'org-todo-list))
-     ((equal c ?T)
-      (setq current-prefix-arg (or arg '(4)))
-      (call-interactively 'org-todo-list))
-     ((equal c ?m) (call-interactively 'org-tags-view))
-     ((equal c ?M)
-      (setq current-prefix-arg (or arg '(4)))
-      (call-interactively 'org-tags-view))
-     (t (error "Invalid key")))))
+  (catch 'exit
+    (let ((restrict-ok (and (buffer-file-name) (eq major-mode 'org-mode)))
+          (custom org-agenda-custom-commands)
+          c entry key type string)
+      (put 'org-agenda-files 'org-restrict nil)
+      (save-window-excursion
+        (delete-other-windows)
+        (switch-to-buffer-other-window " *Agenda Commands*")
+        (erase-buffer)
+        (insert
+         "Press key for an agenda command:
+--------------------------------
+a   Agenda for current week or day
+t   List of all TODO entries             T   Entries with special TODO kwd
+m   Match a TAGS query                   M   Like m, but only TODO entries.
+C   Configure your own agenda commands")
+        (while (setq entry (pop custom))
+          (setq key (car entry) type (nth 1 entry) string (nth 2 entry))
+          (insert (format "\n%-4s%-12s: %s"
+                          key
+                          (if (eq type 'tags) "Tags query" "TODO keyword")
+                          string)))
+        (goto-char (point-min))
+        (fit-window-to-buffer)
+        (message "Press key for agenda command%s"
+                (if restrict-ok ", or [1] to restrict to current file" ""))
+        (setq c (read-char-exclusive))
+        (message "")
+        (when (equal c ?1)
+          (if restrict-ok
+              (put 'org-agenda-files 'org-restrict (list (buffer-file-name)))
+            (error "Cannot restrict agenda to current buffer"))
+          (message "Press key for agenda command%s"
+                   (if restrict-ok " (restricted to current file)" ""))
+          (setq c (read-char-exclusive))
+          (message "")))
+      (require 'calendar)  ; FIXME: can we avoid this for some commands?
+      (cond
+       ((equal c ?C) (customize-variable 'org-agenda-custom-commands))
+       ((equal c ?a) (call-interactively 'org-agenda-list))
+       ((equal c ?t) (call-interactively 'org-todo-list))
+       ((equal c ?T)
+        (setq current-prefix-arg (or arg '(4)))
+        (call-interactively 'org-todo-list))
+       ((equal c ?m) (call-interactively 'org-tags-view))
+       ((equal c ?M)
+        (setq current-prefix-arg (or arg '(4)))
+        (call-interactively 'org-tags-view))
+       ((setq entry (assoc (char-to-string c) org-agenda-custom-commands))
+        (setq type (nth 1 entry) string (nth 2 entry))
+        (cond
+         ((eq type 'tags)
+          (org-tags-view current-prefix-arg string))
+         ((eq type 'todo)
+          (org-todo-list string))
+         (t (error "Invalid custom agenda command type %s" type))))
+       (t (error "Invalid key"))))))
 
 (defun org-fit-agenda-window ()
   "Fit the window to the buffer size."
@@ -4667,7 +4746,8 @@ for a keyword.  A numeric prefix directly selects the Nth keyword in
          (kwds org-todo-keywords)
          (completion-ignore-case t)
          (org-select-this-todo-keyword
-          (and arg (integerp arg) (nth (1- arg) org-todo-keywords)))
+          (if (stringp arg) arg
+            (and arg (integerp arg) (nth (1- arg) org-todo-keywords))))
          rtn rtnall files file pos)
     (when (equal arg '(4))
       (setq org-select-this-todo-keyword
@@ -6005,6 +6085,30 @@ the same tree node, and the headline of the tree node in the Org-mode file."
     (org-agenda-change-all-lines newhead hdmarker)
     (beginning-of-line 1)))
 
+(defun org-agenda-set-tags ()
+  "Set tags for the current headline."
+  (interactive)
+  (org-agenda-check-no-diary)
+  (let* ((marker (or (get-text-property (point) 'org-marker)
+                     (org-agenda-error)))
+         (hdmarker (get-text-property (point) 'org-hd-marker))
+         (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-set-tags)
+      (end-of-line 1)
+      (setq newhead (org-get-heading)))
+    (org-agenda-change-all-lines newhead hdmarker)
+    (beginning-of-line 1)))
+
 (defun org-agenda-date-later (arg &optional what)
   "Change the date of this item to one day later."
   (interactive "p")
@@ -6269,21 +6373,34 @@ MATCH can contain positive and negative selection of tags, like
 (defun org-make-tags-matcher (match)
   "Create the TAGS matcher form for the tags-selecting string MATCH."
   (unless match
+    ;; Get a new match request, with completion
     (setq org-last-tags-completion-table
           (or (org-get-buffer-tags)
               org-last-tags-completion-table))
     (setq match (completing-read
                  "Tags: " 'org-tags-completion-function nil nil nil
                  'org-tags-history)))
-  (let ((match0 match) minus tag mm matcher)
-    (while (string-match "^\\([-+:]\\)?\\([A-Za-z_]+\\)" match)
-      (setq minus (and (match-end 1) (equal (string-to-char match) ?-))
-            tag (match-string 2 match)
-            match (substring match (match-end 0))
-            mm (list 'member (downcase tag) 'tags-list)
-            mm (if minus (list 'not mm) mm))
-      (push mm matcher))
-    (cons match0 (cons 'and matcher))))
+  ;; parse the string and create a lisp form
+  (let ((match0 match) minus tag mm matcher orterms term orlist)
+    (setq orterms (org-split-string match "|"))
+    (while (setq term (pop orterms))
+      (while (string-match "^&?\\([-+:]\\)?\\([A-Za-z_]+\\)" term)
+        (setq minus (and (match-end 1)
+                         (equal (match-string 1 term) "-"))
+              tag (match-string 2 term)
+              term (substring term (match-end 0))
+              mm (list 'member (downcase tag) 'tags-list)
+              mm (if minus (list 'not mm) mm))
+        (push mm matcher))
+      (push (if (> (length matcher) 1) (cons 'and matcher) (car matcher))
+            orlist)
+      (setq matcher nil))
+    (setq matcher (if (> (length orlist) 1) (cons 'or orlist) (car orlist)))
+    ;; Return the string and lisp forms of the matcher
+    (cons match0 matcher)))
+
+;;(org-make-tags-matcher "&hello&-you")
+
 
 ;;;###autoload
 (defun org-tags-view (&optional todo-only match keep-modes)
@@ -6368,32 +6485,35 @@ With prefix ARG, realign all tags in headings in the current buffer."
       (if just-align
           (setq tags current)
         (setq org-last-tags-completion-table
-              (or (org-get-buffer-tags);; FIXME: replace +- with :, so that we can use history stuff???
+              (or (org-get-buffer-tags)
                   org-last-tags-completion-table))
         (setq tags
               (let ((org-add-colon-after-tag-completion t))
                 (completing-read "Tags: " 'org-tags-completion-function
                                  nil nil current 'org-tags-history)))
-        (while (string-match "[-+]" tags)
+        (while (string-match "[-+&]+" tags)
           (setq tags (replace-match ":" t t tags)))
         (unless (string-match ":$" tags) (setq tags (concat tags ":")))
         (unless (string-match "^:" tags) (setq tags (concat ":" tags))))
-      (beginning-of-line 1)
-      (looking-at (concat "\\(.*\\)\\(" (regexp-quote current) "\\)[ \t]*"))
-      (setq hd (save-match-data (org-trim (match-string 1))))
-      (delete-region (match-beginning 0) (match-end 0))
-      (insert hd " ")
-      (move-to-column (max (current-column)
-                           (if (> org-tags-column 0)
-                               org-tags-column
-                             (- org-tags-column (length tags))))
-                      t)
-      (insert tags)
+      (if (equal current "")
+          (end-of-line 1)
+        (beginning-of-line 1)
+        (looking-at (concat "\\(.*\\)\\(" (regexp-quote current) "\\)[ \t]*"))
+        (setq hd (match-string 1))
+        (delete-region (match-beginning 0) (match-end 0))
+        (insert (org-trim hd) " "))
+      (unless (equal tags "")
+        (move-to-column (max (current-column)
+                             (if (> org-tags-column 0)
+                                 org-tags-column
+                               (- (- org-tags-column) (length tags))))
+                        t)
+        (insert tags))
       (move-to-column col))))
 
 (defun org-tags-completion-function (string predicate &optional flag)
   (let (s1 s2 rtn (ctable org-last-tags-completion-table))
-    (if (string-match "^\\(.*[-+:]\\)\\([^-+:]*\\)$" string)
+    (if (string-match "^\\(.*[-+:&|]\\)\\([^-+:&|]*\\)$" string)
         (setq s1 (match-string 1 string)
               s2 (match-string 2 string))
       (setq s1 "" s2 string)) 
@@ -11610,19 +11730,13 @@ See the individual commands for more information."
      ["Goto Calendar" org-goto-calendar t]
      ["Date from Calendar" org-date-from-calendar t])
     "--"
-    ("Agenda/Summary Views"
-     "Current File"
+    ["Agenda Command" org-agenda t]
+    ("File List for Agenda")
+    ("Special views current file"
      ["TODO Tree"  org-show-todo-tree t]
      ["Check Deadlines" org-check-deadlines t]
      ["Timeline" org-timeline t]
-     ["Tags Tree" org-tags-sparse-tree t]
-     "--"
-     "All Agenda Files"
-     ["Command Dispatcher" org-agenda t]
-     ["TODO list" org-todo-list t]
-     ["Agenda" org-agenda-list t]
-     ["Tags View" org-tags-view t])
-    ("File List for Agenda")
+     ["Tags Tree" org-tags-sparse-tree t])
     "--"
     ("Hyperlinks"
      ["Store Link (Global)" org-store-link t]
@@ -12011,5 +12125,3 @@ Show the heading too, if it is currently invisible."
 
 ;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd
 ;;; org.el ends here
-
-
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 5d528dec109..78741065100 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -661,60 +661,69 @@ Picture mode is invoked by the command \\[picture-mode]."
 ;;;###autoload
 (defun picture-mode ()
   "Switch to Picture mode, in which a quarter-plane screen model is used.
+\\<picture-mode-map>
 Printing characters replace instead of inserting themselves with motion
 afterwards settable by these commands:
-  C-c <   Move left after insertion.
-  C-c >   Move right after insertion.
-  C-c ^   Move up after insertion.
-  C-c .   Move down after insertion.
-  C-c `   Move northwest (nw) after insertion.
-  C-c '   Move northeast (ne) after insertion.
-  C-c /   Move southwest (sw) after insertion.
-  C-c \\   Move southeast (se) after insertion.
-  C-u C-c `  Move westnorthwest (wnw) after insertion.
-  C-u C-c '  Move eastnortheast (ene) after insertion.
-  C-u C-c /  Move westsouthwest (wsw) after insertion.
-  C-u C-c \\  Move eastsoutheast (ese) after insertion.
+
+ Move left after insertion:            \\[picture-movement-left]
+ Move right after insertion:           \\[picture-movement-right]
+ Move up after insertion:              \\[picture-movement-up]
+ Move down after insertion:            \\[picture-movement-down]
+
+ Move northwest (nw) after insertion:  \\[picture-movement-nw]
+ Move northeast (ne) after insertion:  \\[picture-movement-ne]
+ Move southwest (sw) after insertion:  \\[picture-movement-sw]
+ Move southeast (se) after insertion:  \\[picture-movement-se]
+
+ Move westnorthwest (wnw) after insertion:  C-u \\[picture-movement-nw]
+ Move eastnortheast (ene) after insertion:  C-u \\[picture-movement-ne]
+ Move westsouthwest (wsw) after insertion:  C-u \\[picture-movement-sw]
+ Move eastsoutheast (ese) after insertion:  C-u \\[picture-movement-se]
+
 The current direction is displayed in the mode line.  The initial
 direction is right.  Whitespace is inserted and tabs are changed to
 spaces when required by movement.  You can move around in the buffer
 with these commands:
-  \\[picture-move-down]   Move vertically to SAME column in previous line.
-  \\[picture-move-up]     Move vertically to SAME column in next line.
-  \\[picture-end-of-line]         Move to column following last non-whitespace character.
-  \\[picture-forward-column]      Move right inserting spaces if required.
-  \\[picture-backward-column]     Move left changing tabs to spaces if required.
-  C-c C-f Move in direction of current picture motion.
-  C-c C-b Move in opposite direction of current picture motion.
-  Return  Move to beginning of next line.
+
+ Move vertically to SAME column in previous line: \\[picture-move-down]
+ Move vertically to SAME column in next line:     \\[picture-move-up]
+ Move to column following last
+  non-whitespace character:                       \\[picture-end-of-line]
+ Move right, inserting spaces if required:        \\[picture-forward-column]
+ Move left changing tabs to spaces if required:   \\[picture-backward-column]
+ Move in direction of current picture motion:     \\[picture-motion]
+ Move opposite to current picture motion:         \\[picture-motion-reverse]
+ Move to beginning of next line:                  \\[next-line]
+
 You can edit tabular text with these commands:
-  M-Tab   Move to column beneath (or at) next interesting character.
-            `Indents' relative to a previous line.
-  Tab     Move to next stop in tab stop list.
-  C-c Tab Set tab stops according to context of this line.
-            With ARG resets tab stops to default (global) value.
-            See also documentation of variable  picture-tab-chars
-            which defines \"interesting character\".  You can manually
-            change the tab stop list with command \\[edit-tab-stops].
+
+ Move to column beneath (or at) next interesting
+  character (see variable `picture-tab-chars'):   \\[picture-tab-search]
+ Move to next stop in tab stop list:              \\[picture-tab]
+ Set tab stops according to context of this line: \\[picture-set-tab-stops]
+   (With ARG, resets tab stops to default value.)
+ Change the tab stop list:                        \\[edit-tab-stops]
+
 You can manipulate text with these commands:
-  C-d     Clear (replace) ARG columns after point without moving.
-  C-c C-d Delete char at point - the command normally assigned to C-d.
-  \\[picture-backward-clear-column]  Clear (replace) ARG columns before point, moving back over them.
-  \\[picture-clear-line]          Clear ARG lines, advancing over them.  The cleared
-            text is saved in the kill ring.
-  \\[picture-open-line]   Open blank line(s) beneath current line.
+ Clear ARG columns after point without moving:    \\[picture-clear-column]
+ Delete char at point:                            \\[delete-char]
+ Clear ARG columns backward:                      \\[picture-backward-clear-column]
+ Clear ARG lines, advancing over them:            \\[picture-clear-line]
+  (the cleared text is saved in the kill ring)
+ Open blank line(s) beneath current line:         \\[picture-open-line]
+
 You can manipulate rectangles with these commands:
-  C-c C-k Clear (or kill) a rectangle and save it.
-  C-c C-w Like C-c C-k except rectangle is saved in named register.
-  C-c C-y Overlay (or insert) currently saved rectangle at point.
-  C-c C-x Like C-c C-y except rectangle is taken from named register.
-  C-c C-r Draw a rectangular box around mark and point.
-  \\[copy-rectangle-to-register]   Copies a rectangle to a register.
-  \\[advertised-undo]   Can undo effects of rectangle overlay commands
-            if invoked soon enough.
-You can return to the previous mode with:
-  C-c C-c Which also strips trailing whitespace from every line.
-            Stripping is suppressed by supplying an argument.
+  Clear a rectangle and save it:                  \\[picture-clear-rectangle]
+  Clear a rectangle, saving in a named register:  \\[picture-clear-rectangle-to-register]
+  Insert currently saved rectangle at point:      \\[picture-yank-rectangle]
+  Insert rectangle from named register:           \\[picture-yank-rectangle-from-register]
+  Draw a rectangular box around mark and point:   \\[picture-draw-rectangle]
+  Copies a rectangle to a register:               \\[copy-rectangle-to-register]
+  Undo effects of rectangle overlay commands:     \\[advertised-undo]
+
+You can return to the previous mode with \\[picture-mode-exit], which
+also strips trailing whitespace from every line.  Stripping is suppressed
+by supplying an argument.
 
 Entry to this mode calls the value of `picture-mode-hook' if non-nil.
 
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 8f609601822..e88bc6017ce 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -29,7 +29,15 @@
 
 (defvar comint-prompt-regexp)
 
-;;; Customizable settings
+(defgroup tooltip nil
+  "Customization group for the `tooltip' package."
+  :group 'help
+  :group 'gud
+  :group 'mouse
+  :group 'tools
+  :version "21.1"
+  :tag "Tool Tips")
+
 ;;; Switching tooltips on/off
 
 ;; We don't set track-mouse globally because this is a big redisplay
@@ -60,14 +68,8 @@ With ARG, turn tooltip mode on if and only if ARG is positive."
   (setq show-help-function
         (if tooltip-mode 'tooltip-show-help nil)))
 
-(defgroup tooltip nil
-  "Customization group for the `tooltip' package."
-  :group 'help
-  :group 'gud
-  :group 'mouse
-  :group 'tools
-  :version "21.1"
-  :tag "Tool Tips")
+
+;;; Customizable settings
 
 (defcustom tooltip-delay 0.7
   "Seconds to wait before displaying a tooltip the first time."
@@ -92,9 +94,10 @@ Do so after `tooltip-short-delay'."
 
 (defcustom tooltip-x-offset 5
   "X offset, in pixels, for the display of tooltips.
-The offset is relative to the position of the mouse.  It must
-be chosen so that the tooltip window doesn't contain the mouse
-when it pops up.
+The offset is the distance between the X position of the mouse and
+the left border of the tooltip window.  It must be chosen so that the
+tooltip window doesn't contain the mouse when it pops up, or it may
+interfere with clicking where you wish.
 
 If `tooltip-frame-parameters' includes the `left' parameter,
 the value of `tooltip-x-offset' is ignored."
@@ -103,9 +106,10 @@ the value of `tooltip-x-offset' is ignored."
 
 (defcustom tooltip-y-offset +20
   "Y offset, in pixels, for the display of tooltips.
-The offset is relative to the position of the mouse.  It must
-be chosen so that the tooltip window doesn't contain the mouse
-when it pops up.
+The offset is the distance between the Y position of the mouse and
+the top border of the tooltip window.  It must be chosen so that the
+tooltip window doesn't contain the mouse when it pops up, or it may
+interfere with clicking where you wish.
 
 If `tooltip-frame-parameters' includes the `top' parameter,
 the value of `tooltip-y-offset' is ignored."