aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2012-08-30 10:22:24 +0200
committerAndreas Schwab2012-08-30 10:22:24 +0200
commitf17e1d00e0513d781d2bd9a80af24bb047d32d5c (patch)
tree2bc71b4a89a2814147e00487cc064d8087fbfc4a
parent247778328b6bd9618051504cee9f376686b2dd45 (diff)
downloademacs-f17e1d00e0513d781d2bd9a80af24bb047d32d5c.tar.gz
emacs-f17e1d00e0513d781d2bd9a80af24bb047d32d5c.zip
* progmodes/compile.el (compilation-always-kill): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/compile.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c59723a1047..5229c3332b2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-08-30 Andreas Schwab <schwab@linux-m68k.org>
2
3 * progmodes/compile.el (compilation-always-kill): Doc fix.
4
12012-08-30 Chong Yidong <cyd@gnu.org> 52012-08-30 Chong Yidong <cyd@gnu.org>
2 6
3 * window.el (display-buffer-reuse-frames): Make the obsolescence 7 * window.el (display-buffer-reuse-frames): Make the obsolescence
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 83f31d5c8d5..fbb0c9e204a 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1504,8 +1504,8 @@ Otherwise, construct a buffer name from NAME-OF-MODE."
1504(make-obsolete 'compile-internal 'compilation-start "22.1") 1504(make-obsolete 'compile-internal 'compilation-start "22.1")
1505 1505
1506(defcustom compilation-always-kill nil 1506(defcustom compilation-always-kill nil
1507 "If nil, ask to kill compilation. If 't, always kill an 1507 "If t, always kill a running compilation process before starting a new one.
1508incomplete compilation before starting a new one." 1508If nil, ask to kill it."
1509 :type 'boolean 1509 :type 'boolean
1510 :version "24.3" 1510 :version "24.3"
1511 :group 'compilation) 1511 :group 'compilation)