[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114077: * bytecomp.el (byte-recompile-directory): F
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r114077: * bytecomp.el (byte-recompile-directory): Fix is-this-a-directory logic. |
Date: |
Fri, 30 Aug 2013 17:40:44 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114077
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15220
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-08-30 13:40:39 -0400
message:
* bytecomp.el (byte-recompile-directory): Fix is-this-a-directory logic.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/emacs-lisp/bytecomp.el bytecomp.el-20091113204419-o5vbwnq5f7feedwu-492
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-08-29 21:00:18 +0000
+++ b/lisp/ChangeLog 2013-08-30 17:40:39 +0000
@@ -1,3 +1,8 @@
+2013-08-30 Glenn Morris <address@hidden>
+
+ * emacs-lisp/bytecomp.el (byte-recompile-directory):
+ Fix is-this-a-directory logic. (Bug#15220)
+
2013-08-29 Stefan Monnier <address@hidden>
* textmodes/css-mode.el: Use SMIE.
=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el 2013-08-16 06:53:41 +0000
+++ b/lisp/emacs-lisp/bytecomp.el 2013-08-30 17:40:39 +0000
@@ -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 <address@hidden>
;; Hallvard Furuseth <address@hidden>
@@ -1593,14 +1593,14 @@
(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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114077: * bytecomp.el (byte-recompile-directory): Fix is-this-a-directory logic.,
Glenn Morris <=