diff src/coding.c @ 42104:d69c2368e549

(DECODE_COMPOSITION_END): Fixed a typo in the last patch (COMPOSING_P, not COMPOSING).

--- a/src/coding.c	Mon Dec 17 14:05:07 2001 +0000
+++ b/src/coding.c	Mon Dec 17 15:21:06 2001 +0000
@@ -60,7 +60,7 @@
   all variants of ISO2022.  Details are described in section 3.
 
   2. SJIS (or Shift-JIS or MS-Kanji-Code)
-   
+
   A coding system to encode character sets: ASCII, JISX0201, and
   JISX0208.  Widely used for PC's in Japan.  Details are described in
   section 4.
@@ -503,7 +503,7 @@
      struct coding_system *coding;
 {
   Lisp_Object coding_spec, plist, safe_chars;
-  
+
   coding_spec = Fget (coding->symbol, Qcoding_system);
   plist = XVECTOR (coding_spec)->contents[3];
   safe_chars = Fplist_get (XVECTOR (coding_spec)->contents[3], Qsafe_chars);
@@ -889,7 +889,7 @@
       CODING_ADD_COMPOSITION_START (coding, coding->produced_char, method);
       for (i = 0; i < ncomponent; i++)
 	CODING_ADD_COMPOSITION_COMPONENT (coding, component[i]);
-      CODING_ADD_COMPOSITION_END (coding, coding->produced_char + nchars);  
+      CODING_ADD_COMPOSITION_END (coding, coding->produced_char + nchars);
       if (buf < bufp)
 	{
 	  unsigned char *p = buf;
@@ -1055,7 +1055,7 @@
 	coding->cmp_data_start = 0;					\
       }									\
   } while (0)
-  
+
 
 static void encode_eol P_ ((struct coding_system *, unsigned char *,
 			    unsigned char *, int, int));
@@ -1433,7 +1433,7 @@
 	      mask_found |= CODING_CATEGORY_MASK_ISO_SHIFT;
 	    }
 	  break;
-	  
+
 	case ISO_CODE_SI:
 	  if (inhibit_iso_escape_detection)
 	    break;
@@ -1665,7 +1665,7 @@
 
 #define DECODE_COMPOSITION_END(c1)					\
   do {									\
-    if (! COMPOSING (coding))						\
+    if (! COMPOSING_P (coding))						\
       {									\
 	*dst++ = ISO_CODE_ESC;						\
 	*dst++ = c1;							\
@@ -2439,7 +2439,7 @@
       ONE_MORE_CHAR (c);
       if (c == '\n')
 	break;
-      
+
       charset = CHAR_CHARSET (c);
       reg = CODING_SPEC_ISO_REQUESTED_DESIGNATION (coding, charset);
       if (reg != CODING_SPEC_ISO_NO_REQUESTED_DESIGNATION && r[reg] < 0)
@@ -2609,7 +2609,7 @@
 		*dst++ = ISO_CODE_CR;
 	      CODING_SPEC_ISO_BOL (coding) = 1;
 	    }
-	  else 
+	  else
 	    {
 	      if (coding->flags & CODING_FLAG_ISO_RESET_AT_CNTL)
 		ENCODE_RESET_PLANE_AND_REGISTER;
@@ -3032,7 +3032,7 @@
 
       src_base = src;
       ONE_MORE_CHAR (c);
-      
+
       /* Now encode the character C.  */
       if (SINGLE_BYTE_CHAR_P (c))
 	{
@@ -3357,7 +3357,7 @@
 
 	If the value is nil, graphic register N is never used on
 	encoding.
-   
+
    sub-element[N] where N is 4 through 11: to be set in `coding->flags'
    	Each value takes t or nil.  See the section ISO2022 of
 	`coding.h' for more information.
@@ -3481,7 +3481,7 @@
     }
   else
     goto label_invalid_coding_system;
-  
+
   /* If the coding system has non-nil `composition' property, enable
      composition handling.  */
   val = Fplist_get (plist, Qcomposition);
@@ -3621,7 +3621,7 @@
 	      }
 	    else
 	      CODING_SPEC_ISO_INITIAL_DESIGNATION (coding, i) = -1;
-	    
+
 	    CODING_SPEC_ISO_DESIGNATION (coding, i)
 	      = CODING_SPEC_ISO_INITIAL_DESIGNATION (coding, i);
 	  }
@@ -3994,7 +3994,7 @@
 		  | CODING_CATEGORY_MASK_UTF_16_LE);
 
 	  /* Or, if C is a special latin extra code,
-	     or is an ISO2022 specific control code of C1 (SS2 or SS3), 
+	     or is an ISO2022 specific control code of C1 (SS2 or SS3),
 	     or is an ISO2022 control-sequence-introducer (CSI),
 	     we should also consider the possibility of ISO2022 codings.  */
 	  if ((VECTORP (Vlatin_extra_code_table)
@@ -5101,7 +5101,7 @@
 	break;
       if (coding->flags & CODING_FLAG_ISO_DESIGNATE_AT_BOL)
 	{
-	  unsigned char *bol = begp; 
+	  unsigned char *bol = begp;
 	  while (begp < endp && *begp < 0x80)
 	    {
 	      begp++;
@@ -5599,7 +5599,7 @@
 	    coding->symbol = XVECTOR (eol_type)->contents[CODING_EOL_LF];
 	  else
 	    coding->symbol = saved_coding_symbol;
-	  
+
 	  continue;
 	}
       if (len_byte <= 0)
@@ -5617,7 +5617,7 @@
 	  if (multibyte_p)
 	    {
 	      unsigned char *start = dst;
-	      
+
 	      inserted += len_byte;
 	      while (len_byte--)
 		{
@@ -5700,7 +5700,7 @@
       inserted_byte = str_to_multibyte (GPT_ADDR, GAP_SIZE, inserted_byte);
     }
 
-  /* If we shrank the conversion area, adjust it now.  */ 
+  /* If we shrank the conversion area, adjust it now.  */
   if (total_skip > 0)
     {
       if (tail_skip > 0)
@@ -5942,7 +5942,7 @@
 		}
 	      produced += num_eol;
 	      produced_char += num_eol;
-	    } 
+	    }
 	  /* Suppress eol-format conversion in the further conversion.  */
 	  coding->eol_type = CODING_EOL_LF;
 
@@ -6212,7 +6212,7 @@
 	}
     }
   return (highest ? XCAR (val) : val);
-}  
+}
 
 DEFUN ("detect-coding-region", Fdetect_coding_region, Sdetect_coding_region,
        2, 3, 0,
@@ -6408,7 +6408,7 @@
       for (p = p1; p < p1end && ASCII_BYTE_P (*p); p++);
       if (p == p1end)
 	{
-	  for (p = p2; p < p2end && ASCII_BYTE_P (*p); p++);	  
+	  for (p = p2; p < p2end && ASCII_BYTE_P (*p); p++);
 	  if (p == p2end)
 	    return Qt;
 	}
@@ -6940,7 +6940,7 @@
 {
   int i;
 
-  /* Emacs' internal format specific initialize routine.  */ 
+  /* Emacs' internal format specific initialize routine.  */
   for (i = 0; i <= 0x20; i++)
     emacs_code_class[i] = EMACS_control_code;
   emacs_code_class[0x0A] = EMACS_linefeed_code;