[Emacs-commit] emacs/lisp/mh-e mh-letter.el mh-folder.el mh-sh...

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/08/13 13:41:25

Modified files:
        lisp/mh-e      : mh-letter.el mh-folder.el mh-show.el ChangeLog 

Log message:
        Merge from emacs--rel--22
        
        Revision: address@hidden/emacs--devo--0--patch-851

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-letter.el?cvsroot=emacs&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-folder.el?cvsroot=emacs&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-show.el?cvsroot=emacs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/ChangeLog?cvsroot=emacs&r1=1.245&r2=1.246

Patches:
Index: mh-letter.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-letter.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- mh-letter.el        26 Jul 2007 05:27:16 -0000      1.17
+++ mh-letter.el        13 Aug 2007 13:41:24 -0000      1.18
@@ -844,7 +844,7 @@
 (defun mh-position-on-field (field &optional ignored)
   "Move to the end of the FIELD in the header.
 Move to end of entire header if FIELD not found.
-Returns non-nil iff FIELD was found.
+Returns non-nil if FIELD was found.
 The optional second arg is for pre-version 4 compatibility and is
 IGNORED."
   (cond ((mh-goto-header-field field)

Index: mh-folder.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-folder.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- mh-folder.el        26 Jul 2007 05:27:15 -0000      1.15
+++ mh-folder.el        13 Aug 2007 13:41:24 -0000      1.16
@@ -1495,7 +1495,7 @@
 
 (defun mh-update-unseen ()
   "Synchronize the unseen sequence with MH.
-Return non-nil iff the MH folder was set.
+Return non-nil if the MH folder was set.
 The hook `mh-unseen-updated-hook' is called after the unseen sequence
 is updated."
   (if mh-seen-list

Index: mh-show.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-show.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- mh-show.el  26 Jul 2007 05:27:16 -0000      1.8
+++ mh-show.el  13 Aug 2007 13:41:24 -0000      1.9
@@ -161,7 +161,7 @@
 (defun mh-showing-mode (&optional arg)
   "Change whether messages should be displayed.
 
-With ARG, display messages iff ARG is positive."
+With ARG, display messages if ARG is positive, otherwise don't display them."
   (setq mh-showing-mode
         (if (null arg)
             (not mh-showing-mode)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/ChangeLog,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -b -r1.245 -r1.246
--- ChangeLog   26 Jul 2007 05:27:14 -0000      1.245
+++ ChangeLog   13 Aug 2007 13:41:24 -0000      1.246
@@ -1,3 +1,8 @@
+2007-08-08  Glenn Morris  <address@hidden>
+
+       * mh-folder.el, mh-letter.el, mh-show.el: Replace `iff' in
+       doc-strings and comments.
+
 2007-07-25  Glenn Morris  <address@hidden>
 
        * Relicense all FSF files to GPLv3 or later.