aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2004-03-22 15:23:59 +0000
committerStefan Monnier2004-03-22 15:23:59 +0000
commitb122f3fb5ac825f2a429442b2485cd77bb0ecf94 (patch)
tree3782d69f68f224026b2bd744f5b123f646b44dba
parent66599b54fb2fc58b536b8e3a37945762ea52bea2 (diff)
downloademacs-b122f3fb5ac825f2a429442b2485cd77bb0ecf94.tar.gz
emacs-b122f3fb5ac825f2a429442b2485cd77bb0ecf94.zip
(byte-recompile-directory): Ignore hidden dir.
(byte-compile-file): Output warning when deleting a file.
-rw-r--r--lisp/emacs-lisp/bytecomp.el20
1 files changed, 12 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index f4bcb353518..e2a228c0d79 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1,6 +1,6 @@
1;;; bytecomp.el --- compilation of Lisp code into byte code 1;;; bytecomp.el --- compilation of Lisp code into byte code
2 2
3;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1998, 2000, 2001, 2002, 2003 3;; Copyright (C) 1985,86,87,92,94,1998,2000,01,02,03,2004
4;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: Jamie Zawinski <jwz@lucid.com> 6;; Author: Jamie Zawinski <jwz@lucid.com>
@@ -10,7 +10,7 @@
10 10
11;;; This version incorporates changes up to version 2.10 of the 11;;; This version incorporates changes up to version 2.10 of the
12;;; Zawinski-Furuseth compiler. 12;;; Zawinski-Furuseth compiler.
13(defconst byte-compile-version "$Revision: 2.142 $") 13(defconst byte-compile-version "$Revision: 2.143 $")
14 14
15;; This file is part of GNU Emacs. 15;; This file is part of GNU Emacs.
16 16
@@ -1493,7 +1493,8 @@ recompile every `.el' file that already has a `.elc' file."
1493 source dest) 1493 source dest)
1494 (dolist (file files) 1494 (dolist (file files)
1495 (setq source (expand-file-name file directory)) 1495 (setq source (expand-file-name file directory))
1496 (if (and (not (member file '("." ".." "RCS" "CVS"))) 1496 (if (and (not (member file '("RCS" "CVS")))
1497 (not (eq ?\. (aref file 0)))
1497 (file-directory-p source) 1498 (file-directory-p source)
1498 (not (file-symlink-p source))) 1499 (not (file-symlink-p source)))
1499 ;; This file is a subdirectory. Handle them differently. 1500 ;; This file is a subdirectory. Handle them differently.
@@ -1611,11 +1612,14 @@ The value is non-nil if there were no errors, nil if errors."
1611 ;; compile this file. 1612 ;; compile this file.
1612 (if (with-current-buffer input-buffer no-byte-compile) 1613 (if (with-current-buffer input-buffer no-byte-compile)
1613 (progn 1614 (progn
1614 (message "%s not compiled because of `no-byte-compile: %s'" 1615 ;; (message "%s not compiled because of `no-byte-compile: %s'"
1615 (file-relative-name filename) 1616 ;; (file-relative-name filename)
1616 (with-current-buffer input-buffer no-byte-compile)) 1617 ;; (with-current-buffer input-buffer no-byte-compile))
1617 (if (file-exists-p target-file) 1618 (when (file-exists-p target-file)
1618 (condition-case nil (delete-file target-file) (error nil))) 1619 (message "%s deleted because of `no-byte-compile: %s'"
1620 (file-relative-name target-file)
1621 (buffer-local-value 'no-byte-compile input-buffer))
1622 (condition-case nil (delete-file target-file) (error nil)))
1619 ;; We successfully didn't compile this file. 1623 ;; We successfully didn't compile this file.
1620 'no-byte-compile) 1624 'no-byte-compile)
1621 (when byte-compile-verbose 1625 (when byte-compile-verbose