nnheader.el (nnheader-insert-buffer-substring): Renamed from nntp- and moved from...

[gnu-emacs] / lisp / gnus / nnheader.el

diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index ae5893ae42db6780fac9bd86d662b08d0355b4b2..6f871ccb9e879610f499abbe9281398b034778bb 100644 (file)
--- 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))