From: Kenichi Handa <handa@m17n.org>
Date: Wed, 8 Jul 1998 02:19:14 +0000 (+0000)
Subject: (Fformat): Replace explicit numeric constants with proper macros.
X-Git-Tag: emacs-20.3~367
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=25aa5d6464a1808690383a85b408f51e28dd5c23;p=emacs.git

(Fformat): Replace explicit numeric constants with proper macros.
---

diff --git a/src/editfns.c b/src/editfns.c
index 258ce2b2e79..aca1a3455e1 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2527,9 +2527,9 @@ Use %% to put a single % into the output.")
 
 	      if (p > buf
 		  && multibyte
-		  && *((unsigned char *) p - 1) >= 0x80
+		  && !ASCII_BYTE_P (*((unsigned char *) p - 1))
 		  && STRING_MULTIBYTE (args[n])
-		  && XSTRING (args[n])->data[0] >= 0xA0)
+		  && !CHAR_HEAD_P (XSTRING (args[n])->data[0]))
 		maybe_combine_byte = 1;
 	      nbytes = copy_text (XSTRING (args[n])->data, p,
 				  STRING_BYTES (XSTRING (args[n])),
@@ -2559,8 +2559,8 @@ Use %% to put a single % into the output.")
 
 	      if (p > buf
 		  && multibyte
-		  && *((unsigned char *) p - 1) >= 0x80
-		  && *((unsigned char *) p) >= 0xA0)
+		  && !ASCII_BYTE_P (*((unsigned char *) p - 1))
+		  && !CHAR_HEAD_P (*((unsigned char *) p)))
 		maybe_combine_byte = 1;
 	      this_nchars = strlen (p);
 	      p += this_nchars;
@@ -2572,8 +2572,8 @@ Use %% to put a single % into the output.")
 	  /* Copy a whole multibyte character.  */
 	  if (p > buf
 	      && multibyte
-	      && *((unsigned char *) p - 1) >= 0x80
-	      && *format >= 0xA0)
+	      && !ASCII_BYTE_P (*((unsigned char *) p - 1))
+	      && !CHAR_HEAD_P (*format))
 	    maybe_combine_byte = 1;
 	  *p++ = *format++;
 	  while (! CHAR_HEAD_P (*format)) *p++ = *format++;