diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-08-30 13:40:39 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-08-30 13:40:39 -0400 |
| commit | 415f808eb158e4988bc91092cd96e43c74d2873e (patch) | |
| tree | f21f2bb16bd6e834f42083c1ae3745acdb87418d /lisp/emacs-lisp | |
| parent | 9d7693d74c4ec73c01d03d990d552e1480ec2739 (diff) | |
| download | emacs-415f808eb158e4988bc91092cd96e43c74d2873e.tar.gz emacs-415f808eb158e4988bc91092cd96e43c74d2873e.tar.bz2 emacs-415f808eb158e4988bc91092cd96e43c74d2873e.zip | |
* bytecomp.el (byte-recompile-directory): Fix is-this-a-directory logic.
Fixes: debbugs:15220
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index c6612024fa6..164cdb12952 100644 --- 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 |