diff options
Diffstat (limited to 'lisp/gnus/nnfolder.el')
| -rw-r--r-- | lisp/gnus/nnfolder.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el index ea83acf8081..f24e5482cb2 100644 --- a/lisp/gnus/nnfolder.el +++ b/lisp/gnus/nnfolder.el @@ -95,7 +95,7 @@ message, a huge time saver for large mailboxes.") (defvoo nnfolder-scantime-alist nil) (defvoo nnfolder-active-timestamp nil) (defvoo nnfolder-active-file-coding-system mm-text-coding-system) -(defvoo nnfolder-active-file-coding-system-for-write +(defvoo nnfolder-active-file-coding-system-for-write nnmail-active-file-coding-system) (defvoo nnfolder-file-coding-system mm-text-coding-system) (defvoo nnfolder-file-coding-system-for-write nnheader-file-coding-system @@ -189,7 +189,7 @@ If nil, `nnfolder-file-coding-system' is used.") (cons nnfolder-current-group article) (goto-char (point-min)) (cons nnfolder-current-group - (if (search-forward (concat "\n" nnfolder-article-marker) + (if (search-forward (concat "\n" nnfolder-article-marker) nil t) (string-to-int (buffer-substring @@ -313,7 +313,7 @@ If nil, `nnfolder-file-coding-system' is used.") (let ((marker (concat "\n" nnfolder-article-marker)) (number "[0-9]+") numbers) - + (while (and (search-forward marker nil t) (re-search-forward number nil t)) (let ((newnum (string-to-number (match-string 0)))) @@ -352,7 +352,7 @@ If nil, `nnfolder-file-coding-system' is used.") force nnfolder-inhibit-expiry)) (unless (eq nnmail-expiry-target 'delete) (with-temp-buffer - (nnfolder-request-article (car maybe-expirable) + (nnfolder-request-article (car maybe-expirable) newsgroup server (current-buffer)) (let ((nnml-current-directory nil)) (nnmail-expiry-target-group @@ -384,7 +384,7 @@ If nil, `nnfolder-file-coding-system' is used.") (goto-char (point-min)) (while (re-search-forward (concat "^" nnfolder-article-marker) - (save-excursion (and (search-forward "\n\n" nil t) (point))) + (save-excursion (and (search-forward "\n\n" nil t) (point))) t) (delete-region (progn (beginning-of-line) (point)) (progn (forward-line 1) (point)))) @@ -629,7 +629,7 @@ deleted. Point is left where the deleted region was." ;; See whether we need to create the new file. (unless (file-exists-p file) (gnus-make-directory (file-name-directory file)) - (let ((nnmail-file-coding-system + (let ((nnmail-file-coding-system (or nnfolder-file-coding-system-for-write nnfolder-file-coding-system-for-write))) (nnmail-write-region (point-min) (point-min) @@ -746,7 +746,7 @@ deleted. Point is left where the deleted region was." (defun nnfolder-read-folder (group) (let* ((file (nnfolder-group-pathname group)) (buffer (set-buffer - (let ((nnheader-file-coding-system + (let ((nnheader-file-coding-system nnfolder-file-coding-system)) (nnheader-find-file-noselect file))))) (mm-enable-multibyte) ;; Use multibyte buffer for future copying. @@ -886,7 +886,7 @@ This command does not work if you use short group names." (when (buffer-modified-p) (run-hooks 'nnfolder-save-buffer-hook) (gnus-make-directory (file-name-directory (buffer-file-name))) - (let ((coding-system-for-write + (let ((coding-system-for-write (or nnfolder-file-coding-system-for-write nnfolder-file-coding-system))) (save-buffer)))) |