(redraw_overlapping_rows): Fix detection of

[gnu-emacs] / src / regex.c

diff --git a/src/regex.c b/src/regex.c
index cbc67568743fc982cc559fdff068d3846b9008d9..91259dc77942602eaebaf6fb3dcc186467faf806 100644 (file)
--- a/src/regex.c
+++ b/src/regex.c
@@ -3,7 +3,7 @@
    internationalization features.)
 
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006, 2007, 2008
+                 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
                  Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -153,10 +153,7 @@
 
 # define RE_CHAR_TO_MULTIBYTE(c) unibyte_to_multibyte_table[(c)]
 
-# define RE_CHAR_TO_UNIBYTE(c)                 \
-  (ASCII_CHAR_P (c) ? (c)                      \
-   : CHAR_BYTE8_P (c) ? CHAR_TO_BYTE8 (c)      \
-   : multibyte_char_to_unibyte_safe (c))
+# define RE_CHAR_TO_UNIBYTE(c) CHAR_TO_BYTE_SAFE (c)
 
 /* Set C a (possibly converted to multibyte) character before P.  P
    points into a string which is the virtual concatenation of STR1
@@ -5574,10 +5571,7 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
                if (multibyte)
                  {
                    pat_ch = STRING_CHAR_AND_LENGTH (p, pend - p, pat_charlen);
-                   if (CHAR_BYTE8_P (pat_ch))
-                     pat_ch = CHAR_TO_BYTE8 (pat_ch);
-                   else
-                     pat_ch = RE_CHAR_TO_UNIBYTE (pat_ch);
+                   pat_ch = RE_CHAR_TO_UNIBYTE (pat_ch);
                  }
                else
                  {
@@ -6841,20 +6835,17 @@ void
 regfree (preg)
     regex_t *preg;
 {
-  if (preg->buffer != NULL)
-    free (preg->buffer);
+  free (preg->buffer);
   preg->buffer = NULL;
 
   preg->allocated = 0;
   preg->used = 0;
 
-  if (preg->fastmap != NULL)
-    free (preg->fastmap);
+  free (preg->fastmap);
   preg->fastmap = NULL;
   preg->fastmap_accurate = 0;
 
-  if (preg->translate != NULL)
-    free (preg->translate);
+  free (preg->translate);
   preg->translate = NULL;
 }
 WEAK_ALIAS (__regfree, regfree)