aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2002-06-13 09:28:48 +0000
committerMiles Bader2002-06-13 09:28:48 +0000
commitfcc6fa51533c1bfe3d0b69327c40ab59b29a1dec (patch)
treee3429da74ca75bdfa7b047056d3aa8ef9185d741
parent76bc6ee3862e35bb4ea9e6c5c8d3359b7a5e7611 (diff)
downloademacs-fcc6fa51533c1bfe3d0b69327c40ab59b29a1dec.tar.gz
emacs-fcc6fa51533c1bfe3d0b69327c40ab59b29a1dec.zip
(comint-mode): Don't set `font-lock-defaults'.
(comint-mode-hook): Turn on font-lock by default.
-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 @@
12002-06-13 Miles Bader <miles@gnu.org>
2
3 * comint.el (comint-mode): Don't set `font-lock-defaults'.
4 (comint-mode-hook): Turn on font-lock by default.
5
12002-06-12 Karl Fogel <kfogel@red-bean.com> 62002-06-12 Karl Fogel <kfogel@red-bean.com>
2 7
3 * bookmark.el (bookmark-file-or-variation-thereof): Restore 8 * 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)."
384 :type 'boolean 384 :type 'boolean
385 :group 'comint) 385 :group 'comint)
386 386
387(defcustom comint-mode-hook '() 387(defcustom comint-mode-hook '(turn-on-font-lock)
388 "Called upon entry into `comint-mode' 388 "Called upon entry into `comint-mode'
389This is run before the process is cranked up." 389This is run before the process is cranked up."
390 :type 'hook 390 :type 'hook
@@ -507,8 +507,6 @@ Entry to this mode runs the hooks on `comint-mode-hook'."
507 (make-local-variable 'comint-file-name-chars) 507 (make-local-variable 'comint-file-name-chars)
508 (make-local-variable 'comint-file-name-quote-list) 508 (make-local-variable 'comint-file-name-quote-list)
509 (set (make-local-variable 'comint-accum-marker) (make-marker)) 509 (set (make-local-variable 'comint-accum-marker) (make-marker))
510 (set (make-local-variable 'font-lock-defaults)
511 '(nil t nil nil nil (font-lock-core-only . t)))
512 ;; This behavior is not useful in comint buffers, and is annoying 510 ;; This behavior is not useful in comint buffers, and is annoying
513 (set (make-local-variable 'next-line-add-newlines) nil)) 511 (set (make-local-variable 'next-line-add-newlines) nil))
514 512