[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104075: nnheader.el (nnheader-insert
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104075: nnheader.el (nnheader-insert-buffer-substring): Renamed from nntp- and moved from that file for reuse. |
Date: |
Mon, 02 May 2011 03:37:06 +0000 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104075
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2011-05-02 03:37:06 +0000
message:
nnheader.el (nnheader-insert-buffer-substring): Renamed from nntp- and moved
from that file for reuse.
modified:
lisp/gnus/ChangeLog
lisp/gnus/nnheader.el
lisp/gnus/nnimap.el
lisp/gnus/nntp.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2011-05-02 01:19:21 +0000
+++ b/lisp/gnus/ChangeLog 2011-05-02 03:37:06 +0000
@@ -1,5 +1,8 @@
2011-05-02 Lars Magne Ingebrigtsen <address@hidden>
+ * 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 <address@hidden>
=== modified file 'lisp/gnus/nnheader.el'
--- a/lisp/gnus/nnheader.el 2011-02-03 07:25:14 +0000
+++ b/lisp/gnus/nnheader.el 2011-05-02 03:37:06 +0000
@@ -1099,6 +1099,19 @@
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))
=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el 2011-05-01 23:30:18 +0000
+++ b/lisp/gnus/nnimap.el 2011-05-02 03:37:06 +0000
@@ -545,7 +545,7 @@
(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)))))))
=== modified file 'lisp/gnus/nntp.el'
--- a/lisp/gnus/nntp.el 2011-05-01 23:30:18 +0000
+++ b/lisp/gnus/nntp.el 2011-05-02 03:37:06 +0000
@@ -364,19 +364,6 @@
(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 @@
(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 @@
(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 @@
(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 @@
(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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104075: nnheader.el (nnheader-insert-buffer-substring): Renamed from nntp- and moved from that file for reuse.,
Katsumi Yamaoka <=