2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el
index a49c44bfe4f..fb17e4c3f68 100644
--- a/lisp/textmodes/tildify.el
+++ b/lisp/textmodes/tildify.el
@@ -1,6 +1,6 @@
 ;;; tildify.el --- adding hard spaces into texts
 
-;; Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author:     Milan Zamazal <pdm@freesoft.cz>
 ;; Version:    4.4
@@ -84,6 +84,7 @@ mode, the item for the mode SYMBOL is looked up in the alist instead."
 (defcustom tildify-string-alist
   '((latex-mode . "~")
     (tex-mode . latex-mode)
+    (plain-tex-mode . latex-mode)
     (sgml-mode . "&nbsp;")
     (html-mode . sgml-mode)
     (t . " "))
diff --git a/src/ChangeLog b/src/ChangeLog
index 5fffc61fcf3..45c41746ad8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-28  Gerd Moellmann  <gerd@gnu.org>
+
+        * xdisp.c (forward_to_next_line_start): Check for newlines, 
+        not end of line, which includes CR.
+
 2000-11-28  Kenichi Handa  <handa@etl.go.jp>
 
         * coding.c (Ffind_coding_systems_region_internal): Be sure to