summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/comint.el4
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eacc3f1ab48..eb6dba6c6c0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-13 Miles Bader <miles@gnu.org>
+
+ * comint.el (comint-mode): Don't set `font-lock-defaults'.
+ (comint-mode-hook): Turn on font-lock by default.
+
2002-06-12 Karl Fogel <kfogel@red-bean.com>
* bookmark.el (bookmark-file-or-variation-thereof): Restore
diff --git a/lisp/comint.el b/lisp/comint.el
index 9d31e975789..ea06ab4ac5f 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -384,7 +384,7 @@ field boundaries in a natural way)."
:type 'boolean
:group 'comint)
-(defcustom comint-mode-hook '()
+(defcustom comint-mode-hook '(turn-on-font-lock)
"Called upon entry into `comint-mode'
This is run before the process is cranked up."
:type 'hook
@@ -507,8 +507,6 @@ Entry to this mode runs the hooks on `comint-mode-hook'."
(make-local-variable 'comint-file-name-chars)
(make-local-variable 'comint-file-name-quote-list)
(set (make-local-variable 'comint-accum-marker) (make-marker))
- (set (make-local-variable 'font-lock-defaults)
- '(nil t nil nil nil (font-lock-core-only . t)))
;; This behavior is not useful in comint buffers, and is annoying
(set (make-local-variable 'next-line-add-newlines) nil))