* gnus-agent.el (gnus-agent-save-active): Bind nnheader-file-coding-system to

 gnus-agent-file-coding-system.

* gnus-cache.el (gnus-cache-save-buffers)
(gnus-cache-possibly-enter-article, gnus-cache-request-article)
(gnus-cache-retrieve-headers, gnus-cache-change-buffer)
(gnus-cache-possibly-remove-article, gnus-cache-articles-in-group)
(gnus-cache-braid-nov, gnus-cache-braid-heads)
(gnus-cache-generate-active, gnus-cache-rename-group)
(gnus-cache-delete-group, gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for): Bind file-name-coding-system to
 nnmail-pathname-coding-system.
(gnus-cache-decoded-group-names, gnus-cache-unified-group-names): New variables.
(gnus-cache-decoded-group-name): New function.
(gnus-cache-file-name): Use it.
(gnus-cache-generate-active): Use non-decoded group name for active.

* gnus-util.el (gnus-write-buffer): Bind file-name-coding-system at the right
 place.
(gnus-write-active-file): Don't break non-ASCII group names.

* nntp.el (nntp-marks-changed-p): Bind file-name-coding-system to
 nnmail-pathname-coding-system.

* lpath.el: Bind default-file-name-coding-system, file-name-coding-system and
 language-info-alist for XEmacs.

* gnus-uu.el (gnus-uu-decode-save): Typo.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af78681..b2dc152 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,35 @@
+2007-07-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-agent.el (gnus-agent-save-active): Bind
+       nnheader-file-coding-system to gnus-agent-file-coding-system.
+
+       * gnus-cache.el (gnus-cache-save-buffers)
+       (gnus-cache-possibly-enter-article, gnus-cache-request-article)
+       (gnus-cache-retrieve-headers, gnus-cache-change-buffer)
+       (gnus-cache-possibly-remove-article, gnus-cache-articles-in-group)
+       (gnus-cache-braid-nov, gnus-cache-braid-heads)
+       (gnus-cache-generate-active, gnus-cache-rename-group)
+       (gnus-cache-delete-group, gnus-cache-update-file-total-fetched-for)
+       (gnus-cache-update-overview-total-fetched-for): Bind
+       file-name-coding-system to nnmail-pathname-coding-system.
+       (gnus-cache-decoded-group-names, gnus-cache-unified-group-names): New
+       variables.
+       (gnus-cache-decoded-group-name): New function.
+       (gnus-cache-file-name): Use it.
+       (gnus-cache-generate-active): Use non-decoded group name for active.
+
+       * gnus-util.el (gnus-write-buffer): Bind file-name-coding-system at the
+       right place.
+       (gnus-write-active-file): Don't break non-ASCII group names.
+
+       * nntp.el (nntp-marks-changed-p): Bind file-name-coding-system to
+       nnmail-pathname-coding-system.
+
+       * lpath.el: Bind default-file-name-coding-system,
+       file-name-coding-system and language-info-alist for XEmacs.
+
+       * gnus-uu.el (gnus-uu-decode-save): Typo.
+
 2007-07-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-srvr.el (gnus-server-font-lock-keywords): Quote faces.

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 918aa2d..6681b71 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -1311,7 +1311,8 @@ This can be added to `gnus-select-article-hook' or
       (gnus-active-to-gnus-format nil new)
       (gnus-agent-write-active file new)
       (erase-buffer)
-      (nnheader-insert-file-contents file))))
+      (let ((nnheader-file-coding-system gnus-agent-file-coding-system))
+       (nnheader-insert-file-contents file)))))
 
 (defun gnus-agent-write-active (file new)
     (gnus-make-directory (file-name-directory file))

diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el
index c4e0e22..f90d565 100644 (file)
--- a/lisp/gnus-cache.el
+++ b/lisp/gnus-cache.el
@@ -131,16 +131,17 @@ it's not cached."
              (let ((coding-system-for-write
                     gnus-cache-overview-coding-system))
                (gnus-write-buffer overview-file))
-           ;; Empty overview file, remove it
-           (when (file-exists-p overview-file)
-             (delete-file overview-file))
-           ;; If possible, remove group's cache subdirectory.
-           (condition-case nil
-               ;; FIXME: we can detect the error type and warn the user
-               ;; of any inconsistencies (articles w/o nov entries?).
-               ;; for now, just be conservative...delete only if safe -- sj
-               (delete-directory (file-name-directory overview-file))
-             (error)))
+           (let ((file-name-coding-system nnmail-pathname-coding-system))
+             ;; Empty overview file, remove it
+             (when (file-exists-p overview-file)
+               (delete-file overview-file))
+             ;; If possible, remove group's cache subdirectory.
+             (condition-case nil
+                 ;; FIXME: we can detect the error type and warn the user
+                 ;; of any inconsistencies (articles w/o nov entries?).
+                 ;; for now, just be conservative...delete only if safe -- sj
+                 (delete-directory (file-name-directory overview-file))
+               (error))))
 
          (gnus-cache-update-overview-total-fetched-for
           (car gnus-cache-buffer) overview-file)))
@@ -154,7 +155,8 @@ it's not cached."
             (numberp article)
             (> article 0))             ; This might be a dummy article.
     (let ((number article)
-         file headers lines-chars)
+         file headers lines-chars
+         (file-name-coding-system nnmail-pathname-coding-system))
       ;; If this is a virtual group, we find the real group.
       (when (gnus-virtual-group-p group)
        (let ((result (nnvirtual-find-group-art
@@ -260,7 +262,8 @@ it's not cached."
 (defun gnus-cache-request-article (article group)
   "Retrieve ARTICLE in GROUP from the cache."
   (let ((file (gnus-cache-file-name group article))
-       (buffer-read-only nil))
+       (buffer-read-only nil)
+       (file-name-coding-system nnmail-pathname-coding-system))
     (when (file-exists-p file)
       (erase-buffer)
       (gnus-kill-all-overlays)
@@ -289,7 +292,8 @@ it's not cached."
          (gnus-retrieve-headers articles group fetch-old))
       (let ((uncached-articles (gnus-sorted-difference articles cached))
            (cache-file (gnus-cache-file-name group ".overview"))
-           type)
+           type
+           (file-name-coding-system nnmail-pathname-coding-system))
        ;; We first retrieve all the headers that we don't have in
        ;; the cache.
        (let ((gnus-use-cache nil))
@@ -408,7 +412,8 @@ Returns the list of articles removed."
                               " *gnus-cache-overview*"))))
       ;; Insert the contents of this group's cache overview.
       (erase-buffer)
-      (let ((file (gnus-cache-file-name group ".overview")))
+      (let ((file (gnus-cache-file-name group ".overview"))
+           (file-name-coding-system nnmail-pathname-coding-system))
        (when (file-exists-p file)
          (nnheader-insert-file-contents file)))
       ;; We have a fresh (empty/just loaded) buffer,
@@ -422,8 +427,43 @@ Returns the list of articles removed."
       (and unread (memq 'unread class))
       (and (not unread) (not ticked) (not dormant) (memq 'read class))))
 
+(defvar gnus-cache-decoded-group-names nil
+  "Alist of original group names and decoded group names.
+Decoding is done according to `gnus-group-name-charset-method-alist'
+or `gnus-group-name-charset-group-alist'.")
+
+(defvar gnus-cache-unified-group-names nil
+  "Alist of unified decoded group names and original group names.
+A group name is decoded according to
+`gnus-group-name-charset-method-alist' or
+`gnus-group-name-charset-group-alist' first, and is encoded and
+decoded again according to `nnmail-pathname-coding-system',
+`file-name-coding-system', or `default-file-name-coding-system'.
+
+It is used when asking for a original group name from a cache
+directory name, in which non-ASCII characters might have been unified
+into the ones of a certain charset particularly if the `utf-8' coding
+system for example was used.")
+
+(defun gnus-cache-decoded-group-name (group)
+  "Return a decoded group name of GROUP."
+  (or (cdr (assoc group gnus-cache-decoded-group-names))
+      (let ((decoded (gnus-group-decoded-name group))
+           (coding (or nnmail-pathname-coding-system
+                       (and (boundp 'file-name-coding-system)
+                            file-name-coding-system)
+                       (and (boundp 'default-file-name-coding-system)
+                            default-file-name-coding-system))))
+       (push (cons group decoded) gnus-cache-decoded-group-names)
+       (push (cons (mm-decode-coding-string
+                    (mm-encode-coding-string decoded coding)
+                    coding)
+                   group)
+             gnus-cache-unified-group-names)
+       decoded)))
+
 (defun gnus-cache-file-name (group article)
-  (setq group (gnus-group-decoded-name group))
+  (setq group (gnus-cache-decoded-group-name group))
   (expand-file-name
    (if (stringp article) article (int-to-string article))
    (file-name-as-directory
@@ -456,7 +496,8 @@ Returns the list of articles removed."
   "Possibly remove ARTICLE from the cache."
   (let ((group gnus-newsgroup-name)
        (number article)
-       file)
+       file
+       (file-name-coding-system nnmail-pathname-coding-system))
     ;; If this is a virtual group, we find the real group.
     (when (gnus-virtual-group-p group)
       (let ((result (nnvirtual-find-group-art
@@ -488,7 +529,8 @@ Returns the list of articles removed."
 (defun gnus-cache-articles-in-group (group)
   "Return a sorted list of cached articles in GROUP."
   (let ((dir (file-name-directory (gnus-cache-file-name group 1)))
-       articles)
+       articles
+       (file-name-coding-system nnmail-pathname-coding-system))
     (when (file-exists-p dir)
       (setq articles
            (sort (mapcar (lambda (name) (string-to-number name))
@@ -511,8 +553,8 @@ Returns the list of articles removed."
     (save-excursion
       (set-buffer cache-buf)
       (erase-buffer)
-      (let ((coding-system-for-read
-            gnus-cache-overview-coding-system))
+      (let ((coding-system-for-read gnus-cache-overview-coding-system)
+           (file-name-coding-system nnmail-pathname-coding-system))
        (insert-file-contents
         (or file (gnus-cache-file-name group ".overview"))))
       (goto-char (point-min))
@@ -554,8 +596,8 @@ Returns the list of articles removed."
       (beginning-of-line)
       (set-buffer cache-buf)
       (erase-buffer)
-      (let ((coding-system-for-read
-            gnus-cache-coding-system))
+      (let ((coding-system-for-read gnus-cache-coding-system)
+           (file-name-coding-system nnmail-pathname-coding-system))
        (insert-file-contents (gnus-cache-file-name group entry)))
       (goto-char (point-min))
       (insert "220 ")
@@ -662,6 +704,7 @@ If LOW, update the lower bound instead."
   (interactive)
   (let* ((top (null directory))
         (directory (expand-file-name (or directory gnus-cache-directory)))
+        (file-name-coding-system nnmail-pathname-coding-system)
         (files (directory-files directory 'full))
         (group
          (if top
@@ -687,7 +730,13 @@ If LOW, update the lower bound instead."
        (push (pop files) alphs)))
     ;; If we have nums, then this is probably a valid group.
     (when (setq nums (sort nums '<))
-      (gnus-sethash group (cons (car nums) (gnus-last-element nums))
+      ;; Use non-decoded group name.
+      ;; FIXME: this is kind of a workaround.  The active file should
+      ;; be updated at the time articles are cached.  It will make
+      ;; `gnus-cache-unified-group-names' needless.
+      (gnus-sethash (or (cdr (assoc group gnus-cache-unified-group-names))
+                       group)
+                   (cons (car nums) (gnus-last-element nums))
                    gnus-cache-active-hashtb))
     ;; Go through all the other files.
     (dolist (file alphs)
@@ -739,7 +788,8 @@ files would corrupt Gnus when the cache was next enabled.  It
 depends on the caller to determine whether group renaming is
 supported."
   (let ((old-dir (gnus-cache-file-name old-group ""))
-       (new-dir (gnus-cache-file-name new-group "")))
+       (new-dir (gnus-cache-file-name new-group ""))
+       (file-name-coding-system nnmail-pathname-coding-system))
     (gnus-rename-file old-dir new-dir t))
 
   (gnus-cache-rename-group-total-fetched-for old-group new-group)
@@ -767,7 +817,8 @@ Always updates the cache, even when disabled, as the old cache
 files would corrupt gnus when the cache was next enabled.
 Depends upon the caller to determine whether group deletion is
 supported."
-  (let ((dir (gnus-cache-file-name group "")))
+  (let ((dir (gnus-cache-file-name group ""))
+       (file-name-coding-system nnmail-pathname-coding-system))
     (gnus-delete-directory dir))
 
   (gnus-cache-delete-group-total-fetched-for group)
@@ -806,9 +857,10 @@ supported."
 
        (if file
           (setq size (or (nth 7 (file-attributes file)) 0))
-        (let ((files (directory-files (gnus-cache-file-name group "") 
-                                      t nil t))
-              file attrs)
+        (let* ((file-name-coding-system nnmail-pathname-coding-system)
+               (files (directory-files (gnus-cache-file-name group "")
+                                       t nil t))
+               file attrs)
           (setq size 0.0)
           (while (setq file (pop files))
             (setq attrs (file-attributes file))
@@ -826,6 +878,7 @@ supported."
      (let* ((entry (or (gnus-gethash group gnus-cache-total-fetched-hashtb)
                       (gnus-sethash group (make-list 2 0) 
                                     gnus-cache-total-fetched-hashtb)))
+           (file-name-coding-system nnmail-pathname-coding-system)
            (size (or (nth 7 (file-attributes 
                              (or file
                                  (gnus-cache-file-name group ".overview"))))

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 78a6a1c..56c9b25 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -773,9 +773,9 @@ Bind `print-quoted' and `print-readably' to t, and `print-length' and
 
 (defun gnus-write-buffer (file)
   "Write the current buffer's contents to FILE."
-  ;; Make sure the directory exists.
-  (gnus-make-directory (file-name-directory file))
   (let ((file-name-coding-system nnmail-pathname-coding-system))
+    ;; Make sure the directory exists.
+    (gnus-make-directory (file-name-directory file))
     ;; Write the buffer.
     (write-region (point-min) (point-max) file nil 'quietly)))
 
@@ -1190,8 +1190,12 @@ Return the modified alist."
     t))
 
 (defun gnus-write-active-file (file hashtb &optional full-names)
+  ;; `coding-system-for-write' should be `raw-text' or equivalent.
   (let ((coding-system-for-write nnmail-active-file-coding-system))
     (with-temp-file file
+      ;; The buffer should be in the unibyte mode because group names
+      ;; are ASCII text or encoded non-ASCII text (i.e., unibyte).
+      (mm-disable-multibyte)
       (mapatoms
        (lambda (sym)
         (when (and sym

diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index 0297106..c204ace 100644 (file)
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -393,7 +393,7 @@ didn't work, and overwrite existing files.  Otherwise, ask each time."
    (list current-prefix-arg
         (read-file-name
          (if gnus-uu-save-separate-articles
-             "Save articles is dir: "
+             "Save articles in dir: "
            "Save articles in file: ")
          gnus-uu-default-dir
          gnus-uu-default-dir)))

diff --git a/lisp/lpath.el b/lisp/lpath.el
index dd10062..af440d1 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -44,9 +44,9 @@
                    buffer-display-table buffer-file-coding-system
                    current-language-environment cursor-in-non-selected-windows
                    default-enable-multibyte-characters
-                   enable-multibyte-characters gnus-agent-expire-current-dirs
-                   language-info-alist line-spacing mark-active
-                   mouse-selection-click-count
+                   default-file-name-coding-system enable-multibyte-characters
+                   gnus-agent-expire-current-dirs anguage-info-alist
+                   line-spacing mark-active mouse-selection-click-count
                    mouse-selection-click-count-buffer pgg-parse-crc24
                    temporary-file-directory timer-list tool-bar-mode
                    transient-mark-mode)))
@@ -71,12 +71,14 @@
                 char-charset charsetp coding-system-get define-ccl-program
                 find-charset-region get-charset-property
                 pgg-parse-crc24-string))
+  (maybe-bind '(language-info-alist))
   (unless (featurep 'file-coding)
     (maybe-fbind '(coding-system-base
                   coding-system-change-eol-conversion coding-system-list
                   coding-system-p decode-coding-region decode-coding-string
                   detect-coding-region encode-coding-region
-                  encode-coding-string))))
+                  encode-coding-string))
+    (maybe-bind '(file-name-coding-system))))
 
 (defun nnkiboze-score-file (a)
   )

diff --git a/lisp/nntp.el b/lisp/nntp.el
index d819dfe..5dff3a9 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -2045,7 +2045,8 @@ Please refer to the following variables to customize the connection:
   (autoload 'time-less-p "time-date"))
 
 (defun nntp-marks-changed-p (group server)
-  (let ((file (nntp-group-pathname server group nntp-marks-file-name)))
+  (let ((file (nntp-group-pathname server group nntp-marks-file-name))
+       (file-name-coding-system nnmail-pathname-coding-system))
     (if (null (gnus-gethash file nntp-marks-modtime))
        t ;; never looked at marks file, assume it has changed
       (time-less-p (gnus-gethash file nntp-marks-modtime)