From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Mon, 2 May 2011 03:37:06 +0000 (+0000)
Subject: nnheader.el (nnheader-insert-buffer-substring): Renamed from nntp- and moved from... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~151
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9f5e78f7d565d4d779d8ed2715ef72ff70c10e45;p=emacs.git

nnheader.el (nnheader-insert-buffer-substring): Renamed from nntp- and moved from that file for reuse.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3038ef53ef4..e4a5aede155 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* nnheader.el (nnheader-insert-buffer-substring): Renamed from nntp-
+	and moved from that file for reuse.
+
 	* pop3.el (pop3-open-server): Error messages are "-ERR".
 
 2011-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index ae5893ae42d..6f871ccb9e8 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -1099,6 +1099,19 @@ See `find-file-noselect' for the arguments."
 	       backend-marks)))))
   backend-marks)
 
+(defmacro nnheader-insert-buffer-substring (buffer &optional start end)
+  "Copy string from unibyte buffer to multibyte current buffer."
+  (if (featurep 'xemacs)
+      `(insert-buffer-substring ,buffer ,start ,end)
+    `(if enable-multibyte-characters
+	 (insert (with-current-buffer ,buffer
+		   (mm-string-to-multibyte
+		    ,(if (or start end)
+			 `(buffer-substring (or ,start (point-min))
+					    (or ,end (point-max)))
+		       '(buffer-string)))))
+       (insert-buffer-substring ,buffer ,start ,end))))
+
 (when (featurep 'xemacs)
   (require 'nnheaderxm))
 
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 681d483b462..6882ed63135 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -545,7 +545,7 @@ textual parts.")
 		  (nnimap-get-whole-article article))
 	    (let ((buffer (current-buffer)))
 	      (with-current-buffer (or to-buffer nntp-server-buffer)
-		(nntp-insert-buffer-substring buffer)
+		(nnheader-insert-buffer-substring buffer)
 		(nnheader-ms-strip-cr)))
 	    (cons group article)))))))
 
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index c8f1d04d4d3..727d9b4d8c0 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -364,19 +364,6 @@ be restored and the command retried."
 
   (throw 'nntp-with-open-group-error t))
 
-(defmacro nntp-insert-buffer-substring (buffer &optional start end)
-  "Copy string from unibyte buffer to multibyte current buffer."
-  (if (featurep 'xemacs)
-      `(insert-buffer-substring ,buffer ,start ,end)
-    `(if enable-multibyte-characters
-	 (insert (with-current-buffer ,buffer
-		   (mm-string-to-multibyte
-		    ,(if (or start end)
-			 `(buffer-substring (or ,start (point-min))
-					    (or ,end (point-max)))
-		       '(buffer-string)))))
-       (insert-buffer-substring ,buffer ,start ,end))))
-
 (defmacro nntp-copy-to-buffer (buffer start end)
   "Copy string from unibyte current buffer to multibyte buffer."
   (if (featurep 'xemacs)
@@ -434,7 +421,7 @@ be restored and the command retried."
 	  (unless discard
 	    (with-current-buffer buffer
 	      (goto-char (point-max))
-	      (nntp-insert-buffer-substring (process-buffer process))
+	      (nnheader-insert-buffer-substring (process-buffer process))
 	      ;; Nix out "nntp reading...." message.
 	      (when nntp-have-messaged
 		(setq nntp-have-messaged nil)
@@ -996,7 +983,7 @@ command whose response triggered the error."
           (narrow-to-region
            (setq point (goto-char (point-max)))
            (progn
-	     (nntp-insert-buffer-substring buf last-point (cdr entry))
+	     (nnheader-insert-buffer-substring buf last-point (cdr entry))
              (point-max)))
           (setq last-point (cdr entry))
           (nntp-decode-text)
@@ -1472,7 +1459,7 @@ password contained in '~/.nntp-authinfo'."
 		(goto-char (point-max))
 		(save-restriction
 		  (narrow-to-region (point) (point))
-		  (nntp-insert-buffer-substring buf start)
+		  (nnheader-insert-buffer-substring buf start)
 		  (when decode
 		    (nntp-decode-text))))))
 	  ;; report it.
@@ -1700,7 +1687,7 @@ password contained in '~/.nntp-authinfo'."
 	(when in-process-buffer-p
 	  (set-buffer buf)
 	  (goto-char (point-max))
-	  (nntp-insert-buffer-substring process-buffer)
+	  (nnheader-insert-buffer-substring process-buffer)
 	  (set-buffer process-buffer)
 	  (erase-buffer)
 	  (set-buffer buf))