Merge remote-tracking branch 'savannah/master' into HEAD

5 files changed, 10 insertions, 9 deletions

diff --git a/src/data.c b/src/data.c
index 173b92c5bf4..2820f647981 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1602,7 +1602,7 @@ notify_variable_watchers (Lisp_Object symbol,
 /* Return the default value of SYMBOL, but don't check for voidness.
    Return Qunbound if it is void.  */
 
-static Lisp_Object
+Lisp_Object
 default_value (Lisp_Object symbol)
 {
   struct Lisp_Symbol *sym;
diff --git a/src/eval.c b/src/eval.c
index e5c850a579e..6de81e5467f 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -3825,7 +3825,7 @@ backtrace_eval_unrewind (int distance)
           {
             Lisp_Object sym = specpdl_symbol (tmp);
             Lisp_Object old_value = specpdl_old_value (tmp);
-            set_specpdl_old_value (tmp, Fdefault_value (sym));
+            set_specpdl_old_value (tmp, default_value (sym));
             Fset_default (sym, old_value);
           }
           break;
@@ -3841,7 +3841,7 @@ backtrace_eval_unrewind (int distance)
             if (!NILP (Flocal_variable_p (symbol, where)))
               {
                 set_specpdl_old_value
-                  (tmp, Fbuffer_local_value (symbol, where));
+                  (tmp, buffer_local_value (symbol, where));
                 set_internal (symbol, old_value, where, SET_INTERNAL_UNBIND);
               }
           }
diff --git a/src/filelock.c b/src/filelock.c
index 73202f0b2c4..2b734ee00d5 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -680,6 +680,9 @@ lock_file (Lisp_Object fn)
   dostounix_filename (SSDATA (fn));
 #endif
   encoded_fn = ENCODE_FILE (fn);
+  if (create_lockfiles)
+    /* Create the name of the lock-file for file fn */
+    MAKE_LOCK_NAME (lfname, encoded_fn);
 
   /* See if this file is visited and has changed on disk since it was
      visited.  */
@@ -690,7 +693,8 @@ lock_file (Lisp_Object fn)
 
     if (!NILP (subject_buf)
         && NILP (Fverify_visited_file_modtime (subject_buf))
-        && !NILP (Ffile_exists_p (fn)))
+        && !NILP (Ffile_exists_p (fn))
+        && (!create_lockfiles || current_lock_owner (NULL, lfname) != -2))
       call1 (intern ("userlock--ask-user-about-supersession-threat"), fn);
 
   }
@@ -698,10 +702,6 @@ lock_file (Lisp_Object fn)
   /* Don't do locking if the user has opted out.  */
   if (create_lockfiles)
     {
-
-      /* Create the name of the lock-file for file fn */
-      MAKE_LOCK_NAME (lfname, encoded_fn);
-
       /* Try to lock the lock.  FIXME: This ignores errors when
          lock_if_free returns a positive errno value.  */
       if (lock_if_free (&lock_info, lfname) < 0)
diff --git a/src/ftfont.c b/src/ftfont.c
index 2b442ead4bf..6b549c3ddf2 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -119,7 +119,7 @@ static struct
     { "jisx0213.2004-1", { 0x20B9F }},
     { "viscii1.1-1", { 0x1EA0, 0x1EAE, 0x1ED2 }, "vi"},
     { "tis620.2529-1", { 0x0E01 }, "th"},
-    { "windows-1251", { 0x0401, 0x0490 }, "ru"},
+    { "microsoft-cp1251", { 0x0401, 0x0490 }, "ru"},
     { "koi8-r", { 0x0401, 0x2219 }, "ru"},
     { "mulelao-1", { 0x0E81 }, "lo"},
     { "unicode-sip", { 0x20000 }},
diff --git a/src/lisp.h b/src/lisp.h
index 96959764879..f86b4880f35 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -595,6 +595,7 @@ extern void char_table_set (Lisp_Object, int, Lisp_Object);
 
 /* Defined in data.c.  */
 extern AVOID wrong_type_argument (Lisp_Object, Lisp_Object);
+extern Lisp_Object default_value (Lisp_Object symbol);
 
 
 /* Defined in emacs.c.  */