diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f3e0ab3fb05..fdf12be0a1c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -2,7 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | * progmodes/compile.el (compilation-error-regexp-alist-alist): | 3 | * progmodes/compile.el (compilation-error-regexp-alist-alist): |
| 4 | Identify g++ template instantiation trace. (Bug#12287) | 4 | Identify g++ template instantiation trace. (Bug#12287) |
| 5 | (compilation-start-hook): Simplify docstring. (Bug#13379) | 5 | (compilation-mode-hook, compilation-start-hook) |
| 6 | (compilation-window-height): Simplify docstrings. (Bug#13379) | ||
| 6 | 7 | ||
| 7 | 2013-02-02 Stefan Monnier <monnier@iro.umontreal.ca> | 8 | 2013-02-02 Stefan Monnier <monnier@iro.umontreal.ca> |
| 8 | 9 | ||
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 240b1e41d4c..d2a9617e28e 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el | |||
| @@ -42,20 +42,21 @@ | |||
| 42 | 42 | ||
| 43 | ;;;###autoload | 43 | ;;;###autoload |
| 44 | (defcustom compilation-mode-hook nil | 44 | (defcustom compilation-mode-hook nil |
| 45 | "List of hook functions run by `compilation-mode' (see `run-mode-hooks')." | 45 | "List of hook functions run by `compilation-mode'." |
| 46 | :type 'hook | 46 | :type 'hook |
| 47 | :group 'compilation) | 47 | :group 'compilation) |
| 48 | 48 | ||
| 49 | ;;;###autoload | 49 | ;;;###autoload |
| 50 | (defcustom compilation-start-hook nil | 50 | (defcustom compilation-start-hook nil |
| 51 | "Hook run after starting a new compilation process. The hook | 51 | "Hook run after starting a new compilation process. |
| 52 | is run with one argument, the new process." | 52 | The hook is run with one argument, the new process." |
| 53 | :type 'hook | 53 | :type 'hook |
| 54 | :group 'compilation) | 54 | :group 'compilation) |
| 55 | 55 | ||
| 56 | ;;;###autoload | 56 | ;;;###autoload |
| 57 | (defcustom compilation-window-height nil | 57 | (defcustom compilation-window-height nil |
| 58 | "Number of lines in a compilation window. If nil, use Emacs default." | 58 | "Number of lines in a compilation window. |
| 59 | If nil, use Emacs default." | ||
| 59 | :type '(choice (const :tag "Default" nil) | 60 | :type '(choice (const :tag "Default" nil) |
| 60 | integer) | 61 | integer) |
| 61 | :group 'compilation) | 62 | :group 'compilation) |