diff options
Diffstat (limited to 'lisp/gnus/nnir.el')
| -rw-r--r-- | lisp/gnus/nnir.el | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 560ba8ad2e5..eb436f51df5 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -928,17 +928,17 @@ ready to be added to the list of search results." ;; Set group to dirnam without any leading dots or slashes, ;; and with all subsequent slashes replaced by dots - (let ((group (gnus-replace-in-string - (gnus-replace-in-string dirnam "^[./\\]" "" t) - "[/\\]" "." t))) - - (vector (gnus-group-full-name group server) - (if (string-match "\\`nnmaildir:" (gnus-group-server server)) - (nnmaildir-base-name-to-article-number - (substring article 0 (string-match ":" article)) - group nil) - (string-to-number article)) - (string-to-number score))))) + (let ((group (replace-regexp-in-string + (replace-regexp-in-string dirnam "^[./\\]" "" nil t) + "[/\\]" "." nil t))) + + (vector (gnus-group-full-name group server) + (if (string-match "\\`nnmaildir:" (gnus-group-server server)) + (nnmaildir-base-name-to-article-number + (substring article 0 (string-match ":" article)) + group nil) + (string-to-number article)) + (string-to-number score))))) ;;; Search Engine Interfaces: @@ -1340,9 +1340,10 @@ Tested with swish-e-2.0.1 on Windows NT 4.0." ;; eliminate all ".", "/", "\" from beginning. Always matches. (string-match "^[./\\]*\\(.*\\)$" dirnam) ;; "/" -> "." - (setq group (gnus-replace-in-string (match-string 1 dirnam) "/" ".")) + (setq group (replace-regexp-in-string + (match-string 1 dirnam) "/" ".")) ;; Windows "\\" -> "." - (setq group (gnus-replace-in-string group "\\\\" ".")) + (setq group (replace-regexp-in-string group "\\\\" ".")) (push (vector (gnus-group-full-name group server) (string-to-number artno) @@ -1414,7 +1415,7 @@ Tested with swish-e-2.0.1 on Windows NT 4.0." (when (string-match prefix dirnam) (setq dirnam (replace-match "" t t dirnam))) (push (vector (gnus-group-full-name - (gnus-replace-in-string dirnam "/" ".") server) + (replace-regexp-in-string dirnam "/" ".") server) (string-to-number artno) (string-to-number score)) artlist)) @@ -1612,9 +1613,8 @@ actually)." group (if (file-directory-p (setq group - (gnus-replace-in-string - group - "\\." "/" t))) + (replace-regexp-in-string + group "\\." "/" nil t))) group)))))) (unless group (error "Cannot locate directory for group")) |