upstream i think

3 files changed, 5 insertions, 6 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 6bdd96c0fcc..02e531120be 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -2674,7 +2674,7 @@
 
         Follow MH-E Developers Guide conventions.  Use `' quotes for Help
         hyperlinks such as symbols, Info nodes, or URLs.  Use \" quotes for
-        everything else.  Otherwise, you can accidently get links to
+        everything else.  Otherwise, you can accidentally get links to
         nonsense symbols.
 
 2005-12-22  Bill Wohler  <wohler@newt.com>
@@ -3456,4 +3456,3 @@
 ;; sentence-end-double-space: nil
 ;; add-log-time-zone-rule: t
 ;; End:
-
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index d35d7d4c676..871b84dd039 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -2553,7 +2553,7 @@
         for users who have customized it to a long list now redundant with
         `mh-invisible-header-fields-default'.
         (mh-invisible-header-fields-default-override): New defcustom.
-        Users check off the fields they want displyed from what we
+        Users check off the fields they want displayed from what we
         included in `mh-invisible-header-fields-default'.
         (mh-invisible-headers): Function adapted to new variables.
 
@@ -7385,7 +7385,7 @@
         (mh-visit-folder) alias, and v (mh-visit-folder).
         (mh-index-folder-mode-help-messages): Changes for above.
         (mh-index-folder-message-menu, mh-index-folder-folder-menu): New
-        menus. I decided to delete the unavailable items since greying out
+        menus. I decided to delete the unavailable items since graying out
         implies that the user can do something to access them. In this
         case, that's not the case. Well, that's not entirely true--the
         user could write code for those functions ;-).
@@ -9150,7 +9150,7 @@
         %number(msg).
         (mh-scan-msg-format-string): Format to be used with the current
         maximum width of message number for the folder in the
-        `mh-upate-scan-format' function.
+        `mh-update-scan-format' function.
         (mh-update-scan-format): Use `mh-scan-msg-format-regexp' for greater
         flexibility. The message number is no longer anchored to the
         beginning of the `mh-scan-format-nmh' or `mh-scan-format-mh' format
diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el
index ddc9b3ffe94..4469c043b15 100644
--- a/lisp/mh-e/mh-tool-bar.el
+++ b/lisp/mh-e/mh-tool-bar.el
@@ -127,7 +127,7 @@ where,
   first line is useful and complete without the rest of the string.
 
   Optional item ENABLE-EXPR is an arbitrary lisp expression. If it
-  evaluates to nil, then the button is deactivated, otherwise it is
+  evaluates to nil, then the button is inactive, otherwise it is
   active. If it isn't present then the button is always active."
   ;; The following variable names have been carefully chosen to make code
   ;; generation easier. Modifying the names should be done carefully.