avoid using cl at runtime.
+2008-04-21 Justus Piater <Justus-bulk@Piater.name>
+
+ * nnir.el (nnir-compose-result): Use `gnus-replace-in-string' instead
+ of `substitute' to avoid using cl at runtime.
+
2008-04-19 Reiner Steib <Reiner.Steib@gmx.de>
* nnir.el: Don't require edmacro anymore. Remove bogus Emacs 19
2008-04-19 Reiner Steib <Reiner.Steib@gmx.de>
* nnir.el: Don't require edmacro anymore. Remove bogus Emacs 19
(setq dirnam
(substring dirnam 0 (if (string= server "nnmaildir:") -5 -1)))
(setq dirnam
(substring dirnam 0 (if (string= server "nnmaildir:") -5 -1)))
- ;; eliminate all ".", "/", "\" from beginning. Always matches.
- (string-match "^[./\\]*\\(.*\\)$" dirnam)
- (setq group (substitute ?. ?/ (match-string 1 dirnam))) ;; "/" -> "."
- (setq group (substitute ?. ?\\ group)) ;; "\\" -> "."
+ ;; Set group to dirnam without any leading dots or slashes,
+ ;; and with all subsequent slashes replaced by dots
+ (setq group (gnus-replace-in-string
+ (gnus-replace-in-string dirnam "^[./\\]" "" t)
+ "[/\\]" "." t))
(vector (nnir-group-full-name group server)
(if (string= server "nnmaildir:")
(vector (nnir-group-full-name group server)
(if (string= server "nnmaildir:")