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--unicode--0--patch-246

1 files changed, 2 insertions, 2 deletions

diff --git a/src/coding.h b/src/coding.h
index d4b159c3dfa..134402f3256 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -212,7 +212,7 @@ enum coding_attr_index
   hash_lookup (XHASH_TABLE (Vcoding_system_hash_table),         \
                coding_system_symbol, NULL)
 
-/* Return 1 iff CODING_SYSTEM_SYMBOL is a coding system.  */
+/* Return 1 if CODING_SYSTEM_SYMBOL is a coding system.  */
 
 #define CODING_SYSTEM_P(coding_system_symbol)           \
   (CODING_SYSTEM_ID (coding_system_symbol) >= 0         \
@@ -421,7 +421,7 @@ struct coding_system
   Lisp_Object dst_object;
   unsigned char *destination;
 
-  /* Set to 1 iff the source of conversion is not in the member
+  /* Set to 1 if the source of conversion is not in the member
      `charbuf', but at `src_object'.  */
   int chars_at_source;