diff options
| author | Thien-Thi Nguyen | 2007-09-01 23:33:15 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen | 2007-09-01 23:33:15 +0000 |
| commit | ea1cb2bdd6c998b4f22f73c4c3ecb9c5b467b8db (patch) | |
| tree | 417a980bd38cf5a08130344cdfe27f2a8e99f390 | |
| parent | 28aa2c3e65bfbbd8a1db965b41e5a2632d53f147 (diff) | |
| download | emacs-ea1cb2bdd6c998b4f22f73c4c3ecb9c5b467b8db.tar.gz emacs-ea1cb2bdd6c998b4f22f73c4c3ecb9c5b467b8db.zip | |
(byte-recompile-directory): Fix bug:
Don't expand top-level file name more than once.
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index bfc21820b5c..e9846d5875f 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el | |||
| @@ -975,7 +975,7 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'." | |||
| 975 | (pos (if (and byte-compile-current-file | 975 | (pos (if (and byte-compile-current-file |
| 976 | (integerp byte-compile-read-position)) | 976 | (integerp byte-compile-read-position)) |
| 977 | (with-current-buffer byte-compile-current-buffer | 977 | (with-current-buffer byte-compile-current-buffer |
| 978 | (format "%d:%d:" | 978 | (format "%d:%d:" |
| 979 | (save-excursion | 979 | (save-excursion |
| 980 | (goto-char byte-compile-last-position) | 980 | (goto-char byte-compile-last-position) |
| 981 | (1+ (count-lines (point-min) (point-at-bol)))) | 981 | (1+ (count-lines (point-min) (point-at-bol)))) |
| @@ -1552,7 +1552,7 @@ recompile every `.el' file that already has a `.elc' file." | |||
| 1552 | ;; compilation-mode copies value of default-directory. | 1552 | ;; compilation-mode copies value of default-directory. |
| 1553 | (unless (eq major-mode 'compilation-mode) | 1553 | (unless (eq major-mode 'compilation-mode) |
| 1554 | (compilation-mode)) | 1554 | (compilation-mode)) |
| 1555 | (let ((directories (list (expand-file-name directory))) | 1555 | (let ((directories (list default-directory)) |
| 1556 | (default-directory default-directory) | 1556 | (default-directory default-directory) |
| 1557 | (skip-count 0) | 1557 | (skip-count 0) |
| 1558 | (fail-count 0) | 1558 | (fail-count 0) |
| @@ -1659,7 +1659,7 @@ The value is non-nil if there were no errors, nil if errors." | |||
| 1659 | byte-compile-dest-file) | 1659 | byte-compile-dest-file) |
| 1660 | (setq target-file (byte-compile-dest-file filename)) | 1660 | (setq target-file (byte-compile-dest-file filename)) |
| 1661 | (setq byte-compile-dest-file target-file) | 1661 | (setq byte-compile-dest-file target-file) |
| 1662 | (with-current-buffer | 1662 | (with-current-buffer |
| 1663 | (setq input-buffer (get-buffer-create " *Compiler Input*")) | 1663 | (setq input-buffer (get-buffer-create " *Compiler Input*")) |
| 1664 | (erase-buffer) | 1664 | (erase-buffer) |
| 1665 | (setq buffer-file-coding-system nil) | 1665 | (setq buffer-file-coding-system nil) |