2 files changed, 8 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 07c3df9e279..c8fb65e89e8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * emacs-lisp/bytecomp.el (byte-recompile-directory): Reject files
+        that match "\`\.#", to avoid compiling lock files, even if they
+        are readable (as they are on MS-Windows).
+
 2013-02-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * files.el (basic-save-buffer): Remove redundant directory-creation.
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index f5861550c9a..e0837033c74 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1594,7 +1594,9 @@ that already has a `.elc' file."
                    (setq directories (nconc directories (list source))))
                ;; It is an ordinary file.  Decide whether to compile it.
                (if (and (string-match emacs-lisp-file-regexp source)
+                        ;; The next 2 tests avoid compiling lock files
                         (file-readable-p source)
+                        (not (string-match "\\`\\.#" file))
                         (not (auto-save-file-name-p source))
                         (not (string-equal dir-locals-file
                                            (file-name-nondirectory source))))