[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v |
Date: |
Fri, 20 Jul 2007 18:54:59 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 07/07/20 18:54:58
Index: progmodes/compile.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/compile.el,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -b -r1.431 -r1.432
--- progmodes/compile.el 11 Jul 2007 19:38:21 -0000 1.431
+++ progmodes/compile.el 20 Jul 2007 18:54:56 -0000 1.432
@@ -934,7 +934,7 @@
(unless (equal command (eval compile-command))
(setq compile-command command))
(save-some-buffers (not compilation-ask-about-save) nil)
- (setq compilation-directory default-directory)
+ (setq-default compilation-directory default-directory)
(compilation-start command comint))
;; run compile with the default command line
@@ -944,10 +944,7 @@
original use. Otherwise, recompile using `compile-command'."
(interactive)
(save-some-buffers (not compilation-ask-about-save) nil)
- (let ((default-directory
- (or (and (not (eq major-mode (nth 1 compilation-arguments)))
- compilation-directory)
- default-directory)))
+ (let ((default-directory (or compilation-directory default-directory)))
(apply 'compilation-start (or compilation-arguments
`(,(eval compile-command))))))
@@ -1042,6 +1039,10 @@
(buffer-disable-undo (current-buffer))
;; first transfer directory from where M-x compile was called
(setq default-directory thisdir)
+ ;; Remember the original dir, so we can use it when we recompile.
+ ;; default-directory' can't be used reliably for that because it may be
+ ;; affected by the special handling of "cd ...;".
+ (set (make-local-variable 'compilation-directory) thisdir)
;; Make compilation buffer read-only. The filter can still write it.
;; Clear out the compilation buffer.
(let ((inhibit-read-only t)
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v, Michael Albinus, 2007/07/08
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v, Stefan Monnier, 2007/07/10
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v, Michael Albinus, 2007/07/10
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v, Michael Albinus, 2007/07/11
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v, Dan Nicolaescu, 2007/07/20
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v, Michael Albinus, 2007/07/24
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v, Stefan Monnier, 2007/07/25
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v, Miles Bader, 2007/07/26
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v, Stefan Monnier, 2007/07/30