[sawfish] make-image defined twice, rename the second instance (squashes compiler warning)

[Christopher Bratusek <chrisb src gnome org>]

commit d25a29ef69dfe31cae657a7a5c50fafbb88976bc
Author: chrisb <zanghar freenet de>
Date:   Mon Sep 7 19:58:52 2009 +0200

    make-image defined twice, rename the second instance (squashes compiler warning)

 ChangeLog                             |    6 ++++++
 lisp/sawfish/wm/theming/make-theme.jl |    7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 01a9dc7..6db1d89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,12 @@
 
 	* lisp/sawfish/wm/integration/kde.jl: added logout, reboot and shutdown entries
 
+	* lisp/sawfish/wm/theming/make-theme.jl: make-image is defined the *second* time here
+	                                         the first time in gaol, rename this instance to
+						 make-image-possibly-from-cache to avoid confusion
+						 for both users and the rep-compiler 
+						 also squashes a compiler warning [Matthew Love]
+
 2009-09-06  Christopher Bratusek <zanghar freenet de>
 	* lisp/sawfish/wm/ext/fdo-menu.jl: Partial rewrite of fdo-menu [Matthew Love]
 
diff --git a/lisp/sawfish/wm/theming/make-theme.jl b/lisp/sawfish/wm/theming/make-theme.jl
index fc8acbe..87b846e 100644
--- a/lisp/sawfish/wm/theming/make-theme.jl
+++ b/lisp/sawfish/wm/theming/make-theme.jl
@@ -35,10 +35,9 @@
   (define (make-frames patterns-alist frame-alist)
     (let ((image-cache '()))
       
-      (define (make-image file)
+      (define (make-image-possibly-from-cache file)
 	(or (cdr (assoc file image-cache))
-	    (let
-		((img (gaol-eval `(make-image ',file))))
+	    (let ((img (gaol-eval `(make-image ',file))))
 	      (setq image-cache (cons (cons file img) image-cache))
 	      img)))
 
@@ -50,7 +49,7 @@
 			   (setq value (get-color value)))
 			  ((and (consp value) (stringp (car value)))
 			   (let
-			       ((img (make-image (car value))))
+			       ((img (make-image-possibly-from-cache (car value))))
 			     (when img
 			       (mapc (lambda (attr)
 				       (cond