[gnus git] branch master updated: n0-15-96-g8ea8c66 =1= Use nntp-insert-buffer-substring to get the conversion from unibyte to multibyte buffers to work on Emacs 22.

       via  8ea8c66caa7ea01e9284a6c25c1ebf619e6ece81 (commit)
      from  29aaf33fa282f8b86be1fa339560fb2d5c195c30 (commit)


- Log -----------------------------------------------------------------
commit 8ea8c66caa7ea01e9284a6c25c1ebf619e6ece81
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Sun May 1 19:27:52 2011 +0200

    Use nntp-insert-buffer-substring to get the conversion from unibyte to multibyte buffers to work on Emacs 22.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c54ffb3..2ed7b29 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-01  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* nnimap.el (nnimap-request-article): Use nntp-insert-buffer-substring
+	to get the conversion from unibyte to multibyte buffers to work on
+	Emacs 22.
+
+	* nntp.el (nntp-request-article): Slight clean-up.
+
 2011-04-29  Lars Magne Ingebrigtsen  <[email protected]>
 
 	* shr.el (shr-strike-through): New face.
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index f819c17..681d483 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -545,10 +545,9 @@ textual parts.")
 		  (nnimap-get-whole-article article))
 	    (let ((buffer (current-buffer)))
 	      (with-current-buffer (or to-buffer nntp-server-buffer)
-		(erase-buffer)
-		(insert-buffer-substring buffer)
-		(nnheader-ms-strip-cr)
-		(cons group article)))))))))
+		(nntp-insert-buffer-substring buffer)
+		(nnheader-ms-strip-cr)))
+	    (cons group article)))))))
 
 (deffoo nnimap-request-head (article &optional group server to-buffer)
   (when (nnimap-possibly-change-group group server)
diff --git a/lisp/nntp.el b/lisp/nntp.el
index 3285da5..c8f1d04 100644
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1032,12 +1032,11 @@ command whose response triggered the error."
     (when (nntp-send-command-and-decode
            "\r?\n\\.\r?\n" "ARTICLE"
            (if (numberp article) (int-to-string article) article))
-      (if (and buffer
+      (when (and buffer
                (not (equal buffer nntp-server-buffer)))
           (with-current-buffer nntp-server-buffer
-            (copy-to-buffer buffer (point-min) (point-max))
-            (nntp-find-group-and-number group))
-        (nntp-find-group-and-number group)))))
+	  (copy-to-buffer buffer (point-min) (point-max))))
+      (nntp-find-group-and-number group))))
 
 (deffoo nntp-request-head (article &optional group server)
   (nntp-with-open-group

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    8 ++++++++
 lisp/nnimap.el |    7 +++----
 lisp/nntp.el   |   13 ++++++-------
 3 files changed, 17 insertions(+), 11 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project