aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-02-08 23:24:30 -0800
committerGlenn Morris2012-02-08 23:24:30 -0800
commit8327412569d4b82a58c38696bb9dca3f2e6d2364 (patch)
treef35610ca865097d86431972651f0d57100fac580
parent3b90aec0a7741b78d2fe583c1da3ff011741bfb6 (diff)
downloademacs-8327412569d4b82a58c38696bb9dca3f2e6d2364.tar.gz
emacs-8327412569d4b82a58c38696bb9dca3f2e6d2364.zip
Doc fixes for compile.el
* lisp/progmodes/compile.el (compilation-first-column) (compilation-error-screen-columns): Doc fixes. * etc/NEWS: Related markup.
-rw-r--r--etc/NEWS1
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/progmodes/compile.el10
3 files changed, 12 insertions, 2 deletions
diff --git a/etc/NEWS b/etc/NEWS
index f67cfd3e434..138689cff69 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -672,6 +672,7 @@ on platforms that support it. This calls your desktop's preferred browser.
672inserted by the compilation filter function, when calling 672inserted by the compilation filter function, when calling
673compilation-filter-hook. 673compilation-filter-hook.
674 674
675---
675*** `compilation-error-screen-columns' and `compilation-first-column' 676*** `compilation-error-screen-columns' and `compilation-first-column'
676are obeyed in the editing buffer. So programming language modes can 677are obeyed in the editing buffer. So programming language modes can
677set them, whereas previously only the value in the *compilation* buffer 678set them, whereas previously only the value in the *compilation* buffer
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c1c7f74bf75..e51f41fb99e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-02-09 Glenn Morris <rgm@gnu.org> 12012-02-09 Glenn Morris <rgm@gnu.org>
2 2
3 * progmodes/compile.el (compilation-first-column)
4 (compilation-error-screen-columns): Doc fixes.
5
3 * vc/log-view.el (log-view-toggle-entry-display): 6 * vc/log-view.el (log-view-toggle-entry-display):
4 * vc/vc.el (vc-merge, vc-pull): Doc fixes. 7 * vc/vc.el (vc-merge, vc-pull): Doc fixes.
5 8
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index d477569fb2d..6c48eee7f4b 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -78,7 +78,10 @@ after `call-process' inserts the grep output into the buffer.")
78This is bound to a buffer position before running `compilation-filter-hook'.") 78This is bound to a buffer position before running `compilation-filter-hook'.")
79 79
80(defvar compilation-first-column 1 80(defvar compilation-first-column 1
81 "*This is how compilers number the first column, usually 1 or 0.") 81 "*This is how compilers number the first column, usually 1 or 0.
82If this is buffer-local in the destination buffer, Emacs obeys
83that value, otherwise it uses the value in the *compilation*
84buffer. This enables a major-mode to specify its own value.")
82 85
83(defvar compilation-parse-errors-filename-function nil 86(defvar compilation-parse-errors-filename-function nil
84 "Function to call to post-process filenames while parsing error messages. 87 "Function to call to post-process filenames while parsing error messages.
@@ -547,7 +550,10 @@ Otherwise they are interpreted as character positions, with
547each character occupying one column. 550each character occupying one column.
548The default is to use screen columns, which requires that the compilation 551The default is to use screen columns, which requires that the compilation
549program and Emacs agree about the display width of the characters, 552program and Emacs agree about the display width of the characters,
550especially the TAB character." 553especially the TAB character.
554If this is buffer-local in the destination buffer, Emacs obeys
555that value, otherwise it uses the value in the *compilation*
556buffer. This enables a major-mode to specify its own value."
551 :type 'boolean 557 :type 'boolean
552 :group 'compilation 558 :group 'compilation
553 :version "20.4") 559 :version "20.4")