Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 846-851)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 88-92)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 242-244)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31

8 files changed, 28 insertions, 18 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 7da5459c40c..9fd1a50736c 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-08  Glenn Morris  <rgm@gnu.org>
+
+        * TODO: `iff' item is dealt with.
+        * GNUS-NEWS, NEWS, NEWS.1-17, NEWS.19, NEWS.21: Replace `iff'.
+
 2007-08-01  Glenn Morris  <rgm@gnu.org>
 
         * NEWS: Add fortran-line-length, plus some more sections.
diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index fce326fc0d0..f09451af805 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -30,7 +30,7 @@ or remove them using `make remove-installed-shadows'.
 
 Use `make.bat' if you want to install Gnus under MS Windows, the first
 argument to the batch-program should be the directory where `xemacs.exe'
-respectively `emacs.exe' is located, iff you want to install Gnus after
+respectively `emacs.exe' is located, if you want to install Gnus after
 compiling it, give `make.bat' `/copy' as the second parameter.
 
 `make.bat' has been rewritten from scratch, it now features automatic
@@ -308,7 +308,7 @@ as external parts.
 
 ** Gnus no longer generate the Sender: header automatically.
 
-Earlier it was generated iff the user configurable email address was
+Earlier it was generated when the user configurable email address was
 different from the Gnus guessed default user address.  As the guessing
 algorithm is rarely correct these days, and (more controversially) the
 only use of the Sender: header was to check if you are entitled to
diff --git a/etc/NEWS b/etc/NEWS
index f56a7a0bf0c..c70f968e41a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -77,8 +77,6 @@ history element containing the search string becomes the current.
 
 * New Modes and Packages in Emacs 23.1
 
-** bibtex-style-mode helps you write BibTeX's *.bst files.
-
 ** minibuffer-indicate-depth-mode shows the minibuffer depth in the prompt.
 
 
@@ -99,8 +97,6 @@ considered for update.
 *** VC backends can provide extra menu entries to be added to the "Version Control" menu.
 This can be used to add menu entries for backend specific functions.
 
-*** VC has some support for Bazaar (bzr).
-
 ** sgml-electric-tag-pair-mode lets you simultaneously edit matched tag pairs.
 
 ** BibTeX mode:
@@ -198,10 +194,6 @@ like this:
 Use this instead of "~/.emacs.d".
 
 +++
-** The new function `image-refresh' refreshes all images associated
-with a given image specification.
-
-+++
 ** The new function `start-file-process is similar to `start-process',
 but obeys file handlers.  The file handler is chosen based on
 `default-directory'.  The functions `start-file-process-shell-command'
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index 4e5243ea0c4..7bc30e5d228 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -1208,7 +1208,7 @@ whether and where a line has a comment.
 
 * New function `auto-save-file-name-p'
 
-Should return non-`nil' iff given a string which is the name of an
+Should return non-`nil' if given a string which is the name of an
 auto-save file (sans directory name).  If you redefine
 `make-auto-save-file-name', you should redefine this accordingly.  By
 default, this function returns `t' for filenames beginning with
diff --git a/etc/NEWS.19 b/etc/NEWS.19
index 2f3e83fb946..08573703c04 100644
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -5133,8 +5133,8 @@ using X).
 ** It is now simpler to tell Emacs to display accented characters under
 X windows.  M-x standard-display-european toggles the display of
 buffer text according to the ISO Latin-1 standard.  With a prefix
-argument, this command enables European character display iff the
-argument is positive.
+argument, this command enables European character display if and only
+if the argument is positive.
 
 ** The `-i' command-line argument tells Emacs to use a picture of the
 GNU gnu as its icon, instead of letting the window manager choose an
diff --git a/etc/NEWS.21 b/etc/NEWS.21
index 91a37be8276..a4c42a6479a 100644
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
@@ -2502,7 +2502,7 @@ value is returned.  If no window satisfies PREDICATE, DEFAULT is
 returned.
 
 Optional second arg MINIBUF t means count the minibuffer window even
-if not active.  MINIBUF nil or omitted means count the minibuffer iff
+if not active.  MINIBUF nil or omitted means count the minibuffer if
 it is active.  MINIBUF neither t nor nil means not to count the
 minibuffer even if it is active.
 
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index ae31b2489e1..6e227639fed 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -55,6 +55,8 @@ in to make it use the scrollbars from the system theme.
 
 * New Modes and Packages in Emacs 22.2
 
+** bibtex-style-mode helps you write BibTeX's *.bst files.
+
 ** The new package css-mode.el provides a major mode for editing CSS files.
 
 ** The new package vera-mode.el provides a major mode for editing Vera files.
@@ -67,8 +69,21 @@ in to make it use the scrollbars from the system theme.
 
 *** VC has some support for Mercurial (hg).
 
+*** VC has some support for Bazaar (Bzr).
+
 *** VC has some support for Git.
 
+* Lisp Changes in Emacs 22.2.
+
+** New function `window-full-width-p' returns t if a window is as wide
+as its frame.
+
+** The new function `image-refresh' refreshes all images associated
+with a given image specification.
+
+** The new function `split-string-and-unquote' does (what?)
+
+** The new function `combine-and-quote-strings' does (what?)
 
 * Installation Changes in Emacs 22.1
 
@@ -3550,8 +3565,8 @@ that is, floats are compared by value and other elements with `eq'.
 
 *** New functions `string-or-null-p' and `booleanp'.
 
-`string-or-null-p' returns non-nil iff OBJECT is a string or nil.
-`booleanp' returns non-nil iff OBJECT is t or nil.
+`string-or-null-p' returns non-nil if OBJECT is a string or nil.
+`booleanp' returns non-nil if OBJECT is t or nil.
 
 *** `makehash' is now obsolete.  Use `make-hash-table' instead.
 
diff --git a/etc/TODO b/etc/TODO
index 19a481aabd6..9fe78690651 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -19,8 +19,6 @@ I.e. mouse-set-font should use customize-face.
 
 ** Compute the list of active keymaps *after* reading the first event.
 
-** Avoid using "iff" in doc strings.
-
 ** mouse-autoselect-window should wait to select the window until
 the mouse is put to rest or after a delay or both, so that moving over
 a window doesn't select it.