projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(gnus-copy-article-buffer): Don't assume `format' removes text
[gnus]
/
lisp
/
gnus-soup.el
diff --git
a/lisp/gnus-soup.el
b/lisp/gnus-soup.el
index
4a49c88
..
de67cc7
100644
(file)
--- a/
lisp/gnus-soup.el
+++ b/
lisp/gnus-soup.el
@@
-67,9
+67,9
@@
The SOUP packet file name will be inserted at the %s.")
;;; Internal Variables:
;;; Internal Variables:
-(defvar gnus-soup-encoding-type ?
n
+(defvar gnus-soup-encoding-type ?
u
"*Soup encoding type.
"*Soup encoding type.
-`
n' is
news format, `m' is Unix mbox format, and `M' is MMDF mailbox
+`
u' is USENET
news format, `m' is Unix mbox format, and `M' is MMDF mailbox
format.")
(defvar gnus-soup-index-type ?c
format.")
(defvar gnus-soup-index-type ?c
@@
-140,7
+140,7
@@
move those articles instead."
(buffer-disable-undo tmp-buf)
(save-excursion
(while articles
(buffer-disable-undo tmp-buf)
(save-excursion
(while articles
-
;; Put the article in a buffer.
+ ;; Put the article in a buffer.
(set-buffer tmp-buf)
(when (gnus-request-article-this-buffer
(car articles) gnus-newsgroup-name)
(set-buffer tmp-buf)
(when (gnus-request-article-this-buffer
(car articles) gnus-newsgroup-name)
@@
-245,7
+245,8
@@
Note -- this function hasn't been implemented yet."
;; a soup header.
(setq head-line
(cond
;; a soup header.
(setq head-line
(cond
- ((= gnus-soup-encoding-type ?n)
+ ((or (= gnus-soup-encoding-type ?u)
+ (= gnus-soup-encoding-type ?n)) ;;Gnus back compatibility.
(format "#! rnews %d\n" (buffer-size)))
((= gnus-soup-encoding-type ?m)
(while (search-forward "\nFrom " nil t)
(format "#! rnews %d\n" (buffer-size)))
((= gnus-soup-encoding-type ?m)
(while (search-forward "\nFrom " nil t)
@@
-335,7
+336,8
@@
If NOT-ALL, don't pack ticked articles."
(while (setq prefix (pop prefixes))
(erase-buffer)
(insert (format "(setq gnus-soup-prev-prefix %d)\n" (cdr prefix)))
(while (setq prefix (pop prefixes))
(erase-buffer)
(insert (format "(setq gnus-soup-prev-prefix %d)\n" (cdr prefix)))
- (gnus-write-buffer (concat (car prefix) gnus-soup-prefix-file))))))
+ (let ((coding-system-for-write mm-text-coding-system))
+ (gnus-write-buffer (concat (car prefix) gnus-soup-prefix-file)))))))
(defun gnus-soup-pack (dir packer)
(let* ((files (mapconcat 'identity
(defun gnus-soup-pack (dir packer)
(let* ((files (mapconcat 'identity
@@
-513,9
+515,12
@@
Return whether the unpacking was successful."
(tmp-buf (gnus-get-buffer-create " *soup send*"))
beg end)
(cond
(tmp-buf (gnus-get-buffer-create " *soup send*"))
beg end)
(cond
- ((/= (gnus-soup-encoding-format
- (gnus-soup-reply-encoding (car replies)))
- ?n)
+ ((and (/= (gnus-soup-encoding-format
+ (gnus-soup-reply-encoding (car replies)))
+ ?u)
+ (/= (gnus-soup-encoding-format
+ (gnus-soup-reply-encoding (car replies)))
+ ?n)) ;; Gnus back compatibility.
(error "Unsupported encoding"))
((null msg-buf)
t)
(error "Unsupported encoding"))
((null msg-buf)
t)