Merge from emacs-24; up to 2012-11-30T04:44:52Z!cyd@gnu.org

3 files changed, 38 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 53c0d93f512..b7bb772d266 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2012-12-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * search.c (search_buffer): Check the inverse translations of each
+        character in pattern when the buffer being searched is unibyte.
+        (Bug#13084)
+
+2012-12-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * fileio.c (Fvisited_file_modtime): Return (-1 ...) for nonexistent
+        files, fixing a regression from 24.2.
+        (Fverify_visited_file_modtime): Don't read uninitialized st.st_size.
+
 2012-12-13  Paul Eggert  <eggert@cs.ucla.edu>
 
         * fileio.c (Fcopy_file): Make fstat failure as serious as open failure.
diff --git a/src/fileio.c b/src/fileio.c
index d9029d29168..874162c5bb6 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5126,8 +5126,8 @@ See Info node `(elisp)Modification Time' for more details.  */)
            ? get_stat_mtime (&st)
            : time_error_value (errno));
   if (EMACS_TIME_EQ (mtime, b->modtime)
-      && (st.st_size == b->modtime_size
-          || b->modtime_size < 0))
+      && (b->modtime_size < 0
+          || st.st_size == b->modtime_size))
     return Qt;
   return Qnil;
 }
@@ -5154,7 +5154,15 @@ See Info node `(elisp)Modification Time' for more details.  */)
   (void)
 {
   if (EMACS_NSECS (current_buffer->modtime) < 0)
-    return make_number (0);
+    {
+      if (EMACS_NSECS (current_buffer->modtime) == NONEXISTENT_MODTIME_NSECS)
+        {
+          /* make_lisp_time won't work here if time_t is unsigned.  */
+          return list4 (make_number (-1), make_number (65535),
+                        make_number (0), make_number (0));
+        }
+      return make_number (0);
+    }
   return make_lisp_time (current_buffer->modtime);
 }
 
diff --git a/src/search.c b/src/search.c
index aacdbe33eef..7f26601cc69 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1406,7 +1406,7 @@ search_buffer (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
           char_base = 0;
           while (--len >= 0)
             {
-              int c, translated;
+              int c, translated, inverse;
 
               /* If we got here and the RE flag is set, it's because we're
                  dealing with a regexp known to be trivial, so the backslash
@@ -1420,6 +1420,20 @@ search_buffer (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
               c = *base_pat++;
               TRANSLATE (translated, trt, c);
               *pat++ = translated;
+              /* Check that none of C's equivalents violates the
+                 assumptions of boyer_moore.  */
+              TRANSLATE (inverse, inverse_trt, c);
+              while (1)
+                {
+                  if (inverse >= 0200)
+                    {
+                      boyer_moore_ok = 0;
+                      break;
+                    }
+                  if (c == inverse)
+                    break;
+                  TRANSLATE (inverse, inverse_trt, inverse);
+                }
             }
         }