Commit 6ab8077a authored by Dave Love's avatar Dave Love
Browse files

(gnus-cache-active-file): Don't use

file-name-as-directory on directory.
(gnus-cache-file-name): Use expand-file-name, not concat.  Don't
use file-name-as-directory on directory.
parent 1c57d870
2000-11-10 Dave Love <fx@gnu.org>
* gnus-cache.el (gnus-cache-active-file): Don't use
file-name-as-directory on directory.
(gnus-cache-file-name): Use expand-file-name, not concat. Don't
use file-name-as-directory on directory.
* time-date.el (timezone-make-date-arpa-standard): Autoload.
(date-to-time): Use it.
* message.el (message-mode) <adaptive-fill-regexp>:
<adaptive-fill-first-line-regexp>: Use [:alnum:] in regexp range.
(message-newline-and-reformat): Likewise.
* mm-util.el: Doc fixes.
(mm-mime-charset): Don't use the raw result of
mm-preferred-coding-system.
(mm-with-unibyte-buffer, mm-with-unibyte-current-buffer)
(mm-with-unibyte): Simplify.
* gnus-int.el (gnus-start-news-server): Use expand-file-name, not
concat.
* pop3.el (pop3-version): Deleted.
(pop3-make-date): New function, avoiding message-make-date.
(pop3-munge-message-separator): Use it.
......
......@@ -36,7 +36,7 @@
(require 'gnus-sum))
(defcustom gnus-cache-active-file
(concat (file-name-as-directory gnus-cache-directory) "active")
(expand-file-name "active" gnus-cache-directory)
"*The cache active file."
:group 'gnus-cache
:type 'file)
......@@ -410,20 +410,22 @@ Returns the list of articles removed."
(and (not unread) (not ticked) (not dormant) (memq 'read class))))
(defun gnus-cache-file-name (group article)
(concat (file-name-as-directory gnus-cache-directory)
(file-name-as-directory
(nnheader-translate-file-chars
(if (gnus-use-long-file-name 'not-cache)
group
(let ((group (nnheader-replace-duplicate-chars-in-string
(nnheader-replace-chars-in-string group ?/ ?_)
?. ?_)))
;; Translate the first colon into a slash.
(when (string-match ":" group)
(aset group (match-beginning 0) ?/))
(nnheader-replace-chars-in-string group ?. ?/)))
t))
(if (stringp article) article (int-to-string article))))
(expand-file-name
(if (stringp article) article (int-to-string article))
(file-name-as-directory
(expand-file-name
(nnheader-translate-file-chars
(if (gnus-use-long-file-name 'not-cache)
group
(let ((group (nnheader-replace-duplicate-chars-in-string
(nnheader-replace-chars-in-string group ?/ ?_)
?. ?_)))
;; Translate the first colon into a slash.
(when (string-match ":" group)
(aset group (match-beginning 0) ?/))
(nnheader-replace-chars-in-string group ?. ?/)))
t)
gnus-cache-directory))))
(defun gnus-cache-update-article (group article)
"If ARTICLE is in the cache, remove it and re-enter it."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment