gnus.texi (Face): Fix typo.

gnus-group.el (gnus-import-other-newsrc-file): Use insert-file-contents.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c1d94c..a8d641e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-17  Glenn Morris  <rgm@gnu.org>
+
+       * gnus-group.el (gnus-import-other-newsrc-file):
+       Use insert-file-contents.
+
 2011-05-16  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus-sum.el (gnus-summary-hide-all-threads): Add update message every

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index c265538..a21faa8 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -4407,7 +4407,7 @@ and the second element is the address."
 ;; file.  Use with caution, if at all.
 (defun gnus-import-other-newsrc-file (file)
   (with-temp-buffer
-    (insert-file file)
+    (insert-file-contents file)
     (let (form)
       (while (ignore-errors
               (setq form (read (current-buffer))))

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 0d0829a..b7986af 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-17  Glenn Morris  <rgm@gnu.org>
+
+       * gnus.texi (Face): Fix typo.
+
 2011-05-03  Peter Münster  <pmlists@free.fr>  (tiny change)
 
        * gnus.texi (Summary Buffer Lines):

diff --git a/texi/gnus.texi b/texi/gnus.texi
index b458ce6..1f09f75 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -23501,7 +23501,7 @@ specifications.
 The @code{gnus-face-properties-alist} variable affects the appearance of
 displayed Face images.  @xref{X-Face}.
 
-Viewing an @code{Face} header requires an Emacs that is able to display
+Viewing a @code{Face} header requires an Emacs that is able to display
 PNG images.
 @c Maybe add this:
 @c (if (featurep 'xemacs)