* lisp/erc/erc-backend.el (erc-process-sentinel): Check that buffer is alive

[gnu-emacs] / lisp / ChangeLog.7

diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index bca4c14c40455bc133e1267798c6e11dcd519c30..cc813b263c0bfd961d717cc297178e043801c159 100644 (file)
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -1043,10 +1043,10 @@
        (quail-prev-translation-block): Likewise.
        (quail-conversion-backward-char): Call quail-error instead of
        error.  Set quail-translating to nil.
-       (quail-conversion-forward-char): Likewize.
+       (quail-conversion-forward-char): Likewise.
        (quail-conversion-delete-char): Call quail-error instead of error.
        If conversion region gets vacant, set quail-converting to nil.
-       (quail-conversion-backward-delete-char): Likewize.
+       (quail-conversion-backward-delete-char): Likewise.
        (quail-no-conversion): Just set quail-converting to nil.
        (quail-mouse-choose-completion): Call quai-error instead of error.
        (quail-choose-completion-string): Likewise.
@@ -1428,7 +1428,7 @@
        (texi-format-region): Always tagify.
        (texi2info):          Always tagify.
        (texinfo-anchor):     Add @anchor command as place to which
-        a cross reference may go.
+       a cross reference may go.
        (texinfo-no-refill-regexp): Add smalldisplay, smallformat.
        (texinfo-format-uref):            New command: @uref.
        (texinfo-format-var):             New command: @acronym.
@@ -18746,10 +18746,10 @@
        (sgml-value): Doc added.
        (sgml-value): Square brackets removed from prompt.
        (html-tag-alist): New variable 1-7, variable `list' changed.
-       (html-tag-alist)<dir>, <menu>: Use new value of `list'.
-       (html-tag-alist)<font>: Fixed (doc of sgml-tag-alist needs fixing).
-       (html-tag-alist)<ol>, <ul>: Fixed.
-       (html-tag-alist)<fn>: Commented out.
+       (html-tag-alist) <dir>, <menu>: Use new value of `list'.
+       (html-tag-alist) <font>: Fixed (doc of sgml-tag-alist needs fixing).
+       (html-tag-alist) <ol>, <ul>: Fixed.
+       (html-tag-alist) <fn>: Commented out.
 
        * skeleton.el (define-skeleton): Doc fix.
 
@@ -23108,7 +23108,7 @@ See ChangeLog.6 for earlier changes.
 ;; End:
 
        Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006,
-      2007, 2008, 2009  Free Software Foundation, Inc.
+      2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.