Merged from miles@gnu.org--gnu-2005 (patch 683-684)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-683
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-684
   Update from CVS

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

36 files changed, 2181 insertions, 1647 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1050d3deb84..061ace7ec79 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,221 @@
+2006-01-05  Bill Wohler  <wohler@newt.com>
+
+        * Makefile.in (compile-always): Add mh-autoloads dependency.
+        (bootstrap): Remove mh-autoloads dependency, as compile dependency
+        provides it.
+        (updates): Remove mh-autoloads dependency, since it probably has
+        already run recently (via recompile).
+
+2006-01-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/flyspell.el (flyspell-accept-buffer-local-defs): Add an
+        argument `force' to disable the flyspell-last-buffer optimization.
+        (flyspell-mode-on): Use it.
+
+        * progmodes/flymake.el (flymake-get-cleanup-function): Default to
+        flymake-simple-cleanup.
+        (flymake-allowed-file-name-masks): Use this new default.
+        All the functions are now called in the right buffer rather than
+        passing the buffer as argument.
+        (flymake-process-sentinel): Switch to buffer before calling cleanup.
+        (flymake-parse-err-lines): Remove redundant buffer arg.
+        (flymake-get-program-dir): Comment out unused function.
+        (flymake-start-syntax-check, flymake-start-syntax-check-process):
+        Remove redundant buffer argument.
+        (flymake-get-real-file-name, flymake-simple-java-cleanup)
+        (flymake-simple-cleanup, flymake-master-cleanup): Remove buffer arg.
+
+2006-01-05  Richard M. Stallman  <rms@gnu.org>
+
+        * info.el (Info-find-node): Don't record previous node if have none.
+        (info): Go to directory only if history is empty.
+
+        * simple.el (mark): Doc fix.
+
+2006-01-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * term/mac-win.el (mac-ae-parameter): Don't coerce data if it is
+        already of desired type.
+        (mac-ae-list): Coerce parameter to "list" type.
+        (mac-dispatch-apple-event): Replace cadr part of event with a
+        dummy position so that event-start returns it.
+
+2006-01-05  Carsten Dominik  <dominik@science.uva.nl>
+
+        * textmodes/org.el: (org-end-of-subtree): New function.
+        (org-cycle, org-subtree-end-visible-p, org-scan-tags):
+        Use `org-end-of-subtree'.
+        (org-agenda, org-agenda-convert-date): Protect calls to
+        `fit-window-to-buffer'.
+        (org-tags-view): Force matching of sublevels when doing a
+        todo-only search.  Define the correct redo command, including the
+        arguments.
+        (org-agenda-redo): Display message.
+        (org-check-for-org-mode): New function.
+        (org-agenda-type): New variable.
+        (org-timeline, org-agenda-list, org-todo-list, org-tags-view):
+        Set `org-agenda-type'.
+        (org-agenda-check-type): New function.
+        (org-agenda-goto-today, org-agenda-later, org-agenda-earlier)
+        (org-agenda-week-view, org-agenda-day-view)
+        (org-agenda-next-date-line, org-agenda-previous-date-line)
+        (org-agenda-log-mode, org-agenda-toggle-diary)
+        (org-agenda-toggle-time-grid, org-agenda-date-later)
+        (org-agenda-date-prompt, org-agenda-diary-entry)
+        (org-agenda-execute-calendar-command, org-agenda-goto-calendar)
+        (org-agenda-convert-date, org-agenda-menu):
+        Use `org-agenda-check-type'.
+        (org-make-overlay, org-delete-overlay)
+        (org-detatch-overlay, org-move-overlay, org-overlay-put):
+        New compatibility functions.
+        (org-calendar-select-mouse): New command.
+
+2006-01-04  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cus-edit.el (Custom-reset-current, Custom-reset-saved)
+        (Custom-reset-standard): Fix y-or-n-p messages.
+        (custom-link): New face for links.
+        (custom-buffer-create-internal, custom-manual): Use it.
+        (custom-face-save): Push to theme-face before setting face spec.
+
+        * wid-edit.el (widget-default-mouse-face-get): New function.
+        (widget-specify-button): Handle mouse-face like button-face.
+
+        * custom.el (load-theme): Clear old theme settings if reloading.
+
+2006-01-03  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * cus-edit.el (custom-buffer-create-internal): Move whole buffer
+        "Erase Customization" button back to same position it occupies in
+        the individual State menus.
+
+2006-01-04  Kim F. Storm  <storm@cua.dk>
+
+        * wid-edit.el (key-sequence): Rework widget to read key binding
+        using `kbd' syntax.  Use C-q to insert literal key, event, or code.
+        (widget-key-sequence-default-value): Default value for empty sequence.
+        (widget-key-sequence-map): New map for reading key binding.  Bind C-q.
+        (widget-key-sequence-read-event): New command for C-q.
+        (widget-key-sequence-validate, widget-key-sequence-value-to-internal)
+        (widget-key-sequence-value-to-external): New functions.
+
+2006-01-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/flymake.el (flymake-create-temp-with-folder-structure):
+        Use expand-file-name.
+        (flymake-delete-temp-directory): Use expand-file-name,
+        file-name-directory, and directory-file-name.
+        (flymake-strrchr): Delete.
+        (flymake-start-syntax-check): Don't pass the redundant buffer argument
+        to the init-f function.
+        (flymake-save-buffer-in-file, flymake-init-create-temp-buffer-copy)
+        (flymake-init-find-buildfile-dir)
+        (flymake-init-create-temp-source-and-master-buffer-copy)
+        (flymake-simple-make-init-impl, flymake-simple-make-init)
+        (flymake-master-make-init, flymake-master-make-header-init)
+        (flymake-simple-make-java-init, flymake-simple-ant-java-init)
+        (flymake-perl-init, flymake-simple-tex-init, flymake-master-tex-init)
+        (flymake-xml-init): Remove corresponding redundant buffer argument.
+        (flymake-allowed-file-name-masks): Remove last elems that are equal to
+        the default anyway.  Clean up regexps.
+
+        * progmodes/flymake.el (flymake-temp-source-file-name)
+        (flymake-master-file-name, flymake-temp-master-file-name)
+        (flymake-base-dir): New buffer-local vars.
+        (flymake-buffer-data, flymake-get-buffer-value)
+        (flymake-set-buffer-value): Replace those hash-tables by the new
+        buffer-local vars.  Update callers.
+
+        * progmodes/flymake.el (flymake-check-start-time)
+        (flymake-check-was-interrupted, flymake-err-info, flymake-is-running)
+        (flymake-last-change-time, flymake-new-err-info, flymake-timer):
+        Move definition, so we can remove redundant earlier declaration.
+        (flymake-replace-regexp-in-string, flymake-split-string)
+        (flymake-get-temp-dir): Use defalias.
+        (flymake-popup-menu): Remove `pos' argument.  Use posn-at-point.
+        (flymake-xemacs-window-edges): Remove unused function.
+        (flymake-get-point-pixel-pos): Move.
+        (flymake-pid-to-names, flymake-reg-names)
+        (flymake-get-source-buffer-name, flymake-unreg-names): Remove.
+        Replace by a simple list flymake-processes and by process-buffer.
+        Update callers.  Other than simplify the code, it uses buffers rather
+        than buffer-names so it doesn't get confused by uniquify.
+        (flymake-buffer-data): The global value should just be nil.
+
+        * emacs-lisp/bytecomp.el (byte-compile-file-form-defalias):
+        Optimize the body of a defalias like any other code.
+
+        * font-lock.el (font-lock-fontify-buffer, font-lock-fontify-region):
+        Make sure we've setup font-lock's vars.  It may influence which
+        function we then call.
+        (font-lock-default-fontify-buffer): Don't bother calling set-defaults
+        here since it's too late anyway.
+
+2006-01-03  Romain Francoise  <romain@orebokech.com>
+
+        * startup.el (fancy-splash-tail, normal-splash-screen):
+        Update copyright year.
+
+2006-01-02  J.D. Smith  <jdsmith@as.arizona.edu>
+
+        * mouse.el (mouse-drag-track): Rename, from
+        `mouse-drag-region-1'.  Includes optional argument required to
+        enable post-drag event processing (e.g. delete region keys).
+        Can be used without this argument to track a mouse region and operate
+        on it as soon as the drag completes.
+        (mouse-drag-region): Use `mouse-drag-track'.
+
+2006-01-02  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cus-edit.el (custom-guess-name-alist, custom-guess-doc-alist):
+        Move to `custom-buffer' group.
+
+        * cus-theme.el: Rewrite the Custom New Theme Mode interface.
+        (custom-new-theme-mode-map, custom-theme-insert-variable-marker)
+        (custom-theme-insert-face-marker, custom-theme-variable-menu)
+        (custom-theme-face-menu): New variables.
+        (custom-theme-add-variable, custom-theme-variable-action)
+        (custom-variable-reset-theme, custom-theme-delete-variable)
+        (custom-face-reset-theme, custom-theme-face-action)
+        (custom-theme-delete-face, custom-theme-merge-theme)
+        (custom-theme-add-face, custom-theme-visit-theme): New functions.
+
+2006-01-01  Chong Yidong  <cyd@stupidchicken.com>
+
+        * custom.el: Move Custom Themes commentary to start of theme code.
+        (custom-known-themes): Rename `standard' theme to `changed'.
+        (custom-push-theme): Caller no longer specifies what theme to use
+        when doing `reset'---the setting is simply removed from the theme.
+        Delete MODE from `theme-value' and `theme-settings' properties.
+        (custom-declare-theme): Ignore &rest args since we don't use them.
+
+        (custom-loaded-themes): Delete variable.
+        (custom-theme-load-themes, custom-theme-loaded-p)
+        (custom-theme-value): Delete functions.
+
+        (custom-declare-theme): Signal error on invalid theme names.
+        (provide-theme): custom-loaded-themes was deleted.
+        (load-theme): Load the file unconditionally.
+        (enable-theme): Call `load-theme' if theme is undefined.
+        (custom-enabled-themes): Only update value for successful loads.
+        (disable-theme): Complete from enabled themes when interactive.
+        (custom-variable-theme-value): Calculate theme value directly.
+
+        (custom-theme-reset-variables, custom-reset-variables): Mark as
+        XEmacs compatibility functions.  We don't actually use these.
+
+        * cus-edit.el (custom-variable-state-set):
+        Use custom-variable-theme-value instead of custom-theme-value.
+        (custom-face-state-set): Rename `standard' theme to `changed'.
+        (custom-save-variables, custom-save-faces): Delete unneeded
+        references to custom-reset-variables.
+        (custom-save-resets): Delete function.
+        (custom-save-variables, custom-save-faces): MODE argument deleted.
+        (custom-save-variables, custom-save-faces): Ignore theme values.
+
+        * cus-face.el (custom-theme-reset-faces): Mark as XEmacs
+        compatibility function.
+
 2006-01-01  Richard M. Stallman  <rms@gnu.org>
 
         * cus-edit.el (Custom-set, Custom-save): Ask for confirmation.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 9a4497679ef..1cc34fcb663 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1,5 +1,5 @@
 # Maintenance productions for the Lisp directory
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -117,7 +117,7 @@ update-subdirs: doit
            $(srcdir)/update-subdirs $$file; \
         done;
 
-updates: update-subdirs autoloads mh-autoloads finder-data custom-deps
+updates: update-subdirs autoloads finder-data custom-deps
 
 # This is useful after "cvs up".
 cvs-update: recompile autoloads finder-data custom-deps
@@ -169,7 +169,7 @@ compile: $(lisp)/subdirs.el mh-autoloads doit
 # unconditionally.  Some files don't actually get compiled because they
 # set the local variable no-byte-compile.
 
-compile-always: $(lisp)/subdirs.el doit
+compile-always: $(lisp)/subdirs.el mh-autoloads doit
         # `|| true' prevents old Bash versions from getting confused
         # by an error.
         find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1 || true; \
@@ -283,7 +283,7 @@ bootstrap-clean:
 
 # Generate/update files for the bootstrap process.
 
-bootstrap: update-subdirs autoloads mh-autoloads compile
+bootstrap: update-subdirs autoloads compile
 
 # Generate/update files after the bootstrap process.
 # custom-deps needs `preloaded-file-list'.
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 4c92034eaad..5a4b499d792 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -619,7 +619,7 @@ used.
 This is used for guessing the type of variables not declared with
 customize."
   :type '(repeat (group (regexp :tag "Match") (sexp :tag "Type")))
-  :group 'customize)
+  :group 'custom-buffer)
 
 (defcustom custom-guess-doc-alist
   '(("\\`\\*?Non-nil " boolean))
@@ -633,7 +633,7 @@ matches the name of the symbol will be used.
 This is used for guessing the type of variables not declared with
 customize."
   :type '(repeat (group (regexp :tag "Match") (sexp :tag "Type")))
-  :group 'customize)
+  :group 'custom-buffer)
 
 (defun custom-guess-type (symbol)
   "Guess a widget suitable for editing the value of SYMBOL.
@@ -768,8 +768,8 @@ groups after non-groups, if nil do not order groups at all."
     (message "Aborted")))
 
 (defvar custom-reset-menu
-  '(("Current" . Custom-reset-current)
-    ("Saved" . Custom-reset-saved)
+  '(("Reset to current settings" . Custom-reset-current)
+    ("Reset to saved settings" . Custom-reset-saved)
     ("Erase Customization (use standard values)" . Custom-reset-standard))
   "Alist of actions for the `Reset' button.
 The key is a string containing the name of the action, the value is a
@@ -779,7 +779,7 @@ when the action is chosen.")
 (defun custom-reset (event)
   "Select item from reset menu."
   (let* ((completion-ignore-case t)
-         (answer (widget-choose "Reset to"
+         (answer (widget-choose "Reset settings"
                                 custom-reset-menu
                                 event)))
     (if answer
@@ -788,7 +788,7 @@ when the action is chosen.")
 (defun Custom-reset-current (&rest ignore)
   "Reset all modified group members to their current value."
   (interactive)
-  (if (y-or-n-p "Update buffer text to show all current settings? ")
+  (if (y-or-n-p "Reset buffer to show current settings? ")
       (let ((children custom-options))
         (mapc (lambda (widget)
                 (if (memq (widget-get widget :custom-state)
@@ -800,7 +800,7 @@ when the action is chosen.")
 (defun Custom-reset-saved (&rest ignore)
   "Reset all modified or set group members to their saved value."
   (interactive)
-  (if (y-or-n-p "Update buffer text to show all saved settings? ")
+  (if (y-or-n-p "Reset all settings to saved values? ")
       (let ((children custom-options))
         (mapc (lambda (widget)
                 (if (memq (widget-get widget :custom-state)
@@ -819,7 +819,7 @@ making them as if they had never been customized at all."
     (if (or (and (= 1 (length children))
                  (memq (widget-type (car children))
                        '(custom-variable custom-face)))
-            (yes-or-no-p "Really erase all customizations in this buffer? "))
+            (yes-or-no-p "Erase all customizations in this buffer? "))
         (mapc (lambda (widget)
                 (and (if (widget-get widget :custom-standard-value)
                          (widget-apply widget :custom-standard-value)
@@ -1456,12 +1456,16 @@ See "
                                  "Square brackets indicate")))
         (widget-create 'info-link
                        :tag "Custom file"
+                       :button-face 'custom-link
+                       :mouse-face 'highlight
                        "(emacs)Saving Customizations")
         (widget-insert
          " for information on how to save in a different file.\n
 See ")
         (widget-create 'info-link
                        :tag "Help"
+                       :button-face 'custom-link
+                       :mouse-face 'highlight
                        :help-echo "Read the online help."
                        "(emacs)Easy Customization")
         (widget-insert " for more information.\n\n")
@@ -1473,6 +1477,15 @@ See ")
 Make your editing in this buffer take effect for this session."
                  :action (lambda (widget &optional event)
                            (Custom-set)))
+  (if (not custom-buffer-verbose-help)
+      (progn
+        (widget-insert " ")
+        (widget-create 'info-link
+                       :tag "Help"
+                       :button-face 'custom-link
+                       :mouse-face 'highlight
+                       :help-echo "Read the online help."
+                       "(emacs)Easy Customization")))
   (when (or custom-file user-init-file)
     (widget-insert " ")
     (widget-create 'push-button
@@ -1486,18 +1499,11 @@ This updates your Emacs initialization file or creates a new one."
       (progn
         (widget-insert " ")
         (widget-create 'push-button
-                       :tag "Reset"
+                       :tag "Reset buffer"
                        :help-echo "Show a menu with reset operations."
                        :mouse-down-action (lambda (&rest junk) t)
                        :action (lambda (widget &optional event)
                                  (custom-reset event))))
-    (widget-insert " ")
-    (when (or custom-file user-init-file)
-      (widget-create 'push-button
-                     :tag "Erase Customization"
-                     :help-echo "\
-Un-customize all settings in this buffer--save them with standard values."
-                     :action 'Custom-reset-standard)))
     (widget-insert "\n ")
     (widget-create 'push-button
                    :tag "Reset to Current"
@@ -1510,13 +1516,13 @@ Reset all edited text in this buffer to reflect current values."
                    :help-echo "\
 Reset all settings in this buffer to their saved values."
                    :action 'Custom-reset-saved)
-  (if (not custom-buffer-verbose-help)
-      (progn
-        (widget-insert " ")
-        (widget-create 'info-link
-                       :tag "Help"
-                       :help-echo "Read the online help."
-                       "(emacs)Easy Customization")))
+    (widget-insert " ")
+    (when (or custom-file user-init-file)
+      (widget-create 'push-button
+                     :tag "Erase Customization"
+                     :help-echo "\
+Un-customize all settings in this buffer and save them with standard values."
+                     :action 'Custom-reset-standard)))
   (widget-insert "   ")
   (widget-create 'push-button
                  :tag "Finish"
@@ -1701,6 +1707,8 @@ item in another window.\n\n"))
 (define-widget 'custom-manual 'info-link
   "Link to the manual entry for this customization option."
   :help-echo "Read the manual entry for this option."
+  :button-face 'custom-link
+  :mouse-face 'highlight
   :tag "Manual")
 
 ;;; The `custom-magic' Widget.
@@ -2045,6 +2053,17 @@ and `face'."
 ;; backward-compatibility alias
 (put 'custom-state-face 'face-alias 'custom-state)
 
+(defface custom-link
+  '((((min-colors 88)
+      (class color) (background light)) :foreground "blue1" :underline t)
+    (((class color) (background light)) :foreground "blue" :underline t)
+    (((min-colors 88)
+      (class color) (background dark)) :foreground "cyan1" :underline t)
+    (((class color) (background dark)) :foreground "cyan" :underline t)
+    (t :underline t))
+  "Face for Info links in customization buffers."
+  :group 'info)
+
 (define-widget 'custom 'default
   "Customize a user option."
   :format "%v"
@@ -2207,6 +2226,8 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
                   (insert " ")
                   (push (widget-create-child-and-convert
                          widget 'custom-group-link
+                         :button-face 'custom-link
+                         :mouse-face 'highlight
                          :tag (custom-unlispify-tag-name symbol)
                          symbol)
                         buttons)
@@ -2578,15 +2599,13 @@ Otherwise, look up symbol in `custom-guess-type-alist'."
                        (if (condition-case nil
                                (and (equal comment temp)
                                     (equal value
-                                           (eval (car
-                                                  (custom-theme-value
-                                                   (caar tmp) tmp)))))
+                                           (eval
+                                            (car (custom-variable-theme-value
+                                                  symbol)))))
                              (error nil))
                            (cond
-                            ((eq 'user (caar (get symbol 'theme-value)))
-                             'saved)
-                            ((eq 'standard (caar (get symbol 'theme-value)))
-                             'changed)
+                            ((eq (caar tmp) 'user) 'saved)
+                            ((eq (caar tmp) 'changed) 'changed)
                             (t 'themed))
                          'changed))
                       ((setq tmp (get symbol 'standard-value))
@@ -2603,39 +2622,40 @@ Otherwise, look up symbol in `custom-guess-type-alist'."
   (get (widget-value widget) 'standard-value))
 
 (defvar custom-variable-menu
-  `(("Set for Current Session" custom-variable-set
+  `(("Set for current session" custom-variable-set
      (lambda (widget)
        (eq (widget-get widget :custom-state) 'modified)))
     ,@(when (or custom-file user-init-file)
-        '(("Save for Future Sessions" custom-variable-save
+        '(("Save for future sessions" custom-variable-save
            (lambda (widget)
-             (memq (widget-get widget :custom-state) '(modified set changed rogue))))))
-    ("Reset to Current" custom-redraw
+             (memq (widget-get widget :custom-state)
+                   '(modified set changed rogue))))))
+    ("---" ignore ignore)
+    ("Reset to current value" custom-redraw
      (lambda (widget)
        (and (default-boundp (widget-value widget))
             (memq (widget-get widget :custom-state) '(modified changed)))))
-    ("Reset to Saved" custom-variable-reset-saved
+    ("Reset to saved value" custom-variable-reset-saved
      (lambda (widget)
        (and (or (get (widget-value widget) 'saved-value)
                 (get (widget-value widget) 'saved-variable-comment))
             (memq (widget-get widget :custom-state)
                   '(modified set changed rogue)))))
+    ("Reset to backup value" custom-variable-reset-backup
+     (lambda (widget)
+       (get (widget-value widget) 'backup-value)))
     ,@(when (or custom-file user-init-file)
-        '(("Erase Customization" custom-variable-reset-standard
+        '(("Erase customization" custom-variable-reset-standard
            (lambda (widget)
              (and (get (widget-value widget) 'standard-value)
                   (memq (widget-get widget :custom-state)
                         '(modified set changed saved rogue)))))))
-    ("Use Backup Value" custom-variable-reset-backup
-     (lambda (widget)
-       (get (widget-value widget) 'backup-value)))
     ("---" ignore ignore)
-    ("Add Comment" custom-comment-show custom-comment-invisible-p)
-    ("---" ignore ignore)
-    ("Don't show as Lisp expression" custom-variable-edit
+    ("Add comment" custom-comment-show custom-comment-invisible-p)
+    ("Show value widget" custom-variable-edit
      (lambda (widget)
        (eq (widget-get widget :custom-form) 'lisp)))
-    ("Show initial Lisp expression" custom-variable-edit-lisp
+    ("Show Lisp expression" custom-variable-edit-lisp
      (lambda (widget)
        (eq (widget-get widget :custom-form) 'edit))))
   "Alist of actions for the `custom-variable' widget.
@@ -2772,7 +2792,7 @@ becomes the backup value, so you can get it again."
     (cond ((or value comment)
            (put symbol 'variable-comment comment)
            (custom-variable-backup-value widget)
-           (custom-push-theme 'theme-value symbol 'user 'set value)
+           (custom-push-theme 'theme-value symbol 'user 'set (car-safe value))
            (condition-case nil
                (funcall set symbol (eval (car value)))
              (error nil)))
@@ -2790,15 +2810,14 @@ This operation eliminates any saved setting for the variable,
 restoring it to the state of a variable that has never been customized.
 The value that was current before this operation
 becomes the backup value, so you can get it again."
-  (let* ((symbol (widget-value widget))
-         (set (or (get symbol 'custom-set) 'set-default)))
+  (let* ((symbol (widget-value widget)))
     (if (get symbol 'standard-value)
         (custom-variable-backup-value widget)
       (error "No standard setting known for %S" symbol))
     (put symbol 'variable-comment nil)
     (put symbol 'customized-value nil)
     (put symbol 'customized-variable-comment nil)
-    (custom-push-theme 'theme-value symbol 'user 'reset nil)
+    (custom-push-theme 'theme-value symbol 'user 'reset)
     (custom-theme-recalc-variable symbol)
     (when (or (get symbol 'saved-value) (get symbol 'saved-variable-comment))
       (put symbol 'saved-value nil)
@@ -3276,27 +3295,27 @@ SPEC must be a full face spec."
              (message "Creating face editor...done"))))))
 
 (defvar custom-face-menu
-  `(("Set for Current Session" custom-face-set)
+  `(("Set for current session" custom-face-set)
     ,@(when (or custom-file user-init-file)
-        '(("Save for Future Sessions" custom-face-save-command)))
-    ("Reset to Saved" custom-face-reset-saved
+        '(("Save for future sessions" custom-face-save-command)))
+    ("---" ignore ignore)
+    ("Reset to saved face" custom-face-reset-saved
      (lambda (widget)
        (or (get (widget-value widget) 'saved-face)
            (get (widget-value widget) 'saved-face-comment))))
     ,@(when (or custom-file user-init-file)
-        '(("Erase Customization" custom-face-reset-standard
+        '(("Erase customization" custom-face-reset-standard
            (lambda (widget)
              (get (widget-value widget) 'face-defface-spec)))))
     ("---" ignore ignore)
-    ("Add Comment" custom-comment-show custom-comment-invisible-p)
-    ("---" ignore ignore)
-    ("Show all display specs" custom-face-edit-all
+    ("Add comment" custom-comment-show custom-comment-invisible-p)
+    ("Show all attributes" custom-face-edit-all
      (lambda (widget)
        (not (eq (widget-get widget :custom-form) 'all))))
-    ("Just current attributes" custom-face-edit-selected
+    ("Show current attributes" custom-face-edit-selected
      (lambda (widget)
        (not (eq (widget-get widget :custom-form) 'selected))))
-    ("Show as Lisp expression" custom-face-edit-lisp
+    ("Show Lisp expression" custom-face-edit-lisp
      (lambda (widget)
        (not (eq (widget-get widget :custom-form) 'lisp)))))
   "Alist of actions for the `custom-face' widget.
@@ -3345,7 +3364,7 @@ widget.  If FILTER is nil, ACTION is always valid.")
                      (cond
                       ((eq 'user (caar (get symbol 'theme-face)))
                        'saved)
-                      ((eq 'standard (caar (get symbol 'theme-face)))
+                      ((eq 'changed (caar (get symbol 'theme-face)))
                        'changed)
                       (t 'themed))
                    'changed))
@@ -3416,6 +3435,7 @@ Optional EVENT is the location for the menu."
       (setq comment nil)
       ;; Make the comment invisible by hand if it's empty
       (custom-comment-hide comment-widget))
+    (custom-push-theme 'theme-face symbol 'user 'set value)
     (if (face-spec-choose value)
         (face-spec-set symbol value)
       ;; face-set-spec ignores empty attribute lists, so just give it
@@ -3423,7 +3443,6 @@ Optional EVENT is the location for the menu."
       (face-spec-set symbol '((t :foreground unspecified))))
     (unless (eq (widget-get widget :custom-state) 'standard)
       (put symbol 'saved-face value))
-    (custom-push-theme 'theme-face symbol 'user 'set value)
     (put symbol 'customized-face nil)
     (put symbol 'face-comment comment)
     (put symbol 'customized-face-comment nil)
@@ -3467,7 +3486,7 @@ restoring it to the state of a face that has never been customized."
       (error "No standard setting for this face"))
     (put symbol 'customized-face nil)
     (put symbol 'customized-face-comment nil)
-    (custom-push-theme 'theme-face symbol 'user 'reset nil)
+    (custom-push-theme 'theme-face symbol 'user 'reset)
     (custom-theme-recalc-face symbol)
     (when (or (get symbol 'saved-face) (get symbol 'saved-face-comment))
       (put symbol 'saved-face nil)
@@ -3757,6 +3776,8 @@ If GROUPS-ONLY non-nil, return only those members that are groups."
            (if (eq custom-buffer-style 'links)
                (push (widget-create-child-and-convert
                       widget 'custom-group-link
+                      :button-face 'custom-link
+                      :mouse-face 'highlight
                       :tag "Go to Group"
                       symbol)
                      buttons)
@@ -3872,21 +3893,22 @@ Creating group members... %2d%%"
            (insert "/\n")))))
 
 (defvar custom-group-menu
-  `(("Set for Current Session" custom-group-set
+  `(("Set for current session" custom-group-set
      (lambda (widget)
        (eq (widget-get widget :custom-state) 'modified)))
     ,@(when (or custom-file user-init-file)
-        '(("Save for Future Sessions" custom-group-save
+        '(("Save for future sessions" custom-group-save
            (lambda (widget)
              (memq (widget-get widget :custom-state) '(modified set))))))
-    ("Reset to Current" custom-group-reset-current
+    ("---" ignore ignore)
+    ("Reset to current settings" custom-group-reset-current
      (lambda (widget)
        (memq (widget-get widget :custom-state) '(modified))))
-    ("Reset to Saved" custom-group-reset-saved
+    ("Reset to saved settings" custom-group-reset-saved
      (lambda (widget)
        (memq (widget-get widget :custom-state) '(modified set))))
     ,@(when (or custom-file user-init-file)
-        '(("Reset to standard setting" custom-group-reset-standard
+        '(("Reset to standard settings" custom-group-reset-standard
            (lambda (widget)
              (memq (widget-get widget :custom-state) '(modified set saved)))))))
   "Alist of actions for the `custom-group' widget.
@@ -4123,16 +4145,15 @@ This function does not save the buffer."
 (defun custom-save-variables ()
   "Save all customized variables in `custom-file'."
   (save-excursion
-    (custom-save-delete 'custom-reset-variables)
     (custom-save-delete 'custom-set-variables)
-    (custom-save-resets 'theme-value 'custom-reset-variables nil)
     (let ((standard-output (current-buffer))
           (saved-list (make-list 1 0))
           sort-fold-case)
       ;; First create a sorted list of saved variables.
       (mapatoms
        (lambda (symbol)
-         (if (get symbol 'saved-value)
+         (if (and (get symbol 'saved-value)
+                  (eq 'user (car (car-safe (get symbol 'theme-value)))))
              (nconc saved-list (list symbol)))))
       (setq saved-list (sort (cdr saved-list) 'string<))
       (unless (bolp)
@@ -4156,9 +4177,7 @@ This function does not save the buffer."
             (when (and (symbolp request) (not (featurep request)))
               (message "Unknown requested feature: %s" request)
               (setq requests (delq request requests))))
-          (when (or (and spec
-                         (eq (nth 0 spec) 'user)
-                         (eq (nth 1 spec) 'set))
+          (when (or (and spec (eq (car spec) 'user))
                     comment
                     (and (null spec) (get symbol 'saved-value)))
             (unless (bolp)
@@ -4183,46 +4202,19 @@ This function does not save the buffer."
       (unless (looking-at "\n")
         (princ "\n")))))
 
-(defun custom-save-resets (property setter special)
-  (let (started-writing ignored-special)
-    ;; (custom-save-delete setter) Done by caller
-    (let ((standard-output (current-buffer))
-          (mapper `(lambda (object)
-                    (let ((spec (car-safe (get object (quote ,property)))))
-                      (when (and (not (memq object ignored-special))
-                                 (eq (nth 0 spec) 'user)
-                                 (eq (nth 1 spec) 'reset))
-                        ;; Do not write reset statements unless necessary.
-                        (unless started-writing
-                          (setq started-writing t)
-                          (unless (bolp)
-                            (princ "\n"))
-                        (princ "(")
-                        (princ (quote ,setter))
-                        (princ "\n '(")
-                        (prin1 object)
-                        (princ " ")
-                        (prin1 (nth 3 spec))
-                        (princ ")")))))))
-      (mapc mapper special)
-      (setq ignored-special special)
-      (mapatoms mapper)
-      (when started-writing
-        (princ ")\n")))))
-
 (defun custom-save-faces ()
   "Save all customized faces in `custom-file'."
   (save-excursion
     (custom-save-delete 'custom-reset-faces)
     (custom-save-delete 'custom-set-faces)
-    (custom-save-resets 'theme-face 'custom-reset-faces '(default))
     (let ((standard-output (current-buffer))
           (saved-list (make-list 1 0))
           sort-fold-case)
       ;; First create a sorted list of saved faces.
       (mapatoms
        (lambda (symbol)
-         (if (get symbol 'saved-face)
+         (if (and (get symbol 'saved-face)
+                  (eq 'user (car (car-safe (get symbol 'theme-face)))))
              (nconc saved-list (list symbol)))))
       (setq saved-list (sort (cdr saved-list) 'string<))
       ;; The default face must be first, since it affects the others.
@@ -4242,9 +4234,7 @@ This function does not save the buffer."
                             (and (not (custom-facep symbol))
                                  (not (get symbol 'force-face))))))
               (comment (get symbol 'saved-face-comment)))
-          (when (or (and spec
-                         (eq (nth 0 spec) 'user)
-                         (eq (nth 1 spec) 'set))
+          (when (or (and spec (eq (nth 0 spec) 'user))
                     comment
                     (and (null spec) (get symbol 'saved-face)))
             ;; Don't print default face here.
@@ -4377,9 +4367,9 @@ The format is suitable for use with `easy-menu-define'."
     ,(customize-menu-create 'customize)
     ["Set" Custom-set t]
     ["Save" Custom-save t]
-    ["Reset to Current" Custom-reset-current t]
-    ["Reset to Saved" Custom-reset-saved t]
-    ["Reset to Standard Values" Custom-reset-standard t]
+    ["Reset to current settings" Custom-reset-current t]
+    ["Reset to saved settings" Custom-reset-saved t]
+    ["Erase customizations" Custom-reset-standard t]
     ["Info" (info "(emacs)Easy Customization") t]))
 
 (defun Custom-goto-parent ()
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 3e4e32ecc97..c5547657a17 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -353,17 +353,20 @@ FACE's list property `theme-face' \(using `custom-push-theme')."
           (custom-push-theme 'theme-face face theme 'set spec))
         (setq args (cdr (cdr args))))))))
 
+;; XEmacs compability function.  In XEmacs, when you reset a Custom
+;; Theme, you have to specify the theme to reset it to.  We just apply
+;; the next theme.
 ;;;###autoload
 (defun custom-theme-reset-faces (theme &rest args)
   "Reset the specs in THEME of some faces to their specs in other themes.
 Each of the arguments ARGS has this form:
 
-    (FACE FROM-THEME)
+    (FACE IGNORED)
 
-This means reset FACE to its value in FROM-THEME."
+This means reset FACE.  The argument IGNORED is ignored."
   (custom-check-theme theme)
   (dolist (arg args)
-    (custom-push-theme 'theme-face (car arg) theme 'reset (cadr arg))))
+    (custom-push-theme 'theme-face (car arg) theme 'reset)))
 
 ;;;###autoload
 (defun custom-reset-faces (&rest args)
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index d7102fc11f7..0a421da925c 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -58,18 +58,18 @@ use by `customize-create-theme'."
     (set (make-local-variable 'widget-link-suffix) "")))
 (put 'custom-new-theme-mode 'mode-class 'special)
 
-(defvar custom-theme-name)
-(defvar custom-theme-variables)
-(defvar custom-theme-faces)
+(defvar custom-theme-name nil)
+(defvar custom-theme-variables nil)
+(defvar custom-theme-faces nil)
 (defvar custom-theme-description)
+(defvar custom-theme-insert-variable-marker)
+(defvar custom-theme-insert-face-marker)
 
 ;;;###autoload
 (defun customize-create-theme ()
   "Create a custom theme."
   (interactive)
-  (if (get-buffer "*New Custom Theme*")
-      (kill-buffer "*New Custom Theme*"))
-  (switch-to-buffer "*New Custom Theme*")
+  (switch-to-buffer (generate-new-buffer "*New Custom Theme*"))
   (let ((inhibit-read-only t))
     (erase-buffer))
   (custom-new-theme-mode)
@@ -77,17 +77,39 @@ use by `customize-create-theme'."
   (make-local-variable 'custom-theme-variables)
   (make-local-variable 'custom-theme-faces)
   (make-local-variable 'custom-theme-description)
+  (make-local-variable 'custom-theme-insert-variable-marker)
+  (make-local-variable 'custom-theme-insert-face-marker)
   (widget-insert "This buffer helps you write a custom theme elisp file.
 This will help you share your customizations with other people.
 
-Just insert the names of all variables and faces you want the theme
-to include.  Then clicking mouse-2 or pressing RET on the [Done] button
-will write a theme file that sets all these variables and faces to their
-current global values.  It will write that file into the directory given
-by the variable `custom-theme-directory', usually \"~/.emacs.d/\".
+Insert the names of all variables and faces you want the theme to include.
+Invoke \"Save Theme\" to save the theme.  The theme file will be saved to
+the directory " custom-theme-directory "\n\n")
+  (widget-create 'push-button
+                 :tag "Visit Theme"
+                 :help-echo "Insert the settings of a pre-defined theme."
+                 :action (lambda (widget &optional event)
+                           (call-interactively 'custom-theme-visit-theme)))
+  (widget-insert "  ")
+  (widget-create 'push-button
+                 :tag "Merge Theme"
+                 :help-echo "Merge in the settings of a pre-defined theme."
+                 :action (lambda (widget &optional event)
+                           (call-interactively 'custom-theme-merge-theme)))
+  (widget-insert "  ")
+  (widget-create 'push-button
+                 :notify (lambda (&rest ignore)
+                           (when (y-or-n-p "Discard current changes?")
+                             (kill-buffer (current-buffer))
+                             (customize-create-theme)))
+                 "Reset Buffer")
+  (widget-insert "  ")
+  (widget-create 'push-button
+                 :notify (function custom-theme-write)
+                 "Save Theme")
+  (widget-insert "\n")
 
-To undo all your edits to the buffer, use the [Reset] button.\n\n")
-  (widget-insert "Theme name: ")
+  (widget-insert "\n\nTheme name: ")
   (setq custom-theme-name
         (widget-create 'editable-field
                        :size 10
@@ -96,76 +118,254 @@ To undo all your edits to the buffer, use the [Reset] button.\n\n")
   (setq custom-theme-description
         (widget-create 'text
                        :value (format-time-string "Created %Y-%m-%d.")))
-  (widget-insert "\nVariables:\n\n")
-  (setq custom-theme-variables
-        (widget-create 'editable-list
-                       :entry-format "%i %d %v"
-                       'variable))
-  (widget-insert "\nFaces:\n\n")
-  (setq custom-theme-faces
-        (widget-create 'editable-list
-                       :entry-format "%i %d %v"
-                       'face))
   (widget-insert "\n")
   (widget-create 'push-button
-                 :notify (function custom-theme-write)
-                 "Done")
-  (widget-insert " ")
+                 :tag "Insert Variable"
+                 :help-echo "Add another variable to this theme."
+                 :action (lambda (widget &optional event)
+                           (call-interactively 'custom-theme-add-variable)))
+  (widget-insert "\n")
+  (setq custom-theme-insert-variable-marker (point-marker))
+  (widget-insert "\n")
   (widget-create 'push-button
-                 :notify (lambda (&rest ignore)
-                           (customize-create-theme))
-                 "Reset")
-  (widget-insert " ")
+                 :tag "Insert Face"
+                 :help-echo "Add another face to this theme."
+                 :action (lambda (widget &optional event)
+                           (call-interactively 'custom-theme-add-face)))
+  (widget-insert "\n")
+  (setq custom-theme-insert-face-marker (point-marker))
+  (widget-insert "\n")
   (widget-create 'push-button
                  :notify (lambda (&rest ignore)
-                           (bury-buffer))
-                 "Bury Buffer")
+                           (when (y-or-n-p "Discard current changes?")
+                             (kill-buffer (current-buffer))
+                             (customize-create-theme)))
+                 "Reset Buffer")
+  (widget-insert "  ")
+  (widget-create 'push-button
+                 :notify (function custom-theme-write)
+                 "Save Theme")
   (widget-insert "\n")
+  (widget-setup)
+  (goto-char (point-min))
+  (message ""))
+
+;;; Theme variables
+
+(defun custom-theme-add-variable (symbol)
+  (interactive "vVariable name: ")
+  (save-excursion
+    (goto-char custom-theme-insert-variable-marker)
+    (if (assq symbol custom-theme-variables)
+        (message "%s is already in the theme" (symbol-name symbol))
+      (widget-insert "\n")
+      (let ((widget (widget-create 'custom-variable
+                                   :tag (custom-unlispify-tag-name symbol)
+                                   :custom-level 0
+                                   :action 'custom-theme-variable-action
+                                   :custom-state 'unknown
+                                   :value symbol)))
+        (push (cons symbol widget) custom-theme-variables)
+        (custom-magic-reset widget))
+      (widget-setup))))
+
+(defvar custom-theme-variable-menu
+  `(("Reset to Current" custom-redraw
+     (lambda (widget)
+       (and (boundp (widget-value widget))
+            (memq (widget-get widget :custom-state)
+                  '(themed modified changed)))))
+    ("Reset to Theme Value" custom-variable-reset-theme
+     (lambda (widget)
+       (let ((theme  (intern (widget-value custom-theme-name)))
+             (symbol (widget-value widget))
+             found)
+         (and (custom-theme-p theme)
+              (dolist (setting (get theme 'theme-settings) found)
+                (if (and (eq (cadr setting) symbol)
+                         (eq (car  setting) 'theme-value))
+                    (setq found t)))))))
+    ("---" ignore ignore)
+    ("Delete" custom-theme-delete-variable nil))
+  "Alist of actions for the `custom-variable' widget in Custom Theme Mode.
+See the documentation for `custom-variable'.")
+
+(defun custom-theme-variable-action (widget &optional event)
+  "Show the Custom Theme Mode menu for a `custom-variable' widget.
+Optional EVENT is the location for the menu."
+  (let ((custom-variable-menu custom-theme-variable-menu))
+    (custom-variable-action widget event)))
+
+(defun custom-variable-reset-theme (widget)
+  "Reset WIDGET to its value for the currently edited theme."
+  (let ((theme  (intern (widget-value custom-theme-name)))
+        (symbol (widget-value widget))
+        found)
+    (dolist (setting (get theme 'theme-settings))
+      (if (and (eq (cadr setting) symbol)
+               (eq (car  setting) 'theme-value))
+          (setq found setting)))
+    (widget-value-set (car (widget-get widget :children))
+                      (nth 3 found)))
+  (widget-put widget :custom-state 'themed)
+  (custom-redraw-magic widget)
+  (widget-setup))
+
+(defun custom-theme-delete-variable (widget)
+  (setq custom-theme-variables
+        (assq-delete-all (widget-value widget) custom-theme-variables))
+  (widget-delete widget))
+
+;;; Theme faces
+
+(defun custom-theme-add-face (symbol)
+  (interactive (list (read-face-name "Face name" nil nil)))
+  (save-excursion
+    (goto-char custom-theme-insert-face-marker)
+    (if (assq symbol custom-theme-faces)
+        (message "%s is already in the theme" (symbol-name symbol))
+      (widget-insert "\n")
+      (let ((widget (widget-create 'custom-face
+                                   :tag (custom-unlispify-tag-name symbol)
+                                   :custom-level 0
+                                   :action 'custom-theme-face-action
+                                   :custom-state 'unknown
+                                   :value symbol)))
+        (push (cons symbol widget) custom-theme-faces)
+        (custom-magic-reset widget)
+        (widget-setup)))))
+
+(defvar custom-theme-face-menu
+  `(("Reset to Theme Value" custom-face-reset-theme
+     (lambda (widget)
+       (let ((theme  (intern (widget-value custom-theme-name)))
+             (symbol (widget-value widget))
+             found)
+         (and (custom-theme-p theme)
+              (dolist (setting (get theme 'theme-settings) found)
+                (if (and (eq (cadr setting) symbol)
+                         (eq (car  setting) 'theme-face))
+                    (setq found t)))))))
+    ("---" ignore ignore)
+    ("Delete" custom-theme-delete-face nil))
+  "Alist of actions for the `custom-variable' widget in Custom Theme Mode.
+See the documentation for `custom-variable'.")
+
+(defun custom-theme-face-action (widget &optional event)
+  "Show the Custom Theme Mode menu for a `custom-face' widget.
+Optional EVENT is the location for the menu."
+  (let ((custom-face-menu custom-theme-face-menu))
+    (custom-face-action widget event)))
+
+(defun custom-face-reset-theme (widget)
+  "Reset WIDGET to its value for the currently edited theme."
+  (let ((theme  (intern (widget-value custom-theme-name)))
+        (symbol (widget-value widget))
+        found)
+    (dolist (setting (get theme 'theme-settings))
+      (if (and (eq (cadr setting) symbol)
+               (eq (car  setting) 'theme-face))
+          (setq found setting)))
+    (widget-value-set (car (widget-get widget :children))
+                      (nth 3 found)))
+  (widget-put widget :custom-state 'themed)
+  (custom-redraw-magic widget)
   (widget-setup))
 
+(defun custom-theme-delete-face (widget)
+  (setq custom-theme-faces
+        (assq-delete-all (widget-value widget) custom-theme-faces))
+  (widget-delete widget))
+
+;;; Reading and writing
+
+(defun custom-theme-visit-theme ()
+  (interactive)
+  (when (or (null custom-theme-variables)
+            (if (y-or-n-p "Discard current changes?")
+                (progn (customize-create-theme) t)))
+    (let ((theme (call-interactively 'custom-theme-merge-theme)))
+      (unless (eq theme 'user)
+        (widget-value-set custom-theme-name (symbol-name theme)))
+      (widget-value-set custom-theme-description
+                        (or (get theme 'theme-documentation)
+                            (format-time-string "Created %Y-%m-%d.")))
+      (widget-setup))))
+
+(defun custom-theme-merge-theme (theme)
+  (interactive "SCustom theme name: ")
+  (unless (eq theme 'user)
+    (load-theme theme))
+  (let ((settings (get theme 'theme-settings)))
+    (dolist (setting settings)
+      (if (eq (car setting) 'theme-value)
+          (custom-theme-add-variable (cadr setting))
+        (custom-theme-add-face (cadr setting)))))
+  (disable-theme theme)
+  theme)
+
 (defun custom-theme-write (&rest ignore)
-  (let ((name (widget-value custom-theme-name))
-        (doc (widget-value custom-theme-description))
-        (variables (widget-value custom-theme-variables))
-        (faces (widget-value custom-theme-faces)))
-    (switch-to-buffer (concat name "-theme.el"))
-    (emacs-lisp-mode)
-    (unless (file-exists-p custom-theme-directory)
-      (make-directory (file-name-as-directory custom-theme-directory) t))
-    (setq default-directory custom-theme-directory)
-    (setq buffer-file-name (expand-file-name (concat name "-theme.el")))
-    (let ((inhibit-read-only t))
-      (erase-buffer))
-    (insert "(deftheme " name)
-    (when doc
-      (newline)
-      (insert "  \"" doc "\""))
-    (insert  ")\n")
-    (custom-theme-write-variables name variables)
-    (custom-theme-write-faces name faces)
-    (insert "\n(provide-theme '" name ")\n")
-    (save-buffer)))
+  (let* ((name (widget-value custom-theme-name))
+         (filename (expand-file-name (concat name "-theme.el")
+                                     custom-theme-directory))
+         (doc (widget-value custom-theme-description))
+         (vars custom-theme-variables)
+         (faces custom-theme-faces))
+    (cond ((or (string-equal name "")
+              (string-equal name "user")
+              (string-equal name "changed"))
+           (error "Custom themes cannot be named `%s'" name))
+          ((string-match " " name)
+           (error "Custom theme names should not contain spaces"))
+          ((if (file-exists-p filename)
+               (not (y-or-n-p
+                     (format "File %s exists.  Overwrite? " filename))))
+           (error "Aborted")))
+    (with-temp-buffer
+      (emacs-lisp-mode)
+      (unless (file-exists-p custom-theme-directory)
+        (make-directory (file-name-as-directory custom-theme-directory) t))
+      (setq buffer-file-name filename)
+      (erase-buffer)
+      (insert "(deftheme " name)
+      (if doc (insert "\n  \"" doc "\""))
+      (insert  ")\n")
+      (custom-theme-write-variables name vars)
+      (custom-theme-write-faces name faces)
+      (insert "\n(provide-theme '" name ")\n")
+      (save-buffer))
+    (dolist (var vars)
+      (widget-put (cdr var) :custom-state 'saved)
+      (custom-redraw-magic (cdr var)))
+    (dolist (face faces)
+      (widget-put (cdr face) :custom-state 'saved)
+      (custom-redraw-magic (cdr face)))))
 
 (defun custom-theme-write-variables (theme vars)
   "Write a `custom-theme-set-variables' command for THEME.
 It includes all variables in list VARS."
-  ;; Most code is stolen from `custom-save-variables'.
   (when vars
     (let ((standard-output (current-buffer)))
       (princ "\n(custom-theme-set-variables\n")
       (princ " '")
       (princ theme)
       (princ "\n")
-      (mapc (lambda (symbol)
-              (when (boundp symbol)
-                (unless (bolp)
-                  (princ "\n"))
-                (princ " '(")
-                (prin1 symbol)
-                (princ " ")
-                (prin1 (custom-quote (symbol-value symbol)))
-                (princ ")")))
-              vars)
+      (mapc (lambda (spec)
+              (let* ((symbol (car spec))
+                     (child (car-safe (widget-get (cdr spec) :children)))
+                     (value (if child
+                                (widget-value child)
+                              ;; For hidden widgets, use the standard value
+                              (get symbol 'standard-value))))
+                (when (boundp symbol)
+                  (unless (bolp)
+                    (princ "\n"))
+                  (princ " '(")
+                  (prin1 symbol)
+                  (princ " ")
+                  (prin1 (custom-quote value))
+                  (princ ")"))))
+            vars)
       (if (bolp)
           (princ " "))
       (princ ")")
@@ -181,18 +381,19 @@ It includes all faces in list FACES."
       (princ " '")
       (princ theme)
       (princ "\n")
-      (mapc (lambda (symbol)
-              (when (facep symbol)
-                (unless (bolp)
-                  (princ "\n"))
-                (princ " '(")
-                (prin1 symbol)
-                (princ " ")
-                (prin1 (list (append '(t)
-                                     (custom-face-attributes-get
-                                      'font-lock-comment-face nil))))
-                (princ ")")))
-              faces)
+      (mapc (lambda (spec)
+              (let* ((symbol (car spec))
+                     (child (car-safe (widget-get (cdr spec) :children)))
+                     (value (if child (widget-value child))))
+                (when (and (facep symbol) child)
+                  (unless (bolp)
+                    (princ "\n"))
+                  (princ " '(")
+                  (prin1 symbol)
+                  (princ " ")
+                  (prin1 value)
+                  (princ ")"))))
+            faces)
       (if (bolp)
           (princ " "))
       (princ ")")
diff --git a/lisp/custom.el b/lisp/custom.el
index 18d79a6af23..6267febe0d5 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -599,9 +599,160 @@ This recursively follows aliases."
               ((equal load "cus-edit"))
               (t (condition-case nil (load load) (error nil))))))))
 
-(defvar custom-known-themes '(user standard)
+(defvar custom-local-buffer nil
+  "Non-nil, in a Customization buffer, means customize a specific buffer.
+If this variable is non-nil, it should be a buffer,
+and it means customize the local bindings of that buffer.
+This variable is a permanent local, and it normally has a local binding
+in every Customization buffer.")
+(put 'custom-local-buffer 'permanent-local t)
+
+(defun custom-set-default (variable value)
+  "Default :set function for a customizable variable.
+Normally, this sets the default value of VARIABLE to VALUE,
+but if `custom-local-buffer' is non-nil,
+this sets the local binding in that buffer instead."
+  (if custom-local-buffer
+      (with-current-buffer custom-local-buffer
+        (set variable value))
+    (set-default variable value)))
+
+(defun custom-set-minor-mode (variable value)
+  ":set function for minor mode variables.
+Normally, this sets the default value of VARIABLE to nil if VALUE
+is nil and to t otherwise,
+but if `custom-local-buffer' is non-nil,
+this sets the local binding in that buffer instead."
+  (if custom-local-buffer
+      (with-current-buffer custom-local-buffer
+        (funcall variable (if value 1 0)))
+    (funcall variable (if value 1 0))))
+
+(defun custom-quote (sexp)
+  "Quote SEXP iff it is not self quoting."
+  (if (or (memq sexp '(t nil))
+          (keywordp sexp)
+          (and (listp sexp)
+               (memq (car sexp) '(lambda)))
+          (stringp sexp)
+          (numberp sexp)
+          (vectorp sexp)
+;;;       (and (fboundp 'characterp)
+;;;            (characterp sexp))
+          )
+      sexp
+    (list 'quote sexp)))
+
+(defun customize-mark-to-save (symbol)
+  "Mark SYMBOL for later saving.
+
+If the default value of SYMBOL is different from the standard value,
+set the `saved-value' property to a list whose car evaluates to the
+default value.  Otherwise, set it to nil.
+
+To actually save the value, call `custom-save-all'.
+
+Return non-nil iff the `saved-value' property actually changed."
+  (let* ((get (or (get symbol 'custom-get) 'default-value))
+         (value (funcall get symbol))
+         (saved (get symbol 'saved-value))
+         (standard (get symbol 'standard-value))
+         (comment (get symbol 'customized-variable-comment)))
+    ;; Save default value iff different from standard value.
+    (if (or (null standard)
+            (not (equal value (condition-case nil
+                                  (eval (car standard))
+                                (error nil)))))
+        (put symbol 'saved-value (list (custom-quote value)))
+      (put symbol 'saved-value nil))
+    ;; Clear customized information (set, but not saved).
+    (put symbol 'customized-value nil)
+    ;; Save any comment that might have been set.
+    (when comment
+      (put symbol 'saved-variable-comment comment))
+    (not (equal saved (get symbol 'saved-value)))))
+
+(defun customize-mark-as-set (symbol)
+  "Mark current value of SYMBOL as being set from customize.
+
+If the default value of SYMBOL is different from the saved value if any,
+or else if it is different from the standard value, set the
+`customized-value' property to a list whose car evaluates to the
+default value.  Otherwise, set it to nil.
+
+Return non-nil iff the `customized-value' property actually changed."
+  (let* ((get (or (get symbol 'custom-get) 'default-value))
+         (value (funcall get symbol))
+         (customized (get symbol 'customized-value))
+         (old (or (get symbol 'saved-value) (get symbol 'standard-value))))
+    ;; Mark default value as set iff different from old value.
+    (if (or (null old)
+            (not (equal value (condition-case nil
+                                  (eval (car old))
+                                (error nil)))))
+        (put symbol 'customized-value (list (custom-quote value)))
+      (put symbol 'customized-value nil))
+    ;; Changed?
+    (not (equal customized (get symbol 'customized-value)))))
+
+(defun custom-reevaluate-setting (symbol)
+  "Reset the value of SYMBOL by re-evaluating its saved or standard value.
+Use the :set function to do so.  This is useful for customizable options
+that are defined before their standard value can really be computed.
+E.g. dumped variables whose default depends on run-time information."
+  (funcall (or (get symbol 'custom-set) 'set-default)
+           symbol
+           (eval (car (or (get symbol 'saved-value) (get symbol 'standard-value))))))
+
+
+;;; Custom Themes
+
+;; Custom themes are collections of settings that can be enabled or
+;; disabled as a unit.
+
+;; Each Custom theme is defined by a symbol, called the theme name.
+;; The `theme-settings' property of the theme name records the
+;; variable and face settings of the theme.  This property is a list
+;; of elements, each of the form
+;;
+;;     (PROP SYMBOL THEME VALUE)
+;;
+;;  - PROP is either `theme-value' or `theme-face'
+;;  - SYMBOL is the face or variable name
+;;  - THEME is the theme name (redundant, but simplifies the code)
+;;  - VALUE is an expression that gives the theme's setting for SYMBOL.
+;;
+;; The theme name also has a `theme-feature' property, whose value is
+;; specified when the theme is defined (see `custom-declare-theme').
+;; Usually, this is just a symbol named THEME-theme.  This lets
+;; external libraries call (require 'foo-theme).
+
+;; In addition, each symbol (either a variable or a face) affected by
+;; an *enabled* theme has a `theme-value' or `theme-face' property,
+;; which is a list of elements each of the form
+;;
+;;     (THEME VALUE)
+;;
+;; which have the same meanings as in `theme-settings'.
+;;
+;; The `theme-value' and `theme-face' lists are ordered by decreasing
+;; theme precedence.  Thus, the first element is always the one that
+;; is in effect.
+
+;; Each theme is stored in a theme file, with filename THEME-theme.el.
+;; Loading a theme basically involves calling (load "THEME-theme")
+;; This is done by the function `load-theme'.  Loading a theme
+;; automatically enables it.
+;;
+;; When a theme is enabled, the `theme-value' and `theme-face'
+;; properties for the affected symbols are set.  When a theme is
+;; disabled, its settings are removed from the `theme-value' and
+;; `theme-face' properties, but the theme's own `theme-settings'
+;; property remains unchanged.
+
+(defvar custom-known-themes '(user changed)
    "Themes that have been defined with `deftheme'.
-The default value is the list (user standard).  The theme `standard'
+The default value is the list (user changed).  The theme `changed'
 contains the settings before custom themes are applied.  The
 theme `user' contains all the settings the user customized and saved.
 Additional themes declared with the `deftheme' macro will be added to
@@ -616,44 +767,22 @@ the front of this list.")
   (unless (custom-theme-p theme)
     (error "Unknown theme `%s'" theme)))
 
-;;; Initializing.
-
-(defun custom-push-theme (prop symbol theme mode value)
-  "Record a value for face or variable SYMBOL in custom theme THEME.
-PROP is`theme-face' for a face, `theme-value' for a variable.
-The value is specified by (THEME MODE VALUE), which is interpreted
-by `custom-theme-value'.
+(defun custom-push-theme (prop symbol theme mode &optional value)
+  "Record VALUE for face or variable SYMBOL in custom theme THEME.
+PROP is `theme-face' for a face, `theme-value' for a variable.
 
 MODE can be either the symbol `set' or the symbol `reset'.  If it is the
 symbol `set', then VALUE is the value to use.  If it is the symbol
-`reset', then VALUE is either another theme, which means to use the
-value defined by that theme; or nil, which means to remove SYMBOL from
-THEME entirely.
-
-In the following example, the variable `goto-address-url-face' has been
-set by three different themes.  Its `theme-value' property is:
-
-  \((subtle-hacker reset gnome2)
-   \(jonadab set underline)
-   \(gnome2 set info-xref)
-
-The theme value defined by `subtle-hacker' is in effect, because
-that theme currently has the highest precedence.  The theme
-`subtle-hacker' says to use the same value for the variable as
-the theme `gnome2'.  Therefore, the theme value of the variable
-is `info-xref'.  To change the precedence of the themes, use
-`enable-theme'.
-
-The user has not customized the variable; had he done that, the
-list would contain an entry for the `user' theme, too.
+`reset', then SYMBOL will be removed from THEME (VALUE is ignored).
 
 See `custom-known-themes' for a list of known themes."
   (unless (memq prop '(theme-value theme-face))
     (error "Unknown theme property"))
   (let* ((old (get symbol prop))
-         (setting (assq theme old))
-         (theme-settings (get theme 'theme-settings)))
-    (if (and (eq mode 'reset) (null value))
+         (setting (assq theme old))  ; '(theme value)
+         (theme-settings             ; '(prop symbol theme value)
+          (get theme 'theme-settings)))
+    (if (eq mode 'reset)
         ;; Remove a setting.
         (when setting
           (let (res)
@@ -671,13 +800,12 @@ See `custom-known-themes' for a list of known themes."
                        (eq (cadr theme-setting) symbol))
                   (setq res theme-setting)))
             (put theme 'theme-settings
-                 (cons (list prop symbol theme mode value)
+                 (cons (list prop symbol theme value)
                        (delq res theme-settings)))
-            (setcar (cdr setting) mode)
-            (setcar (cddr setting) value))
+            (setcar (cdr setting) value))
         ;; Add a new setting.
         ;; If the user changed the value outside of Customize, we
-        ;; first save the current value to a fake theme, `standard'.
+        ;; first save the current value to a fake theme, `changed'.
         ;; This ensures that the user-set value comes back if the
         ;; theme is later disabled.
         (if (null old)
@@ -686,23 +814,16 @@ See `custom-known-themes' for a list of known themes."
                      (or (null (get symbol 'standard-value))
                          (not (equal (eval (car (get symbol 'standard-value)))
                                      (symbol-value symbol)))))
-                (setq old (list (list 'standard 'set (symbol-value symbol))))
+                (setq old (list (list 'changed (symbol-value symbol))))
               (if (facep symbol)
-                  (setq old (list (list 'standard 'set (list
+                  (setq old (list (list 'changed (list
                     (append '(t) (custom-face-attributes-get symbol nil)))))))))
-        (put symbol prop (cons (list theme mode value) old))
+        (put symbol prop (cons (list theme value) old))
         (put theme 'theme-settings
-             (cons (list prop symbol theme mode value)
+             (cons (list prop symbol theme value)
                    theme-settings))))))
-
-(defvar custom-local-buffer nil
-  "Non-nil, in a Customization buffer, means customize a specific buffer.
-If this variable is non-nil, it should be a buffer,
-and it means customize the local bindings of that buffer.
-This variable is a permanent local, and it normally has a local binding
-in every Customization buffer.")
-(put 'custom-local-buffer 'permanent-local t)
 
+
 (defun custom-set-variables (&rest args)
   "Install user customizations of variable values specified in ARGS.
 These settings are registered as theme `user'.
@@ -719,15 +840,6 @@ handle SYMBOL properly.
 COMMENT is a comment string about SYMBOL."
   (apply 'custom-theme-set-variables 'user args))
 
-(defun custom-reevaluate-setting (symbol)
-  "Reset the value of SYMBOL by re-evaluating its saved or standard value.
-Use the :set function to do so.  This is useful for customizable options
-that are defined before their standard value can really be computed.
-E.g. dumped variables whose default depends on run-time information."
-  (funcall (or (get symbol 'custom-set) 'set-default)
-           symbol
-           (eval (car (or (get symbol 'saved-value) (get symbol 'standard-value))))))
-
 (defun custom-theme-set-variables (theme &rest args)
   "Initialize variables for theme THEME according to settings in ARGS.
 Each of the arguments in ARGS should be a list of this form:
@@ -742,16 +854,6 @@ REQUEST is a list of features we must require in order to
 handle SYMBOL properly.
 COMMENT is a comment string about SYMBOL.
 
-Several properties of THEME and SYMBOL are used in the process:
-
-If THEME's property `theme-immediate' is non-nil, this is equivalent of
-providing the NOW argument to all symbols in the argument list:
-evaluate each EXP and set the corresponding SYMBOL.  However,
-there's a difference in the handling of SYMBOL's property
-`force-value': if NOW is non-nil, SYMBOL's property `force-value' is set to
-the symbol `rogue', else if THEME's property `theme-immediate' is non-nil,
-SYMBOL's property `force-value' is set to the symbol `immediate'.
-
 EXP itself is saved unevaluated as SYMBOL property `saved-value' and
 in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
   (custom-check-theme theme)
@@ -814,133 +916,34 @@ in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
           (custom-push-theme 'theme-value symbol theme 'set value))
         (setq args (cdr (cdr args)))))))
 
-(defun custom-set-default (variable value)
-  "Default :set function for a customizable variable.
-Normally, this sets the default value of VARIABLE to VALUE,
-but if `custom-local-buffer' is non-nil,
-this sets the local binding in that buffer instead."
-  (if custom-local-buffer
-      (with-current-buffer custom-local-buffer
-        (set variable value))
-    (set-default variable value)))
-
-(defun custom-set-minor-mode (variable value)
-  ":set function for minor mode variables.
-Normally, this sets the default value of VARIABLE to nil if VALUE
-is nil and to t otherwise,
-but if `custom-local-buffer' is non-nil,
-this sets the local binding in that buffer instead."
-  (if custom-local-buffer
-      (with-current-buffer custom-local-buffer
-        (funcall variable (if value 1 0)))
-    (funcall variable (if value 1 0))))
-
-(defun custom-quote (sexp)
-  "Quote SEXP iff it is not self quoting."
-  (if (or (memq sexp '(t nil))
-          (keywordp sexp)
-          (and (listp sexp)
-               (memq (car sexp) '(lambda)))
-          (stringp sexp)
-          (numberp sexp)
-          (vectorp sexp)
-;;;       (and (fboundp 'characterp)
-;;;            (characterp sexp))
-          )
-      sexp
-    (list 'quote sexp)))
-
-(defun customize-mark-to-save (symbol)
-  "Mark SYMBOL for later saving.
-
-If the default value of SYMBOL is different from the standard value,
-set the `saved-value' property to a list whose car evaluates to the
-default value.  Otherwise, set it to nil.
-
-To actually save the value, call `custom-save-all'.
-
-Return non-nil iff the `saved-value' property actually changed."
-  (let* ((get (or (get symbol 'custom-get) 'default-value))
-         (value (funcall get symbol))
-         (saved (get symbol 'saved-value))
-         (standard (get symbol 'standard-value))
-         (comment (get symbol 'customized-variable-comment)))
-    ;; Save default value iff different from standard value.
-    (if (or (null standard)
-            (not (equal value (condition-case nil
-                                  (eval (car standard))
-                                (error nil)))))
-        (put symbol 'saved-value (list (custom-quote value)))
-      (put symbol 'saved-value nil))
-    ;; Clear customized information (set, but not saved).
-    (put symbol 'customized-value nil)
-    ;; Save any comment that might have been set.
-    (when comment
-      (put symbol 'saved-variable-comment comment))
-    (not (equal saved (get symbol 'saved-value)))))
-
-(defun customize-mark-as-set (symbol)
-  "Mark current value of SYMBOL as being set from customize.
-
-If the default value of SYMBOL is different from the saved value if any,
-or else if it is different from the standard value, set the
-`customized-value' property to a list whose car evaluates to the
-default value.  Otherwise, set it to nil.
-
-Return non-nil iff the `customized-value' property actually changed."
-  (let* ((get (or (get symbol 'custom-get) 'default-value))
-         (value (funcall get symbol))
-         (customized (get symbol 'customized-value))
-         (old (or (get symbol 'saved-value) (get symbol 'standard-value))))
-    ;; Mark default value as set iff different from old value.
-    (if (or (null old)
-            (not (equal value (condition-case nil
-                                  (eval (car old))
-                                (error nil)))))
-        (put symbol 'customized-value (list (custom-quote value)))
-      (put symbol 'customized-value nil))
-    ;; Changed?
-    (not (equal customized (get symbol 'customized-value)))))
 
 ;;; Defining themes.
 
-;; deftheme is used at the beginning of the file that records a theme.
+;; A theme file should be named `THEME-theme.el' (where THEME is the theme
+;; name), and found in either `custom-theme-directory' or the load path.
+;; It has the following format:
+;;
+;;   (deftheme THEME
+;;     DOCSTRING)
+;;
+;;   (custom-theme-set-variables
+;;    'THEME
+;;    [THEME-VARIABLES])
+;;
+;;   (custom-theme-set-faces
+;;    'THEME
+;;    [THEME-FACES])
+;;
+;;   (provide-theme 'THEME)
 
-(defmacro deftheme (theme &optional doc &rest args)
-  "Declare custom theme THEME.
-The optional argument DOC is a doc string describing the theme.
-The remaining arguments should have the form
 
-   [KEYWORD VALUE]...
+;; The IGNORED arguments to deftheme come from the XEmacs theme code, where
+;; they were used to supply keyword-value pairs like `:immediate',
+;; `:variable-reset-string', etc.  We don't use any of these, so ignore them.
 
-The following KEYWORD's are defined:
-
-:short-description
-        VALUE is a short (one line) description of the theme.  If not
-        given, DOC is used.
-:immediate
-        If VALUE is non-nil, variables specified in this theme are set
-        immediately when loading the theme.
-:variable-set-string
-        VALUE is a string used to indicate that a variable takes its
-        setting from this theme.  It is passed to FORMAT with the name
-        of the theme as an additional argument.  If not given, a
-        generic description is used.
-:variable-reset-string
-        VALUE is a string used in the case a variable has been forced
-        to its value in this theme.  It is passed to FORMAT with the
-        name of the theme as an additional argument.  If not given, a
-        generic description is used.
-:face-set-string
-        VALUE is a string used to indicate that a face takes its
-        setting from this theme.  It is passed to FORMAT with the name
-        of the theme as an additional argument.  If not given, a
-        generic description is used.
-:face-reset-string
-        VALUE is a string used in the case a face has been forced to
-        its value in this theme.  It is passed to FORMAT with the name
-        of the theme as an additional argument.  If not given, a
-        generic description is used.
+(defmacro deftheme (theme &optional doc &rest ignored)
+  "Declare THEME to be a Custom theme.
+The optional argument DOC is a doc string describing the theme.
 
 Any theme `foo' should be defined in a file called `foo-theme.el';
 see `custom-make-theme-feature' for more information."
@@ -948,42 +951,17 @@ see `custom-make-theme-feature' for more information."
     ;; It is better not to use backquote in this file,
     ;; because that makes a bootstrapping problem
     ;; if you need to recompile all the Lisp files using interpreted code.
-    (nconc (list 'custom-declare-theme
-                 (list 'quote theme)
-                 (list 'quote feature)
-                 doc)
-           args)))
+    (list 'custom-declare-theme (list 'quote theme) (list 'quote feature) doc)))
 
-(defun custom-declare-theme (theme feature &optional doc &rest args)
+(defun custom-declare-theme (theme feature &optional doc &rest ignored)
   "Like `deftheme', but THEME is evaluated as a normal argument.
-FEATURE is the feature this theme provides.  This symbol is created
-from THEME by `custom-make-theme-feature'."
+FEATURE is the feature this theme provides.  Normally, this is a symbol
+created from THEME by `custom-make-theme-feature'."
+  (if (memq theme '(user changed))
+      (error "Custom theme cannot be named %S" theme))
   (add-to-list 'custom-known-themes theme)
   (put theme 'theme-feature feature)
-  (when doc
-    (put theme 'theme-documentation doc))
-  (while args
-    (let ((arg (car args)))
-      (setq args (cdr args))
-      (unless (symbolp arg)
-        (error "Junk in args %S" args))
-      (let ((keyword arg)
-            (value (car args)))
-        (unless args
-          (error "Keyword %s is missing an argument" keyword))
-        (setq args (cdr args))
-        (cond ((eq keyword :short-description)
-               (put theme 'theme-short-description value))
-              ((eq keyword :immediate)
-               (put theme 'theme-immediate value))
-              ((eq keyword :variable-set-string)
-               (put theme 'theme-variable-set-string value))
-              ((eq keyword :variable-reset-string)
-               (put theme 'theme-variable-reset-string value))
-              ((eq keyword :face-set-string)
-               (put theme 'theme-face-set-string value))
-              ((eq keyword :face-reset-string)
-               (put theme 'theme-face-reset-string value)))))))
+  (when doc (put theme 'theme-documentation doc)))
 
 (defun custom-make-theme-feature (theme)
   "Given a symbol THEME, create a new symbol by appending \"-theme\".
@@ -998,38 +976,6 @@ Every theme X has a property `provide-theme' whose value is \"X-theme\".
 
 ;;; Loading themes.
 
-;; The variable and face settings of a theme are recorded in
-;; the `theme-settings' property of the theme name.
-;; This property's value is a list of elements, each of the form
-;; (PROP SYMBOL THEME MODE VALUE), where PROP is `theme-value' or `theme-face'
-;; and SYMBOL is the face or variable name.
-;; THEME is the theme name itself; that's redundant, but simplifies things.
-;; MODE is `set' or `reset'.
-;; If MODE is `set', then VALUE is an expression that specifies the
-;; theme's setting for SYMBOL.
-;; If MODE is `reset', then VALUE is another theme,
-;; and it means to use the value from that theme.
-
-;; Each variable has a `theme-value' property that describes all the
-;; settings of enabled themes that apply to it.
-;; Each face name has a `theme-face' property that describes all the
-;; settings of enabled themes that apply to it.
-;; The property value is a list of settings, each with the form
-;; (THEME MODE VALUE).  THEME, MODE and VALUE are as above.
-;; Each of these lists is ordered by decreasing theme precedence.
-;; Thus, the first element is always the one that is in effect.
-
-;; Disabling a theme removes its settings from the `theme-value' and
-;; `theme-face' properties, but the theme's own `theme-settings'
-;; property remains unchanged.
-
-;; Loading a theme implicitly enables it.  Enabling a theme adds its
-;; settings to the symbols' `theme-value' and `theme-face' properties,
-;; or moves them to the front of those lists if they're already present.
-
-(defvar custom-loaded-themes nil
-  "Custom themes that have been loaded.")
-
 (defcustom custom-theme-directory
   (if (eq system-type 'ms-dos)
          ;; MS-DOS cannot have initial dot.
@@ -1043,76 +989,39 @@ into this directory."
   :group 'customize
   :version "22.1")
 
-(defun custom-theme-loaded-p (theme)
-  "Return non-nil if THEME has been loaded."
-  (memq theme custom-loaded-themes))
-
 (defun provide-theme (theme)
-  "Indicate that this file provides THEME, and mark it as enabled.
-Add THEME to `custom-loaded-themes' and `custom-enabled-themes',
-and `provide' the feature name stored in THEME's property `theme-feature'.
-
-Usually the `theme-feature' property contains a symbol created
-by `custom-make-theme-feature'."
-  (if (eq theme 'user)
-      (error "Custom theme cannot be named `user'"))
+  "Indicate that this file provides THEME.
+This calls `provide' to provide the feature name stored in THEME's
+property `theme-feature' (which is usually a symbol created by
+`custom-make-theme-feature')."
+  (if (memq theme '(user changed))
+      (error "Custom theme cannot be named %S" theme))
   (custom-check-theme theme)
   (provide (get theme 'theme-feature))
-  (push theme custom-loaded-themes)
-  ;; Loading a theme also installs its settings,
-  ;; so mark it as "enabled".
+  ;; Loading a theme also enables it.
   (push theme custom-enabled-themes)
   ;; `user' must always be the highest-precedence enabled theme.
   ;; Make that remain true.  (This has the effect of making user settings
   ;; override the ones just loaded, too.)
-  (enable-theme 'user))
+  (let ((custom-enabling-themes t))
+    (enable-theme 'user)))
 
 (defun load-theme (theme)
-  "Try to load a theme's settings from its file.
+  "Load a theme's settings from its file.
 This also enables the theme; use `disable-theme' to disable it."
-
-  ;; THEME's feature is stored in THEME's `theme-feature' property.
-  ;; Usually the `theme-feature' property contains a symbol created
-  ;; by `custom-make-theme-feature'.
-
   ;; Note we do no check for validity of the theme here.
   ;; This allows to pull in themes by a file-name convention
   (interactive "SCustom theme name: ")
+  ;; If reloading, clear out the old theme settings.
+  (when (custom-theme-p theme)
+    (disable-theme theme)
+    (put theme 'theme-settings nil)
+    (put theme 'theme-feature nil)
+    (put theme 'theme-documentation nil))
   (let ((load-path (if (file-directory-p custom-theme-directory)
                        (cons custom-theme-directory load-path)
                      load-path)))
-    (require (or (get theme 'theme-feature)
-                 (custom-make-theme-feature theme)))))
-
-;;; How to load and enable various themes as part of `user'.
-
-(defun custom-theme-load-themes (by-theme &rest body)
-  "Load the themes specified by BODY.
-Record them as required by theme BY-THEME.
-
-BODY is a sequence of either
-
-THEME
-        Load THEME and enable it.
-\(reset THEME)
-        Undo all the settings made by THEME
-\(hidden THEME)
-        Load THEME but do not enable it.
-
-All the themes loaded for BY-THEME are recorded in BY-THEME's property
-`theme-loads-themes'."
-  (custom-check-theme by-theme)
-  (let ((themes-loaded (get by-theme 'theme-loads-themes)))
-    (dolist (theme body)
-      (cond ((and (consp theme) (eq (car theme) 'reset))
-             (disable-theme (cadr theme)))
-            ((and (consp theme) (eq (car theme) 'hidden))
-             (load-theme (cadr theme))
-             (disable-theme (cadr theme)))
-            (t
-             (load-theme theme)))
-      (push theme themes-loaded))
-    (put by-theme 'theme-loads-themes themes-loaded)))
+    (load (symbol-name (custom-make-theme-feature theme)))))
 
 ;;; Enabling and disabling loaded themes.
 
@@ -1123,25 +1032,26 @@ All the themes loaded for BY-THEME are recorded in BY-THEME's property
 The newly enabled theme gets the highest precedence (after `user').
 If it is already enabled, just give it highest precedence (after `user').
 
-This signals an error if THEME does not specify any theme
-settings.  Theme settings are set using `load-theme'."
+If THEME does not specify any theme settings, this tries to load
+the theme from its theme file, by calling `load-theme'."
   (interactive "SEnable Custom theme: ")
-  (unless (or (eq theme 'user) (memq theme custom-loaded-themes))
-    (error "Theme %s not defined" (symbol-name theme)))
-  (let ((settings (get theme 'theme-settings)))
-    (dolist (s settings)
-      (let* ((prop (car s))
-             (symbol (cadr s))
-             (spec-list (get symbol prop)))
-        (put symbol prop (cons (cddr s) (assq-delete-all theme spec-list)))
-        (if (eq prop 'theme-value)
-            (custom-theme-recalc-variable symbol)
-          (custom-theme-recalc-face symbol)))))
-  (unless (eq theme 'user)
-    (setq custom-enabled-themes
-          (cons theme (delq theme custom-enabled-themes)))
-    (unless custom-enabling-themes
-      (enable-theme 'user))))
+  (if (not (custom-theme-p theme))
+      (load-theme theme)
+    ;; This could use a bit of optimization -- cyd
+    (let ((settings (get theme 'theme-settings)))
+      (dolist (s settings)
+        (let* ((prop (car s))
+               (symbol (cadr s))
+               (spec-list (get symbol prop)))
+          (put symbol prop (cons (cddr s) (assq-delete-all theme spec-list)))
+          (if (eq prop 'theme-value)
+              (custom-theme-recalc-variable symbol)
+            (custom-theme-recalc-face symbol)))))
+    (unless (eq theme 'user)
+      (setq custom-enabled-themes
+            (cons theme (delq theme custom-enabled-themes)))
+      (unless custom-enabling-themes
+        (enable-theme 'user)))))
 
 (defcustom custom-enabled-themes nil
   "List of enabled Custom Themes, highest precedence first.
@@ -1155,28 +1065,36 @@ and always takes precedence over other Custom Themes."
          ;; defined in a theme (e.g. `user').  Enabling the theme sets
          ;; custom-enabled-themes, which enables the theme...
          (unless custom-enabling-themes
-           (let ((custom-enabling-themes t))
+           (let ((custom-enabling-themes t) failures)
              (setq themes (delq 'user (delete-dups themes)))
              (if (boundp symbol)
                  (dolist (theme (symbol-value symbol))
                    (if (not (memq theme themes))
                        (disable-theme theme))))
              (dolist (theme (reverse themes))
-               (if (or (custom-theme-loaded-p theme) (eq theme 'user))
+               (condition-case nil
                    (enable-theme theme)
-                 (load-theme theme)))
+                 (error (progn (push theme failures)
+                               (setq themes (delq theme themes))))))
              (enable-theme 'user)
-             (custom-set-default symbol themes)))))
+             (custom-set-default symbol themes)
+             (if failures
+                 (message "Failed to enable themes: %s"
+                          (mapconcat 'symbol-name failures " ")))))))
 
-(defun custom-theme-enabled-p (theme)
+(defsubst custom-theme-enabled-p (theme)
   "Return non-nil if THEME is enabled."
   (memq theme custom-enabled-themes))
 
 (defun disable-theme (theme)
   "Disable all variable and face settings defined by THEME.
 See `custom-enabled-themes' for a list of enabled themes."
-  (interactive "SDisable Custom theme: ")
-  (when (memq theme custom-enabled-themes)
+  (interactive (list (intern
+                      (completing-read
+                       "Disable Custom theme: "
+                       (mapcar 'symbol-name custom-enabled-themes)
+                       nil t))))
+  (when (custom-theme-enabled-p theme)
     (let ((settings (get theme 'theme-settings)))
       (dolist (s settings)
         (let* ((prop (car s))
@@ -1189,28 +1107,6 @@ See `custom-enabled-themes' for a list of enabled themes."
     (setq custom-enabled-themes
           (delq theme custom-enabled-themes))))
 
-(defun custom-theme-value (theme setting-list)
-  "Determine the value specified for THEME according to SETTING-LIST.
-Returns a list whose car is the specified value, if we
-find one; nil otherwise.
-
-SETTING-LIST is an alist with themes as its key.
-Each element has the form:
-
-  \(THEME MODE VALUE)
-
-MODE is either the symbol `set' or the symbol `reset'.  See
-`custom-push-theme' for more information on the format of
-SETTING-LIST."
-  ;; Note we do _NOT_ signal an error if the theme is unknown
-  ;; it might have gone away without the user knowing.
-  (let ((elt (cdr (assoc theme setting-list))))
-    (if elt
-        (if (eq (car elt) 'set)
-            (cdr elt)
-          ;; `reset' means refer to another theme's value in the same alist.
-          (custom-theme-value (cadr elt) setting-list)))))
-
 (defun custom-variable-theme-value (variable)
   "Return (list VALUE) indicating the custom theme value of VARIABLE.
 That is to say, it specifies what the value should be according to
@@ -1219,47 +1115,53 @@ currently enabled custom themes.
 This function returns nil if no custom theme specifies a value for VARIABLE."
   (let* ((theme-value (get variable 'theme-value)))
     (if theme-value
-        (custom-theme-value (car (car theme-value)) theme-value))))
+        (cdr (car theme-value)))))
 
 (defun custom-theme-recalc-variable (variable)
   "Set VARIABLE according to currently enabled custom themes."
   (let ((valspec (custom-variable-theme-value variable)))
-    (when valspec
-      (put variable 'saved-value valspec))
-    (unless valspec
+    (if valspec
+        (put variable 'saved-value valspec)
       (setq valspec (get variable 'standard-value)))
-    (when valspec
-      (if (or (get 'force-value variable) (default-boundp variable))
-          (funcall (or (get variable 'custom-set) 'set-default) variable
-                   (eval (car valspec)))))))
+    (if (and valspec
+             (or (get variable 'force-value)
+                 (default-boundp variable)))
+        (funcall (or (get variable 'custom-set) 'set-default) variable
+                 (eval (car valspec))))))
 
 (defun custom-theme-recalc-face (face)
   "Set FACE according to currently enabled custom themes."
   (if (facep face)
       (let ((theme-faces (reverse (get face 'theme-face))))
         (dolist (spec theme-faces)
-          (face-spec-set face (car (cddr spec)))))))
+          (face-spec-set face (cadr spec))))))
 
+;;; XEmacs compability functions
+
+;; In XEmacs, when you reset a Custom Theme, you have to specify the
+;; theme to reset it to.  We just apply the next available theme, so
+;; just ignore the IGNORED arguments.
+
 (defun custom-theme-reset-variables (theme &rest args)
-  "Reset the specs in THEME of some variables to their values in other themes.
+  "Reset some variable settings in THEME to their values in other themes.
 Each of the arguments ARGS has this form:
 
-    (VARIABLE FROM-THEME)
+    (VARIABLE IGNORED)
 
-This means reset VARIABLE to its value in FROM-THEME."
+This means reset VARIABLE.  (The argument IGNORED is ignored)."
   (custom-check-theme theme)
   (dolist (arg args)
-    (custom-push-theme 'theme-value (car arg) theme 'reset (cadr arg))))
+    (custom-push-theme 'theme-value (car arg) theme 'reset)))
 
 (defun custom-reset-variables (&rest args)
-  "Reset the specs of some variables to their values in certain themes.
+  "Reset the specs of some variables to their values in other themes.
 This creates settings in the `user' theme.
 
 Each of the arguments ARGS has this form:
 
-    (VARIABLE FROM-THEME)
+    (VARIABLE IGNORED)
 
-This means reset VARIABLE to its value in FROM-THEME."
+This means reset VARIABLE.  (The argument IGNORED is ignored)."
     (apply 'custom-theme-reset-variables 'user args))
 
 ;;; The End.
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 47bcbbcae6c..6219482b12e 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1,7 +1,7 @@
 ;;; bytecomp.el --- compilation of Lisp code into byte code
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1998, 2000, 2001, 2002,
-;;   2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;      Hallvard Furuseth <hbf@ulrik.uio.no>
@@ -3785,7 +3785,15 @@ that suppresses all warnings during execution of BODY."
         (push (cons (nth 1 (nth 1 form))
                     (if constant (nth 1 (nth 2 form)) t))
               byte-compile-function-environment)))
-  (byte-compile-normal-call form))
+  ;; We used to jus do: (byte-compile-normal-call form)
+  ;; But it turns out that this fails to optimize the code.
+  ;; So instead we now do the same as what other byte-hunk-handlers do,
+  ;; which is to call back byte-compile-file-form and then return nil.
+  ;; Except that we can't just call byte-compile-file-form since it would
+  ;; call us right back.
+  (byte-compile-keep-pending form)
+  ;; Return nil so the form is not output twice.
+  nil)
 
 ;; Turn off warnings about prior calls to the function being defalias'd.
 ;; This could be smarter and compare those calls with
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 7819a0e81cc..4e592da0e9c 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1,7 +1,7 @@
 ;;; font-lock.el --- Electric font lock mode
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004 2005 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 ;; Author: jwz, then rms, then sm
 ;; Maintainer: FSF
@@ -980,6 +980,7 @@ The value of this variable is used when Font Lock mode is turned on."
 (defun font-lock-fontify-buffer ()
   "Fontify the current buffer the way the function `font-lock-mode' would."
   (interactive)
+  (font-lock-set-defaults)
   (let ((font-lock-verbose (or font-lock-verbose (interactive-p))))
     (funcall font-lock-fontify-buffer-function)))
 
@@ -987,6 +988,7 @@ The value of this variable is used when Font Lock mode is turned on."
   (funcall font-lock-unfontify-buffer-function))
 
 (defun font-lock-fontify-region (beg end &optional loudly)
+  (font-lock-set-defaults)
   (funcall font-lock-fontify-region-function beg end loudly))
 
 (defun font-lock-unfontify-region (beg end)
@@ -1000,8 +1002,6 @@ The value of this variable is used when Font Lock mode is turned on."
     (with-temp-message
         (when verbose
           (format "Fontifying %s..." (buffer-name)))
-      ;; Make sure we have the right `font-lock-keywords' etc.
-      (font-lock-set-defaults)
       ;; Make sure we fontify etc. in the whole buffer.
       (save-restriction
         (widen)
diff --git a/lisp/info.el b/lisp/info.el
index e3ca18e0ede..386f549d3e2 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -568,8 +568,10 @@ in all the directories in that path."
        (if (and (stringp file-or-node) (string-match "(.*)" file-or-node))
            file-or-node
          (concat "(" file-or-node ")")))
-    (if (zerop (buffer-size))
-        (Info-directory))))
+    (if (and (zerop (buffer-size))
+             (null Info-history))
+        ;; If we just created the Info buffer, go to the directory.
+        (Info-directory))))
 
 ;;;###autoload
 (defun info-emacs-manual ()
@@ -688,11 +690,12 @@ it says do not attempt further (recursive) error recovery."
   (setq filename (Info-find-file filename))
   ;; Go into Info buffer.
   (or (eq major-mode 'Info-mode) (pop-to-buffer "*info*"))
-  ;; Record the node we are leaving.
-  (if (not no-going-back)
-      (setq Info-history
-            (cons (list Info-current-file Info-current-node (point))
-                  Info-history)))
+  ;; Record the node we are leaving, if we were in one.
+  (and (not no-going-back)
+       Info-current-file
+       (setq Info-history
+             (cons (list Info-current-file Info-current-node (point))
+                   Info-history)))
   (Info-find-node-2 filename nodename no-going-back))
 
 ;;;###autoload
diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index da4926ff4c4..141bef2f0ba 100644
--- a/lisp/language/ind-util.el
+++ b/lisp/language/ind-util.el
@@ -821,7 +821,7 @@ Returns new end position."
 
 ;;;###autoload
 (defun indian-compose-region (from to)
-  "Compose the region according to `composition-function-table'. "
+  "Compose the region according to `composition-function-table'."
   (interactive "r")
   (save-excursion
     (save-restriction
diff --git a/lisp/language/mlm-util.el b/lisp/language/mlm-util.el
index 04dfde491d1..e575cfc61f4 100644
--- a/lisp/language/mlm-util.el
+++ b/lisp/language/mlm-util.el
@@ -103,7 +103,7 @@
 ;;;###autoload
 (defun malayalam-composition-function (from to pattern  &optional string)
   "Compose Malayalam characters in REGION, or STRING if specified.
-Assume that the REGION or STRING must fully match the composable 
+Assume that the REGION or STRING must fully match the composable
 PATTERN regexp."
   (if string (malayalam-compose-syllable-string string)
     (malayalam-compose-syllable-region from to))
@@ -239,7 +239,7 @@ PATTERN regexp."
     ("$,1@H@m@E(B" . "$,47Y(B")
     ("$,1@H@m@Q(B" . "$,47b(B")
     ("$,1@H@a(B" . "$,47k(B")
-    ("$,1@H@m@H@a(B" . "$,47l(B") 
+    ("$,1@H@m@H@a(B" . "$,47l(B")
 
     ("$,1@J(B" . "$,46=(B")
     ("$,1@J@m@J(B" . "$,478(B") ;; duplicate
@@ -401,7 +401,7 @@ PATTERN regexp."
                (apply
                 'nconc
                 (mapcar
-                 (function 
+                 (function
                   (lambda (x) (list '(5 . 3) x))) ;; default ref. point.
                  glyph-str))))
         (compose-region from to glyph-str)))))
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 4f3d56f98c9..1f17d15500e 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,118 @@
+2006-01-03  Mark D. Baushke  <mdb@gnu.org>
+
+        * mh-e.el (mh-delete-a-msg): Fix whitespace nit.
+        * mh-index.el (mh-mairix-execute-search): Fix symbol quote.
+
+2006-01-03  Bill Wohler  <wohler@newt.com>
+
+        * mh-alias.el (mh-alias-add-alias): Grand message and error string
+        unification. Use single sentence if possible by using semicolon.
+        Don't end message with punctuation. Don't need format with
+        message. Quote messages as in docstrings: use `' around symbols,
+        \" for option choices. Don't use quotes around %s.
+        
+        * mh-comp.el (mh-complete-word): Ditto.
+
+        * mh-customize.el (mh-adaptive-cmd-note-flag-check)
+        (mh-scan-format-file-check): Ditto.
+
+        * mh-e.el (mh-refile-or-write-again, mh-previous-unread-msg)
+        (mh-delete-a-msg, mh-refile-a-msg, mh-next-unread-msg)
+        (mh-msg-num-width-to-column): Ditto.
+
+        * mh-identity.el (mh-identity-field-handler): Ditto.
+
+        * mh-index.el (mh-mairix-execute-search)
+        (mh-swish-execute-search, mh-swish++-execute-search)
+        (mh-namazu-execute-search): Ditto.
+
+        * mh-init.el (mh-variant-set): Ditto.
+
+        * mh-mime.el (mh-mh-to-mime-undo, mh-mml-forward-message)
+        (mh-secure-message, mh-mime-display): Ditto.
+
+        * mh-pick.el (mh-search-folder, mh-pick-construct-regexp): Ditto.
+
+        * mh-seq.el (mh-narrow-to-seq, mh-put-msg-in-seq, mh-read-seq)
+        (mh-read-range, mh-thread-container-subject): Ditto.
+
+        * mh-utils.el (mh-x-image-scale-and-display)
+        (mh-prompt-for-folder, mh-handle-process-error)
+        (mh-list-to-string-1): Ditto.
+
+        * mh-comp.el (mh-reply): Use standard default notation in
+        prompts (closes SF #1275933).
+
+        * mh-mime.el (mh-mime-save-parts): Ditto.
+
+        * mh-seq.el (mh-read-seq, mh-read-range): Ditto.
+
+        * mh-customize.el (mh-folder-msg-number): Snow is actually
+        off-white on low color displays which turns to white when bold.
+        This is unreadable on white backgrounds. Use snow with min-colors
+        requirement. Use cyan on low-color displays.
+
+        * mh-init.el (mh-defface-compat): On low-color displays, delete
+        the high-color display rather than simply strip the min-colors
+        requirement since the existing algorithm shadowed the desired
+        display on low-color displays.
+
+        * mh-alias.el (mh-alias-add-alias): Remove leading * from
+        docstring.
+
+2006-01-02  Bill Wohler  <wohler@newt.com>
+
+        * mh-alias.el (mh-alias-grab-from-field): Remove leading * from
+        docstring. Does this mean something in a defun?
+
+        * mh-customize.el (bw-new-face-to-old, bw-old-face-to-new):
+        Checkdoc fix.
+
+        * mh-e.el (mh-inc-folder): Rename maildrop-name argument to file
+        so it reads better in docstring and manual. Sync docstring with
+        manual.
+
+        * mh-init.el (mh-defface-compat): Remove trailing space (checkdoc).
+
+        * mh-alias.el (mh-alias-apropos): Sync docstring with manual.
+
+        * mh-comp.el (mh-redistribute, mh-to-field, mh-to-fcc)
+        (mh-insert-auto-fields, mh-send-letter, mh-yank-cur-msg)
+        (mh-fully-kill-draft, mh-open-line, mh-letter-complete)
+        (mh-letter-complete-or-space, mh-letter-confirm-address)
+        (mh-letter-next-header-field-or-indent)
+        (mh-letter-previous-header-field): Ditto.
+
+        * mh-customize.el (mh-alias-completion-ignore-case-flag)
+        (mh-default-folder-for-message-function, mh-mml-method-default)
+        (mh-signature-file-name, mh-yank-behavior, mh-show-hook)
+        (mh-show-mode-hook) Ditto.
+
+        * mh-e.el (mh-refile-or-write-again, mh-toggle-showing): Ditto.
+
+        * mh-funcs.el (mh-pipe-msg, mh-sort-folder, mh-undo-folder)
+        (mh-store-msg, mh-store-buffer): Ditto
+
+        * mh-index.el (mh-index-search, mh-index-do-search)
+        (mh-index-next-folder, mh-index-sequenced-messages): Ditto.
+
+        * mh-junk.el (mh-spamassassin-blacklist): Ditto.
+
+        * mh-mime.el (mh-mh-compose-external-compressed-tar)
+        (mh-mh-compose-external-type, mh-mh-to-mime, mh-mh-to-mime-undo)
+        (mh-mml-secure-message-sign, mh-mml-secure-message-encrypt)
+        (mh-mml-secure-message-signencrypt): Ditto
+
+        * mh-pick.el (mh-search-folder): Ditto.
+
+        * mh-seq.el (mh-widen): Ditto.
+
+        * mh-utils.el (mh-show, mh-modify): Ditto.
+
+2006-01-02  Mark D. Baushke  <mdb@gnu.org>
+
+        * mh-mime.el (mh-mml-unsecure-message): Remove unused argument.
+
 2006-01-01  Bill Wohler  <wohler@newt.com>
 
         * mh-customize.el: Sync docstrings with manual for faces and sort
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index 397cd9ea782..a1bafb3ec51 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -1,7 +1,7 @@
 ;;; mh-alias.el --- MH-E mail alias completion and expansion
 ;;
 ;; Copyright (C) 1994, 1995, 1996, 1997,
-;;  2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -548,7 +548,8 @@ folder name hint when filing messages."
 
 ;;;###mh-autoload
 (defun mh-alias-add-alias (alias address)
-  "*Add ALIAS for ADDRESS in personal alias file.
+  "Add ALIAS for ADDRESS in personal alias file.
+
 This function prompts you for an alias and address. If the alias
 exists already, you will have the choice of inserting the new
 alias before or after the old alias. In the former case, this
@@ -570,7 +571,7 @@ filing messages."
     (cond
      ((and (equal alias address-alias)
            (equal address alias-address))
-      (message "Already defined as: %s" alias-address))
+      (message "Already defined as %s" alias-address))
      (address-alias
       (if (y-or-n-p (format "Address has alias %s; set new one? "
                             address-alias))
@@ -580,7 +581,7 @@ filing messages."
 
 ;;;###mh-autoload
 (defun mh-alias-grab-from-field ()
-  "*Add alias for the sender of the current message."
+  "Add alias for the sender of the current message."
   (interactive)
   (mh-alias-reload-maybe)
   (save-excursion
@@ -609,7 +610,7 @@ filing messages."
 
 ;;;###mh-autoload
 (defun mh-alias-apropos (regexp)
-  "Show all aliases or addresses that match REGEXP."
+  "Show all aliases or addresses that match a regular expression REGEXP."
   (interactive "sAlias regexp: ")
   (if mh-alias-local-users
       (mh-alias-reload-maybe))
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 113572153af..9a4c8733959 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -1,7 +1,7 @@
 ;;; mh-comp.el --- MH-E functions for composing messages
 
 ;; Copyright (C) 1993, 1995, 1997,
-;;  2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -462,7 +462,7 @@ the message had come from the original sender. When you run this
 command, you are prompted for the TO and CC recipients. The
 default MESSAGE is the current message.
 
-Also investigate the \\[mh-edit-again] command for another way to
+Also investigate the command \\[mh-edit-again] for another way to
 redistribute messages.
 
 See also `mh-redist-full-contents-flag'."
@@ -582,7 +582,7 @@ See also `mh-reply-show-message-flag',
                 (let ((minibuffer-help-form
                        "from => Sender only\nto => Sender and primary recipients\ncc or all => Sender and all recipients"))
                   (or mh-reply-default-reply-to
-                      (completing-read "Reply to whom: [from] "
+                      (completing-read "Reply to whom (default from): "
                                        '(("from") ("to") ("cc") ("all"))
                                        nil
                                        t)))
@@ -1114,10 +1114,12 @@ lines."
 ;;;###mh-autoload
 (defun mh-to-field ()
   "Move to specified header field.
-The field is indicated by the previous keystroke (the last keystroke
-of the command) according to the list in the variable
-`mh-to-field-choices'. Create the field if it does not exist. Set the
-mark to point before moving."
+
+The field is indicated by the previous keystroke (the last
+keystroke of the command) according to the list in the variable
+`mh-to-field-choices'.
+Create the field if it does not exist.
+Set the mark to point before moving."
   (interactive)
   (expand-abbrev)
   (let ((target (cdr (or (assoc (char-to-string (logior last-input-char ?`))
@@ -1146,8 +1148,9 @@ mark to point before moving."
 ;;;###mh-autoload
 (defun mh-to-fcc (&optional folder)
   "Move to \"Fcc:\" header field.
-This command will prompt you for the FOLDER name in which to file a
-copy of the draft."
+
+This command will prompt you for the FOLDER name in which to file
+a copy of the draft."
   (interactive)
   (or folder
       (setq folder (mh-prompt-for-folder
@@ -1333,10 +1336,9 @@ The versions of MH-E, Emacs, and MH are shown."
 (defun mh-insert-auto-fields (&optional non-interactive)
   "Insert custom fields if recipient is found in `mh-auto-fields-list'.
 
-Sets buffer-local `mh-insert-auto-fields-done-local' when done
-and inserted something. If NON-INTERACTIVE is non-nil, do not be
-verbose and only attempt matches if
-`mh-insert-auto-fields-done-local' is nil.
+Sets buffer-local `mh-insert-auto-fields-done-local' if header
+fields were added. If NON-INTERACTIVE is non-nil, perform actions
+quietly and only if `mh-insert-auto-fields-done-local' is nil.
 
 An `identity' entry is skipped if one was already entered
 manually.
@@ -1476,9 +1478,9 @@ command. You can give a prefix argument ARG to monitor the first stage
 of the delivery\; this output can be found in a buffer called \"*MH-E
 Mail Delivery*\".
 
-The hook `mh-before-send-letter-hook' is run at the beginning of the
-this command. For example, if you want to check your spelling in your
-message before sending, add the `ispell-message' function.
+The hook `mh-before-send-letter-hook' is run at the beginning of
+this command. For example, if you want to check your spelling in
+your message before sending, add the function `ispell-message'.
 
 In case the MH \"send\" program is installed under a different name,
 use `mh-send-prog' to tell MH-E the name."
@@ -1607,12 +1609,13 @@ text from the message to which you're replying, and inserting
 `mh-ins-buf-prefix' (`> ') before each line.
 
 The attribution consists of the sender's name and email address
-followed by the content of the `mh-extract-from-attribution-verb'
-option.
+followed by the content of the option
+`mh-extract-from-attribution-verb'.
 
-You can also turn on the `mh-delete-yanked-msg-window-flag'
-option to delete the window containing the original message after
-yanking it to make more room on your screen for your reply.
+You can also turn on the option
+`mh-delete-yanked-msg-window-flag' to delete the window
+containing the original message after yanking it to make more
+room on your screen for your reply.
 
 You can control how the message to which you are replying is
 yanked into your reply using `mh-yank-behavior'.
@@ -1741,9 +1744,10 @@ Otherwise, simply insert MH-INS-STRING before each line."
 ;;;###mh-autoload
 (defun mh-fully-kill-draft ()
   "Quit editing and delete draft message.
+
 If for some reason you are not happy with the draft, you can use
-the this command to kill the draft buffer and delete the draft
-message. Use the \\[kill-buffer] command if you don't want to
+this command to kill the draft buffer and delete the draft
+message. Use the command \\[kill-buffer] if you don't want to
 delete the draft message."
   (interactive)
   (if (y-or-n-p "Kill draft message? ")
@@ -1771,9 +1775,9 @@ delete the draft message."
 
 ;;;###mh-autoload
 (defun mh-open-line ()
-  "Insert a newline and leave point after it.
+  "Insert a newline and leave point before it.
 
-This command is similar to the \\[open-line] command in that it
+This command is similar to the command \\[open-line] in that it
 inserts a newline after point. It differs in that it also inserts
 the right number of quoting characters and spaces so that the
 next line begins in the same column as it was. This is useful
@@ -1814,7 +1818,7 @@ Any match found replaces the text from BEGIN to END."
           ((null completion)
            (ignore-errors
              (kill-buffer completions-buffer))
-           (message "No completion for `%s'" word))
+           (message "No completion for %s" word))
           ((stringp completion)
            (if (equal word completion)
                (with-output-to-temp-buffer completions-buffer
@@ -1865,12 +1869,13 @@ Any match found replaces the text from BEGIN to END."
 
 (defun mh-letter-complete (arg)
   "Perform completion on header field or word preceding point.
+
 If the field contains addresses (for example, \"To:\" or \"Cc:\")
-or folders (for example, \"Fcc:\") then this command will
-provide alias completion. In the body of the message, this
-command runs `mh-letter-complete-function' instead, which is set
-to \"'ispell-complete-word\" by default. This command takes a
-prefix argument ARG that is passed to the
+or folders (for example, \"Fcc:\") then this command will provide
+alias completion. In the body of the message, this command runs
+`mh-letter-complete-function' instead, which is set to
+`ispell-complete-word' by default. This command takes a prefix
+argument ARG that is passed to the
 `mh-letter-complete-function'."
   (interactive "P")
   (let ((func nil))
@@ -1883,11 +1888,11 @@ prefix argument ARG that is passed to the
 
 (defun mh-letter-complete-or-space (arg)
   "Perform completion or insert space.
-Turn on the `mh-compose-space-does-completion-flag' option to use
-this command to perform completion in the header. Otherwise, a
-space is inserted.
 
-ARG is the number of spaces inserted."
+Turn on the option `mh-compose-space-does-completion-flag' to use
+this command to perform completion in the header. Otherwise, a
+space is inserted; use a prefix argument ARG to specify more than
+one space."
   (interactive "p")
   (let ((func nil)
         (end-of-prev (save-excursion
@@ -1904,9 +1909,10 @@ ARG is the number of spaces inserted."
 
 (defun mh-letter-confirm-address ()
   "Flash alias expansion.
-Addresses are separated by a comma\; and when you press the
-comma, this command flashes the alias expansion in the minibuffer
-if `mh-alias-flash-on-comma' is turned on."
+
+Addresses are separated by a comma\; when you press the comma,
+this command flashes the alias expansion in the minibuffer if
+`mh-alias-flash-on-comma' is turned on."
   (interactive)
   (cond ((not (mh-in-header-p)) (self-insert-command 1))
         ((eq (cdr (assoc (mh-letter-header-field-at-point)
@@ -1929,9 +1935,11 @@ downcasing the field name."
 
 ;;;###mh-autoload
 (defun mh-letter-next-header-field-or-indent (arg)
-  "Move to next field or indent depending on point.
+  "Cycle to next field.
+
 Within the header of the message, this command moves between
-fields, but skips those fields listed in
+fields that are highlighted with the face
+`mh-letter-header-field', skipping those fields listed in
 `mh-compose-skipped-header-fields'. After the last field, this
 command then moves point to the message body before cycling back
 to the first field. If point is already past the first line of
@@ -1969,10 +1977,11 @@ body."
 ;;;###mh-autoload
 (defun mh-letter-previous-header-field ()
   "Cycle to the previous header field.
+
 This command moves backwards between the fields and cycles to the
-body of the message after the first field. Unlike the
-\\[mh-letter-next-header-field-or-indent] command, it will always
-take point to the last field from anywhere in the body."
+body of the message after the first field. Unlike the command
+\\[mh-letter-next-header-field-or-indent], it will always take
+point to the last field from anywhere in the body."
   (interactive)
   (let ((header-end (mh-mail-header-end)))
     (if (>= (point) header-end)
diff --git a/lisp/mh-e/mh-customize.el b/lisp/mh-e/mh-customize.el
index edd6ee41b01..01b03db63f9 100644
--- a/lisp/mh-e/mh-customize.el
+++ b/lisp/mh-e/mh-customize.el
@@ -1,6 +1,6 @@
 ;;; mh-customize.el --- MH-E customization
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -260,7 +260,7 @@ accordingly."
   "*Non-nil means don't consider case significant in MH alias completion.
 
 As MH ignores case in the aliases, so too does MH-E. However, you
-may turn this option off to make case significant which can be
+may turn off this option to make case significant which can be
 used to segregate completion of your aliases. You might use
 lowercase for mailing lists and uppercase for people."
   :type 'boolean
@@ -435,7 +435,7 @@ an alternate view. For example, \"'(\"-nolimit\" \"-textfield\"
 ;;; Folder Selection (:group 'mh-folder-selection)
 
 (defcustom mh-default-folder-for-message-function nil
-  "Function to select a default folder for refiling or \"Fcc\".
+  "Function to select a default folder for refiling or \"Fcc:\".
 
 The current buffer is set to the message being refiled with point
 at the start of the message. This function should return the
@@ -898,10 +898,11 @@ vanilla \"PGP\" and \"S/MIME\".
 The `pgg' customization group may have some settings which may
 interest you (see Info node `(pgg)').
 
-In particular, I set the option `pgg-encrypt-for-me' to t so that all
-messages I encrypt are encrypted with my public key as well. If you
-keep a copy of all of your outgoing mail with a \"Fcc:\" header field,
-this setting is vital so that you can read the mail you write!"
+In particular, I turn on the option `pgg-encrypt-for-me' so that
+all messages I encrypt are encrypted with my public key as well.
+If you keep a copy of all of your outgoing mail with a \"Fcc:\"
+header field, this setting is vital so that you can read the mail
+you write!"
   :type '(choice (const :tag "PGP (MIME)" "pgpmime")
                  (const :tag "PGP" "pgp")
                  (const :tag "S/MIME" "smime")
@@ -925,8 +926,8 @@ said separator). The function `mh-signature-separator-p', which
 reports t if the buffer contains a separator, may be useful as well.
 
 The signature is inserted into your message with the command
-\\<mh-letter-mode-map>\\[mh-insert-signature] or with the
-`mh-identity-list' option."
+\\<mh-letter-mode-map>\\[mh-insert-signature] or with the option
+`mh-identity-list'."
   :type 'file
   :group 'mh-letter)
 
@@ -971,33 +972,33 @@ this option doesn't exist."
 (defcustom mh-yank-behavior 'attribution
   "*Controls which part of a message is yanked by \\<mh-letter-mode-map>\\[mh-yank-cur-msg].
 
-To include the entire message, including the entire header, use \"Body
-and Header\". Use \"Body\" to yank just the body without the header.
-To yank only the portion of the message following the point, set this
-option to \"Below Point\".
+To include the entire message, including the entire header, use
+\"Body and Header\". Use \"Body\" to yank just the body without
+the header. To yank only the portion of the message following the
+point, set this option to \"Below Point\".
 
 Choose \"Invoke supercite\" to pass the entire message and header
 through supercite.
 
-If the \"Body With Attribution\" setting is used, then the message
-minus the header is yanked and a simple attribution line is added at
-the top using the value of the `mh-extract-from-attribution-verb'
-option. This is the default.
-
-If the \"Invoke supercite\" or \"Body With Attribution\" settings are
-used, the \"-noformat\" argument is passed to the \"repl\" program to
-override a \"-filter\" or \"-format\" argument. These settings also
-have \"Automatically\" variants that perform the action automatically
-when you reply so that you don't need to use \\[mh-yank-cur-msg] at
-all. Note that this automatic action is only performed if the show
-buffer matches the message being replied to. People who use the
-automatic variants tend to turn on the
-`mh-delete-yanked-msg-window-flag' option as well so that the show
-window is never displayed.
-
-If the show buffer has a region, the `mh-yank-behavior' option is
-ignored unless its value is one of Attribution variants in which case
-the attribution is added to the yanked region.
+If the \"Body With Attribution\" setting is used, then the
+message minus the header is yanked and a simple attribution line
+is added at the top using the value of the option
+`mh-extract-from-attribution-verb'. This is the default.
+
+If the \"Invoke supercite\" or \"Body With Attribution\" settings
+are used, the \"-noformat\" argument is passed to the \"repl\"
+program to override a \"-filter\" or \"-format\" argument. These
+settings also have \"Automatically\" variants that perform the
+action automatically when you reply so that you don't need to use
+\\[mh-yank-cur-msg] at all. Note that this automatic action is
+only performed if the show buffer matches the message being
+replied to. People who use the automatic variants tend to turn on
+the option `mh-delete-yanked-msg-window-flag' as well so that the
+show window is never displayed.
+
+If the show buffer has a region, the option `mh-yank-behavior' is
+ignored unless its value is one of Attribution variants in which
+case the attribution is added to the yanked region.
 
 If this option is set to one of the supercite flavors, the hook
 `mail-citation-hook' is ignored and `mh-ins-buf-prefix' is not
@@ -1040,7 +1041,7 @@ Throw an error if user tries to turn on
 Otherwise, set SYMBOL to VALUE."
   (if (and value
            (not (eq mh-scan-format-file t)))
-      (error "%s %s" "Can't turn on unless mh-scan-format-file"
+      (error "%s %s" "Can't turn on unless `mh-scan-format-file'"
              "is set to \"Use MH-E scan Format\"")
     (set-default symbol value)))
 
@@ -1051,7 +1052,7 @@ anything but t when `mh-adaptive-cmd-note-flag' is on. Otherwise,
 set SYMBOL to VALUE."
   (if (and (not (eq value t))
            (eq mh-adaptive-cmd-note-flag t))
-      (error "%s %s" "You must turn off mh-adaptive-cmd-note-flag"
+      (error "%s %s" "You must turn off `mh-adaptive-cmd-note-flag'"
              "unless you use \"Use MH-E scan Format\"")
     (set-default symbol value)))
 
@@ -2460,7 +2461,7 @@ See also `mh-before-quit-hook'."
 
 It is the last thing called after messages are displayed. It's
 used to affect the behavior of MH-E in general or when
-`mh-show-mode-hook' is too early."
+`mh-show-mode-hook' is too early. See `mh-show-mode-hook'."
   :type 'hook
   :group 'mh-hooks
   :group 'mh-show)
@@ -2470,7 +2471,7 @@ used to affect the behavior of MH-E in general or when
 
 This hook is called early on in the process of the message
 display. It is usually used to perform some action on the
-message's content."
+message's content. See `mh-show-hook'."
   :type 'hook
   :group 'mh-hooks
   :group 'mh-show)
@@ -2535,10 +2536,14 @@ sequence."
   :group 'mh-folder)
 
 (defface mh-folder-msg-number
-  '((((class color) (background light))
-     (:foreground "snow4"))
-    (((class color) (background dark))
-     (:foreground "snow3")))
+  (mh-defface-compat
+   '((((class color) (min-colors 88) (background light))
+      (:foreground "snow4"))
+     (((class color) (min-colors 88) (background dark))
+      (:foreground "snow3"))
+     (((class color))
+      (:foreground "cyan"))))
+    
   "Message number face."
   :group 'mh-faces
   :group 'mh-folder)
@@ -2802,7 +2807,7 @@ The background and foreground are used in the image."
          (setq bw-face-generation 'new))))
 
 (defun bw-new-face-to-old ()
-  "Sets old faces."
+  "Set old faces."
   (face-spec-set 'mh-folder-body
     (mh-defface-compat
      '((((class color) (min-colors 88) (background light))
@@ -2858,7 +2863,7 @@ The background and foreground are used in the image."
        (:bold t)))))
 
 (defun bw-old-face-to-new ()
-  "Sets new faces."
+  "Set new faces."
   (face-spec-set 'mh-folder-body
     '((((class color))
        (:inherit mh-folder-msg-number))
@@ -2875,7 +2880,9 @@ The background and foreground are used in the image."
     '((((class color) (background light))
        (:foreground "snow4"))
       (((class color) (background dark))
-       (:foreground "snow3")))))
+       (:foreground "snow3"))
+      (((class color))
+       (:foreground "cyan")))))
 
 
 ;; Local Variables:
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 1deb465c1fe..8d0760f331f 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1985, 1986, 1987, 1988,
 ;;  1990, 1992, 1993, 1994, 1995, 1997, 1999,
-;;  2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -711,21 +711,18 @@ Use the command \\[mh-show] to show the message normally again."
       (mh-recenter 0))
     (setq mh-showing-with-headers t)))
 
-(defun mh-inc-folder (&optional maildrop-name folder)
+(defun mh-inc-folder (&optional file folder)
   "Incorporate new mail into a folder.
 
 You can incorporate mail from any file into the current folder by
 specifying a prefix argument; you'll be prompted for the name of
-the file to use as well as the destination folder
+the FILE to use as well as the destination FOLDER
 
 The hook `mh-inc-folder-hook' is run after incorporating new
-mail. Do not call this function from outside MH-E; use
-\\[mh-rmail] instead.
+mail.
 
-In a program optional argument MAILDROP-NAME specifies an
-alternate maildrop from the default. The optional argument FOLDER
-specifies where to incorporate mail instead of the default named
-by `mh-inbox'."
+Do not call this function from outside MH-E; use \\[mh-rmail]
+instead."
   (interactive (list (if current-prefix-arg
                          (expand-file-name
                           (read-file-name "inc mail from file: "
@@ -745,7 +742,7 @@ by `mh-inbox'."
             ((not (eq (current-buffer) (get-buffer folder)))
              (switch-to-buffer folder)
              (setq mh-previous-window-config config))))
-    (mh-get-new-mail maildrop-name)
+    (mh-get-new-mail file)
     (when (and threading-needed-flag
                (save-excursion
                  (goto-char (point-min))
@@ -892,8 +889,10 @@ DONT-UPDATE-LAST-DESTINATION-FLAG is non-nil."
 (defun mh-refile-or-write-again (range &optional interactive-flag)
   "Repeat last output command.
 
-If you are refiling several messages into the same folder, you can use
-this command to repeat the last refile or write. You can use a range.
+If you are refiling several messages into the same folder, you
+can use this command to repeat the last
+refile (\\[mh-refile-msg]) or write (\\[mh-write-msg-to-file]).
+You can use a range.
 
 Check the documentation of `mh-interactive-range' to see how RANGE is
 read in interactive use.
@@ -905,8 +904,7 @@ called interactively."
       (error "No previous refile or write"))
   (cond ((eq (car mh-last-destination) 'refile)
          (mh-refile-msg range (cdr mh-last-destination))
-         (message "%s" (format "Destination folder: %s"
-                               (cdr mh-last-destination))))
+         (message "Destination folder: %s" (cdr mh-last-destination)))
         (t
          (mh-iterate-on-range msg range
            (apply 'mh-write-msg-to-file msg (cdr mh-last-destination)))
@@ -1006,7 +1004,7 @@ This command can be given a prefix argument COUNT to specify how
 many unread messages to skip."
   (interactive "p")
   (unless (> count 0)
-    (error "The function mh-previous-unread-msg expects positive argument"))
+    (error "The function `mh-previous-unread-msg' expects positive argument"))
   (setq count (1- count))
   (let ((unread-sequence (cdr (assoc mh-unseen-seq mh-seq-list)))
         (cur-msg (mh-get-msg-num nil)))
@@ -1255,7 +1253,14 @@ the command \\[mh-refile-or-write-again]."
       (append-to-file (point) (point-max) output-file))))
 
 (defun mh-toggle-showing ()
-  "Toggle the scanning mode/showing mode of displaying messages."
+  "Toggle between MH-Folder and MH-Folder Show modes.
+
+This command switches between MH-Folder mode and MH-Folder Show
+mode. MH-Folder mode turns off the associated show buffer so that
+you can perform operations on the messages quickly without
+reading them. This is an excellent way to prune out your junk
+mail or to refile a group of messages to another folder for later
+examination."
   (interactive)
   (if mh-showing-mode
       (mh-set-scan-mode)
@@ -1521,7 +1526,7 @@ once when he kept statistics on his mail usage."
       (beginning-of-line)
       (setq message (mh-get-msg-num t)))
     (if (looking-at mh-scan-refiled-msg-regexp)
-        (error "Message %d is refiled.  Undo refile before deleting" message))
+        (error "Message %d is refiled; undo refile before deleting" message))
     (if (looking-at mh-scan-deleted-msg-regexp)
         nil
       (mh-set-folder-modified-p t)
@@ -1541,10 +1546,10 @@ be refiled."
       (beginning-of-line)
       (setq message (mh-get-msg-num t)))
     (cond ((looking-at mh-scan-deleted-msg-regexp)
-           (error "Message %d is deleted.  Undo delete before moving" message))
+           (error "Message %d is deleted; undo delete before moving" message))
           ((looking-at mh-scan-refiled-msg-regexp)
            (if (y-or-n-p
-                (format "Message %d already refiled.  Copy to %s as well? "
+                (format "Message %d already refiled; copy to %s as well? "
                         message folder))
                (mh-exec-cmd "refile" (mh-get-msg-num t) "-link"
                             "-src" mh-current-folder
@@ -1575,7 +1580,7 @@ This command can be given a prefix argument COUNT to specify how
 many unread messages to skip."
   (interactive "p")
   (unless (> count 0)
-    (error "The function mh-next-unread-msg expects positive argument"))
+    (error "The function `mh-next-unread-msg' expects positive argument"))
   (setq count (1- count))
   (let ((unread-sequence (reverse (cdr (assoc mh-unseen-seq mh-seq-list))))
         (cur-msg (mh-get-msg-num nil)))
@@ -1983,8 +1988,8 @@ columns contain the message number, and the column for notations
 comes after that."
   (if (eq mh-scan-format-file t)
       (max (1+ width) 2)
-    (error "%s %s" "Can't call mh-msg-num-width-to-column"
-           "when mh-scan-format-file is not t")))
+    (error "%s %s" "Can't call `mh-msg-num-width-to-column' when"
+           "`mh-scan-format-file' is not set to \"Use MH-E scan Format\"")))
 
 (defun mh-set-cmd-note (column)
   "Set `mh-cmd-note' to COLUMN.
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index 800ff96b510..4fb64b4cd17 100644
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -1,7 +1,7 @@
 ;;; mh-funcs.el --- MH-E functions not everyone will use right away
 
 ;; Copyright (C) 1993, 1995,
-;;  2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -214,9 +214,9 @@ Display RANGE after packing, or the entire folder if RANGE is nil."
   "Pipe message through shell command COMMAND.
 
 You are prompted for the Unix command through which you wish to
-run your message. If you give an argument INCLUDE-HEADER to this
-command, the message header is included in the text passed to the
-command."
+run your message. If you give a prefix argument INCLUDE-HEADER to
+this command, the message header is included in the text passed
+to the command."
   (interactive
    (list (read-string "Shell command on message: ") current-prefix-arg))
   (let ((msg-file-to-pipe (mh-msg-filename (mh-get-msg-num t)))
@@ -266,12 +266,11 @@ command."
 
 ;;;###mh-autoload
 (defun mh-sort-folder (&optional extra-args)
-  "Sort the messages in the current folder by date.
+  "Sort folder.
 
-Calls the MH program sortm to do the work.
-
-The arguments in the list `mh-sortm-args' are passed to sortm if
-the optional argument EXTRA-ARGS is given."
+By default, messages are sorted by date. The option
+`mh-sortm-args' holds extra arguments to pass on to the command
+\"sortm\" when a prefix argument EXTRA-ARGS is used."
   (interactive "P")
   (mh-process-or-undo-commands mh-current-folder)
   (setq mh-next-direction 'forward)
@@ -288,7 +287,7 @@ the optional argument EXTRA-ARGS is given."
 
 ;;;###mh-autoload
 (defun mh-undo-folder ()
-  "Undo all pending deletes and refiles in current folder."
+  "Undo all refiles and deletes in the current folder."
   (interactive)
   (cond ((or mh-do-not-confirm-flag
              (yes-or-no-p "Undo all commands in folder? "))
@@ -310,7 +309,9 @@ however, you have a chance to specify a different extraction
 directory. The next time you use this command, the default
 directory is the last directory you used. If you would like to
 change the initial default directory, customize the option
-`mh-store-default-directory'."
+`mh-store-default-directory', change the value from \"Current\"
+to \"Directory\", and then enter the name of the directory for
+storing the content of these messages."
   (interactive (list (let ((udir (or mh-store-default-directory
                                      default-directory)))
                        (read-file-name "Store message in directory: "
@@ -324,12 +325,9 @@ change the initial default directory, customize the option
 
 ;;;###mh-autoload
 (defun mh-store-buffer (directory)
-  "Store the file(s) contained in the current buffer into DIRECTORY.
-
-The buffer can contain a shar file or uuencoded file.
+  "Unpack buffer created with \"uudecode\" or \"shar\".
 
-Default directory is the last directory used, or initially the
-value of `mh-store-default-directory' or the current directory."
+See `mh-store-msg' for a description of DIRECTORY."
   (interactive (list (let ((udir (or mh-store-default-directory
                                      default-directory)))
                        (read-file-name "Store buffer in directory: "
diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el
index 52bb8f903fe..1af2563eeda 100644
--- a/lisp/mh-e/mh-identity.el
+++ b/lisp/mh-e/mh-identity.el
@@ -1,6 +1,6 @@
 ;;; mh-identity.el --- Multiple identify support for MH-E.
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -127,7 +127,7 @@ character \":\", then it must have a special handler defined in
 valid header field."
   (or (cdr (mh-assoc-ignore-case field mh-identity-handlers))
       (and (eq (aref field 0) ?:)
-           (error "Field %s - unknown mh-identity-handler" field))
+           (error "Field %s not found in `mh-identity-handlers'" field))
       (cdr (assoc ":default" mh-identity-handlers))
       'mh-identity-handler-default))
 
diff --git a/lisp/mh-e/mh-index.el b/lisp/mh-e/mh-index.el
index c8ec7fb399b..c1a30ac68b2 100644
--- a/lisp/mh-e/mh-index.el
+++ b/lisp/mh-e/mh-index.el
@@ -1,6 +1,6 @@
 ;;; mh-index  --  MH-E interface to indexing programs
 
-;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -359,46 +359,52 @@ construct the base name."
                         &optional window-config)
   "Perform an indexed search in an MH mail folder.
 
-Use a prefix argument to repeat the search.
+Use a prefix argument to repeat the last search.
 
-Unlike regular searches, the prompt for the folder to search can be
-\"all\" to search all folders; in addition, the search works recursively
-on the listed folder. The search criteria are entered in an MH-Pick
-buffer as described in `mh-search-folder'.
+Unlike regular searches, the prompt for the folder to search can
+be \"all\" to search all folders; in addition, the search works
+recursively on the listed folder. The search criteria are entered
+in an MH-Pick buffer as described in `mh-search-folder'.\\<mh-pick-mode-map>
 
-To perform the search, type \\<mh-pick-mode-map>\\[mh-do-search].
-Another difference from the regular searches is that because the
-search operates on more than one folder, the messages that are found
-are put in a temporary sub-folder of \"+mhe-index\" and are displayed in
-an MH-Folder buffer. This buffer is special because it displays
+To perform the search, type \\[mh-do-search]. Another difference
+from the regular searches is that because the search operates on
+more than one folder, the messages that are found are put in a
+temporary sub-folder of \"+mhe-index\" and are displayed in an
+MH-Folder buffer. This buffer is special because it displays
 messages from multiple folders; each set of messages from a given
-folder has a heading with the folder name.
-
-In addition, the \\<mh-folder-mode-map>\\[mh-index-visit-folder]
-command can be used to visit the folder of the message at point.
-Initially, only the messages that matched the search criteria are
-displayed in the folder. While the temporary buffer has its own set of
-message numbers, the actual messages numbers are shown in the visited
-folder. Thus, the \\[mh-index-visit-folder] command is useful to find
-the actual message number of an interesting message, or to view
-surrounding messages with the \\[mh-rescan-folder] command.
-
-Because this folder is temporary, you'll probably get in the habit of
-killing it when you're done with \\[mh-kill-folder].
-
-If you have run the \\[mh-search-folder] command, but change your mind
-while entering the search criteria and actually want to run an indexed
-search, then you can use the
-\\<mh-pick-mode-map>\\[mh-index-do-search] command in the MH-Pick
-buffer.
-
-The \\<mh-folder-mode-map>\\[mh-index-search] command runs the command
-defined by the `mh-index-program' option. The default value is
-\"Auto-detect\" which means that MH-E will automatically choose one of
+folder has a heading with the folder name.\\<mh-folder-mode-map>
+
+The appearance of the heading can be modified by customizing the
+face `mh-index-folder'. You can jump back and forth between the
+headings using the commands \\[mh-index-next-folder] and
+\\[mh-index-previous-folder].
+
+In addition, the command \\[mh-index-visit-folder] can be used to
+visit the folder of the message at point. Initially, only the
+messages that matched the search criteria are displayed in the
+folder. While the temporary buffer has its own set of message
+numbers, the actual messages numbers are shown in the visited
+folder. Thus, the command \\[mh-index-visit-folder] is useful to
+find the actual message number of an interesting message, or to
+view surrounding messages with the command \\[mh-rescan-folder].
+
+Because this folder is temporary, you'll probably get in the
+habit of killing it when you're done with
+\\[mh-kill-folder].
+
+If you have run the command \\[mh-search-folder], but change your
+mind while entering the search criteria and actually want to run
+an indexed search, then you can use the command
+\\<mh-pick-mode-map>\\[mh-index-do-search] in the MH-Pick
+buffer.\\<mh-folder-mode-map>
+
+The command \\[mh-index-search] runs the command defined by the
+option `mh-index-program'. The default value is \"Auto-detect\"
+which means that MH-E will automatically choose one of
 \"swish++\", \"swish-e\", \"mairix\", \"namazu\", \"pick\" and
-\"grep\" in that order. If, for example, you have both \"swish++\" and
-\"mairix\" installed and you want to use \"mairix\", then you can set
-this option to \"mairix\".
+\"grep\" in that order. If, for example, you have both
+\"swish++\" and \"mairix\" installed and you want to use
+\"mairix\", then you can set this option to \"mairix\".
 
                                 *NOTE*
 
@@ -621,7 +627,7 @@ PROC is used to convert the value to actual data."
 
 ;;;###mh-autoload
 (defun mh-index-do-search ()
-  "Construct appropriate regexp and call `mh-index-search'."
+  "Find messages that match the qualifications in the current pattern buffer."
   (interactive)
   (unless (mh-index-choose) (error "No indexing program found"))
   (let* ((regexp-list (mh-pick-parse-search-buffer))
@@ -736,8 +742,7 @@ parsed."
 ;;;###mh-autoload
 (defun mh-index-next-folder (&optional backward-flag)
   "Jump to the next folder marker.
-The function is only applicable to folders displaying index search
-results.
+
 With non-nil optional argument BACKWARD-FLAG, jump to the previous
 group of results."
   (interactive "P")
@@ -1163,7 +1168,7 @@ SEARCH-REGEXP-LIST is used to search."
   (set-buffer (get-buffer-create mh-index-temp-buffer))
   (erase-buffer)
   (unless mh-mairix-binary
-    (error "Set mh-mairix-binary appropriately"))
+    (error "Set `mh-mairix-binary' appropriately"))
   (apply #'call-process mh-mairix-binary nil '(t nil) nil
          "-r" "-f" (format "%s%s/config" mh-user-path mh-mairix-directory)
          search-regexp-list)
@@ -1305,11 +1310,12 @@ recursively. All parameters ARGS are ignored."
 
 ;;;###mh-autoload
 (defun mh-index-sequenced-messages (folders sequence)
-  "Display messages from FOLDERS in SEQUENCE.
-All messages in the sequence you provide from the folders in
-`mh-new-messages-folders' are listed. With a prefix argument,
-enter a space-separated list of folders, or nothing to search all
-folders."
+  "Display messages in any sequence.
+
+All messages from the FOLDERS in `mh-new-messages-folders' in the
+SEQUENCE you provide are listed. With a prefix argument, enter a
+space-separated list of folders at the prompt, or nothing to
+search all folders."
   (interactive
    (list (if current-prefix-arg
              (split-string (read-string "Search folder(s) (default all): "))
@@ -1440,7 +1446,7 @@ is used to search."
   (set-buffer (get-buffer-create mh-index-temp-buffer))
   (erase-buffer)
   (unless mh-swish-binary
-    (error "Set mh-swish-binary appropriately"))
+    (error "Set `mh-swish-binary' appropriately"))
   (call-process mh-swish-binary nil '(t nil) nil
                 "-w" search-regexp
                 "-f" (format "%s%s/index" mh-user-path mh-swish-directory))
@@ -1529,7 +1535,7 @@ used to search."
   (set-buffer (get-buffer-create mh-index-temp-buffer))
   (erase-buffer)
   (unless mh-swish++-binary
-    (error "Set mh-swish++-binary appropriately"))
+    (error "Set `mh-swish++-binary' appropriately"))
   (call-process mh-swish++-binary nil '(t nil) nil
                 "-m" "10000"
                 (format "-i%s%s/swish++.index"
@@ -1608,7 +1614,7 @@ is used to search."
     (unless (file-exists-p namazu-index-directory)
       (error "Namazu directory %s not present" namazu-index-directory))
     (unless (executable-find mh-namazu-binary)
-      (error "Set mh-namazu-binary appropriately"))
+      (error "Set `mh-namazu-binary' appropriately"))
     (set-buffer (get-buffer-create mh-index-temp-buffer))
     (erase-buffer)
     (call-process mh-namazu-binary nil '(t nil) nil
diff --git a/lisp/mh-e/mh-init.el b/lisp/mh-e/mh-init.el
index 2818674afae..2297fef6a80 100644
--- a/lisp/mh-e/mh-init.el
+++ b/lisp/mh-e/mh-init.el
@@ -127,13 +127,13 @@ finally GNU mailutils."
        ((mh-variant-set-variant 'mu-mh)
         (message "%s installed as MH variant" mh-variant-in-use))
        (t
-        (message "No MH variant found on the system!"))))
+        (message "No MH variant found on the system"))))
      ((member variant valid-list)
       (when (not (mh-variant-set-variant variant))
-        (message "Warning: %s variant not found.  Autodetecting..." variant)
+        (message "Warning: %s variant not found. Autodetecting..." variant)
         (mh-variant-set 'autodetect)))
      (t
-      (message "Unknown variant.  Use %s"
+      (message "Unknown variant; use %s"
                (mapconcat '(lambda (x) (format "%s" (car x)))
                           mh-variants " or "))))))
 
@@ -334,25 +334,30 @@ there. Otherwise, the images directory is added to the
 
 (defun mh-defface-compat (spec)
   "Convert SPEC for defface if necessary to run on older platforms.
-Modifies SPEC in place and returns it. See `defface' for the spec definition. 
-
-When `mh-min-colors-defined-flag' is nil, this function finds a
-display with a single \"class\" requirement with a \"color\"
-item, renames the requirement to \"tty\" and moves it to the
-beginning of the list. It then strips any \"min-colors\"
-requirements."
-  (when (not mh-min-colors-defined-flag)
-    ;; Insert ((class tty)) display with ((class color)) attributes.
-    (let ((attributes (cdr (assoc '((class color)) spec))))
-      (cons (cons '((class tty)) attributes) spec))
-    ;; Delete ((class color)) display.
-    (delq (assoc '((class color)) spec) spec)
-    ;; Strip min-colors.
-    (loop for entry in spec do
-          (when (not (eq (car entry) t))
-            (if (assoc 'min-colors (car entry))
-                (delq (assoc 'min-colors (car entry)) (car entry))))))
-  spec)
+Modifies SPEC in place and returns it. See `defface' for the spec definition.
+
+When `mh-min-colors-defined-flag' is nil, this function finds
+display entries with \"min-colors\" requirements and either
+removes the \"min-colors\" requirement or strips the display
+entirely if the display does not support the number of specified
+colors."
+  (if mh-min-colors-defined-flag
+      spec
+    (let ((cells (display-color-cells))
+          new-spec)
+      ;; Remove entries with min-colors, or delete them if we have fewer colors
+      ;; than they specify.
+      (loop for entry in (reverse spec) do
+            (let ((requirement (if (eq (car entry) t)
+                                   nil
+                                 (assoc 'min-colors (car entry)))))
+              (if requirement
+                  (when (>= cells (nth 1 requirement))
+                    (setq new-spec (cons (cons (delq requirement (car entry))
+                                               (cdr entry))
+                                         new-spec)))
+                (setq new-spec (cons entry new-spec)))))
+      new-spec)))
 
 (provide 'mh-init)
 
diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el
index 5d2bf87581e..71d3fbf7b8b 100644
--- a/lisp/mh-e/mh-junk.el
+++ b/lisp/mh-e/mh-junk.el
@@ -1,6 +1,6 @@
 ;;; mh-junk.el --- Interface to anti-spam measures
 
-;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>,
 ;;         Bill Wohler <wohler@newt.com>
@@ -108,10 +108,12 @@ RANGE is read in interactive use."
 (defun mh-spamassassin-blacklist (msg)
   "Blacklist MSG with SpamAssassin.
 
-SpamAssassin is one of the more popular spam filtering programs. Get
-it from your local distribution or from http://spamassassin.org/.
+SpamAssassin is one of the more popular spam filtering programs.
+Get it from your local distribution or from
+http://spamassassin.org/.
 
-To use SpamAssassin, add the following recipes to \".procmailrc\":
+To use SpamAssassin, add the following recipes to
+\".procmailrc\":
 
     MAILDIR=$HOME/`mhparam Path`
 
@@ -130,56 +132,59 @@ To use SpamAssassin, add the following recipes to \".procmailrc\":
 
 If you don't use \"spamc\", use \"spamassassin -P -a\".
 
-Note that one of the recipes above throws away messages with a score
-greater than or equal to 10. Here's how you can determine a value that
-works best for you.
+Note that one of the recipes above throws away messages with a
+score greater than or equal to 10. Here's how you can determine a
+value that works best for you.
 
-First, run \"spamassassin -t\" on every mail message in your archive and
-use Gnumeric to verify that the average plus the standard deviation of
-good mail is under 5, the SpamAssassin default for \"spam\".
+First, run \"spamassassin -t\" on every mail message in your
+archive and use Gnumeric to verify that the average plus the
+standard deviation of good mail is under 5, the SpamAssassin
+default for \"spam\".
 
-Using Gnumeric, sort the messages by score and view the messages with
-the highest score. Determine the score which encompasses all of your
-interesting messages and add a couple of points to be conservative.
-Add that many dots to the \"X-Spam-Level:\" header field above to send
-messages with that score down the drain.
+Using Gnumeric, sort the messages by score and view the messages
+with the highest score. Determine the score which encompasses all
+of your interesting messages and add a couple of points to be
+conservative. Add that many dots to the \"X-Spam-Level:\" header
+field above to send messages with that score down the drain.
 
-In the example above, messages with a score of 5-9 are set aside in
-the \"+spam\" folder for later review. The major weakness of rules-based
-filters is a plethora of false positives so it is worthwhile to check.
+In the example above, messages with a score of 5-9 are set aside
+in the \"+spam\" folder for later review. The major weakness of
+rules-based filters is a plethora of false positives so it is
+worthwhile to check.
 
-If SpamAssassin classifies a message incorrectly, or is unsure, you
-can use the MH-E commands \\[mh-junk-blacklist] and
+If SpamAssassin classifies a message incorrectly, or is unsure,
+you can use the MH-E commands \\[mh-junk-blacklist] and
 \\[mh-junk-whitelist].
 
-The \\[mh-junk-blacklist] command adds a \"blacklist_from\" entry to
-\"~/spamassassin/user_prefs\", deletes the message, and sends the
-message to the Razor, so that others might not see this spam. If the
-\"sa-learn\" command is available, the message is also recategorized as
-spam.
+The command \\[mh-junk-blacklist] adds a \"blacklist_from\" entry
+to \"~/spamassassin/user_prefs\", deletes the message, and sends
+the message to the Razor, so that others might not see this spam.
+If the \"sa-learn\" command is available, the message is also
+recategorized as spam.
 
-The \\[mh-junk-whitelist] command adds a \"whitelist_from\" rule to the
-\"~/.spamassassin/user_prefs\" file. If the \"sa-learn\" command is
-available, the message is also recategorized as ham.
+The command \\[mh-junk-whitelist] adds a \"whitelist_from\" rule
+to the \"~/.spamassassin/user_prefs\" file. If the \"sa-learn\"
+command is available, the message is also recategorized as ham.
 
 Over time, you'll observe that the same host or domain occurs
-repeatedly in the \"blacklist_from\" entries, so you might think that
-you could avoid future spam by blacklisting all mail from a particular
-domain. The utility function `mh-spamassassin-identify-spammers' helps
-you do precisely that. This function displays a frequency count of the
-hosts and domains in the \"blacklist_from\" entries from the last blank
-line in \"~/.spamassassin/user_prefs\" to the end of the file. This
+repeatedly in the \"blacklist_from\" entries, so you might think
+that you could avoid future spam by blacklisting all mail from a
+particular domain. The utility function
+`mh-spamassassin-identify-spammers' helps you do precisely that.
+This function displays a frequency count of the hosts and domains
+in the \"blacklist_from\" entries from the last blank line in
+\"~/.spamassassin/user_prefs\" to the end of the file. This
 information can be used so that you can replace multiple
 \"blacklist_from\" entries with a single wildcard entry such as:
 
     blacklist_from *@*amazingoffersdirect2u.com
 
 In versions of SpamAssassin (2.50 and on) that support a Bayesian
-classifier, \\[mh-junk-blacklist] uses the \"sa-learn\" program to
-recategorize the message as spam. Neither MH-E, nor SpamAssassin,
-rebuilds the database after adding words, so you will need to run
-\"sa-learn --rebuild\" periodically. This can be done by adding the
-following to your crontab:
+classifier, \\[mh-junk-blacklist] uses the program \"sa-learn\"
+to recategorize the message as spam. Neither MH-E, nor
+SpamAssassin, rebuilds the database after adding words, so you
+will need to run \"sa-learn --rebuild\" periodically. This can be
+done by adding the following to your crontab:
 
     0 * * * *   sa-learn --rebuild > /dev/null 2>&1"
   (unless mh-spamassassin-executable
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index c028890f6a1..f7377d80b2d 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -1,7 +1,7 @@
 ;;; mh-mime.el --- MH-E support for composing MIME messages
 
 ;; Copyright (C) 1993, 1995,
-;;  2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -318,9 +318,10 @@ set of ATTRIBUTES and an optional COMMENT can also be included."
 ;;;###mh-autoload
 (defun mh-mh-compose-anon-ftp (host filename type description)
   "Add tag to include anonymous ftp reference to a file.
-You can even have your message initiate an \"ftp\" transfer when
-the recipient reads the message. You are prompted for the remote
-HOST and FILENAME, the media TYPE, and the content DESCRIPTION.
+
+You can have your message initiate an \"ftp\" transfer when the
+recipient reads the message. You are prompted for the remote HOST
+and FILENAME, the media TYPE, and the content DESCRIPTION.
 
 See also \\[mh-mh-to-mime]."
   (interactive (list
@@ -334,8 +335,9 @@ See also \\[mh-mh-to-mime]."
 ;;;###mh-autoload
 (defun mh-mh-compose-external-compressed-tar (host filename description)
   "Add tag to include anonymous ftp reference to a compressed tar file.
+
 In addition to retrieving the file via anonymous \"ftp\" as per
-the \\[mh-mh-compose-anon-ftp] command, the file will also be
+the command \\[mh-mh-compose-anon-ftp], the file will also be
 uncompressed and untarred. You are prompted for the remote HOST
 and FILENAME and the content DESCRIPTION.
 
@@ -356,6 +358,7 @@ See also \\[mh-mh-to-mime]."
                                                 attributes parameters
                                                 comment)
   "Add tag to refer to a remote file.
+
 This command is a general utility for referencing external files.
 In fact, all of the other commands that insert directives to
 access external files call this command. You are prompted for the
@@ -435,14 +438,14 @@ Typically, you send a message with attachments just like any other
 message. However, you may take a sneak preview of the MIME encoding if
 you wish by running this command.
 
-If you wish to pass additional arguments to \"mhbuild\" (\"mhn\") to
-affect how it builds your message, use the `mh-mh-to-mime-args'
-option. For example, you can build a consistency check into the
-message by setting `mh-mh-to-mime-args' to \"-check\". The recipient
-of your message can then run \"mhbuild -check\" on the
-message--\"mhbuild\" (\"mhn\") will complain if the message has been
-corrupted on the way. This command only consults this option when
-given a prefix argument EXTRA-ARGS.
+If you wish to pass additional arguments to \"mhbuild\" (\"mhn\")
+to affect how it builds your message, use the option
+`mh-mh-to-mime-args'. For example, you can build a consistency
+check into the message by setting `mh-mh-to-mime-args' to
+\"-check\". The recipient of your message can then run \"mhbuild
+-check\" on the message--\"mhbuild\" (\"mhn\") will complain if
+the message has been corrupted on the way. This command only
+consults this option when given a prefix argument EXTRA-ARGS.
 
 The hook `mh-mh-to-mime-hook' is called after the message has been
 formatted.
@@ -484,8 +487,10 @@ This function will quote all such characters."
 ;;;###mh-autoload
 (defun mh-mh-to-mime-undo (noconfirm)
   "Undo effects of \\[mh-mh-to-mime].
-Optional non-nil argument NOCONFIRM means don't ask for
-confirmation."
+
+It does this by reverting to a backup file. You are prompted to
+confirm this action, but you can avoid the confirmation by adding
+a prefix argument NOCONFIRM."
   (interactive "*P")
   (if (null buffer-file-name)
       (error "Buffer does not seem to be associated with any file"))
@@ -500,7 +505,7 @@ confirmation."
                                     ".orig")))))
       (setq backup-strings (cdr backup-strings)))
     (or backup-strings
-        (error "Backup file for %s no longer exists!" buffer-file-name))
+        (error "Backup file for %s no longer exists" buffer-file-name))
     (or noconfirm
         (yes-or-no-p (format "Revert buffer from file %s? "
                              backup-file))
@@ -580,7 +585,7 @@ MESSAGE number."
                                       mh-user-path (substring folder 1) msg)
                               "message/rfc822"
                               description)))
-          (t (error "The message number, %s is not a integer!" msg)))))
+          (t (error "The message number, %s, is not a integer" msg)))))
 
 (defvar mh-mml-cryptographic-method-history ())
 
@@ -628,9 +633,9 @@ IDENTITY is optionally the default-user-id to use."
     (let ((valid-methods (list "pgpmime" "pgp" "smime"))
           (valid-modes (list "sign" "encrypt" "signencrypt" "none")))
       (if (not (member method valid-methods))
-          (error "Method \"%s\" is invalid" method))
+          (error "Method %s is invalid" method))
       (if (not (member mode valid-modes))
-          (error "Mode \"%s\" is invalid" mode))
+          (error "Mode %s is invalid" mode))
       (mml-unsecure-message)
       (if (not (string= mode "none"))
         (save-excursion
@@ -642,10 +647,9 @@ IDENTITY is optionally the default-user-id to use."
             (mml-insert-tag 'secure 'method method 'mode mode)))))))
 
 ;;;###mh-autoload
-(defun mh-mml-unsecure-message (&optional ignore)
-  "Remove any secure message tags.
-The argument IGNORE is not used."
-  (interactive "P")
+(defun mh-mml-unsecure-message ()
+  "Remove any secure message tags."
+  (interactive)
   (if (not mh-pgp-support-flag)
       (error "Your version of Gnus does not support PGP/GPG")
     (mml-unsecure-message)))
@@ -655,7 +659,7 @@ The argument IGNORE is not used."
   "Add tag to sign the message.
 
 A proper multipart message is created for you when you send the
-message. Use the \\[mh-mml-unsecure-message] command to remove
+message. Use the command \\[mh-mml-unsecure-message] to remove
 this tag. Use a prefix argument METHOD to be prompted for one of
 the possible security methods (see `mh-mml-method-default')."
   (interactive (list (mh-mml-query-cryptographic-method)))
@@ -666,7 +670,7 @@ the possible security methods (see `mh-mml-method-default')."
   "Add tag to encrypt the message.
 
 A proper multipart message is created for you when you send the
-message. Use the \\[mh-mml-unsecure-message] command to remove
+message. Use the command \\[mh-mml-unsecure-message] to remove
 this tag. Use a prefix argument METHOD to be prompted for one of
 the possible security methods (see `mh-mml-method-default')."
   (interactive (list (mh-mml-query-cryptographic-method)))
@@ -677,7 +681,7 @@ the possible security methods (see `mh-mml-method-default')."
   "Add tag to encrypt and sign the message.
 
 A proper multipart message is created for you when you send the
-message. Use the \\[mh-mml-unsecure-message] command to remove
+message. Use the command \\[mh-mml-unsecure-message] to remove
 this tag. Use a prefix argument METHOD to be prompted for one of
 the possible security methods (see `mh-mml-method-default')."
   (interactive (list (mh-mml-query-cryptographic-method)))
@@ -853,7 +857,7 @@ do the work."
                     (equal t mh-mime-save-parts-default-directory))
                 mh-mime-save-parts-directory)
            (read-file-name (format
-                            "Store in directory: [%s] "
+                            "Store in directory (default %s): "
                             mh-mime-save-parts-directory)
                            "" mh-mime-save-parts-directory t ""))
           ((stringp mh-mime-save-parts-default-directory)
@@ -963,7 +967,7 @@ parsed and then displayed."
                    (mh-mime-display-part handles))
                   (t (mh-signature-highlight))))
         (error
-         (message "Please report this error. The error message is:\n %s"
+         (message "Please report this error:\n %s"
                   (error-message-string err))
          (delete-region (point-min) (point-max))
          (insert raw-message-data))))))
diff --git a/lisp/mh-e/mh-pick.el b/lisp/mh-e/mh-pick.el
index 03314ffa6c6..e87e3d11f8d 100644
--- a/lisp/mh-e/mh-pick.el
+++ b/lisp/mh-e/mh-pick.el
@@ -1,7 +1,7 @@
 ;;; mh-pick.el --- make a search pattern and search for a message in MH-E
 
 ;; Copyright (C) 1993, 1995,
-;;  2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -54,13 +54,14 @@
 (defun mh-search-folder (folder window-config)
   "Search FOLDER for messages matching a pattern.
 
-With this command, you can search a folder for messages to or from a
-particular person or about a particular subject. In fact, you can also
-search for messages containing selected strings in any arbitrary
-header field or any string found within the messages.
+With this command, you can search a folder for messages to or
+from a particular person or about a particular subject. In fact,
+you can also search for messages containing selected strings in
+any arbitrary header field or any string found within the
+messages.
 
-You are first prompted for the name of the folder to search and then
-placed in the following buffer in MH-Pick mode:
+You are first prompted for the name of the folder to search and
+then placed in the following buffer in MH-Pick mode:
 
      From:
      To:
@@ -69,26 +70,27 @@ placed in the following buffer in MH-Pick mode:
      Subject:
      --------
 
-Edit this template by entering your search criteria in an appropriate
-header field that is already there, or create a new field yourself. If
-the string you're looking for could be anywhere in a message, then
-place the string underneath the row of dashes. The
-\\[mh-search-folder] command uses the MH command \"pick\" to do the
-real work.
-
-There are no semantics associated with the search criteria--they are
-simply treated as strings. Case is ignored when all lowercase is used,
-and regular expressions (a la \"ed\") are available. It is all right
-to specify several search criteria. What happens then is that a
-logical _and_ of the various fields is performed. If you prefer a
-logical _or_ operation, run \\[mh-search-folder] multiple times.
-
-As an example, let's say that we want to find messages from Ginnean
-about horseback riding in the Kosciusko National Park (Australia)
-during January, 1994. Normally we would start with a broad search and
-narrow it down if necessary to produce a manageable amount of data,
-but we'll cut to the chase and create a fairly restrictive set of
-criteria as follows:
+Edit this template by entering your search criteria in an
+appropriate header field that is already there, or create a new
+field yourself. If the string you're looking for could be
+anywhere in a message, then place the string underneath the row
+of dashes. The command \\[mh-search-folder] uses the MH command
+\"pick\" to do the real work.
+
+There are no semantics associated with the search criteria--they
+are simply treated as strings. Case is ignored when all lowercase
+is used, and regular expressions (a la \"ed\") are available. It
+is all right to specify several search criteria. What happens
+then is that a logical _and_ of the various fields is performed.
+If you prefer a logical _or_ operation, run \\[mh-search-folder]
+multiple times.
+
+As an example, let's say that we want to find messages from
+Ginnean about horseback riding in the Kosciusko National
+Park (Australia) during January, 1994. Normally we would start
+with a broad search and narrow it down if necessary to produce a
+manageable amount of data, but we'll cut to the chase and create
+a fairly restrictive set of criteria as follows:
 
      From: ginnean
      To:
@@ -98,31 +100,32 @@ criteria as follows:
      --------
 
 As with MH-Letter mode, MH-Pick provides commands like
-\\<mh-pick-mode-map>\\[mh-to-field] to help you fill in the blanks.
+\\<mh-pick-mode-map>\\[mh-to-field] to help you fill in the
+blanks.
 
-To perform the search, type \\[mh-do-search]. The selected messages
-are placed in the \"search\" sequence, which you can use later in
-forwarding, printing, or narrowing your field of view. Subsequent
-searches are appended to the \"search\" sequence. If, however, you
-wish to start with a clean slate, first delete the \"search\"
-sequence.
+To perform the search, type \\[mh-do-search]. The selected
+messages are placed in the \"search\" sequence, which you can use
+later in forwarding, printing, or narrowing your field of view.
+Subsequent searches are appended to the \"search\" sequence. If,
+however, you wish to start with a clean slate, first delete the
+\"search\" sequence.
 
 If you're searching in a folder that is already displayed in an
-MH-Folder buffer, only those messages contained in the buffer are used
-for the search. Therefore, if you want to search in all messages,
-first kill the folder's buffer with
-\\<mh-folder-mode-map>\\[kill-buffer] or scan the entire folder with
-\\[mh-rescan-folder].
-
-If you find that you do the same thing over and over when editing the
-search template, you may wish to bind some shortcuts to keys. This can
-be done with the variable `mh-pick-mode-hook', which is called when
-\\[mh-search-folder] is run on a new pattern.
-
-If you have run the \\[mh-index-search] command, but change your mind
-while entering the search criteria and actually want to run a regular
-search, then you can use the \\<mh-pick-mode-map>\\[mh-pick-do-search]
-command.
+MH-Folder buffer, only those messages contained in the buffer are
+used for the search. Therefore, if you want to search in all
+messages, first kill the folder's buffer with
+\\<mh-folder-mode-map>\\[kill-buffer] or scan the entire folder
+with \\[mh-rescan-folder].
+
+If you find that you do the same thing over and over when editing
+the search template, you may wish to bind some shortcuts to keys.
+This can be done with the variable `mh-pick-mode-hook', which is
+called when \\[mh-search-folder] is run on a new pattern.
+
+If you have run the \\[mh-index-search] command, but change your
+mind while entering the search criteria and actually want to run
+a regular search, then you can use the command
+\\<mh-pick-mode-map>\\[mh-pick-do-search] in the MH-Pick buffer.
 
 In a program, argument WINDOW-CONFIG is the current window
 configuration and is used when the search folder is dismissed."
@@ -140,7 +143,7 @@ configuration and is used when the search folder is dismissed."
                         'mh-previous-window-config window-config)
     (message "%s" (substitute-command-keys
                    (concat "Type \\[mh-do-search] to search messages, "
-                           "\\[mh-help] for help.")))))
+                           "\\[mh-help] for help")))))
 
 (defun mh-make-pick-template ()
   "Initialize the current buffer with a template for a pick pattern."
@@ -332,7 +335,7 @@ COMPONENT is the component to search."
         ((eq (car expr) 'not)
          `("-lbrace" "-not" ,@(mh-pick-construct-regexp (cadr expr) component)
            "-rbrace"))
-        (t (error "Unknown operator '%s' seen" (car expr)))))
+        (t (error "Unknown operator %s seen" (car expr)))))
 
 ;; All implementations of pick have special options -cc, -date, -from and
 ;; -subject that allow to search for corresponding components. Any other
diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el
index 6fb70e61de8..53bae76cc07 100644
--- a/lisp/mh-e/mh-seq.el
+++ b/lisp/mh-e/mh-seq.el
@@ -1,7 +1,7 @@
 ;;; mh-seq.el --- MH-E sequences support
 
 ;; Copyright (C) 1993, 1995,
-;;  2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -177,6 +177,7 @@ you want to delete the messages, use \"\\[universal-argument]
 ;;;###mh-autoload
 (defun mh-list-sequences ()
   "List all sequences in folder.
+
 The list appears in a buffer named \"*MH-E Sequences*\"."
   (interactive)
   (let ((folder mh-current-folder)
@@ -219,6 +220,7 @@ The list appears in a buffer named \"*MH-E Sequences*\"."
 ;;;###mh-autoload
 (defun mh-msg-is-in-seq (message)
   "Display the sequences in which the current message appears.
+
 Use a prefix argument to display the sequences in which another
 MESSAGE appears."
   (interactive "P")
@@ -282,7 +284,7 @@ When you want to widen the view to all your messages again, use
                         mh-show-seq-tool-bar-map))))
              (push 'widen mh-view-ops)))
           (t
-           (error "No messages in sequence \"%s\"" (symbol-name sequence))))))
+           (error "No messages in sequence %s" (symbol-name sequence))))))
 
 ;;;###mh-autoload
 (defun mh-put-msg-in-seq (range sequence)
@@ -302,7 +304,7 @@ use."
   (interactive (list (mh-interactive-range "Add messages from")
                      (mh-read-seq-default "Add to" nil)))
   (unless (mh-valid-seq-p sequence)
-    (error "Can't put message in invalid sequence \"%s\"" sequence))
+    (error "Can't put message in invalid sequence %s" sequence))
   (let* ((internal-seq-flag (mh-internal-seq sequence))
          (original-msgs (mh-seq-msgs (mh-find-seq sequence)))
          (folders (list mh-current-folder))
@@ -329,8 +331,10 @@ OP is one of 'widen and 'unthread."
 ;;;###mh-autoload
 (defun mh-widen (&optional all-flag)
   "Remove last restriction.
-If optional prefix argument ALL-FLAG is non-nil, remove all
-limits."
+
+Each limit or sequence restriction can be undone in turn with
+this command. Give this command a prefix argument ALL-FLAG to
+remove all limits and sequence restrictions."
   (interactive "P")
   (let ((msg (mh-get-msg-num nil)))
     (when mh-folder-view-stack
@@ -416,9 +420,9 @@ Prompt with PROMPT, raise an error if the sequence is empty and
 the NOT-EMPTY flag is non-nil, and supply an optional DEFAULT
 sequence. A reply of '%' defaults to the first sequence
 containing the current message."
-  (let* ((input (completing-read (format "%s %s %s" prompt "sequence:"
+  (let* ((input (completing-read (format "%s sequence%s: " prompt
                                          (if default
-                                             (format "[%s] " default)
+                                             (format " (default %s)" default)
                                            ""))
                                  (mh-seq-names mh-seq-list)
                                  nil nil nil 'mh-sequence-history))
@@ -428,7 +432,7 @@ containing the current message."
                     (t (intern input))))
          (msgs (mh-seq-to-msgs seq)))
     (if (and (null msgs) not-empty)
-        (error "No messages in sequence \"%s\"" seq))
+        (error "No messages in sequence %s" seq))
     seq))
 
 
@@ -509,20 +513,22 @@ should be replaced with:
                     (car (mh-seq-containing-msg (mh-get-msg-num nil) t)))
         prompt (format "%s range" prompt))
   (let* ((folder (or folder mh-current-folder))
-         (default (cond ((or (eq default t) (stringp default)) default)
-                        ((symbolp default) (symbol-name default))))
          (guess (eq default t))
          (counts (and guess (mh-folder-size folder)))
          (unseen (and counts (> (cadr counts) 0)))
          (large (and counts mh-large-folder (> (car counts) mh-large-folder)))
-         (str (cond ((and guess large
-                          (setq default (format "last:%s" mh-large-folder)
-                                prompt (format "%s (folder has %s messages)"
-                                               prompt (car counts)))
-                          nil))
-                    ((and guess (not large) (setq default "all") nil))
-                    ((eq default nil) "")
-                    (t (format "[%s] " default))))
+         (default (cond ((and guess large) (format "last:%s" mh-large-folder))
+                        ((and guess (not large)) "all")
+                        ((stringp default) default)
+                        ((symbolp default) (symbol-name default))))
+         (prompt (cond ((and guess large default)
+                        (format "%s (folder has %s messages, default %s)"
+                                prompt (car counts) default))
+                       ((and guess large)
+                        (format "%s (folder has %s messages)"
+                                prompt (car counts)))
+                       (default
+                         (format "%s (default %s)" prompt default))))
          (minibuffer-local-completion-map mh-range-completion-map)
          (seq-list (if (eq folder mh-current-folder)
                        mh-seq-list
@@ -532,7 +538,7 @@ should be replaced with:
                   (mh-seq-names seq-list)))
          (input (cond ((and (not ask-flag) unseen) (symbol-name mh-unseen-seq))
                       ((and (not ask-flag) (not large)) "all")
-                      (t (completing-read (format "%s: %s" prompt str)
+                      (t (completing-read (format "%s: " prompt)
                                           'mh-range-completion-function nil nil
                                           nil 'mh-range-history default))))
          msg-list)
@@ -543,7 +549,7 @@ should be replaced with:
           ((assoc (intern input) seq-list)
            (cdr (assoc (intern input) seq-list)))
           ((setq msg-list (mh-translate-range folder input)) msg-list)
-          (t (error "No messages in range \"%s\"" input)))))
+          (t (error "No messages in range %s" input)))))
 
 ;;;###mh-autoload
 (defun mh-translate-range (folder expr)
@@ -1170,7 +1176,7 @@ children."
                           (mh-message-id (mh-container-message kid)))
                  (let ((kid-message (mh-container-message kid)))
                    (return (mh-message-subject kid-message)))))
-             (error "This can't happen!")))))
+             (error "This can't happen")))))
 
 (defun mh-thread-rewind-pruning ()
   "Restore the thread tree to its state before pruning."
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index e008c93916e..f3205a932a2 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -1,7 +1,7 @@
 ;;; mh-utils.el --- MH-E code needed for both sending and reading
 
 ;; Copyright (C) 1993, 1995, 1997,
-;;  2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;  2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -1582,7 +1582,7 @@ The argument CHANGE is ignored."
       (cond
        ;; Check if we have `convert'
        ((eq mh-x-image-scaling-function 'ignore)
-        (message "The `convert' program is needed to display X-Image-URL")
+        (message "The \"convert\" program is needed to display X-Image-URL")
         (mh-x-image-set-download-state cache-filename 'try-again))
        ;; Scale fetched image
        ((and (funcall mh-x-image-scaling-function temp-file cache-filename)
@@ -1647,6 +1647,14 @@ scrolls to the beginning of the message. MH-E normally hides a lot of
 the superfluous header fields that mailers add to a message, but if
 you wish to see all of them, use the command \\[mh-header-display].
 
+Two hooks can be used to control how messages are displayed. The
+first hook, `mh-show-mode-hook', is called early on in the
+process of the message display. It is usually used to perform
+some action on the message's content. The second hook,
+`mh-show-hook', is the last thing called after messages are
+displayed. It's used to affect the behavior of MH-E in general or
+when `mh-show-mode-hook' is too early.
+
 From a program, optional argument MESSAGE can be used to display an
 alternative message. The optional argument REDISPLAY-FLAG forces the
 redisplay of the message even if the show buffer was already
@@ -1728,7 +1736,7 @@ this with this command. It displays the raw message in an
 editable buffer. When you are done editing, save and kill the
 buffer as you would any other.
 
-From a program, edit MESSAGE instead if it is non-nil."
+From a program, edit MESSAGE; nil means edit current message."
   (interactive)
   (let* ((message (or message (mh-get-msg-num t)))
          (msg-filename (mh-msg-filename message))
@@ -2471,7 +2479,7 @@ used in searching."
             (new-file-flag
              (error "Folder %s does not exist" folder-name))
             ((not (file-directory-p (mh-expand-file-name folder-name)))
-             (error "\"%s\" is not a directory"
+             (error "%s is not a directory"
                     (mh-expand-file-name folder-name)))))
     folder-name))
 
@@ -2655,7 +2663,7 @@ Set mark after inserted text."
         (set-buffer (get-buffer-create mh-log-buffer))
         (mh-truncate-log-buffer)
         (insert error-message)))
-    (error "%s failed, check %s buffer for error message"
+    (error "%s failed, check buffer %s for error message"
            command mh-log-buffer)))
 
 (defun mh-list-to-string (l)
@@ -2676,7 +2684,7 @@ Set mark after inserted text."
             ((listp (car l))
              (setq new-list (nconc (mh-list-to-string-1 (car l))
                                    new-list)))
-            (t (error "Bad element in mh-list-to-string: %s" (car l))))
+            (t (error "Bad element in `mh-list-to-string': %s" (car l))))
       (setq l (cdr l)))
     new-list))
 
diff --git a/lisp/mouse.el b/lisp/mouse.el
index ef655ba836f..e772858b3c7 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -765,7 +765,7 @@ If the click is in the echo area, display the `*Messages*' buffer."
           (display-buffer (current-buffer)))
       ;; Give temporary modes such as isearch a chance to turn off.
       (run-hooks 'mouse-leave-buffer-hook)
-      (mouse-drag-region-1 start-event))))
+      (mouse-drag-track start-event t))))
 
 
 (defun mouse-on-link-p (pos)
@@ -865,7 +865,12 @@ at the same position."
   (let ((range (mouse-start-end start end mode)))
     (move-overlay ol (car range) (nth 1 range))))
 
-(defun mouse-drag-region-1 (start-event)
+(defun mouse-drag-track (start-event  &optional 
+                                      do-mouse-drag-region-post-process)
+    "Track mouse drags by highlighting area between point and cursor.
+The region will be defined with mark and point, and the overlay
+will be deleted after return.  DO-MOUSE-DRAG-REGION-POST-PROCESS
+should only be used by mouse-drag-region."
   (mouse-minibuffer-check start-event)
   (setq mouse-selection-click-count-buffer (current-buffer))
   (let* ((original-window (selected-window))
@@ -949,12 +954,15 @@ at the same position."
                  (integer-or-marker-p end-point))
         (mouse-move-drag-overlay mouse-drag-overlay start-point end-point click-count))
 
+      ;; Handle the terminating event
       (if (consp event)
           (let* ((fun (key-binding (vector (car event))))
                  (do-multi-click   (and (> (event-click-count event) 0)
                                         (functionp fun)
-                                        (not (memq fun '(mouse-set-point mouse-set-region))))))
-            ;; Run the binding of the terminating up-event, if possible.
+                                        (not (memq fun 
+                                                   '(mouse-set-point 
+                                                     mouse-set-region))))))
+            ;; Run the binding of the terminating up-event, if possible.
             (if (and (not (= (overlay-start mouse-drag-overlay)
                              (overlay-end mouse-drag-overlay)))
                      (not do-multi-click))
@@ -965,31 +973,34 @@ at the same position."
                        ;; The end that comes from where we ended the drag.
                        ;; Point goes here.
                        (region-termination
-                        (if (and stop-point (< stop-point start-point))
-                            (overlay-start mouse-drag-overlay)
-                          (overlay-end mouse-drag-overlay)))
-                       ;; The end that comes from where we started the drag.
-                       ;; Mark goes there.
-                       (region-commencement
-                        (- (+ (overlay-end mouse-drag-overlay)
-                              (overlay-start mouse-drag-overlay))
-                           region-termination))
-                       last-command this-command)
-                  (push-mark region-commencement t t)
-                  (goto-char region-termination)
-                  ;; Don't let copy-region-as-kill set deactivate-mark.
-                  (when mouse-drag-copy-region
-                    (let (deactivate-mark)
-                      (copy-region-as-kill (point) (mark t))))
-                  (let ((buffer (current-buffer)))
-                    (mouse-show-mark)
-                    ;; mouse-show-mark can call read-event,
-                    ;; and that means the Emacs server could switch buffers
-                    ;; under us.  If that happened,
-                    ;; avoid trying to use the region.
-                    (and (mark t) mark-active
-                         (eq buffer (current-buffer))
-                         (mouse-set-region-1))))
+                        (if (and stop-point (< stop-point start-point))
+                            (overlay-start mouse-drag-overlay)
+                          (overlay-end mouse-drag-overlay)))
+                       ;; The end that comes from where we started the drag.
+                       ;; Mark goes there.
+                       (region-commencement
+                        (- (+ (overlay-end mouse-drag-overlay)
+                              (overlay-start mouse-drag-overlay))
+                           region-termination))
+                       last-command this-command)
+                  (push-mark region-commencement t t)
+                  (goto-char region-termination)
+                  (if (not do-mouse-drag-region-post-process)
+                      ;; Skip all post-event handling, return immediately.
+                      (delete-overlay mouse-drag-overlay)
+                    ;; Don't let copy-region-as-kill set deactivate-mark.
+                    (when mouse-drag-copy-region
+                      (let (deactivate-mark)
+                        (copy-region-as-kill (point) (mark t))))
+                    (let ((buffer (current-buffer)))
+                      (mouse-show-mark)
+                      ;; mouse-show-mark can call read-event,
+                      ;; and that means the Emacs server could switch buffers
+                      ;; under us.  If that happened,
+                      ;; avoid trying to use the region.
+                      (and (mark t) mark-active
+                           (eq buffer (current-buffer))
+                           (mouse-set-region-1)))))
               ;; Run the binding of the terminating up-event.
               ;; If a multiple click is not bound to mouse-set-point,
               ;; cancel the effects of mouse-move-drag-overlay to
@@ -997,18 +1008,18 @@ at the same position."
               (if do-multi-click (goto-char start-point))
               (delete-overlay mouse-drag-overlay)
               (when (and (functionp fun)
-                         (= start-hscroll (window-hscroll start-window))
-                         ;; Don't run the up-event handler if the
-                         ;; window start changed in a redisplay after
-                         ;; the mouse-set-point for the down-mouse
-                         ;; event at the beginning of this function.
-                         ;; When the window start has changed, the
-                         ;; up-mouse event will contain a different
-                         ;; position due to the new window contents,
-                         ;; and point is set again.
-                         (or end-point
-                             (= (window-start start-window)
-                                start-window-start)))
+              (= start-hscroll (window-hscroll start-window))
+              ;; Don't run the up-event handler if the
+              ;; window start changed in a redisplay after
+              ;; the mouse-set-point for the down-mouse
+              ;; event at the beginning of this function.
+              ;; When the window start has changed, the
+              ;; up-mouse event will contain a different
+              ;; position due to the new window contents,
+              ;; and point is set again.
+              (or end-point
+                  (= (window-start start-window)
+                     start-window-start)))
                 (when (and on-link
                            (or (not end-point) (= end-point start-point))
                            (consp event)
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 6f5d0855e19..4b14d321a46 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1,6 +1,6 @@
 ;;; flymake.el -- a universal on-the-fly syntax checker
 
-;; Copyright (C) 2003, 2004, 2005  Free Software Foundation
+;; Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation
 
 ;; Author:  Pavel Kobiakov <pk_at_work@yahoo.com>
 ;; Maintainer: Pavel Kobiakov <pk_at_work@yahoo.com>
@@ -32,16 +32,33 @@
 
 ;;; Code:
 
-;;;; [[ Silence the byte-compiler
+(defvar flymake-is-running nil
+  "If t, flymake syntax check process is running for the current buffer.")
+(make-variable-buffer-local 'flymake-is-running)
 
-(defvar flymake-check-start-time)
-(defvar flymake-check-was-interrupted)
-(defvar flymake-err-info)
-(defvar flymake-is-running)
-(defvar flymake-last-change-time)
-(defvar flymake-new-err-info)
+(defvar flymake-timer nil
+  "Timer for starting syntax check.")
+(make-variable-buffer-local 'flymake-timer)
 
-;;;; ]]
+(defvar flymake-last-change-time nil
+  "Time of last buffer change.")
+(make-variable-buffer-local 'flymake-last-change-time)
+
+(defvar flymake-check-start-time nil
+  "Time at which syntax check was started.")
+(make-variable-buffer-local 'flymake-check-start-time)
+
+(defvar flymake-check-was-interrupted nil
+  "Non-nil if syntax check was killed by `flymake-compile'.")
+(make-variable-buffer-local 'flymake-check-was-interrupted)
+
+(defvar flymake-err-info nil
+  "Sorted list of line numbers and lists of err info in the form (file, err-text).")
+(make-variable-buffer-local 'flymake-err-info)
+
+(defvar flymake-new-err-info nil
+  "Same as `flymake-err-info', effective when a syntax check is in progress.")
+(make-variable-buffer-local 'flymake-new-err-info)
 
 ;;;; [[ Xemacs overlay compatibility
 (if (featurep 'xemacs) (progn
@@ -69,25 +86,30 @@
           (multiple-value-bind (s0 s1 s2) (current-time)
             (+ (* (float (ash 1 16)) s0) (float s1) (* 0.0000001 s2)))))))
 
-(defsubst flymake-replace-regexp-in-string (regexp rep str)
-  (if (fboundp 'replace-in-string)
-      (replace-in-string str regexp rep)
-    (replace-regexp-in-string regexp rep str)))
-
-(defun flymake-split-string (str pattern)
-  "Split STR into a list of substrings bounded by PATTERN.
+(defalias 'flymake-replace-regexp-in-string
+  (if (eval-when-compile (fboundp 'replace-regexp-in-string))
+      'replace-regexp-in-string
+    (lambda (regexp rep str)
+      (replace-in-string str regexp rep))))
+
+(defalias 'flymake-split-string
+  (if (condition-case nil (equal (split-string " bc " " " t) '("bc"))
+        (error nil))
+      (lambda (str pattern) (split-string str pattern t))
+    (lambda (str pattern)
+      "Split STR into a list of substrings bounded by PATTERN.
 Zero-length substrings at the beginning and end of the list are omitted."
-  (let* ((splitted (split-string str pattern)))
-    (if (and (> (length splitted) 0) (= 0 (length (elt splitted 0))))
-        (setq splitted (cdr splitted)))
-    (if (and (> (length splitted) 0) (= 0 (length (elt splitted (1- (length splitted))))))
-        (setq splitted (reverse (cdr (reverse splitted)))))
-    splitted))
-
-(defsubst flymake-get-temp-dir ()
+      (let ((split (split-string str pattern)))
+        (if (and (> (length split) 0) (= 0 (length (elt split 0))))
+            (setq split (cdr split)))
+        (if (and (> (length split) 0) (= 0 (length (elt split (1- (length split))))))
+            (setq split (nreverse (cdr (nreverse split)))))
+        split))))
+
+(defalias 'flymake-get-temp-dir
   (if (fboundp 'temp-directory)
-      (temp-directory)
-    temporary-file-directory))
+      'temp-directory
+    (lambda () temporary-file-directory)))
 
 (defalias 'flymake-line-beginning-position
   (if (fboundp 'line-beginning-position)
@@ -99,20 +121,26 @@ Zero-length substrings at the beginning and end of the list are omitted."
       'line-end-position
     (lambda (&optional arg) (save-excursion (end-of-line arg) (point)))))
 
-(defun flymake-popup-menu (pos menu-data)
-  "Pop up the flymake menu at position POS, using the data MENU-DATA.
+
+(defun flymake-popup-menu (menu-data)
+  "Pop up the flymake menu at point, using the data MENU-DATA.
 POS is a list of the form ((X Y) WINDOW), where X and Y are
 pixels positions from the top left corner of WINDOW's frame.
 MENU-DATA is a list of error and warning messages returned by
 `flymake-make-err-menu-data'."
   (if (featurep 'xemacs)
-      (let* ((x-pos       (nth 0 (nth 0 pos)))
-             (y-pos       (nth 1 (nth 0 pos)))
+      (let* ((pos         (flymake-get-point-pixel-pos))
+             (x-pos       (nth 0 pos))
+             (y-pos       (nth 1 pos))
              (fake-event-props  '(button 1 x 1 y 1)))
         (setq fake-event-props (plist-put fake-event-props 'x x-pos))
         (setq fake-event-props (plist-put fake-event-props 'y y-pos))
-        (popup-menu (flymake-make-xemacs-menu menu-data) (make-event 'button-press fake-event-props)))
-    (x-popup-menu pos (flymake-make-emacs-menu menu-data))))
+        (popup-menu (flymake-make-xemacs-menu menu-data)
+                    (make-event 'button-press fake-event-props)))
+    (x-popup-menu (if (eval-when-compile (fboundp 'posn-at-point))
+                      (posn-at-point)
+                    (list (flymake-get-point-pixel-pos) (selected-window)))
+                  (flymake-make-emacs-menu menu-data))))
 
 (defun flymake-make-emacs-menu (menu-data)
   "Return a menu specifier using MENU-DATA.
@@ -121,10 +149,9 @@ MENU-DATA is a list of error and warning messages returned by
 See `x-popup-menu' for the menu specifier format."
   (let* ((menu-title     (nth 0 menu-data))
          (menu-items     (nth 1 menu-data))
-         (menu-commands  nil))
-    (setq menu-commands (mapcar (lambda (foo)
-                                  (cons (nth 0 foo) (nth 1 foo)))
-                                menu-items))
+         (menu-commands  (mapcar (lambda (foo)
+                                   (cons (nth 0 foo) (nth 1 foo)))
+                                 menu-items)))
     (list menu-title (cons "" menu-commands))))
 
 (if (featurep 'xemacs) (progn
@@ -141,21 +168,10 @@ See `x-popup-menu' for the menu specifier format."
                                 menu-items))
     (cons menu-title menu-commands)))
 
-(defun flymake-xemacs-window-edges (&optional window)
-  (let ((edges  (window-pixel-edges window))
-        tmp)
-    (setq tmp edges)
-    (setcar tmp (/ (car tmp) (face-width 'default)))
-    (setq tmp (cdr tmp))
-    (setcar tmp (/ (car tmp) (face-height 'default)))
-    (setq tmp (cdr tmp))
-    (setcar tmp (/ (car tmp) (face-width 'default)))
-    (setq tmp (cdr tmp))
-    (setcar tmp (/ (car tmp) (face-height 'default)))
-    edges))
-
 )) ;; xemacs
 
+(unless (eval-when-compile (fboundp 'posn-at-point))
+
 (defun flymake-current-row ()
   "Return current row number in current frame."
   (if (fboundp 'window-edges)
@@ -167,6 +183,24 @@ See `x-popup-menu' for the menu specifier format."
       (selected-frame)
     (selected-window)))
 
+(defun flymake-get-point-pixel-pos ()
+  "Return point position in pixels: (x, y)."
+  (let ((mouse-pos  (mouse-position))
+        (pixel-pos  nil)
+        (ret        nil))
+    (if (car (cdr mouse-pos))
+        (progn
+          (set-mouse-position (flymake-selected-frame) (current-column) (flymake-current-row))
+          (setq pixel-pos (mouse-pixel-position))
+          (set-mouse-position (car mouse-pos) (car (cdr mouse-pos)) (cdr (cdr mouse-pos)))
+          (setq ret (list (car (cdr pixel-pos)) (cdr (cdr pixel-pos)))))
+      (progn
+        (setq ret '(0 0))))
+    (flymake-log 3 "mouse pos is %s" ret)
+    ret))
+
+) ;; End of (unless (fboundp 'posn-at-point)
+
 ;;;; ]]
 
 (defcustom flymake-log-level -1
@@ -187,7 +221,7 @@ are the string substitutions (see `format')."
         ;;(with-temp-buffer
         ;;    (insert msg)
         ;;   (insert "\n")
-        ;;   (flymake-save-buffer-in-file (current-buffer) "d:/flymake.log" t)  ; make log file name customizable
+        ;;   (flymake-save-buffer-in-file "d:/flymake.log" t)  ; make log file name customizable
         ;;)
         )))
 
@@ -203,59 +237,34 @@ are the string substitutions (see `format')."
     (setcar (nthcdr pos tmp) val)
     tmp))
 
-(defvar flymake-pid-to-names (flymake-makehash)
-  "Hash table mapping PIDs to source buffer names and output files.")
-
-(defun flymake-reg-names (pid source-buffer-name)
-  "Associate PID with SOURCE-BUFFER-NAME in `flymake-pid-to-names'."
-  (unless (stringp source-buffer-name)
-    (error "Invalid buffer name"))
-  (puthash pid (list source-buffer-name) flymake-pid-to-names))
-
-(defun flymake-get-source-buffer-name (pid)
-  "Return buffer name associated with PID in `flymake-pid-to-names'."
-  (nth 0 (gethash pid flymake-pid-to-names)))
-
-(defun flymake-unreg-names (pid)
-  "Remove the entry associated with PID from `flymake-pid-to-names'."
-  (remhash pid flymake-pid-to-names))
-
-(defvar flymake-buffer-data (flymake-makehash)
-  "Data specific to syntax check tool, in name-value pairs.")
-
-(make-variable-buffer-local 'flymake-buffer-data)
-
-(defun flymake-get-buffer-value (buffer name)
-  (gethash name (with-current-buffer buffer flymake-buffer-data)))
-
-(defun flymake-set-buffer-value (buffer name value)
-  (puthash name value (with-current-buffer buffer flymake-buffer-data)))
+(defvar flymake-processes nil
+  "List of currently active flymake processes.")
 
 (defvar flymake-output-residual nil)
 
 (make-variable-buffer-local 'flymake-output-residual)
 
 (defcustom flymake-allowed-file-name-masks
-  '((".+\\.c$" flymake-simple-make-init flymake-simple-cleanup flymake-get-real-file-name)
-    (".+\\.cpp$" flymake-simple-make-init flymake-simple-cleanup flymake-get-real-file-name)
-    (".+\\.xml$" flymake-xml-init flymake-simple-cleanup flymake-get-real-file-name)
-    (".+\\.html?$" flymake-xml-init flymake-simple-cleanup flymake-get-real-file-name)
-    (".+\\.cs$" flymake-simple-make-init flymake-simple-cleanup flymake-get-real-file-name)
-    (".+\\.pl$" flymake-perl-init flymake-simple-cleanup flymake-get-real-file-name)
-    (".+\\.h$" flymake-master-make-header-init flymake-master-cleanup flymake-get-real-file-name)
-    (".+\\.java$" flymake-simple-make-java-init flymake-simple-java-cleanup flymake-get-real-file-name)
-    (".+[0-9]+\\.tex$" flymake-master-tex-init flymake-master-cleanup flymake-get-real-file-name)
-    (".+\\.tex$" flymake-simple-tex-init flymake-simple-cleanup flymake-get-real-file-name)
-    (".+\\.idl$" flymake-simple-make-init flymake-simple-cleanup flymake-get-real-file-name)
-    ;; (".+\\.cpp$" 1)
-    ;; (".+\\.java$" 3)
-    ;; (".+\\.h$" 2 (".+\\.cpp$" ".+\\.c$")
+  '(("\\.c\\'" flymake-simple-make-init)
+    ("\\.cpp\\'" flymake-simple-make-init)
+    ("\\.xml\\'" flymake-xml-init)
+    ("\\.html?\\'" flymake-xml-init)
+    ("\\.cs\\'" flymake-simple-make-init)
+    ("\\.pl\\'" flymake-perl-init)
+    ("\\.h\\'" flymake-master-make-header-init flymake-master-cleanup)
+    ("\\.java\\'" flymake-simple-make-java-init flymake-simple-java-cleanup)
+    ("[0-9]+\\.tex\\'" flymake-master-tex-init flymake-master-cleanup)
+    ("\\.tex\\'" flymake-simple-tex-init)
+    ("\\.idl\\'" flymake-simple-make-init)
+    ;; ("\\.cpp\\'" 1)
+    ;; ("\\.java\\'" 3)
+    ;; ("\\.h\\'" 2 ("\\.cpp\\'" "\\.c\\'")
     ;; ("[ \t]*#[ \t]*include[ \t]*\"\\([\w0-9/\\_\.]*[/\\]*\\)\\(%s\\)\"" 1 2))
-    ;; (".+\\.idl$" 1)
-    ;; (".+\\.odl$" 1)
-    ;; (".+[0-9]+\\.tex$" 2 (".+\\.tex$")
+    ;; ("\\.idl\\'" 1)
+    ;; ("\\.odl\\'" 1)
+    ;; ("[0-9]+\\.tex\\'" 2 ("\\.tex\\'")
     ;; ("[ \t]*\\input[ \t]*{\\(.*\\)\\(%s\\)}" 1 2 ))
-    ;; (".+\\.tex$" 1)
+    ;; ("\\.tex\\'" 1)
     )
   "*Files syntax checking is allowed for."
   :group 'flymake
@@ -288,10 +297,12 @@ Return nil if we cannot, non-nil if we can."
 
 (defun flymake-get-cleanup-function (file-name)
   "Return cleanup function to be used for the file."
-  (nth 1 (flymake-get-file-name-mode-and-masks file-name)))
+  (or (nth 1 (flymake-get-file-name-mode-and-masks file-name))
+      'flymake-simple-cleanup))
 
 (defun flymake-get-real-file-name-function (file-name)
-  (or (nth 2 (flymake-get-file-name-mode-and-masks file-name)) 'flymake-get-real-file-name))
+  (or (nth 2 (flymake-get-file-name-mode-and-masks file-name))
+      'flymake-get-real-file-name))
 
 (defcustom flymake-buildfile-dirs '("." ".." "../.." "../../.." "../../../.." "../../../../.." "../../../../../.." "../../../../../../.." "../../../../../../../.." "../../../../../../../../.." "../../../../../../../../../.." "../../../../../../../../../../..")
   "Dirs to look for buildfile."
@@ -491,7 +502,7 @@ instead of reading master file from disk."
                                             (file-name-nondirectory patched-source-file-name))))
                 (forward-line 1)))
             (when found
-              (flymake-save-buffer-in-file (current-buffer) patched-master-file-name)))
+              (flymake-save-buffer-in-file patched-master-file-name)))
         ;;+(flymake-log 3 "killing buffer %s" (buffer-name master-file-temp-buffer))
         (kill-buffer master-file-temp-buffer)))
     ;;+(flymake-log 3 "check-patch master file %s: %s" master-file-name found)
@@ -581,15 +592,12 @@ Find master file, patch and save it."
                      (file-name-nondirectory source-file-name))
         nil))))
 
-(defun flymake-save-buffer-in-file (buffer file-name)
-  (or buffer
-      (error "Invalid buffer"))
-  (with-current-buffer buffer
-    (save-restriction
-      (widen)
-      (make-directory (file-name-directory file-name) 1)
-      (write-region (point-min) (point-max) file-name nil 566)))
-  (flymake-log 3 "saved buffer %s in file %s" (buffer-name buffer) file-name))
+(defun flymake-save-buffer-in-file (file-name)
+  (save-restriction
+    (widen)
+    (make-directory (file-name-directory file-name) 1)
+    (write-region (point-min) (point-max) file-name nil 566))
+  (flymake-log 3 "saved buffer %s in file %s" (buffer-name) file-name))
 
 (defun flymake-save-string-to-file (file-name data)
   "Save string DATA to file FILE-NAME."
@@ -604,44 +612,46 @@ Find master file, patch and save it."
 (defun flymake-process-filter (process output)
   "Parse OUTPUT and highlight error lines.
 It's flymake process filter."
-  (let* ((pid               (process-id process))
-         (source-buffer     (get-buffer (flymake-get-source-buffer-name pid))))
+  (let ((source-buffer (process-buffer process)))
 
-    (flymake-log 3 "received %d byte(s) of output from process %d" (length output) pid)
+    (flymake-log 3 "received %d byte(s) of output from process %d"
+                 (length output) (process-id process))
     (when source-buffer
       (with-current-buffer source-buffer
         (flymake-parse-output-and-residual output)))))
 
 (defun flymake-process-sentinel (process event)
   "Sentinel for syntax check buffers."
-  (if (memq (process-status process) '(signal exit))
-      (let*((exit-status       (process-exit-status process))
-            (command           (process-command process))
-            (pid               (process-id process))
-            (source-buffer     (get-buffer (flymake-get-source-buffer-name pid)))
-            (cleanup-f         (flymake-get-cleanup-function (buffer-file-name source-buffer))))
-
-        (flymake-log 2 "process %d exited with code %d" pid exit-status)
-        (condition-case err
-            (progn
-              (flymake-log 3 "cleaning up using %s" cleanup-f)
-              (funcall cleanup-f source-buffer)
-
-              (flymake-unreg-names pid)
-              (delete-process process)
-
-              (when source-buffer
-                (with-current-buffer source-buffer
-
-                  (flymake-parse-residual)
-                  (flymake-post-syntax-check exit-status command)
-                  (setq flymake-is-running nil))))
-          (error
-           (let ((err-str (format "Error in process sentinel for buffer %s: %s"
-                                  source-buffer (error-message-string err))))
-             (flymake-log 0 err-str)
-             (with-current-buffer source-buffer
-               (setq flymake-is-running nil))))))))
+  (when (memq (process-status process) '(signal exit))
+    (let* ((exit-status       (process-exit-status process))
+           (command           (process-command process))
+           (source-buffer     (process-buffer process))
+           (cleanup-f         (flymake-get-cleanup-function (buffer-file-name source-buffer))))
+
+      (flymake-log 2 "process %d exited with code %d"
+                   (process-id process) exit-status)
+      (condition-case err
+          (progn
+            (flymake-log 3 "cleaning up using %s" cleanup-f)
+            (when (buffer-live-p source-buffer)
+              (with-current-buffer source-buffer
+                (funcall cleanup-f)))
+
+            (delete-process process)
+            (setq flymake-processes (delq process flymake-processes))
+
+            (when (buffer-live-p source-buffer)
+              (with-current-buffer source-buffer
+
+                (flymake-parse-residual)
+                (flymake-post-syntax-check exit-status command)
+                (setq flymake-is-running nil))))
+        (error
+         (let ((err-str (format "Error in process sentinel for buffer %s: %s"
+                                source-buffer (error-message-string err))))
+           (flymake-log 0 err-str)
+           (with-current-buffer source-buffer
+             (setq flymake-is-running nil))))))))
 
 (defun flymake-post-syntax-check (exit-status command)
   (setq flymake-err-info flymake-new-err-info)
@@ -689,11 +699,6 @@ It's flymake process filter."
            (list flymake-output-residual)))
     (setq flymake-output-residual nil)))
 
-(defvar flymake-err-info nil
-  "Sorted list of line numbers and lists of err info in the form (file, err-text).")
-
-(make-variable-buffer-local 'flymake-err-info)
-
 (defun flymake-er-make-er (line-no line-err-info-list)
   (list line-no line-err-info-list))
 
@@ -703,11 +708,6 @@ It's flymake process filter."
 (defun flymake-er-get-line-err-info-list (err-info)
   (nth 1 err-info))
 
-(defvar flymake-new-err-info nil
-  "Same as `flymake-err-info', effective when a syntax check is in progress.")
-
-(make-variable-buffer-local 'flymake-new-err-info)
-
 ;; getters/setters for line-err-info: (file, line, type, text).
 (defun flymake-ler-make-ler (file line type text &optional full-file)
   (list file line type text full-file))
@@ -897,7 +897,8 @@ Perhaps use text from LINE-ERR-INFO-LIST to enhance highlighting."
     (while (< idx count)
       (setq line-err-info (flymake-parse-line (nth idx lines)))
       (when line-err-info
-        (setq real-file-name (funcall get-real-file-name-f (current-buffer) (flymake-ler-get-file line-err-info)))
+        (setq real-file-name (funcall get-real-file-name-f
+                                      (flymake-ler-get-file line-err-info)))
         (setq line-err-info (flymake-ler-set-full-file line-err-info real-file-name))
 
         (if (flymake-same-files real-file-name source-file-name)
@@ -1131,12 +1132,12 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'."
 ;;   "Remove any formatting made by flymake."
 ;;   )
 
-(defun flymake-get-program-dir (buffer)
-  "Get dir to start program in."
-  (unless (bufferp buffer)
-    (error "Invalid buffer"))
-  (with-current-buffer buffer
-    default-directory))
+;; (defun flymake-get-program-dir (buffer)
+;;   "Get dir to start program in."
+;;   (unless (bufferp buffer)
+;;     (error "Invalid buffer"))
+;;   (with-current-buffer buffer
+;;     default-directory))
 
 (defun flymake-safe-delete-file (file-name)
   (when (and file-name (file-exists-p file-name))
@@ -1168,19 +1169,18 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'."
       (flymake-clear-project-include-dirs-cache)
 
       (setq flymake-check-was-interrupted nil)
-      (setq flymake-buffer-data (flymake-makehash 'equal))
 
       (let* ((source-file-name  buffer-file-name)
              (init-f (flymake-get-init-function source-file-name))
              (cleanup-f (flymake-get-cleanup-function source-file-name))
-             (cmd-and-args (funcall init-f (current-buffer)))
+             (cmd-and-args (funcall init-f))
              (cmd          (nth 0 cmd-and-args))
              (args         (nth 1 cmd-and-args))
              (dir          (nth 2 cmd-and-args)))
         (if (not cmd-and-args)
             (progn
               (flymake-log 0 "init function %s for %s failed, cleaning up" init-f source-file-name)
-              (funcall cleanup-f (current-buffer)))
+              (funcall cleanup-f))
           (progn
             (setq flymake-last-change-time nil)
             (flymake-start-syntax-check-process cmd args dir)))))))
@@ -1193,11 +1193,10 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'."
           (when dir
             (let ((default-directory dir))
               (flymake-log 3 "starting process on dir %s" default-directory)))
-          (setq process (get-process (apply 'start-process "flymake-proc" nil cmd args)))
+          (setq process (apply 'start-process "flymake-proc" (current-buffer) cmd args))
           (set-process-sentinel process 'flymake-process-sentinel)
           (set-process-filter process 'flymake-process-filter)
-
-          (flymake-reg-names (process-id process) (buffer-name))
+          (push process flymake-processes)
 
           (setq flymake-is-running t)
           (setq flymake-last-change-time nil)
@@ -1205,7 +1204,8 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'."
 
           (flymake-report-status nil "*")
           (flymake-log 2 "started process %d, command=%s, dir=%s"
-                       (process-id process) (process-command process) default-directory)
+                       (process-id process) (process-command process)
+                       default-directory)
           process)
       (error
        (let* ((err-str (format "Failed to launch syntax check process '%s' with args %s: %s"
@@ -1213,23 +1213,23 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'."
               (source-file-name buffer-file-name)
               (cleanup-f        (flymake-get-cleanup-function source-file-name)))
          (flymake-log 0 err-str)
-         (funcall cleanup-f (current-buffer))
+         (funcall cleanup-f)
          (flymake-report-fatal-status "PROCERR" err-str))))))
 
-(defun flymake-kill-process (pid &optional rest)
-  "Kill process PID."
-  (signal-process pid 9)
-  (let* ((buffer-name (flymake-get-source-buffer-name pid)))
-    (when (and buffer-name (get-buffer buffer-name))
-      (with-current-buffer (get-buffer buffer-name)
+(defun flymake-kill-process (proc)
+  "Kill process PROC."
+  (kill-process proc)
+  (let* ((buf (process-buffer proc)))
+    (when (buffer-live-p buf)
+      (with-current-buffer buf
         (setq flymake-check-was-interrupted t))))
-  (flymake-log 1 "killed process %d" pid))
+  (flymake-log 1 "killed process %d" (process-id proc)))
 
 (defun flymake-stop-all-syntax-checks ()
   "Kill all syntax check processes."
   (interactive)
-  (let ((pids  (copy-hash-table flymake-pid-to-names)))
-    (maphash 'flymake-kill-process pids)))
+  (while flymake-processes
+    (flymake-kill-process (pop flymake-processes))))
 
 (defun flymake-compilation-is-running ()
   (and (boundp 'compilation-in-progress)
@@ -1241,31 +1241,6 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'."
   (flymake-stop-all-syntax-checks)
   (call-interactively 'compile))
 
-(defvar flymake-is-running nil
-  "If t, flymake syntax check process is running for the current buffer.")
-
-(make-variable-buffer-local 'flymake-is-running)
-
-(defvar flymake-timer nil
-  "Timer for starting syntax check.")
-
-(make-variable-buffer-local 'flymake-timer)
-
-(defvar flymake-last-change-time nil
-  "Time of last buffer change.")
-
-(make-variable-buffer-local 'flymake-last-change-time)
-
-(defvar flymake-check-start-time nil
-  "Time at which syntax check was started.")
-
-(make-variable-buffer-local 'flymake-check-start-time)
-
-(defvar flymake-check-was-interrupted nil
-  "Non-nil if syntax check was killed by `flymake-compile'.")
-
-(make-variable-buffer-local 'flymake-check-was-interrupted)
-
 (defcustom flymake-no-changes-timeout 0.5
   "Time to wait after last change before starting compilation."
   :group 'flymake
@@ -1294,33 +1269,16 @@ For the format of LINE-ERR-INFO, see `flymake-ler-make-ler'."
   "Return number of lines in buffer BUFFER."
   (count-lines (point-min) (point-max)))
 
-(defun flymake-get-point-pixel-pos ()
-  "Return point position in pixels: (x, y)."
-  (let ((mouse-pos  (mouse-position))
-        (pixel-pos  nil)
-        (ret        nil))
-    (if (car (cdr mouse-pos))
-        (progn
-          (set-mouse-position (flymake-selected-frame) (current-column) (flymake-current-row))
-          (setq pixel-pos (mouse-pixel-position))
-          (set-mouse-position (car mouse-pos) (car (cdr mouse-pos)) (cdr (cdr mouse-pos)))
-          (setq ret (list (car (cdr pixel-pos)) (cdr (cdr pixel-pos)))))
-      (progn
-        (setq ret '(0 0))))
-    (flymake-log 3 "mouse pos is %s" ret)
-    ret))
-
 (defun flymake-display-err-menu-for-current-line ()
   "Display a menu with errors/warnings for current line if it has errors and/or warnings."
   (interactive)
   (let* ((line-no             (flymake-current-line-no))
          (line-err-info-list  (nth 0 (flymake-find-err-info flymake-err-info line-no)))
          (menu-data           (flymake-make-err-menu-data line-no line-err-info-list))
-         (choice              nil)
-         (menu-pos            (list (flymake-get-point-pixel-pos) (selected-window))))
+         (choice              nil))
     (if menu-data
         (progn
-          (setq choice (flymake-popup-menu menu-pos menu-data))
+          (setq choice (flymake-popup-menu menu-data))
           (flymake-log 3 "choice=%s" choice)
           (when choice
             (eval choice)))
@@ -1579,20 +1537,14 @@ With arg, turn Flymake mode on if and only if arg is positive."
     (error "Invalid file-name"))
 
   (let* ((dir       (file-name-directory file-name))
+         ;; Not sure what this slash-pos is all about, but I guess it's just
+         ;; trying to remove the leading / of absolute file names.
          (slash-pos (string-match "/" dir))
-         (temp-dir  (concat (file-name-as-directory (flymake-get-temp-dir)) (substring dir (1+ slash-pos)))))
+         (temp-dir  (expand-file-name (substring dir (1+ slash-pos))
+                                      (flymake-get-temp-dir))))
 
-    (file-truename (concat (file-name-as-directory temp-dir)
-                           (file-name-nondirectory file-name)))))
-
-(defun flymake-strrchr (str ch)
-  (let* ((count  (length str))
-         (pos    nil))
-    (while (and (not pos) (> count 0))
-      (if (= ch (elt str (1- count)))
-          (setq pos (1- count)))
-      (setq count (1- count)))
-    pos))
+    (file-truename (expand-file-name (file-name-nondirectory file-name)
+                                     temp-dir))))
 
 (defun flymake-delete-temp-directory (dir-name)
   "Attempt to delete temp dir created by `flymake-create-temp-with-folder-structure', do not fail on error."
@@ -1601,45 +1553,55 @@ With arg, turn Flymake mode on if and only if arg is positive."
          (slash-pos   nil))
 
     (while (> (length suffix) 0)
+      (setq suffix (directory-file-name suffix))
       ;;+(flymake-log 0 "suffix=%s" suffix)
-      (flymake-safe-delete-directory (file-truename (concat (file-name-as-directory temp-dir) suffix)))
-      (setq slash-pos (flymake-strrchr suffix (string-to-char "/")))
-      (if slash-pos
-          (setq suffix (substring suffix 0 slash-pos))
-        (setq suffix "")))))
+      (flymake-safe-delete-directory
+       (file-truename (expand-file-name suffix temp-dir)))
+      (setq suffix (file-name-directory suffix)))))
+
+(defvar flymake-temp-source-file-name nil)
+(make-variable-buffer-local 'flymake-temp-source-file-name)
+
+(defvar flymake-master-file-name nil)
+(make-variable-buffer-local 'flymake-master-file-name)
+
+(defvar flymake-temp-master-file-name nil)
+(make-variable-buffer-local 'flymake-temp-master-file-name)
 
-(defun flymake-init-create-temp-buffer-copy (buffer create-temp-f)
+(defvar flymake-base-dir nil)
+(make-variable-buffer-local 'flymake-base-dir)
+
+(defun flymake-init-create-temp-buffer-copy (create-temp-f)
   "Make a temporary copy of the current buffer, save its name in buffer data and return the name."
-  (let*  ((source-file-name       (buffer-file-name buffer))
+  (let*  ((source-file-name       buffer-file-name)
           (temp-source-file-name  (funcall create-temp-f source-file-name "flymake")))
 
-    (flymake-save-buffer-in-file buffer temp-source-file-name)
-    (flymake-set-buffer-value buffer "temp-source-file-name" temp-source-file-name)
+    (flymake-save-buffer-in-file temp-source-file-name)
+    (setq flymake-temp-source-file-name temp-source-file-name)
     temp-source-file-name))
 
-(defun flymake-simple-cleanup (buffer)
+(defun flymake-simple-cleanup ()
   "Do cleanup after `flymake-init-create-temp-buffer-copy'.
 Delete temp file."
-  (let* ((temp-source-file-name (flymake-get-buffer-value buffer "temp-source-file-name")))
-    (flymake-safe-delete-file temp-source-file-name)
-    (with-current-buffer buffer
-      (setq flymake-last-change-time nil))))
+  (flymake-safe-delete-file flymake-temp-source-file-name)
+  (setq flymake-last-change-time nil))
 
-(defun flymake-get-real-file-name (buffer file-name-from-err-msg)
+(defun flymake-get-real-file-name (file-name-from-err-msg)
   "Translate file name from error message to \"real\" file name.
 Return full-name.  Names are real, not patched."
-  (let* ((real-name              nil)
-         (source-file-name       (buffer-file-name buffer))
-         (master-file-name       (flymake-get-buffer-value buffer "master-file-name"))
-         (temp-source-file-name  (flymake-get-buffer-value buffer "temp-source-file-name"))
-         (temp-master-file-name  (flymake-get-buffer-value buffer "temp-master-file-name"))
-         (base-dirs              (list (flymake-get-buffer-value buffer "base-dir")
-                                       (file-name-directory source-file-name)
-                                       (if master-file-name (file-name-directory master-file-name) nil)))
-         (files                  (list (list source-file-name       source-file-name)
-                                       (list temp-source-file-name  source-file-name)
-                                       (list master-file-name       master-file-name)
-                                       (list temp-master-file-name  master-file-name))))
+  (let* ((real-name             nil)
+         (source-file-name      buffer-file-name)
+         (master-file-name      flymake-master-file-name)
+         (temp-source-file-name flymake-temp-source-file-name)
+         (temp-master-file-name flymake-temp-master-file-name)
+         (base-dirs
+          (list flymake-base-dir
+                (file-name-directory source-file-name)
+                (if master-file-name (file-name-directory master-file-name))))
+         (files (list (list source-file-name       source-file-name)
+                      (list temp-source-file-name  source-file-name)
+                      (list master-file-name       master-file-name)
+                      (list temp-master-file-name  master-file-name))))
 
     (when (equal 0 (length file-name-from-err-msg))
       (setq file-name-from-err-msg source-file-name))
@@ -1687,27 +1649,23 @@ Return full-name.  Names are real, not patched."
             (setq base-dirs-count (1- base-dirs-count))))))
     real-name))
 
-(defun flymake-init-find-buildfile-dir (buffer source-file-name buildfile-name)
+(defun flymake-init-find-buildfile-dir (source-file-name buildfile-name)
   "Find buildfile, store its dir in buffer data and return its dir, if found."
-  (let* ((buildfile-dir  (flymake-find-buildfile buildfile-name
-                                                 (file-name-directory source-file-name)
-                                                 flymake-buildfile-dirs)))
-    (if (not buildfile-dir)
-        (progn
-          (flymake-log 1 "no buildfile (%s) for %s" buildfile-name source-file-name)
-          (with-current-buffer buffer
-            (flymake-report-fatal-status "NOMK" (format "No buildfile (%s) found for %s" buildfile-name source-file-name)))
-          )
-      (progn
-        (flymake-set-buffer-value buffer "base-dir" buildfile-dir)))
-    buildfile-dir))
+  (let* ((buildfile-dir
+          (flymake-find-buildfile buildfile-name
+                                  (file-name-directory source-file-name)
+                                  flymake-buildfile-dirs)))
+    (if buildfile-dir
+        (setq flymake-base-dir buildfile-dir)
+      (flymake-log 1 "no buildfile (%s) for %s" buildfile-name source-file-name)
+      (flymake-report-fatal-status
+       "NOMK" (format "No buildfile (%s) found for %s"
+                      buildfile-name source-file-name)))))
 
-(defun flymake-init-create-temp-source-and-master-buffer-copy (buffer get-incl-dirs-f create-temp-f master-file-masks include-regexp-list)
+(defun flymake-init-create-temp-source-and-master-buffer-copy (get-incl-dirs-f create-temp-f master-file-masks include-regexp-list)
   "Find master file (or buffer), create it's copy along with a copy of the source file."
-  (let* ((source-file-name       (buffer-file-name buffer))
-         (temp-source-file-name  (flymake-init-create-temp-buffer-copy buffer create-temp-f))
-         (master-file-name       nil)
-         (temp-master-file-name  nil)
+  (let* ((source-file-name       buffer-file-name)
+         (temp-source-file-name  (flymake-init-create-temp-buffer-copy create-temp-f))
          (master-and-temp-master (flymake-create-master-file
                                   source-file-name temp-source-file-name
                                   get-incl-dirs-f create-temp-f
@@ -1716,21 +1674,14 @@ Return full-name.  Names are real, not patched."
     (if (not master-and-temp-master)
         (progn
           (flymake-log 1 "cannot find master file for %s" source-file-name)
-          (when (bufferp buffer)
-            (with-current-buffer buffer
-              (flymake-report-status "!" "")))  ; NOMASTER
-          )
-      (progn
-        (setq master-file-name       (nth 0 master-and-temp-master))
-        (setq temp-master-file-name  (nth 1 master-and-temp-master))
-        (flymake-set-buffer-value buffer "master-file-name"      master-file-name)
-        (flymake-set-buffer-value buffer "temp-master-file-name" temp-master-file-name)
-        ))
-    temp-master-file-name))
+          (flymake-report-status "!" "")        ; NOMASTER
+          nil)
+      (setq flymake-master-file-name (nth 0 master-and-temp-master))
+      (setq flymake-temp-master-file-name (nth 1 master-and-temp-master)))))
 
-(defun flymake-master-cleanup (buffer)
-  (flymake-simple-cleanup buffer)
-  (flymake-safe-delete-file (flymake-get-buffer-value buffer "temp-master-file-name")))
+(defun flymake-master-cleanup ()
+  (flymake-simple-cleanup)
+  (flymake-safe-delete-file flymake-temp-master-file-name))
 
 ;;;; make-specific init-cleanup routines
 (defun flymake-get-syntax-check-program-args (source-file-name base-dir use-relative-base-dir use-relative-source get-cmd-line-f)
@@ -1762,30 +1713,30 @@ Return full-name.  Names are real, not patched."
               (concat "-DCHK_SOURCES=" source)
               "check-syntax")))
 
-(defun flymake-simple-make-init-impl (buffer create-temp-f use-relative-base-dir use-relative-source build-file-name get-cmdline-f)
+(defun flymake-simple-make-init-impl (create-temp-f use-relative-base-dir use-relative-source build-file-name get-cmdline-f)
   "Create syntax check command line for a directly checked source file.
 Use CREATE-TEMP-F for creating temp copy."
   (let* ((args nil)
-         (source-file-name   (buffer-file-name buffer))
-         (buildfile-dir      (flymake-init-find-buildfile-dir buffer source-file-name build-file-name)))
+         (source-file-name   buffer-file-name)
+         (buildfile-dir      (flymake-init-find-buildfile-dir source-file-name build-file-name)))
     (if buildfile-dir
-        (let* ((temp-source-file-name  (flymake-init-create-temp-buffer-copy buffer create-temp-f)))
+        (let* ((temp-source-file-name  (flymake-init-create-temp-buffer-copy create-temp-f)))
           (setq args (flymake-get-syntax-check-program-args temp-source-file-name buildfile-dir
                                                             use-relative-base-dir use-relative-source
                                                             get-cmdline-f))))
     args))
 
-(defun flymake-simple-make-init (buffer)
-  (flymake-simple-make-init-impl buffer 'flymake-create-temp-inplace t t "Makefile" 'flymake-get-make-cmdline))
+(defun flymake-simple-make-init ()
+  (flymake-simple-make-init-impl 'flymake-create-temp-inplace t t "Makefile" 'flymake-get-make-cmdline))
 
-(defun flymake-master-make-init (buffer get-incl-dirs-f master-file-masks include-regexp-list)
+(defun flymake-master-make-init (get-incl-dirs-f master-file-masks include-regexp-list)
   "Create make command line for a source file checked via master file compilation."
   (let* ((make-args nil)
          (temp-master-file-name (flymake-init-create-temp-source-and-master-buffer-copy
-                                 buffer get-incl-dirs-f 'flymake-create-temp-inplace
+                                 get-incl-dirs-f 'flymake-create-temp-inplace
                                  master-file-masks include-regexp-list)))
     (when temp-master-file-name
-      (let* ((buildfile-dir (flymake-init-find-buildfile-dir buffer temp-master-file-name "Makefile")))
+      (let* ((buildfile-dir (flymake-init-find-buildfile-dir temp-master-file-name "Makefile")))
         (if  buildfile-dir
             (setq make-args (flymake-get-syntax-check-program-args
                              temp-master-file-name buildfile-dir nil nil 'flymake-get-make-cmdline)))))
@@ -1795,30 +1746,29 @@ Use CREATE-TEMP-F for creating temp copy."
   (flymake-find-buildfile "Makefile" source-dir flymake-buildfile-dirs))
 
 ;;;; .h/make specific
-(defun flymake-master-make-header-init (buffer)
-  (flymake-master-make-init buffer
-                            'flymake-get-include-dirs
-                            '(".+\\.cpp$" ".+\\.c$")
+(defun flymake-master-make-header-init ()
+  (flymake-master-make-init 'flymake-get-include-dirs
+                            '("\\.cpp\\'" "\\.c\\'")
                             '("[ \t]*#[ \t]*include[ \t]*\"\\([\w0-9/\\_\.]*[/\\]*\\)\\(%s\\)\"" 1 2)))
 
 ;;;; .java/make specific
-(defun flymake-simple-make-java-init (buffer)
-  (flymake-simple-make-init-impl buffer 'flymake-create-temp-with-folder-structure nil nil "Makefile" 'flymake-get-make-cmdline))
+(defun flymake-simple-make-java-init ()
+  (flymake-simple-make-init-impl 'flymake-create-temp-with-folder-structure nil nil "Makefile" 'flymake-get-make-cmdline))
 
-(defun flymake-simple-ant-java-init (buffer)
-  (flymake-simple-make-init-impl buffer 'flymake-create-temp-with-folder-structure nil nil "build.xml" 'flymake-get-ant-cmdline))
+(defun flymake-simple-ant-java-init ()
+  (flymake-simple-make-init-impl 'flymake-create-temp-with-folder-structure nil nil "build.xml" 'flymake-get-ant-cmdline))
 
-(defun flymake-simple-java-cleanup (buffer)
+(defun flymake-simple-java-cleanup ()
   "Cleanup after `flymake-simple-make-java-init' -- delete temp file and dirs."
-  (let* ((temp-source-file-name (flymake-get-buffer-value buffer "temp-source-file-name")))
-    (flymake-safe-delete-file temp-source-file-name)
-    (when temp-source-file-name
-      (flymake-delete-temp-directory (file-name-directory temp-source-file-name)))))
+  (flymake-safe-delete-file flymake-temp-source-file-name)
+  (when flymake-temp-source-file-name
+    (flymake-delete-temp-directory
+     (file-name-directory flymake-temp-source-file-name))))
 
 ;;;; perl-specific init-cleanup routines
-(defun flymake-perl-init (buffer)
+(defun flymake-perl-init ()
   (let* ((temp-file   (flymake-init-create-temp-buffer-copy
-                       buffer 'flymake-create-temp-inplace))
+                       'flymake-create-temp-inplace))
          (local-file  (concat (flymake-build-relative-filename
                                (file-name-directory buffer-file-name)
                                (file-name-directory temp-file))
@@ -1830,13 +1780,13 @@ Use CREATE-TEMP-F for creating temp copy."
   ;;(list "latex" (list "-c-style-errors" file-name))
   (list "texify" (list "--pdf" "--tex-option=-c-style-errors" file-name)))
 
-(defun flymake-simple-tex-init (buffer)
-  (flymake-get-tex-args (flymake-init-create-temp-buffer-copy buffer 'flymake-create-temp-inplace)))
+(defun flymake-simple-tex-init ()
+  (flymake-get-tex-args (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace)))
 
-(defun flymake-master-tex-init (buffer)
+(defun flymake-master-tex-init ()
   (let* ((temp-master-file-name (flymake-init-create-temp-source-and-master-buffer-copy
-                                 buffer 'flymake-get-include-dirs-dot 'flymake-create-temp-inplace
-                                 '(".+\\.tex$")
+                                 'flymake-get-include-dirs-dot 'flymake-create-temp-inplace
+                                 '("\\.tex\\'")
                                  '("[ \t]*\\input[ \t]*{\\(.*\\)\\(%s\\)}" 1 2))))
     (when temp-master-file-name
       (flymake-get-tex-args temp-master-file-name))))
@@ -1845,8 +1795,8 @@ Use CREATE-TEMP-F for creating temp copy."
   '("."))
 
 ;;;; xml-specific init-cleanup routines
-(defun flymake-xml-init (buffer)
-  (list "xml" (list "val" (flymake-init-create-temp-buffer-copy buffer 'flymake-create-temp-inplace))))
+(defun flymake-xml-init ()
+  (list "xml" (list "val" (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace))))
 
 (provide 'flymake)
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 77345333137..01a1cc74a5a 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3061,10 +3061,12 @@ it is possible that the region may have changed")
   "Hook run when the mark becomes inactive.")
 
 (defun mark (&optional force)
-  "Return this buffer's mark value as integer; error if mark inactive.
-If optional argument FORCE is non-nil, access the mark value
-even if the mark is not currently active, and return nil
-if there is no mark at all.
+  "Return this buffer's mark value as integer, or nil if never set.
+
+In Transient Mark mode, this function signals an error if
+the mark is not active.  However, if `mark-even-if-inactive' is non-nil,
+or the argument FORCE is non-nil, it disregards whether the mark
+is active, and returns an integer or nil in the usual way.
 
 If you are using this in an editing command, you are most likely making
 a mistake; see the documentation of `set-mark'."
@@ -3679,15 +3681,13 @@ and `current-column' to be able to ignore invisible text."
             (goto-char (previous-char-property-change (point) line-beg))))))))
 
 (defun move-end-of-line (arg)
-  "Move point to end of current line.
+  "Move point to end of current line as displayed.
+\(If there's an image in the line, this disregards newlines
+which are part of the text that the image rests on.)
+
 With argument ARG not nil or 1, move forward ARG - 1 lines first.
 If point reaches the beginning or end of buffer, it stops there.
-To ignore intangibility, bind `inhibit-point-motion-hooks' to t.
-
-This command does not move point across a field boundary unless doing so
-would move beyond there to a different line; if ARG is nil or 1, and
-point starts at a field boundary, point does not move.  To ignore field
-boundaries bind `inhibit-field-text-motion' to t."
+To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
   (interactive "p")
   (or arg (setq arg 1))
   (let (done)
@@ -3715,15 +3715,13 @@ boundaries bind `inhibit-field-text-motion' to t."
             (setq done t)))))))
 
 (defun move-beginning-of-line (arg)
-  "Move point to beginning of current display line.
+  "Move point to beginning of current line as displayed.
+\(If there's an image in the line, this disregards newlines
+which are part of the text that the image rests on.)
+
 With argument ARG not nil or 1, move forward ARG - 1 lines first.
 If point reaches the beginning or end of buffer, it stops there.
-To ignore intangibility, bind `inhibit-point-motion-hooks' to t.
-
-This command does not move point across a field boundary unless doing so
-would move beyond there to a different line; if ARG is nil or 1, and
-point starts at a field boundary, point does not move.  To ignore field
-boundaries bind `inhibit-field-text-motion' to t."
+To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
   (interactive "p")
   (or arg (setq arg 1))
   (if (/= arg 1)
diff --git a/lisp/startup.el b/lisp/startup.el
index 21e9fce07c1..2db01f1eecb 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1,7 +1,7 @@
 ;;; startup.el --- process Emacs shell arguments
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -1250,7 +1250,7 @@ where FACE is a valid face specification, as it can be used with
                          (emacs-version)
                          "\n"
                          :face '(variable-pitch :height 0.5)
-                         "Copyright (C) 2005 Free Software Foundation, Inc.")
+                         "Copyright (C) 2006 Free Software Foundation, Inc.")
     (and auto-save-list-file-prefix
          ;; Don't signal an error if the
          ;; directory for auto-save-list files
@@ -1439,7 +1439,7 @@ More Manuals / Ordering Manuals    How to order printed manuals from the FSF
 ")
                   (insert "\n\n" (emacs-version)
                           "
-Copyright (C) 2005 Free Software Foundation, Inc."))
+Copyright (C) 2006 Free Software Foundation, Inc."))
 
               ;; No mouse menus, so give help using kbd commands.
 
@@ -1487,7 +1487,7 @@ If you have no Meta key, you may instead type ESC followed by the character.)")
 
               (insert "\n\n" (emacs-version)
                       "
-Copyright (C) 2005 Free Software Foundation, Inc.")
+Copyright (C) 2006 Free Software Foundation, Inc.")
 
               (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
                        (eq (key-binding "\C-h\C-d") 'describe-distribution)
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 6feaa347c8b..dea988868eb 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1381,7 +1381,7 @@ in `selection-converter-alist', which see."
 (put 'core-event     'mac-apple-event-class "aevt") ; kCoreEventClass
 (put 'internet-event 'mac-apple-event-class "GURL") ; kAEInternetEventClass
 
-;;; Event IDs 
+;;; Event IDs
 ;; kCoreEventClass
 (put 'open-application   'mac-apple-event-id "oapp") ; kAEOpenApplication
 (put 'reopen-application 'mac-apple-event-id "rapp") ; kAEReopenApplication
@@ -1409,14 +1409,14 @@ in `selection-converter-alist', which see."
       (error "Not an Apple event: %S" ae)
     (let ((type-data (cdr (assoc keyword (cdr ae))))
           data)
-      (when (and type type-data)
+      (when (and type type-data (not (equal type (car type-data))))
         (setq data (mac-coerce-ae-data (car type-data) (cdr type-data) type))
         (setq type-data (if data (cons type data) nil)))
       type-data)))
 
 (defun mac-ae-list (ae &optional keyword type)
   (or keyword (setq keyword "----")) ;; Direct object.
-  (let ((desc (mac-ae-parameter ae keyword)))
+  (let ((desc (mac-ae-parameter ae keyword "list")))
     (cond ((null desc)
            nil)
           ((not (equal (car desc) "list"))
@@ -1588,6 +1588,9 @@ Currently the `mailto' scheme is supported."
       (setq service-message
             (intern (decode-coding-string service-message 'utf-8)))
       (setq binding (lookup-key binding (vector service-message))))
+    ;; Replace (cadr event) with a dummy position so that event-start
+    ;; returns it.
+    (setcar (cdr event) (list (selected-window) (point) '(0 . 0) 0))
     (call-interactively binding)))
 
 (global-set-key [mac-apple-event] 'mac-dispatch-apple-event)
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 33582af28b9..39d4b1f7b69 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1,7 +1,7 @@
 ;;; flyspell.el --- on-the-fly spell checker
 
 ;; Copyright (C) 1998, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Manuel Serrano <Manuel.Serrano@sophia.inria.fr>
 ;; Maintainer: FSF
@@ -504,11 +504,11 @@ in your .emacs file.
 (defvar flyspell-last-buffer nil
   "The buffer in which the last flyspell operation took place.")
 
-(defun flyspell-accept-buffer-local-defs ()
+(defun flyspell-accept-buffer-local-defs (&optional force)
   ;; When flyspell-word is used inside a loop (e.g. when processing
   ;; flyspell-changes), the calls to `ispell-accept-buffer-local-defs' end
   ;; up dwarfing everything else, so only do it when the buffer has changed.
-  (unless (eq flyspell-last-buffer (current-buffer))
+  (when (or force (not (eq flyspell-last-buffer (current-buffer))))
     (setq flyspell-last-buffer (current-buffer))
     ;; Strange problem:  If buffer in current window has font-lock turned on,
     ;; but SET-BUFFER was called to point to an invisible buffer, this ispell
@@ -539,7 +539,9 @@ in your .emacs file.
   ;; we have to force ispell to accept the local definition or
   ;; otherwise it could be too late, the local dictionary may
   ;; be forgotten!
-  (flyspell-accept-buffer-local-defs)
+  ;; Pass the `force' argument for the case where flyspell was active already
+  ;; but the buffer's local-defs have been edited.
+  (flyspell-accept-buffer-local-defs 'force)
   ;; we put the `flyspell-delayed' property on some commands
   (flyspell-delay-commands)
   ;; we put the `flyspell-deplacement' property on some commands
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 3cdc40b9f32..dfb169769d3 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -1,11 +1,11 @@
 ;;; org.el --- Outline-based notes management and organize
 ;; Carstens outline-mode for keeping track of everything.
-;; Copyright (c) 2004, 2005 Free Software Foundation
+;; Copyright (c) 2004, 2005, 2006 Free Software Foundation
 ;;
 ;; 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.01
+;; Version: 4.02
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -79,8 +79,12 @@
 ;; excellent reference card made by Philip Rooke.  This card can be found
 ;; in the etc/ directory of Emacs 22.
 ;;
-;; Changes:
-;; -------
+;; Changes since version 4.00:
+;; ---------------------------
+;; Version 4.02
+;;    - Minor bug fixes and improvements around tag searches.
+;;    - XEmacs compatibility fixes.
+;;
 ;; Version 4.01
 ;;    - Tags can also be set remotely from agenda buffer.
 ;;    - Boolean logic for tag searches.
@@ -88,178 +92,6 @@
 ;;      `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.
-;;    - `org-agenda' has now become a dispatcher that will produce the agenda
-;;      and other views on org-mode data with an additional keypress.
-;;
-;; Version 3.24
-;;    - Switching and item to DONE records a time stamp when the variable
-;;      `org-log-done' is turned on.  Default is off.
-;;
-;; Version 3.23
-;;    - M-RET makes new items as well as new headings.
-;;    - Various small bug fixes
-;;
-;; Version 3.22
-;;    - CamelCase words link to other locations in the same file.
-;;    - File links accept search options, to link to specific locations.
-;;    - Plain list items can be folded with `org-cycle'.  See new option
-;;      `org-cycle-include-plain-lists'.
-;;    - Sparse trees for specific TODO keywords through numeric prefix
-;;      argument to `C-c C-v'.
-;;    - Global TODO list, also for specific keywords.
-;;    - Matches in sparse trees are highlighted (highlights disappear with
-;;      next buffer change due to editing).
-;;
-;; Version 3.21
-;;    - Improved CSS support for the HTML export.  Thanks to Christian Egli.
-;;    - Editing support for hand-formatted lists
-;;      - M-S-cursor keys handle plain list items
-;;      - C-c C-c renumbers ordered plain lists
-;;
-;; Version 3.20
-;;    - There is finally an option to make TAB jump over horizontal lines
-;;      in tables instead of creating a new line before that line.
-;;      The option is `org-table-tab-jumps-over-hlines', default nil.
-;;    - New command for sorting tables, on `C-c ^'.
-;;    - Changes to the HTML exporter
-;;      - hand-formatted lists are exported correctly, similar to
-;;        markdown lists.  Nested lists are possible.  See the docstring
-;;        of the variable `org-export-plain-list-max-depth'.
-;;      - cleaned up to produce valid HTML 4.0 (transitional).
-;;      - support for cascading style sheets.
-;;    - New command to cycle through all agenda files, on C-,
-;;    - C-c [ can now also be used to change the sequence of agenda files.
-;;
-;; Version 3.19
-;;    - Bug fixes
-;;
-;; Version 3.18
-;;    - Export of calendar information in the standard iCalendar format.
-;;    - Some bug fixes.
-;;
-;; Version 3.17
-;;    - HTML export specifies character set depending on coding-system.
-;;
-;; Version 3.16
-;;    - In tables, directly after the field motion commands like TAB and RET,
-;;      typing a character will blank the field.  Can be turned off with
-;;      variable `org-table-auto-blank-field'.
-;;    - Inactive timestamps with `C-c !'.  These do not trigger the agenda
-;;      and are not linked to the calendar.
-;;    - Additional key bindings to allow Org-mode to function on a tty emacs.
-;;    - `C-c C-h' prefix key replaced by `C-c C-x', and `C-c C-x C-h' replaced
-;;      by `C-c C-x b' (b=Browser).  This was necessary to recover the
-;;      standard meaning of C-h after a prefix key (show prefix bindings).
-;;
-;; Version 3.15
-;;    - QUOTE keyword at the beginning of an entry causes fixed-width export
-;;      of unmodified entry text. `C-c :' toggles this keyword.
-;;    - New face `org-special-keyword' which is used for COMMENT, QUOTE,
-;;      DEADLINE and SCHEDULED, and priority cookies.  Default is only a weak
-;;      color, to reduce the amount of aggressive color in the buffer.
-;;
-;; Version 3.14
-;;    - Formulas for individual fields in table.
-;;    - Automatic recalculation in calculating tables.
-;;    - Named fields and columns in tables.
-;;    - Fixed bug with calling `org-archive' several times in a row.
-;;
-;; Version 3.13
-;;    - Efficiency improvements:  Fewer table re-alignments needed.
-;;    - New special lines in tables, for defining names for individual cells.
-;;
-;; Version 3.12
-;;    - Tables can store formulas (one per column) and compute fields.
-;;      Not quite like a full spreadsheet, but very powerful.
-;;    - table.el keybinding is now `C-c ~'.
-;;    - Numeric argument to org-cycle does `show-subtree' above on level ARG.
-;;    - Small changes to keys in agenda buffer.  Affected keys:
-;;      [w] weekly view; [d] daily view; [D] toggle diary inclusion.
-;;    - Bug fixes.
-;;
-;; Version 3.11
-;;    - Links inserted with C-c C-l are now by default enclosed in angle
-;;      brackets.  See the new variable `org-link-format'.
-;;    - ">" terminates a link, this is a way to have several links in a line.
-;;      Both "<" and ">" are no longer allowed as characters in a link.
-;;    - Archiving of finished tasks.
-;;    - C-<up>/<down> bindings removed, to allow access to paragraph commands.
-;;    - Compatibility with CUA-mode (see variable `org-CUA-compatible').
-;;    - Compatibility problems with viper-mode fixed.
-;;    - Improved html export of tables.
-;;    - Various clean-up changes.
-;;
-;; Version 3.10
-;;    - Using `define-derived-mode' to derive `org-mode' from `outline-mode'.
-;;
-;; Version 3.09
-;;    - Time-of-day specifications in agenda are extracted and placed
-;;      into the prefix.  Timed entries can be placed into a time grid for
-;;      day.
-;;
-;; Version 3.08
-;;    - "|" no longer allowed as part of a link, to allow links in tables.
-;;    - The prefix of items in the agenda buffer can be configured.
-;;    - Cleanup.
-;;
-;; Version 3.07
-;;    - Some folding inconsistencies removed.
-;;    - BBDB links to company-only entries.
-;;    - Bug fixes and global cleanup.
-;;
-;; Version 3.06
-;;    - M-S-RET inserts a new TODO heading.
-;;    - New startup option `content'.
-;;    - Better visual response when TODO items in agenda change status.
-;;    - Window positioning after visibility state changes optimized and made
-;;      configurable.  See `org-cycle-hook' and `org-occur-hook'.
-;;
-;; Version 3.05
-;;    - Agenda entries from the diary are linked to the diary file, so
-;;      adding and editing diary entries can be done directly from the agenda.
-;;    - Many calendar/diary commands available directly from agenda.
-;;    - Field copying in tables with S-RET does increment.
-;;    - C-c C-x C-v extracts the visible part of the buffer for printing.
-;;    - Moving subtrees up and down preserves the whitespace at the tree end.
-;;
-;; Version 3.04
-;;    - Table editor optimized to need fewer realignments, and to keep
-;;      table shape when typing in fields.
-;;    - A new minor mode, orgtbl-mode, introduces the Org-mode table editor
-;;      into arbitrary major modes.
-;;    - Fixed bug with realignment in XEmacs.
-;;    - Startup options can be set with special #+STARTUP line.
-;;    - Heading following a match in org-occur can be suppressed.
-;;
-;; Version 3.03
-;;    - Copyright transfer to the FSF.
-;;    - Effect of C-u and C-u C-u in org-timeline swapped.
-;;    - Timeline now always contains today, and `.' jumps to it.
-;;    - Table editor:
-;;      - cut and paste of rectangular regions in tables
-;;      - command to convert org-mode table to table.el table and back
-;;      - command to treat several cells like a paragraph and fill it
-;;      - command to convert a buffer region to a table
-;;      - import/export tables as tab-separated files (exchange with Excel)
-;;    - Agenda:
-;;      - Sorting mechanism for agenda items rewritten from scratch.
-;;      - Sorting fully configurable.
-;;      - Entries specifying a time are sorted together.
-;;    - Completion also covers option keywords after `#-'.
-;;    - Bug fixes.
-;;
-;; Version 3.01
-;;    - New reference card, thanks to Philip Rooke for creating it.
-;;    - Single file agenda renamed to "Timeline".  It no longer shows
-;;      warnings about upcoming deadlines/overdue scheduled items.
-;;      That functionality is now limited to the (multifile) agenda.
-;;    - When reading a date, the calendar can be manipulated with keys.
-;;    - Link support for RMAIL and Wanderlust (from planner.el, untested).
-;;    - Minor bug fixes and documentation improvements.
-
 ;;; Code:
 
 (eval-when-compile (require 'cl) (require 'calendar))
@@ -601,21 +433,31 @@ 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"))
+(defcustom org-agenda-custom-commands '(("w" todo "WAITING"))
   "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."
+key    The key (a single char as a string) to be associated with the command.
+type   The command type, any of the following symbols:
+        todo        Entries with a specific TODO keyword, in all agenda files.
+        tags        Tags match in all agenda files.
+        todo-tree   Sparse tree of specific TODO keyword in *current* file.
+        tags-tree   Sparse tree with all tags matches in *current* file.
+        occur-tree  Occur sparse tree for current file.
+match  What to search for:
+        - a single keyword for TODO keyword searches
+        - a tags match expression for tags searches
+        - a regular expression for occur searches"
   :group 'org-agenda
   :type '(repeat
           (list (string :tag "Key")
-                (choice :tag "Type" (const tags) (const todo))
+                (choice :tag "Type"
+                        (const :tag "Tags search in all agenda files" tags)
+                        (const :tag "TODO keyword search in all agenda files" todo)
+                        (const :tag "Tags sparse tree in current buffer" tags-tree)
+                        (const :tag "TODO keyword tree in current buffer" todo-tree)
+                        (const :tag "Occur tree in current buffer" occur-tree))
                 (string :tag "Match"))))
 
 (defcustom org-select-timeline-window t
@@ -1036,7 +878,11 @@ 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.
 This option is off by default, because inheritance in on.  If you turn
-inheritance off, you very likely want to turn this option on."
+inheritance off, you very likely want to turn this option on.
+
+As a special case, if the tag search is restricted to TODO items, the
+value of this variable is ignored and sublevels are always checked, to
+make sure all corresponding TODO items find their way into the list."
   :group 'org-tags
   :type 'boolean)
 
@@ -2137,6 +1983,12 @@ The following commands are available:
   (make-local-hook 'before-change-functions)  ;; needed for XEmacs
   (add-hook 'before-change-functions 'org-before-change-function nil
             'local)
+  ;; FIXME: The following does not work because isearch-mode-end-hook
+  ;; is called *before* the visibility overlays as removed.
+  ;; There should be another hook then for me to be used.
+;;  (make-local-hook 'isearch-mode-end-hook)  ;; needed for XEmacs
+;;  (add-hook 'isearch-mode-end-hook 'org-show-hierarchy-above nil
+;;          'local)
   ;; Paragraphs and auto-filling
   (org-set-autofill-regexps)
   ;; Settings for Calc embedded mode
@@ -2173,6 +2025,13 @@ The following commands are available:
 (defsubst org-current-line (&optional pos)
   (+ (if (bolp) 1 0) (count-lines (point-min) (or pos (point)))))
 
+
+;; FIXME: Do we need to copy?
+(defun org-string-props (string &rest properties)
+  "Add PROPERTIES to string."
+  (add-text-properties 0 (length string) properties string)
+  string)
+
 ;;; Font-Lock stuff
 
 (defvar org-mouse-map (make-sparse-keymap))
@@ -2452,7 +2311,7 @@ The following commands are available:
                         (get-char-property (1- (point)) 'invisible))
               (beginning-of-line 2)) (setq eol (point)))
           (outline-end-of-heading)   (setq eoh (point))
-          (outline-end-of-subtree)   (setq eos (point))
+          (org-end-of-subtree t)     (setq eos (point))
           (outline-next-heading))
         ;; Find out what to do next and set `this-command'
         (cond
@@ -2513,7 +2372,7 @@ This function is the default value of the hook `org-cycle-hook'."
 (defun org-subtree-end-visible-p ()
   "Is the end of the current subtree visible?"
   (pos-visible-in-window-p
-   (save-excursion (outline-end-of-subtree) (point))))
+   (save-excursion (org-end-of-subtree t) (point))))
 
 (defun org-first-headline-recenter (&optional N)
   "Move cursor to the first headline and recenter the headline.
@@ -3626,25 +3485,43 @@ that the match should indeed be shown."
 
 (defun org-show-hierarchy-above ()
   "Make sure point and the headings hierarchy above is visible."
-  (if (org-on-heading-p t)
-      (org-flag-heading nil)    ; only show the heading
-    (and (org-invisible-p) (org-show-hidden-entry)))    ; show entire entry
-  (save-excursion
-    (and org-show-following-heading
-         (outline-next-heading)
-         (org-flag-heading nil)))  ; show the next heading
-  (when org-show-hierarchy-above
-    (save-excursion                  ; show all higher headings
-      (while (condition-case nil
-                 (progn (org-up-heading-all 1) t)
-               (error nil))
-        (org-flag-heading nil)))))
+  (catch 'exit
+    (if (org-on-heading-p t)
+        (org-flag-heading nil)    ; only show the heading
+      (and (org-invisible-p) (org-show-hidden-entry)))    ; show entire entry
+    (save-excursion
+      (and org-show-following-heading
+           (outline-next-heading)
+           (org-flag-heading nil)))  ; show the next heading
+    (when org-show-hierarchy-above
+      (save-excursion                  ; show all higher headings
+        (while (and (condition-case nil
+                        (progn (org-up-heading-all 1) t)
+                      (error nil))
+                    (not (bobp)))
+          (org-flag-heading nil))))))
+
+;; Overlay compatibility functions
+(defun org-make-overlay (beg end &optional buffer)
+  (if org-xemacs-p (make-extent beg end buffer) (make-overlay beg end buffer)))
+(defun org-delete-overlay (ovl)
+  (if org-xemacs-p (delete-extent ovl) (delete-overlay ovl)))
+(defun org-detatch-overlay (ovl) 
+  (if org-xemacs-p (detach-extent ovl) (delete-overlay ovl)))
+(defun org-move-overlay (ovl beg end &optional buffer)
+  (if org-xemacs-p
+      (set-extent-endpoints ovl beg end buffer)
+    (move-overlay ovl beg end buffer)))
+(defun org-overlay-put (ovl prop value)
+  (if org-xemacs-p
+      (set-extent-property ovl prop value)
+    (overlay-put ovl prop value)))
 
 (defvar org-occur-highlights nil)
 (defun org-highlight-new-match (beg end)
   "Highlight from BEG to END and mark the highlight is an occur headline."
-  (let ((ov (make-overlay beg end)))
-    (overlay-put ov 'face 'secondary-selection)
+  (let ((ov (org-make-overlay beg end)))
+    (org-overlay-put ov 'face 'secondary-selection)
     (push ov org-occur-highlights)))
 
 (defun org-remove-occur-highlights (&optional beg end noremove)
@@ -3652,7 +3529,7 @@ that the match should indeed be shown."
 BEG and END are ignored.  If NOREMOVE is nil, remove this function
 from the before-change-functions in the current buffer."
   (interactive)
-  (mapc 'delete-overlay org-occur-highlights)
+  (mapc 'org-delete-overlay org-occur-highlights)
   (setq org-occur-highlights nil)
   (unless noremove
     (remove-hook 'before-change-functions
@@ -3786,6 +3663,10 @@ So these are more for recording a certain time/date."
     (setq fmt (concat "[" (substring fmt 1 -1) "]"))
     (insert (format-time-string fmt time))))
 
+(defvar org-date-ovl (org-make-overlay 1 1))
+(org-overlay-put org-date-ovl 'face 'org-warning)
+(org-detatch-overlay org-date-ovl)
+
 ;;; FIXME: Make the function take "Fri" as "next friday"
 ;;; because these are mostly being used to record the current time.
 (defun org-read-date (&optional with-time to-time)
@@ -3847,12 +3728,15 @@ used to insert the time stamp into the buffer to include the time."
             (calendar-forward-day (- (time-to-days default-time)
                                      (calendar-absolute-from-gregorian
                                       (calendar-current-date))))
+            (org-eval-in-calendar nil)
             (let* ((old-map (current-local-map))
                    (map (copy-keymap calendar-mode-map))
                    (minibuffer-local-map (copy-keymap minibuffer-local-map)))
               (define-key map (kbd "RET") 'org-calendar-select)
               (define-key map (if org-xemacs-p [button1] [mouse-1])
-                'org-calendar-select)
+                'org-calendar-select-mouse)
+              (define-key map (if org-xemacs-p [button2] [mouse-2])
+                'org-calendar-select-mouse)
               (define-key minibuffer-local-map [(meta shift left)]
                 (lambda () (interactive)
                   (org-eval-in-calendar '(calendar-backward-month 1))))
@@ -3885,6 +3769,7 @@ used to insert the time stamp into the buffer to include the time."
                 (use-local-map old-map)))))
       ;; Naked prompt only
       (setq ans (read-string prompt "" nil timestr)))
+    (org-detatch-overlay org-date-ovl)
 
     (if (string-match
          "^ *\\(\\([0-9]+\\)-\\)?\\([0-1]?[0-9]\\)-\\([0-3]?[0-9]\\)\\([^-0-9]\\|$\\)" ans)
@@ -3924,7 +3809,7 @@ Also, store the cursor date in variable ans2."
       (let* ((date (calendar-cursor-to-date))
              (time (encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date))))
         (setq ans2 (format-time-string "%Y-%m-%d" time))))
-    (and org-xemacs-p (sit-for .2))
+    (org-move-overlay org-date-ovl (1- (point)) (1+ (point)) (current-buffer))
     (select-window sw)))
 
 (defun org-calendar-select ()
@@ -3937,6 +3822,17 @@ This is used by `org-read-date' in a temporary keymap for the calendar buffer."
       (setq ans1 (format-time-string "%Y-%m-%d" time)))
     (if (active-minibuffer-window) (exit-minibuffer))))
 
+(defun org-calendar-select-mouse (ev)
+  "Return to `org-read-date' with the date currently selected.
+This is used by `org-read-date' in a temporary keymap for the calendar buffer."
+  (interactive "e")
+  (mouse-set-point ev)
+  (when (calendar-cursor-to-date)
+    (let* ((date (calendar-cursor-to-date))
+           (time (encode-time 0 0 0 (nth 1 date) (nth 0 date) (nth 2 date))))
+      (setq ans1 (format-time-string "%Y-%m-%d" time)))
+    (if (active-minibuffer-window) (exit-minibuffer))))
+
 (defun org-check-deadlines (ndays)
   "Check if there are any deadlines due or past due.
 A deadline is considered due if it happens within `org-deadline-warning-days'
@@ -4220,7 +4116,7 @@ If there is already a time stamp at the cursor position, update it."
 (defvar org-agenda-buffer-name "*Org Agenda*")
 (defvar org-agenda-redo-command nil)
 (defvar org-agenda-mode-hook nil)
-
+(defvar org-agenda-type nil)
 (defvar org-agenda-force-single-file nil)
 
 ;;;###autoload
@@ -4338,40 +4234,42 @@ The following commands are available:
     ["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]
+     ["Reschedule +1 day" org-agenda-date-later (org-agenda-check-type nil 'agenda 'timeline)]
+     ["Reschedule -1 day" org-agenda-date-earlier (org-agenda-check-type nil 'agenda 'timeline)]
      "--"
-     ["Reschedule to ..." org-agenda-date-prompt t])
+     ["Reschedule to ..." org-agenda-date-prompt (org-agenda-check-type nil 'agenda 'timeline)])
     ("Priority"
      ["Set Priority" org-agenda-priority t]
      ["Increase Priority" org-agenda-priority-up t]
      ["Decrease Priority" org-agenda-priority-down t]
      ["Show Priority" org-agenda-show-priority t])
     "--"
+    ;; ["New agenda command" org-agenda t]
     ["Rebuild buffer" org-agenda-redo t]
-    ["Goto Today" org-agenda-goto-today t]
-    ["Next Dates" org-agenda-later (local-variable-p 'starting-day (current-buffer))]
-    ["Previous Dates" org-agenda-earlier (local-variable-p 'starting-day (current-buffer))]
     "--"
-    ["Day View" org-agenda-day-view :active (local-variable-p 'starting-day (current-buffer))
+    ["Goto Today" org-agenda-goto-today (org-agenda-check-type nil 'agenda 'timeline)]
+    ["Next Dates" org-agenda-later (org-agenda-check-type nil 'agenda)]
+    ["Previous Dates" org-agenda-earlier (org-agenda-check-type nil 'agenda)]
+    "--"
+    ["Day View" org-agenda-day-view :active (org-agenda-check-type nil 'agenda)
      :style radio :selected (equal org-agenda-ndays 1)]
-    ["Week View" org-agenda-week-view :active (local-variable-p 'starting-day (current-buffer))
+    ["Week View" org-agenda-week-view :active (org-agenda-check-type nil 'agenda)
      :style radio :selected (equal org-agenda-ndays 7)]
     "--"
     ["Show Logbook entries" org-agenda-log-mode
-     :style toggle :selected org-agenda-show-log :active t]
+     :style toggle :selected org-agenda-show-log :active (org-agenda-check-type nil 'agenda 'timeline)]
     ["Include Diary" org-agenda-toggle-diary
-     :style toggle :selected org-agenda-include-diary :active t]
+     :style toggle :selected org-agenda-include-diary :active (org-agenda-check-type nil 'agenda)]
     ["Use Time Grid" org-agenda-toggle-time-grid
-     :style toggle :selected org-agenda-use-time-grid :active t]
+     :style toggle :selected org-agenda-use-time-grid :active (org-agenda-check-type nil 'agenda)]
     "--"
-    ["New Diary Entry" org-agenda-diary-entry t]
+    ["New Diary Entry" org-agenda-diary-entry (org-agenda-check-type nil 'agenda 'timeline)]
     ("Calendar Commands"
-     ["Goto Calendar" org-agenda-goto-calendar t]
-     ["Phases of the Moon" org-agenda-phases-of-moon t]
-     ["Sunrise/Sunset" org-agenda-sunrise-sunset t]
-     ["Holidays" org-agenda-holidays t]
-     ["Convert" org-agenda-convert-date t])
+     ["Goto Calendar" org-agenda-goto-calendar (org-agenda-check-type nil 'agenda 'timeline)]
+     ["Phases of the Moon" org-agenda-phases-of-moon (org-agenda-check-type nil 'agenda 'timeline)]
+     ["Sunrise/Sunset" org-agenda-sunrise-sunset (org-agenda-check-type nil 'agenda 'timeline)]
+     ["Holidays" org-agenda-holidays (org-agenda-check-type nil 'agenda 'timeline)]
+     ["Convert" org-agenda-convert-date (org-agenda-check-type nil 'agenda 'timeline)])
     ["Create iCalendar file" org-export-icalendar-combine-agenda-files t]
     "--"
     ["Quit" org-agenda-quit t]
@@ -4386,19 +4284,19 @@ 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.
-T     Call `org-todo-list' to display the global todo list, put
-      select only entries with a specific TODO keyword.
+T     Call `org-todo-list' to display the global todo list, select only
+      entries with a specific TODO keyword (the user get a prompt).
 m     Call `org-tags-view' to display headlines with tags matching
-      a condition.  The tags condition is a list of positive and negative
-      selections, like `+WORK+URGENT-WITHBOSS'.
+      a condition  (the user is prompted for the condition).
 M     like `m', but select only TODO entries, no ordinary headlines.
 
 More commands can be added by configuring the variable
-`org-agenda-custom-commands'.
+`org-agenda-custom-commands'.  In particular, specific tags and TODO keyword
+searches can be pre-defined in this way.
 
 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."
+first press `1' to indicate that the agenda should be temporarily (until the
+next use of \\[org-agenda]) restricted to the current file."
   (interactive "P")
   (catch 'exit
     (let ((restrict-ok (and (buffer-file-name) (eq major-mode 'org-mode)))
@@ -4418,14 +4316,20 @@ 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"
+          (insert (format "\n%-4s%-14s: %s"
                           key
-                          (if (eq type 'tags) "Tags query" "TODO keyword")
-                          string)))
+                          (cond
+                           ((eq type 'tags) "Tags query")
+                           ((eq type 'todo) "TODO keyword")
+                           ((eq type 'tags-tree) "Tags tree")
+                           ((eq type 'todo-tree) "TODO kwd tree")
+                           ((eq type 'occur-tree) "Occur tree")
+                           (t "???"))
+                          (org-string-props string 'face 'org-link))))
         (goto-char (point-min))
-        (fit-window-to-buffer)
+        (if (fboundp 'fit-window-to-buffer) (fit-window-to-buffer))
         (message "Press key for agenda command%s"
-                (if restrict-ok ", or [1] to restrict to current file" ""))
+                 (if restrict-ok ", or [1] to restrict to current file" ""))
         (setq c (read-char-exclusive))
         (message "")
         (when (equal c ?1)
@@ -4437,6 +4341,7 @@ C   Configure your own agenda commands")
           (setq c (read-char-exclusive))
           (message "")))
       (require 'calendar)  ; FIXME: can we avoid this for some commands?
+      ;; For example the todo list should not need it (but does...)
       (cond
        ((equal c ?C) (customize-variable 'org-agenda-custom-commands))
        ((equal c ?a) (call-interactively 'org-agenda-list))
@@ -4455,9 +4360,25 @@ C   Configure your own agenda commands")
           (org-tags-view current-prefix-arg string))
          ((eq type 'todo)
           (org-todo-list string))
+         ((eq type 'tags-tree)
+          (org-check-for-org-mode)
+          (org-tags-sparse-tree current-prefix-arg string))
+         ((eq type 'todo-tree)
+          (org-check-for-org-mode)
+          (org-occur (concat "^" outline-regexp "[ \t]*"
+                             (regexp-quote string) "\\>")))
+         ((eq type 'occur-tree)
+          (org-check-for-org-mode)
+          (org-occur string))
          (t (error "Invalid custom agenda command type %s" type))))
        (t (error "Invalid key"))))))
 
+(defun org-check-for-org-mode ()
+  "Make sure current buffer is in org-mode.  Error if not."
+  (or (eq major-mode 'org-mode)
+      (error "Cannot execute org-mode agenda command on buffer in %s."
+             major-mode)))
+
 (defun org-fit-agenda-window ()
   "Fit the window to the buffer size."
   (and org-fit-agenda-window
@@ -4565,6 +4486,7 @@ dates."
     (setq buffer-read-only nil)
     (erase-buffer)
     (org-agenda-mode) (setq buffer-read-only nil)
+    (set (make-local-variable 'org-agenda-type) 'timeline)
     (if doclosed (push :closed args))
     (push :timestamp args)
     (if dotodo (push :todo args))
@@ -4653,6 +4575,7 @@ NDAYS defaults to `org-agenda-ndays'."
     (setq buffer-read-only nil)
     (erase-buffer)
     (org-agenda-mode) (setq buffer-read-only nil)
+    (set (make-local-variable 'org-agenda-type) 'agenda)
     (set (make-local-variable 'starting-day) (car day-numbers))
     (set (make-local-variable 'include-all-loc) include-all)
     (when (and (or include-all org-agenda-include-all-todo)
@@ -4762,6 +4685,7 @@ for a keyword.  A numeric prefix directly selects the Nth keyword in
     (setq buffer-read-only nil)
     (erase-buffer)
     (org-agenda-mode) (setq buffer-read-only nil)
+    (set (make-local-variable 'org-agenda-type) 'todo)
     (set (make-local-variable 'last-arg) arg)
     (set (make-local-variable 'org-todo-keywords) kwds)
     (set (make-local-variable 'org-agenda-redo-command)
@@ -4798,7 +4722,8 @@ for a keyword.  A numeric prefix directly selects the Nth keyword in
 (defun org-check-agenda-file (file)
   "Make sure FILE exists.  If not, ask user what to do."
   ;; FIXME:  this does not correctly change the menus
-  ;; Could probably be fixed by explicitly going to the buffer.
+  ;; Could probably be fixed by explicitly going to the buffer where
+  ;; the call originated.
   (when (not (file-exists-p file))
     (message "non-existent file %s.  [R]emove from agenda-files or [A]bort?"
              file)
@@ -4809,6 +4734,15 @@ for a keyword.  A numeric prefix directly selects the Nth keyword in
         (throw 'nextfile t))
        (t (error "Abort"))))))
 
+(defun org-agenda-check-type (error &rest types)
+  "Check if agenda buffer is of allowed type.
+If ERROR is non-nil, throw an error, otherwise just return nil."
+  (if (memq org-agenda-type types)
+      t
+    (if error
+        (error "Now allowed in %s-type agenda buffers" org-agenda-type)
+      nil)))
+
 (defun org-agenda-quit ()
   "Exit agenda by removing the window or the buffer."
   (interactive)
@@ -4830,11 +4764,14 @@ Org-mode buffers visited directly by the user will not be touched."
   "Rebuild Agenda.
 When this is the global TODO list, a prefix argument will be interpreted."
   (interactive)
-  (eval org-agenda-redo-command))
+  (message "Rebuilding agenda buffer...")
+  (eval org-agenda-redo-command)
+  (message "Rebuilding agenda buffer...done"))
 
 (defun org-agenda-goto-today ()
   "Go to today."
   (interactive)
+  (org-agenda-check-type t 'timeline 'agenda)
   (if (boundp 'starting-day)
       (let ((cmd (car org-agenda-redo-command))
             (iall (nth 1 org-agenda-redo-command))
@@ -4848,8 +4785,7 @@ When this is the global TODO list, a prefix argument will be interpreted."
   "Go forward in time by `org-agenda-ndays' days.
 With prefix ARG, go forward that many times `org-agenda-ndays'."
   (interactive "p")
-  (unless (boundp 'starting-day)
-    (error "Not allowed"))
+  (org-agenda-check-type t 'agenda)
   (org-agenda-list (if (boundp 'include-all-loc) include-all-loc nil)
                    (+ starting-day (* arg org-agenda-ndays)) nil t))
 
@@ -4857,16 +4793,14 @@ With prefix ARG, go forward that many times `org-agenda-ndays'."
   "Go back in time by `org-agenda-ndays' days.
 With prefix ARG, go back that many times `org-agenda-ndays'."
   (interactive "p")
-  (unless (boundp 'starting-day)
-    (error "Not allowed"))
+  (org-agenda-check-type t 'agenda)
   (org-agenda-list (if (boundp 'include-all-loc) include-all-loc nil)
                    (- starting-day (* arg org-agenda-ndays)) nil t))
 
 (defun org-agenda-week-view ()
   "Switch to weekly view for agenda."
   (interactive)
-  (unless (boundp 'starting-day)
-    (error "Not allowed"))
+  (org-agenda-check-type t 'agenda)
   (setq org-agenda-ndays 7)
   (org-agenda-list include-all-loc
                    (or (get-text-property (point) 'day)
@@ -4878,8 +4812,7 @@ With prefix ARG, go back that many times `org-agenda-ndays'."
 (defun org-agenda-day-view ()
   "Switch to weekly view for agenda."
   (interactive)
-  (unless (boundp 'starting-day)
-    (error "Not allowed"))
+  (org-agenda-check-type t 'agenda)
   (setq org-agenda-ndays 1)
   (org-agenda-list include-all-loc
                    (or (get-text-property (point) 'day)
@@ -4891,6 +4824,7 @@ With prefix ARG, go back that many times `org-agenda-ndays'."
 (defun org-agenda-next-date-line (&optional arg)
   "Jump to the next line indicating a date in agenda buffer."
   (interactive "p")
+  (org-agenda-check-type t 'agenda 'timeline)
   (beginning-of-line 1)
   (if (looking-at "^\\S-") (forward-char 1))
   (if (not (re-search-forward "^\\S-" nil t arg))
@@ -4902,14 +4836,14 @@ With prefix ARG, go back that many times `org-agenda-ndays'."
 (defun org-agenda-previous-date-line (&optional arg)
   "Jump to the next line indicating a date in agenda buffer."
   (interactive "p")
+  (org-agenda-check-type t 'agenda 'timeline)
   (beginning-of-line 1)
   (if (not (re-search-backward "^\\S-" nil t arg))
       (error "No previous date before this line in this buffer")))
 
 ;; Initialize the highlight
-(defvar org-hl (funcall (if org-xemacs-p 'make-extent 'make-overlay) 1 1))
-(funcall (if org-xemacs-p 'set-extent-property 'overlay-put) org-hl
-         'face 'highlight)
+(defvar org-hl (org-make-overlay 1 1))
+(org-overlay-put org-hl 'face 'highlight)
 
 (defun org-highlight (begin end &optional buffer)
   "Highlight a region with overlay."
@@ -4932,6 +4866,7 @@ With prefix ARG, go back that many times `org-agenda-ndays'."
 (defun org-agenda-log-mode ()
   "Toggle follow mode in an agenda buffer."
   (interactive)
+  (org-agenda-check-type t 'agenda 'timeline)
   (setq org-agenda-show-log (not org-agenda-show-log))
   (org-agenda-set-mode-name)
   (org-agenda-redo)
@@ -4941,6 +4876,7 @@ With prefix ARG, go back that many times `org-agenda-ndays'."
 (defun org-agenda-toggle-diary ()
   "Toggle follow mode in an agenda buffer."
   (interactive)
+  (org-agenda-check-type t 'agenda)
   (setq org-agenda-include-diary (not org-agenda-include-diary))
   (org-agenda-redo)
   (org-agenda-set-mode-name)
@@ -4950,6 +4886,7 @@ With prefix ARG, go back that many times `org-agenda-ndays'."
 (defun org-agenda-toggle-time-grid ()
   "Toggle follow mode in an agenda buffer."
   (interactive)
+  (org-agenda-check-type t 'agenda)
   (setq org-agenda-use-time-grid (not org-agenda-use-time-grid))
   (org-agenda-redo)
   (org-agenda-set-mode-name)
@@ -5365,16 +5302,16 @@ the documentation of `org-diary'."
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (goto-char (match-beginning 1))
-      (setq marker (org-agenda-new-marker (point-at-bol))
+      (setq marker (org-agenda-new-marker (1+ (match-beginning 0)))
             category (org-get-category)
             txt (org-format-agenda-item "" (match-string 1) category)
             priority
             (+ (org-get-priority txt)
                (if org-todo-kwd-priority-p
-                         (- org-todo-kwd-max-priority -2
-                            (length
-                             (member (match-string 2) org-todo-keywords)))
-                       1)))
+                   (- org-todo-kwd-max-priority -2
+                      (length
+                       (member (match-string 2) org-todo-keywords)))
+                 1)))
       (add-text-properties
        0 (length txt) (append (list 'org-marker marker 'org-hd-marker marker
                                     'priority priority 'category category)
@@ -6089,9 +6026,9 @@ the same tree node, and the headline of the tree node in the Org-mode file."
   "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))
+  (org-agenda-show)   ;;; FIXME This is a stupid hack and should not be needed
+  (let* ((hdmarker (or (get-text-property (point) 'org-hd-marker)
+                       (org-agenda-error)))
          (buffer (marker-buffer hdmarker))
          (pos (marker-position hdmarker))
          (buffer-read-only nil)
@@ -6112,6 +6049,7 @@ the same tree node, and the headline of the tree node in the Org-mode file."
 (defun org-agenda-date-later (arg &optional what)
   "Change the date of this item to one day later."
   (interactive "p")
+  (org-agenda-check-type t 'agenda 'timeline)
   (org-agenda-check-no-diary)
   (let* ((marker (or (get-text-property (point) 'org-marker)
                      (org-agenda-error)))
@@ -6135,6 +6073,7 @@ the same tree node, and the headline of the tree node in the Org-mode file."
 The prefix ARG is passed to the `org-time-stamp' command and can therefore
 be used to request time specification in the time stamp."
   (interactive "P")
+  (org-agenda-check-type t 'agenda 'timeline)
   (org-agenda-check-no-diary)
   (let* ((marker (or (get-text-property (point) 'org-marker)
                      (org-agenda-error)))
@@ -6151,9 +6090,10 @@ be used to request time specification in the time stamp."
 (defun org-get-heading ()
   "Return the heading of the current entry, without the stars."
   (save-excursion
-    (and (bolp) (end-of-line 1))
+    (and (memq (char-before) '(?\n ?\r)) (skip-chars-forward "^\n\r"))
+;;FIXME????????    (and (bolp) (end-of-line 1))
     (if (and (re-search-backward "[\r\n]\\*" nil t)
-             (looking-at "[\r\n]\\*+[ \t]+\\(.*\\)"))
+             (looking-at "[\r\n]\\*+[ \t]+\\([^\r\n]*\\)"))
         (match-string 1)
       "")))
 
@@ -6161,6 +6101,7 @@ be used to request time specification in the time stamp."
   "Make a diary entry, like the `i' command from the calendar.
 All the standard commands work: block, weekly etc"
   (interactive)
+  (org-agenda-check-type t 'agenda 'timeline)
   (require 'diary-lib)
   (let* ((char (progn
                  (message "Diary entry: [d]ay [w]eekly [m]onthly [y]early [a]nniversary [b]lock [c]yclic")
@@ -6201,6 +6142,7 @@ All the standard commands work: block, weekly etc"
 (defun org-agenda-execute-calendar-command (cmd)
   "Execute a calendar command from the agenda, with the date associated to
 the cursor position."
+  (org-agenda-check-type t 'agenda 'timeline)
   (require 'diary-lib)
   (unless (get-text-property (point) 'day)
     (error "Don't know which date to use for calendar command"))
@@ -6245,6 +6187,7 @@ argument, latitude and longitude will be prompted for."
 (defun org-agenda-goto-calendar ()
   "Open the Emacs calendar with the date at the cursor."
   (interactive)
+  (org-agenda-check-type t 'agenda 'timeline)
   (let* ((day (or (get-text-property (point) 'day)
                   (error "Don't know which date to open in calendar")))
          (date (calendar-gregorian-from-absolute day))
@@ -6263,6 +6206,7 @@ This is a command that has to be installed in `calendar-mode-map'."
 
 (defun org-agenda-convert-date ()
   (interactive)
+  (org-agenda-check-type t 'agenda 'timeline)
   (let ((day (get-text-property (point) 'day))
         date s)
     (unless day
@@ -6285,7 +6229,8 @@ This is a command that has to be installed in `calendar-mode-map'."
              "Chinese:    " (calendar-chinese-date-string date) "\n"))
     (with-output-to-temp-buffer "*Dates*"
       (princ s))
-    (fit-window-to-buffer (get-buffer-window "*Dates*"))))
+    (if (fboundp 'fit-window-to-buffer)
+        (fit-window-to-buffer (get-buffer-window "*Dates*")))))
 
 ;;; Tags
 
@@ -6308,6 +6253,7 @@ d are included in the output."
                       'help-echo
                       (format "mouse-2 or RET jump to org file %s"
                               (abbreviate-file-name (buffer-file-name)))))
+         lspos
          tags tags-list tags-alist (llast 0) rtn level category i txt
          todo marker)
 
@@ -6317,7 +6263,7 @@ d are included in the output."
       (while (re-search-forward re nil t)
         (setq todo (if (match-end 1) (match-string 2))
               tags (if (match-end 4) (match-string 4)))
-        (goto-char (1+ (match-beginning 0)))
+        (goto-char (setq lspos (1+ (match-beginning 0))))
         (setq level (outline-level)
               category (org-get-category))
         (setq i llast llast level)
@@ -6349,6 +6295,7 @@ d are included in the output."
                             (make-string (1- level) ?.) "")
                         (org-get-heading))
                        category))
+            (goto-char lspos)
             (setq marker (org-agenda-new-marker))
             (add-text-properties
              0 (length txt) 
@@ -6358,7 +6305,8 @@ d are included in the output."
              txt)
             (push txt rtn))
           ;; if we are to skip sublevels, jump to end of subtree
-          (or org-tags-match-list-sublevels (outline-end-of-subtree)))))
+          (point)
+          (or org-tags-match-list-sublevels (org-end-of-subtree)))))
     (nreverse rtn)))
 
 (defun org-tags-sparse-tree (&optional arg match)
@@ -6399,9 +6347,6 @@ MATCH can contain positive and negative selection of tags, like
     ;; 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)
   "Show all headlines for all `org-agenda-files' matching a TAGS criterions.
@@ -6410,6 +6355,8 @@ The prefix arg TODO-ONLY limits the search to TODO entries."
   (org-agenda-maybe-reset-markers 'force)
   (org-compile-prefix-format org-agenda-prefix-format)
   (let* ((org-agenda-keep-modes keep-modes)
+         (org-tags-match-list-sublevels
+          (if todo-only t org-tags-match-list-sublevels))
          (win (selected-window))
          (completion-ignore-case t)
          rtn rtnall files file pos matcher
@@ -6424,8 +6371,10 @@ The prefix arg TODO-ONLY limits the search to TODO entries."
     (setq buffer-read-only nil)
     (erase-buffer)
     (org-agenda-mode) (setq buffer-read-only nil)
+    (set (make-local-variable 'org-agenda-type) 'tags)
     (set (make-local-variable 'org-agenda-redo-command)
-         '(call-interactively 'org-tags-view))
+         (list 'org-tags-view (list 'quote todo-only) 
+               (list 'if 'current-prefix-arg nil match) t))
     (setq files (org-agenda-files)
           rtnall nil)
     (while (setq file (pop files))
@@ -6459,6 +6408,9 @@ The prefix arg TODO-ONLY limits the search to TODO entries."
     (setq pos (point))
     (insert match "\n")
     (add-text-properties pos (1- (point)) (list 'face 'org-warning))
+    (setq pos (point))
+    (insert "Press `C-u r' to search again with new search string\n")
+    (add-text-properties pos (1- (point)) (list 'face 'org-link))
     (when rtnall
       (insert (mapconcat 'identity rtnall "\n")))
     (goto-char (point-min))
@@ -6475,7 +6427,7 @@ With prefix ARG, realign all tags in headings in the current buffer."
          (re (concat "^" outline-regexp))
          (col (current-column))
          (current (org-get-tags))
-         tags hd)
+         tags hd empty)
     (if arg
         (save-excursion
           (goto-char (point-min))
@@ -6493,15 +6445,18 @@ With prefix ARG, realign all tags in headings in the current buffer."
                                  nil nil current 'org-tags-history)))
         (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))))
+        (unless (setq empty (string-match "\\`[\t ]*\\'" tags))
+          (unless (string-match ":$" tags) (setq tags (concat tags ":")))
+          (unless (string-match "^:" tags) (setq tags (concat ":" tags)))))
       (if (equal current "")
-          (end-of-line 1)
+          (progn
+            (end-of-line 1)
+            (or empty (insert " ")))
         (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) " "))
+        (insert (org-trim hd) (if empty "" " ")))
       (unless (equal tags "")
         (move-to-column (max (current-column)
                              (if (> org-tags-column 0)
@@ -6553,7 +6508,7 @@ With prefix ARG, realign all tags in headings in the current buffer."
       (goto-char (point-min))
       (while (re-search-forward "[ \t]:\\([A-Za-z_:]+\\):[ \t\r\n]" nil t)
         (mapc (lambda (x) (add-to-list 'tags x))
-              (org-split-string (match-string-no-properties 1) ":"))))
+              (org-split-string (match-string 1) ":"))))
     (mapcar 'list tags)))
 
 ;;; Link Stuff
@@ -11542,13 +11497,17 @@ See the individual commands for more information."
       (org-table-paste-rectangle)
     (org-paste-subtree arg)))
 
-;; FIXME: document tags
 (defun org-ctrl-c-ctrl-c (&optional arg)
   "Call realign table, or recognize a table.el table, or update keywords.
 When the cursor is inside a table created by the table.el package,
 activate that table.  Otherwise, if the cursor is at a normal table
 created with org.el, re-align that table.  This command works even if
 the automatic table editor has been turned off.
+
+If the cursor is in a headline, prompt for tags and insert them into
+the current line, aligned to `org-tags-column'.  When in a headline and
+called with prefix arg, realign all tags in the current buffer.
+
 If the cursor is in one of the special #+KEYWORD lines, this triggers
 scanning the buffer for these lines and updating the information.
 If the cursor is on a #+TBLFM line, re-apply the formulae to the table."
@@ -11946,12 +11905,18 @@ that can be added."
                           t)
               "\\'"))))
 
-;; Functions needed for compatibility with old outline.el
+;; Functions needed for compatibility with old outline.el.
+
+;; Programming for the old outline.el (that uses selective display
+;; instead of `invisible' text properties) is a nightmare, mostly
+;; because regular expressions can no longer be anchored at
+;; beginning/end of line.  Therefore a number of function need special
+;; treatment when the old outline.el is being used.
 
 ;; The following functions capture almost the entire compatibility code
-;; between the different versions of outline-mode.  The only other place
-;; where this is important are the font-lock-keywords.  Search for
-;; `org-noutline-p' to find it.
+;; between the different versions of outline-mode.  The only other
+;; places where this is important are the font-lock-keywords, and in
+;; `org-export-copy-visible'.  Search for `org-noutline-p' to find them.
 
 ;; C-a should go to the beginning of a *visible* line, also in the
 ;; new outline.el.  I guess this should be patched into Emacs?
@@ -11968,8 +11933,11 @@ to a visible line beginning.  This makes the function of C-a more intuitive."
           (backward-char 1)
           (beginning-of-line 1))
       (forward-char 1))))
+
 (when org-noutline-p
   (define-key org-mode-map "\C-a" 'org-beginning-of-line))
+;; FIXME: should I use substitute-key-definition to reach other bindings
+;; of beginning-of-line?
 
 (defun org-invisible-p ()
   "Check if point is at a character currently not visible."
@@ -11987,7 +11955,8 @@ to a visible line beginning.  This makes the function of C-a more intuitive."
 Only visible heading lines are considered, unless INVISIBLE-OK is non-nil."
   (if org-noutline-p
       (outline-back-to-heading invisible-ok)
-    (if (looking-at outline-regexp)
+    (if (and (memq (char-before) '(?\n ?\r))
+             (looking-at outline-regexp))
         t
       (if (re-search-backward (concat (if invisible-ok "\\([\r\n]\\|^\\)" "^")
                                       outline-regexp)
@@ -12068,6 +12037,27 @@ When ENTRY is non-nil, show the entire entry."
                                flag
                              (if flag ?\r ?\n))))))
 
+(defun org-end-of-subtree (&optional invisible-OK)
+  ;; This is an exact copy of the original function, but it uses
+  ;; `org-back-to-heading', to make it work also in invisible
+  ;; trees.  And is uses an invisible-OK argument.
+  ;; Under Emacs this is not needed, but the old outline.el needs this fix.
+  (org-back-to-heading invisible-OK)
+  (let ((opoint (point))
+        (first t)
+        (level (funcall outline-level)))
+    (while (and (not (eobp))
+                (or first (> (funcall outline-level) level)))
+      (setq first nil)
+      (outline-next-heading))
+    (if (memq (preceding-char) '(?\n ?\^M))
+        (progn
+          ;; Go to end of line before heading
+          (forward-char -1)
+          (if (memq (preceding-char) '(?\n ?\^M))
+              ;; leave blank line before heading
+              (forward-char -1))))))
+
 (defun org-show-subtree ()
   "Show everything after this heading at deeper levels."
   (outline-flag-region
@@ -12125,3 +12115,4 @@ Show the heading too, if it is currently invisible."
 
 ;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd
 ;;; org.el ends here
+
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index cc2d1eace59..d30534ec6be 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,25 @@
+2006-01-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url-history.el (url-history-hash-table): Initialize in declaration.
+        (url-history-parse-history): Don't reset the history.
+        (url-history-save-history): Create parent dir if necessary.
+        (url-history-save-history): Don't write the initialization of
+        url-history-hash-table into the history file.
+        (url-have-visited-url): Simplify since url-history-hash-table is non-nil.
+        (url-completion-function): Simplify.
+
+        * url-cookie.el (url-cookie-parse-file): Don't complain of missing file.
+        (url-cookie-parse-file, url-cookie-write-file, url-cookie-retrieve)
+        (url-cookie-generate-header-lines, url-cookie-handle-set-cookie)
+        (url-cookie-setup-save-timer): Remove autoload cookies.
+        They're only called from files that require url-cookie anyway.
+
+        * url-history.el (url-history-setup-save-timer)
+        (url-history-parse-history, url-history-save-history):
+        Remove autoload cookies.  They're only called from url.el which requires
+        url-history anyway.
+        (url-history-parse-history): Don't complain if the file is missing.
+
 2006-01-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * url-handlers.el (url-retrieve-synchronously): Don't autoload.
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index 3772846607a..53ba75f4cbb 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -1,7 +1,7 @@
 ;;; url-cookie.el --- Netscape Cookie support
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -109,12 +109,14 @@ telling Microsoft that."
 (defvar url-cookies-changed-since-last-save nil
   "Whether the cookies list has changed since the last save operation.")
 
-;;;###autoload
 (defun url-cookie-parse-file (&optional fname)
   (setq fname (or fname url-cookie-file))
   (condition-case ()
       (load fname nil t)
-    (error (message "Could not load cookie file %s" fname))))
+    (error
+     ;; It's completely normal for the cookies file not to exist yet.
+     ;; (message "Could not load cookie file %s" fname)
+     )))
 
 (defun url-cookie-clean-up (&optional secure)
   (let* (
@@ -145,7 +147,6 @@ telling Microsoft that."
         (setq new (cons cur new))))
     (set var new)))
 
-;;;###autoload
 (defun url-cookie-write-file (&optional fname)
   (setq fname (or fname url-cookie-file))
   (unless (file-directory-p (file-name-directory fname))
@@ -250,7 +251,6 @@ telling Microsoft that."
                           (*   1 (string-to-number (aref exp-time 0))))))
         (> (- cur-norm exp-norm) 1))))))
 
-;;;###autoload
 (defun url-cookie-retrieve (host localpart &optional secure)
   "Retrieve all the netscape-style cookies for a specified HOST and LOCALPART."
   (let ((storage (if secure
@@ -278,7 +278,6 @@ telling Microsoft that."
                 (setq retval (cons cur retval))))))
     retval))
 
-;;;###autoload
 (defun url-cookie-generate-header-lines (host localpart secure)
   (let* ((cookies (url-cookie-retrieve host localpart secure))
          (retval nil)
@@ -344,7 +343,6 @@ telling Microsoft that."
      (t
       nil))))
 
-;;;###autoload
 (defun url-cookie-handle-set-cookie (str)
   (setq url-cookies-changed-since-last-save t)
   (let* ((args (url-parse-args str t))
@@ -457,7 +455,6 @@ to run the `url-cookie-setup-save-timer' function manually."
   :type 'integer
   :group 'url)
 
-;;;###autoload
 (defun url-cookie-setup-save-timer ()
   "Reset the cookie saver timer."
   (interactive)
diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el
index 3bb7145b451..0cdfe329bc2 100644
--- a/lisp/url/url-history.el
+++ b/lisp/url/url-history.el
@@ -1,7 +1,7 @@
 ;;; url-history.el --- Global history tracking for URL package
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -75,12 +75,11 @@ to run the `url-history-setup-save-timer' function manually."
 (defvar url-history-changed-since-last-save nil
   "Whether the history list has changed since the last save operation.")
 
-(defvar url-history-hash-table nil
+(defvar url-history-hash-table (make-hash-table :size 31 :test 'equal)
   "Hash table for global history completion.")
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;;;###autoload
 (defun url-history-setup-save-timer ()
   "Reset the history list timer."
   (interactive)
@@ -92,28 +91,27 @@ to run the `url-history-setup-save-timer' function manually."
                                            url-history-save-interval
                                            'url-history-save-history))))
 
-;;;###autoload
 (defun url-history-parse-history (&optional fname)
   "Parse a history file stored in FNAME."
   ;; Parse out the mosaic global history file for completions, etc.
   (or fname (setq fname (expand-file-name url-history-file)))
   (cond
    ((not (file-exists-p fname))
-    (message "%s does not exist." fname))
+    ;; It's completely normal for this file not to exist, so don't complain.
+    ;; (message "%s does not exist." fname)
+    )
    ((not (file-readable-p fname))
     (message "%s is unreadable." fname))
    (t
     (condition-case nil
         (load fname nil t)
-      (error (message "Could not load %s" fname)))))
-  (if (not url-history-hash-table)
-      (setq url-history-hash-table (make-hash-table :size 31 :test 'equal))))
+      (error (message "Could not load %s" fname))))))
 
 (defun url-history-update-url (url time)
   (setq url-history-changed-since-last-save t)
-  (puthash (if (vectorp url) (url-recreate-url url) url) time url-history-hash-table))
+  (puthash (if (vectorp url) (url-recreate-url url) url) time
+           url-history-hash-table))
 
-;;;###autoload
 (defun url-history-save-history (&optional fname)
   "Write the global history file into `url-history-file'.
 The type of data written is determined by what is in the file to begin
@@ -121,6 +119,8 @@ with.  If the type of storage cannot be determined, then prompt the
 user for what type to save as."
   (interactive)
   (or fname (setq fname (expand-file-name url-history-file)))
+  (unless (file-directory-p (file-name-directory fname))
+    (ignore-errors (make-directory (file-name-directory fname))))
   (cond
    ((not url-history-changed-since-last-save) nil)
    ((not (file-writable-p fname))
@@ -129,26 +129,27 @@ user for what type to save as."
     (let ((make-backup-files nil)
           (version-control nil)
           (require-final-newline t))
-      (save-excursion
-        (set-buffer (get-buffer-create " *url-tmp*"))
+      (with-current-buffer (get-buffer-create " *url-tmp*")
         (erase-buffer)
         (let ((count 0))
-          (maphash (function
-                       (lambda (key value)
-                         (while (string-match "[\r\n]+" key)
-                           (setq key (concat (substring key 0 (match-beginning 0))
-                                             (substring key (match-end 0) nil))))
-                         (setq count (1+ count))
-                         (insert "(puthash \"" key "\""
-                                 (if (not (stringp value)) " '" "")
-                                 (prin1-to-string value)
-                                 " url-history-hash-table)\n")))
-                      url-history-hash-table)
-          (goto-char (point-min))
-          (insert (format
-                   "(setq url-history-hash-table (make-hash-table :size %d :test 'equal))\n"
-                   (/ count 4)))
-          (goto-char (point-max))
+          (maphash (lambda (key value)
+                     (while (string-match "[\r\n]+" key)
+                       (setq key (concat (substring key 0 (match-beginning 0))
+                                         (substring key (match-end 0) nil))))
+                     (setq count (1+ count))
+                     (insert "(puthash \"" key "\""
+                             (if (not (stringp value)) " '" "")
+                             (prin1-to-string value)
+                             " url-history-hash-table)\n"))
+                   url-history-hash-table)
+          ;; We used to add this in the file, but it just makes the code
+          ;; more complex with no benefit.  Worse: it makes it harder to
+          ;; preserve preexisting history when loading the history file.
+          ;; (goto-char (point-min))
+          ;; (insert (format
+          ;;          "(setq url-history-hash-table (make-hash-table :size %d :test 'equal))\n"
+          ;;          (/ count 4)))
+          ;; (goto-char (point-max))
           (insert "\n")
           (write-file fname))
         (kill-buffer (current-buffer))))))
@@ -156,33 +157,30 @@ user for what type to save as."
 
 (defun url-have-visited-url (url)
   (url-do-setup)
-  (and url-history-hash-table
-       (gethash url url-history-hash-table nil)))
+  (gethash url url-history-hash-table nil))
 
 (defun url-completion-function (string predicate function)
+  ;; Completion function to complete urls from the history.
+  ;; This is obsolete since we can now pass the hash-table directly as a
+  ;; completion table.
   (url-do-setup)
   (cond
    ((eq function nil)
     (let ((list nil))
-      (maphash (function (lambda (key val)
-                              (setq list (cons (cons key val)
-                                               list))))
-                  url-history-hash-table)
+      (maphash (lambda (key val) (push key list))
+               url-history-hash-table)
+      ;; Not sure why we bother reversing the list.  --Stef
       (try-completion string (nreverse list) predicate)))
    ((eq function t)
-    (let ((stub (concat "^" (regexp-quote string)))
+    (let ((stub (concat "\\`" (regexp-quote string)))
           (retval nil))
       (maphash
-       (function
-        (lambda (url time)
-          (if (string-match stub url)
-              (setq retval (cons url retval)))))
+       (lambda (url time)
+         (if (string-match stub url) (push url retval)))
        url-history-hash-table)
       retval))
    ((eq function 'lambda)
-    (and url-history-hash-table
-         (gethash string url-history-hash-table)
-         t))
+    (and (gethash string url-history-hash-table) t))
    (t
     (error "url-completion-function very confused"))))
 
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 1f0b8e746c7..0735c467439 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -403,7 +403,8 @@ new value.")
     ;; We want to avoid the face with image buttons.
     (unless (widget-get widget :suppress-face)
       (overlay-put overlay 'face (widget-apply widget :button-face-get))
-      (overlay-put overlay 'mouse-face widget-mouse-face))
+      (overlay-put overlay 'mouse-face 
+                   (widget-apply widget :mouse-face-get)))
     (overlay-put overlay 'pointer 'hand)
     (overlay-put overlay 'follow-link follow-link)
     (overlay-put overlay 'help-echo help-echo)))
@@ -1391,6 +1392,7 @@ The value of the :type attribute should be an unconverted widget type."
   :offset 0
   :format-handler 'widget-default-format-handler
   :button-face-get 'widget-default-button-face-get
+  :mouse-face-get 'widget-default-mouse-face-get
   :sample-face-get 'widget-default-sample-face-get
   :delete 'widget-default-delete
   :copy 'identity
@@ -1535,6 +1537,14 @@ If that does not exists, call the value of `widget-complete-field'."
             (widget-apply parent :button-face-get)
           widget-button-face))))
 
+(defun widget-default-mouse-face-get (widget)
+  ;; Use :mouse-face or widget-mouse-face
+  (or (widget-get widget :mouse-face)
+      (let ((parent (widget-get widget :parent)))
+        (if parent
+            (widget-apply parent :mouse-face-get)
+          widget-mouse-face))))
+
 (defun widget-default-sample-face-get (widget)
   ;; Use :sample-face.
   (widget-get widget :sample-face))
@@ -3161,28 +3171,83 @@ It reads a directory name from an editable text field."
     (widget-apply widget :notify widget event)
     (widget-setup)))
 
+;;; I'm not sure about what this is good for?  KFS.
 (defvar widget-key-sequence-prompt-value-history nil
   "History of input to `widget-key-sequence-prompt-value'.")
 
-;; This mostly works, but I am pretty sure it needs more change
-;; to be 100% correct.  I don't know what the change should be -- rms.
+(defvar widget-key-sequence-default-value [ignore]
+  "Default value for an empty key sequence.")
+
+(defvar widget-key-sequence-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map widget-field-keymap)
+    (define-key map [(control ?q)] 'widget-key-sequence-read-event)
+    map))
 
 (define-widget 'key-sequence 'restricted-sexp
-  "A Lisp function."
+  "A key sequence."
   :prompt-value 'widget-field-prompt-value
   :prompt-internal 'widget-symbol-prompt-internal
-  :prompt-match 'fboundp
+; :prompt-match 'fboundp   ;; What was this good for?  KFS
   :prompt-history 'widget-key-sequence-prompt-value-history
   :action 'widget-field-action
   :match-alternatives '(stringp vectorp)
-  :validate (lambda (widget)
-              (unless (or (stringp (widget-value widget))
-                          (vectorp (widget-value widget)))
-                (widget-put widget :error (format "Invalid key sequence: %S"
-                                                  (widget-value widget)))
-                widget))
-  :value 'ignore
+  :format "%{%t%}: %v"
+  :validate 'widget-key-sequence-validate
+  :value-to-internal 'widget-key-sequence-value-to-internal
+  :value-to-external 'widget-key-sequence-value-to-external
+  :value widget-key-sequence-default-value
+  :keymap widget-key-sequence-map
+  :help-echo "C-q: insert KEY, EVENT, or CODE; RET: enter value"
   :tag "Key sequence")
+
+(defun widget-key-sequence-read-event (ev)
+  (interactive (list
+                (let ((inhibit-quit t) quit-flag)
+                  (read-event "Insert KEY, EVENT, or CODE: "))))
+  (let ((ev2 (and (memq 'down (event-modifiers ev))
+                  (read-event)))
+        (tr (and (keymapp function-key-map)
+                 (lookup-key function-key-map (vector ev)))))
+    (when (and (integerp ev)
+               (or (and (<= ?0 ev) (< ev (+ ?0 (min 10 read-quoted-char-radix))))
+                   (and (<= ?a (downcase ev))
+                        (< (downcase ev) (+ ?a -10 (min 36 read-quoted-char-radix))))))
+      (setq unread-command-events (cons ev unread-command-events)
+            ev (read-quoted-char (format "Enter code (radix %d)" read-quoted-char-radix))
+            tr nil)
+      (if (and (integerp ev) (not (char-valid-p ev)))
+          (insert (char-to-string ev))))  ;; throw invalid char error
+    (setq ev (key-description (list ev)))
+    (when (arrayp tr)
+      (setq tr (key-description (list (aref tr 0))))
+      (if (y-or-n-p (format "Key %s is translated to %s -- use %s? " ev tr tr))
+          (setq ev tr ev2 nil)))
+    (insert (if (= (char-before) ?\s)  "" " ") ev " ")
+    (if ev2
+        (insert (key-description (list ev2)) " "))))
+
+(defun widget-key-sequence-validate (widget)
+  (unless (or (stringp (widget-value widget))
+              (vectorp (widget-value widget)))
+    (widget-put widget :error (format "Invalid key sequence: %S"
+                                      (widget-value widget)))
+    widget))
+
+(defun widget-key-sequence-value-to-internal (widget value)
+  (if (widget-apply widget :match value)
+      (if (equal value widget-key-sequence-default-value)
+          ""
+        (key-description value))
+    value))
+
+(defun widget-key-sequence-value-to-external (widget value)
+  (if (stringp value)
+      (if (string-match "\\`[[:space:]]*\\'" value)
+          widget-key-sequence-default-value
+        (read-kbd-macro value))
+    value))
+
 
 (define-widget 'sexp 'editable-field
   "An arbitrary Lisp expression."