Merge from emacs-23; up to 2010-06-12T17:12:15Z!cyd@stupidchicken.com.

[bpt/emacs.git] / lisp / ChangeLog.8

diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index 8a30b0c..ada6d98 100644 (file)
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -1172,7 +1172,7 @@
 
 1999-12-03  Kenichi Handa  <handa@mule.m17n.org>
 
-       * international/mule-util.el (truncate-string-to-width): Docsting
+       * international/mule-util.el (truncate-string-to-width): Docstring
        fixed.
 
 1999-12-02  Stefan Monnier  <monnier@cs.yale.edu>
@@ -4926,7 +4926,7 @@
 
        * language/ethio-util.el (setup-ethiopic-environment-internal):
        Use quail-activate-hook instead of obsolete hook quail-mode-hook.
-       (exit-ethiopic-environment): Likewize.
+       (exit-ethiopic-environment): Likewise.
 
 1999-06-12  Richard M. Stallman  <rms@gnu.org>
 
@@ -8808,14 +8808,14 @@
        enable-kinsoku.
 
        * simple.el (do-auto-fill): Don't check kinsoku-enable here.
-       Don't call kinsoku directly, intead call fill-find-break-point.
+       Don't call kinsoku directly, instead call fill-find-break-point.
 
        * textmodes/fill.el: Setup `fill-find-break-point-function'
        property to character sets which require `kinsoku' processing for
        filling.
        (fill-find-break-point): New function.
        (fill-region-as-paragraph): Don't check kinsoku-enable here.
-       Don't call kinsoku directly, intead call fill-find-break-point.
+       Don't call kinsoku directly, instead call fill-find-break-point.
 
 1998-10-18  Richard Stallman  <rms@psilocin.ai.mit.edu>
 
@@ -9993,8 +9993,7 @@ See ChangeLog.7 for earlier changes.
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006,
-      2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+    Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -10011,4 +10010,3 @@ See ChangeLog.7 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: efdc1531-ed46-4e14-be59-bee4b23088f3