diff options
| author | Juri Linkov | 2005-08-22 19:55:57 +0000 |
|---|---|---|
| committer | Juri Linkov | 2005-08-22 19:55:57 +0000 |
| commit | bac3a1c9b7f52b509ab6fc13570c68deb3efb01d (patch) | |
| tree | 25fcea0a5278709731acb7469963f158b7d0d831 | |
| parent | 69672704aec84730c106f935200c0c5a7bf599d0 (diff) | |
| download | emacs-bac3a1c9b7f52b509ab6fc13570c68deb3efb01d.tar.gz emacs-bac3a1c9b7f52b509ab6fc13570c68deb3efb01d.zip | |
(compilation-disable-input): Doc fix.
(define-compilation-mode): Doc fix and refill.
(kill-compilation): Use `mode-name' in the error message.
(compilation-find-file): Use `compilation-error' in the
read-file-name's prompt.
| -rw-r--r-- | lisp/ChangeLog | 21 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 14 |
2 files changed, 28 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 04dc5f66cf9..3af80f33359 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,24 @@ | |||
| 1 | 2005-08-22 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * faces.el (set-face-underline): Delete this duplicate function | ||
| 4 | and make an obsolete alias to set-face-underline-p. | ||
| 5 | (set-face-underline-p): Use docstring of set-face-underline. | ||
| 6 | (describe-face): Create hyperlink to parent face. | ||
| 7 | |||
| 8 | * info.el (Info-insert-dir): Use save-excursion around | ||
| 9 | insert-buffer-substring. | ||
| 10 | (Info-isearch-search): Use LITERAL arg of replace-regexp-in-string. | ||
| 11 | (Info-escape-percent): Delete function. | ||
| 12 | (Info-fontify-node): Replace Info-escape-percent by | ||
| 13 | replace-regexp-in-string with REP arg set to lambda that | ||
| 14 | duplicates `%' and preserves text properties. | ||
| 15 | |||
| 16 | * progmodes/compile.el (compilation-disable-input): Doc fix. | ||
| 17 | (define-compilation-mode): Doc fix and refill. | ||
| 18 | (kill-compilation): Use `mode-name' in the error message. | ||
| 19 | (compilation-find-file): Use `compilation-error' in the | ||
| 20 | read-file-name's prompt. | ||
| 21 | |||
| 1 | 2005-08-22 Stefan Monnier <monnier@iro.umontreal.ca> | 22 | 2005-08-22 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 23 | ||
| 3 | * smerge-mode.el (smerge-basic-map): Bind smerge-combine-with-next. | 24 | * smerge-mode.el (smerge-basic-map): Bind smerge-combine-with-next. |
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 94414e2d482..dff4de60e45 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el | |||
| @@ -449,7 +449,7 @@ You might also use mode hooks to specify it in certain modes, like this: | |||
| 449 | (defcustom compilation-disable-input nil | 449 | (defcustom compilation-disable-input nil |
| 450 | "*If non-nil, send end-of-file as compilation process input. | 450 | "*If non-nil, send end-of-file as compilation process input. |
| 451 | This only affects platforms that support asynchronous processes (see | 451 | This only affects platforms that support asynchronous processes (see |
| 452 | start-process); synchronous compilation processes never accept input." | 452 | `start-process'); synchronous compilation processes never accept input." |
| 453 | :type 'boolean | 453 | :type 'boolean |
| 454 | :group 'compilation | 454 | :group 'compilation |
| 455 | :version "22.1") | 455 | :version "22.1") |
| @@ -1228,9 +1228,9 @@ Runs `compilation-mode-hook' with `run-mode-hooks' (which see). | |||
| 1228 | (defmacro define-compilation-mode (mode name doc &rest body) | 1228 | (defmacro define-compilation-mode (mode name doc &rest body) |
| 1229 | "This is like `define-derived-mode' without the PARENT argument. | 1229 | "This is like `define-derived-mode' without the PARENT argument. |
| 1230 | The parent is always `compilation-mode' and the customizable `compilation-...' | 1230 | The parent is always `compilation-mode' and the customizable `compilation-...' |
| 1231 | variables are also set from the name of the mode you have chosen, by replacing | 1231 | variables are also set from the name of the mode you have chosen, |
| 1232 | the fist word, e.g `compilation-scroll-output' from `grep-scroll-output' if that | 1232 | by replacing the first word, e.g `compilation-scroll-output' from |
| 1233 | variable exists." | 1233 | `grep-scroll-output' if that variable exists." |
| 1234 | (let ((mode-name (replace-regexp-in-string "-mode\\'" "" (symbol-name mode)))) | 1234 | (let ((mode-name (replace-regexp-in-string "-mode\\'" "" (symbol-name mode)))) |
| 1235 | `(define-derived-mode ,mode compilation-mode ,name | 1235 | `(define-derived-mode ,mode compilation-mode ,name |
| 1236 | ,doc | 1236 | ,doc |
| @@ -1509,7 +1509,7 @@ Prefix arg N says how many files to move backwards (or forwards, if negative)." | |||
| 1509 | (let ((buffer (compilation-find-buffer))) | 1509 | (let ((buffer (compilation-find-buffer))) |
| 1510 | (if (get-buffer-process buffer) | 1510 | (if (get-buffer-process buffer) |
| 1511 | (interrupt-process (get-buffer-process buffer)) | 1511 | (interrupt-process (get-buffer-process buffer)) |
| 1512 | (error "The compilation process is not running")))) | 1512 | (error "The %s process is not running" (downcase mode-name))))) |
| 1513 | 1513 | ||
| 1514 | (defalias 'compile-mouse-goto-error 'compile-goto-error) | 1514 | (defalias 'compile-mouse-goto-error 'compile-goto-error) |
| 1515 | 1515 | ||
| @@ -1754,8 +1754,8 @@ Pop up the buffer containing MARKER and scroll to MARKER if we ask the user." | |||
| 1754 | marker) | 1754 | marker) |
| 1755 | (let ((name (expand-file-name | 1755 | (let ((name (expand-file-name |
| 1756 | (read-file-name | 1756 | (read-file-name |
| 1757 | (format "Find this error in: (default %s) " | 1757 | (format "Find this %s in: (default %s) " |
| 1758 | filename) | 1758 | compilation-error filename) |
| 1759 | dir filename t)))) | 1759 | dir filename t)))) |
| 1760 | (if (file-directory-p name) | 1760 | (if (file-directory-p name) |
| 1761 | (setq name (expand-file-name filename name))) | 1761 | (setq name (expand-file-name filename name))) |