aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov <[email protected]>2005-08-22 19:55:57 +0000
committerJuri Linkov <[email protected]>2005-08-22 19:55:57 +0000
commitbac3a1c9b7f52b509ab6fc13570c68deb3efb01d (patch)
tree25fcea0a5278709731acb7469963f158b7d0d831
parent69672704aec84730c106f935200c0c5a7bf599d0 (diff)
(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/ChangeLog21
-rw-r--r--lisp/progmodes/compile.el14
2 files changed, 28 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 04dc5f66cf..3af80f3335 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2005-08-22 Juri Linkov <[email protected]>
+
+ * faces.el (set-face-underline): Delete this duplicate function
+ and make an obsolete alias to set-face-underline-p.
+ (set-face-underline-p): Use docstring of set-face-underline.
+ (describe-face): Create hyperlink to parent face.
+
+ * info.el (Info-insert-dir): Use save-excursion around
+ insert-buffer-substring.
+ (Info-isearch-search): Use LITERAL arg of replace-regexp-in-string.
+ (Info-escape-percent): Delete function.
+ (Info-fontify-node): Replace Info-escape-percent by
+ replace-regexp-in-string with REP arg set to lambda that
+ duplicates `%' and preserves text properties.
+
+ * progmodes/compile.el (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.
+
2005-08-22 Stefan Monnier <[email protected]>
* smerge-mode.el (smerge-basic-map): Bind smerge-combine-with-next.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 94414e2d48..dff4de60e4 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:
(defcustom compilation-disable-input nil
"*If non-nil, send end-of-file as compilation process input.
This only affects platforms that support asynchronous processes (see
-start-process); synchronous compilation processes never accept input."
+`start-process'); synchronous compilation processes never accept input."
:type 'boolean
:group 'compilation
:version "22.1")
@@ -1228,9 +1228,9 @@ Runs `compilation-mode-hook' with `run-mode-hooks' (which see).
(defmacro define-compilation-mode (mode name doc &rest body)
"This is like `define-derived-mode' without the PARENT argument.
The parent is always `compilation-mode' and the customizable `compilation-...'
-variables are also set from the name of the mode you have chosen, by replacing
-the fist word, e.g `compilation-scroll-output' from `grep-scroll-output' if that
-variable exists."
+variables are also set from the name of the mode you have chosen,
+by replacing the first word, e.g `compilation-scroll-output' from
+`grep-scroll-output' if that variable exists."
(let ((mode-name (replace-regexp-in-string "-mode\\'" "" (symbol-name mode))))
`(define-derived-mode ,mode compilation-mode ,name
,doc
@@ -1509,7 +1509,7 @@ Prefix arg N says how many files to move backwards (or forwards, if negative)."
(let ((buffer (compilation-find-buffer)))
(if (get-buffer-process buffer)
(interrupt-process (get-buffer-process buffer))
- (error "The compilation process is not running"))))
+ (error "The %s process is not running" (downcase mode-name)))))
(defalias 'compile-mouse-goto-error 'compile-goto-error)
@@ -1754,8 +1754,8 @@ Pop up the buffer containing MARKER and scroll to MARKER if we ask the user."
marker)
(let ((name (expand-file-name
(read-file-name
- (format "Find this error in: (default %s) "
- filename)
+ (format "Find this %s in: (default %s) "
+ compilation-error filename)
dir filename t))))
(if (file-directory-p name)
(setq name (expand-file-name filename name)))