Changes committed gnus/contrib (ChangeLog nnir.el)

Modified: ChangeLog nnir.el

(nnir-compose-result): Use `gnus-replace-in-string' instead of `substitute' to
avoid using cl at runtime.


Index: ChangeLog
diff -u gnus/contrib/ChangeLog:7.65 gnus/contrib/ChangeLog:7.66
--- ChangeLog:7.65	Sat Apr 19 19:23:05 2008
+++ ChangeLog	Mon Apr 21 18:33:54 2008
@@ -1,3 +1,8 @@
+2008-04-21  Justus Piater  <[email protected]>
+
+	* nnir.el (nnir-compose-result): Use `gnus-replace-in-string' instead
+	of `substitute' to avoid using cl at runtime.
+
 2008-04-19  Reiner Steib  <[email protected]>
 
 	* nnir.el: Don't require edmacro anymore.  Remove bogus Emacs 19
Index: nnir.el
diff -u gnus/contrib/nnir.el:7.28 gnus/contrib/nnir.el:7.29
--- nnir.el:7.28	Sat Apr 19 19:19:12 2008
+++ nnir.el	Mon Apr 21 18:33:54 2008
@@ -880,10 +880,11 @@
     (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:")