* bytecomp.el (byte-recompile-directory): Fix is-this-a-directory logic.

Fixes: debbugs:15220

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a2028d5623b598e5d6e415d6919ba68caaf50fd0..2e639615c25492d376e5b1119c228fe1e15a4bd4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-30  Glenn Morris  <rgm@gnu.org>
+
+       * emacs-lisp/bytecomp.el (byte-recompile-directory):
+       Fix is-this-a-directory logic.  (Bug#15220)
+
 2013-08-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * textmodes/css-mode.el: Use SMIE.

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index c6612024fa6a4ee558dcd6cc42ba0a4a0743ca2e..164cdb129529b7f4f0bee737b7a0f7dab3f35e7f 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1,7 +1,7 @@
 ;;; bytecomp.el --- compilation of Lisp code into byte code -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1987, 1992, 1994, 1998, 2000-2013 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 1985-1987, 1992, 1994, 1998, 2000-2013
+;;   Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;     Hallvard Furuseth <hbf@ulrik.uio.no>
@@ -1593,14 +1593,14 @@ that already has a `.elc' file."
         (message "Checking %s..." directory)
          (dolist (file (directory-files directory))
            (let ((source (expand-file-name file directory)))
-             (if (and (not (member file '("RCS" "CVS")))
-                      (not (eq ?\. (aref file 0)))
-                      (file-directory-p source)
-                      (not (file-symlink-p source)))
-                 ;; This file is a subdirectory.  Handle them differently.
-                 (when (or (null arg) (eq 0 arg)
-                           (y-or-n-p (concat "Check " source "? ")))
-                   (setq directories (nconc directories (list source))))
+            (if (file-directory-p source)
+                (and (not (member file '("RCS" "CVS")))
+                     (not (eq ?\. (aref file 0)))
+                     (not (file-symlink-p source))
+                     ;; This file is a subdirectory.  Handle them differently.
+                     (or (null arg) (eq 0 arg)
+                         (y-or-n-p (concat "Check " source "? ")))
+                     (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