procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make gnus cache work with group names having '/'

Browse source 
Make `gnus-cache-file-name` use the existing
`nnmail-group-pathname`.

* lisp/gnus/gnus-cache.el (gnus-cache-file-name)
(gnus-cache-update-article):
* lisp/gnus/nnmail.el (nnmail-group-pathname):
This commit is contained in:
James Thomas 2024-03-14 08:42:00 +05:30 • committed by Eric Abrahamsen
parent a33e7c0286
commit 0df8dadde2
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lisp/gnus/gnus-cache.el
View file

@ -443,23 +443,9 @@ Returns the list of articles removed."
(and (not unread) (not ticked) (not dormant) (memq 'read class))))
(defun gnus-cache-file-name (group 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)
(setq group (concat (substring group 0 (match-beginning 0))
"/" (substring group (match-end 0)))))
(nnheader-replace-chars-in-string group ?. ?/)))
t)
gnus-cache-directory))))
(nnmail-group-pathname
group gnus-cache-directory
(if (stringp article) article (int-to-string article))))
(defun gnus-cache-update-article (group article)
"If ARTICLE is in the cache, remove it and re-enter it."
@ -699,9 +685,10 @@ If LOW, update the lower bound instead."
(file-name-as-directory
(expand-file-name gnus-cache-directory))))
(directory-file-name directory))
(nnheader-replace-chars-in-string
(substring (directory-file-name directory) (match-end 0))
?/ ?.)))
(url-unhex-string
(nnheader-replace-chars-in-string
(substring (directory-file-name directory) (match-end 0))
?/ ?.))))
nums alphs)
(when top
(gnus-message 5 "Generating the cache active file...")

3
lisp/gnus/nnmail.el
View file

@ -33,6 +33,7 @@
(require 'mail-source)
(require 'mm-util)
(require 'gnus-int)
(require 'browse-url)
(autoload 'mail-send-and-exit "sendmail" nil t)
@ -627,7 +628,7 @@ These will be logged to the \"*nnmail split*\" buffer."
(concat
(let ((dir (file-name-as-directory (expand-file-name dir))))
(setq group (nnheader-replace-duplicate-chars-in-string
(nnheader-replace-chars-in-string group ?/ ?_)
(browse-url-url-encode-chars group "[/%]")
?. ?_))
(setq group (nnheader-translate-file-chars group))
;; If this directory exists, we use it directly.