[bongo-patches] Fix bug causing `bongo-track-mark-icon-string' to fail when the image named by `bongo-track-mark-icon-file-name' is not found

[Daniel Brockman]

2007-02-13  Daniel Brockman  <address@hidden>

        Fix bug causing `bongo-track-mark-icon-string' to fail when the
        image named by `bongo-track-mark-icon-file-name' is not found.

diff -rN -u old-bongo/bongo.el new-bongo/bongo.el
--- old-bongo/bongo.el  2007-02-13 18:30:47.000000000 +0100
+++ new-bongo/bongo.el  2007-02-13 18:30:47.000000000 +0100
@@ -3314,15 +3314,16 @@
 
 (defun bongo-track-mark-icon-string ()
   "Return the string to use as a marker icon for the current line."
-  (if (and bongo-track-mark-icon-file-name (display-images-p))
-      (let ((image (bongo-find-image bongo-track-mark-icon-file-name
-                                     'bongo-marked-track-line)))
+  (let ((image (and bongo-track-mark-icon-file-name (display-images-p)
+                    (bongo-find-image bongo-track-mark-icon-file-name
+                                      'bongo-marked-track-line))))
+    (if image
         (if (bongo-marked-track-line-p)
             (bongo-make-image-string image)
-          (bongo-make-image-placeholder-string image)))
-    (if (bongo-marked-track-line-p)
-        bongo-track-mark-icon-string
-      (make-string (length bongo-track-mark-icon-string) ? ))))
+          (bongo-make-image-placeholder-string image))
+      (if (bongo-marked-track-line-p)
+          bongo-track-mark-icon-string
+        (make-string (length bongo-track-mark-icon-string) ? )))))
 
 (defcustom bongo-track-mark-format
   '((bongo-track-mark-icon-string) " ")

-- 
Daniel Brockman <address@hidden>