[Emacs-diffs] Changes to emacs/lisp/gnus/nnfolder.el

[Juanma Barranquero]

Index: emacs/lisp/gnus/nnfolder.el
diff -c emacs/lisp/gnus/nnfolder.el:1.13 emacs/lisp/gnus/nnfolder.el:1.14
*** emacs/lisp/gnus/nnfolder.el:1.13    Wed Jan 15 20:19:02 2003
--- emacs/lisp/gnus/nnfolder.el Tue Feb  4 08:06:38 2003
***************
*** 95,101 ****
  (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 
      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
--- 95,101 ----
  (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
      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,195 ****
              (cons nnfolder-current-group article)
            (goto-char (point-min))
            (cons nnfolder-current-group
!                 (if (search-forward (concat "\n" nnfolder-article-marker) 
                                      nil t)
                      (string-to-int
                       (buffer-substring
--- 189,195 ----
              (cons nnfolder-current-group article)
            (goto-char (point-min))
            (cons nnfolder-current-group
!                 (if (search-forward (concat "\n" nnfolder-article-marker)
                                      nil t)
                      (string-to-int
                       (buffer-substring
***************
*** 313,319 ****
        (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))))
--- 313,319 ----
        (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,358 ****
                       force nnfolder-inhibit-expiry))
            (unless (eq nnmail-expiry-target 'delete)
              (with-temp-buffer
!               (nnfolder-request-article (car maybe-expirable) 
                                          newsgroup server (current-buffer))
                (let ((nnml-current-directory nil))
                  (nnmail-expiry-target-group
--- 352,358 ----
                       force nnfolder-inhibit-expiry))
            (unless (eq nnmail-expiry-target 'delete)
              (with-temp-buffer
!               (nnfolder-request-article (car maybe-expirable)
                                          newsgroup server (current-buffer))
                (let ((nnml-current-directory nil))
                  (nnmail-expiry-target-group
***************
*** 384,390 ****
         (goto-char (point-min))
         (while (re-search-forward
                 (concat "^" nnfolder-article-marker)
!                (save-excursion (and (search-forward "\n\n" nil t) (point))) 
                 t)
           (delete-region (progn (beginning-of-line) (point))
                          (progn (forward-line 1) (point))))
--- 384,390 ----
         (goto-char (point-min))
         (while (re-search-forward
                 (concat "^" nnfolder-article-marker)
!                (save-excursion (and (search-forward "\n\n" nil t) (point)))
                 t)
           (delete-region (progn (beginning-of-line) (point))
                          (progn (forward-line 1) (point))))
***************
*** 629,635 ****
              ;; 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 
                       (or nnfolder-file-coding-system-for-write
                           nnfolder-file-coding-system-for-write)))
                  (nnmail-write-region (point-min) (point-min)
--- 629,635 ----
              ;; 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
                       (or nnfolder-file-coding-system-for-write
                           nnfolder-file-coding-system-for-write)))
                  (nnmail-write-region (point-min) (point-min)
***************
*** 746,752 ****
  (defun nnfolder-read-folder (group)
    (let* ((file (nnfolder-group-pathname group))
         (buffer (set-buffer
!                 (let ((nnheader-file-coding-system 
                         nnfolder-file-coding-system))
                    (nnheader-find-file-noselect file)))))
      (mm-enable-multibyte) ;; Use multibyte buffer for future copying.
--- 746,752 ----
  (defun nnfolder-read-folder (group)
    (let* ((file (nnfolder-group-pathname group))
         (buffer (set-buffer
!                 (let ((nnheader-file-coding-system
                         nnfolder-file-coding-system))
                    (nnheader-find-file-noselect file)))))
      (mm-enable-multibyte) ;; Use multibyte buffer for future copying.
***************
*** 886,892 ****
    (when (buffer-modified-p)
      (run-hooks 'nnfolder-save-buffer-hook)
      (gnus-make-directory (file-name-directory (buffer-file-name)))
!     (let ((coding-system-for-write 
           (or nnfolder-file-coding-system-for-write
               nnfolder-file-coding-system)))
        (save-buffer))))
--- 886,892 ----
    (when (buffer-modified-p)
      (run-hooks 'nnfolder-save-buffer-hook)
      (gnus-make-directory (file-name-directory (buffer-file-name)))
!     (let ((coding-system-for-write
           (or nnfolder-file-coding-system-for-write
               nnfolder-file-coding-system)))
        (save-buffer))))