From 091525d5d7077bb6e955874d15d943fe43dfacd4 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 20 Jul 2007 18:54:57 +0000 Subject: [PATCH] (compilation-start): Remember the original directory in a buffer-local compilation-directory. (compile): Set the global value of compilation-directory. (recompile): Use compilation-directory even if run from the compilation buffer. --- lisp/ChangeLog | 7 +++++++ lisp/progmodes/compile.el | 11 ++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c7f71d5cfc5..8ce759c5e30 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2007-07-20 Stefan Monnier + + * progmodes/compile.el (compilation-start): Remember the original + directory in a buffer-local compilation-directory. + (compile): Set the global value of compilation-directory. + (recompile): Use compilation-directory even in the compilation buffer. + 2007-07-20 Dan Nicolaescu * vc-hg.el (vc-hg-diff): Use vc-hg-command. diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 94def936fb9..a7535cd523a 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -934,7 +934,7 @@ to a function that generates a unique name." (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 @@ If this is run in a Compilation mode buffer, re-use the arguments from the 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 @@ Returns the compilation buffer created." (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) -- 2.11.4.GIT