[patch] Fix for name clash

name-clash.patch (text/plain), 1.04 KB, created by Julian Stecklina on 2009-08-04 11:14:39 UTC

--- color-theme.el.orig	2009-08-04 13:02:14.311729125 +0200
+++ color-theme.el	2009-08-04 13:12:20.561668521 +0200
@@ -72,11 +72,6 @@
                                   (string-match "XEmacs" emacs-version))
   "Non-nil if running XEmacs.")
 
-;; Add this since it appears to miss in emacs-2x
-(or (fboundp 'replace-in-string)
-    (defun replace-in-string (target old new)
-      (replace-regexp-in-string old new  target)))
-
 ;; face-attr-construct has a problem in Emacs 20.7 and older when
 ;; dealing with inverse-video faces.  Here is a short test to check
 ;; wether you are affected.
@@ -1626,8 +1621,8 @@
        (add-to-list 'color-themes
                     (list ',n
                           (upcase-initials
-                           (replace-in-string
-                            (replace-in-string 
+                           (replace-regexp-in-string
+                            (replace-regexp-in-string
                              (symbol-name ',n) "^color-theme-" "") "-" " "))
                           ,author))
        (defun ,n ()