2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b757200c9e2..cc083c22aae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,12 @@
         (sentence-end-without-space): Delete duplicated chars.
         (sentence-end-base): Likewise.
 
+        * textmodes/sgml-mode.el: Change to utf-8.  Adjust coding cookie.
+        (html-mode): Delete duplicated chars from sentence-end-base.
+
+        * textmodes/texinfo.el: Change to utf-8.  Adjust coding cookie.
+        (texinfo-mode): Delete duplicated chars from sentence-end-base.
+
 2009-08-17  Chong Yidong  <cyd@stupidchicken.com>
 
         * files.el (hack-one-local-variable): If the mode function is for
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 04458461103..b936c45b50c 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -1,4 +1,4 @@
-;;; texinfo.el --- major mode for editing Texinfo files -*- coding: iso-2022-7bit -*-
+;;; texinfo.el --- major mode for editing Texinfo files -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1985, 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997,
 ;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -584,7 +584,7 @@ value of `texinfo-mode-hook'."
   (setq paragraph-start (concat "\b\\|@[a-zA-Z]*[ \n]\\|" paragraph-start))
   (make-local-variable 'sentence-end-base)
   (setq sentence-end-base
-        "\\(@\\(end\\)?dots{}\\|[.?!]\\)[]\"'$B!I$,1r}(B)}]*")
+        "\\(@\\(end\\)?dots{}\\|[.?!]\\)[]\"'”)}]*")
   (make-local-variable 'adaptive-fill-mode)
   (setq adaptive-fill-mode nil)
   (make-local-variable 'fill-column)