[Emacs-diffs] trunk r118171: * lisp/net/newst-reader.el (newsticker--image-read): Simplify.

[Stefan Monnier]

------------------------------------------------------------
revno: 118171
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2014-10-20 21:35:30 -0400
message:
  * lisp/net/newst-reader.el (newsticker--image-read): Simplify.
  (newsticker--icon-read): Use dolist and fix free var error.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/newst-reader.el       
newstreader.el-20091113204419-o5vbwnq5f7feedwu-8684

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-10-21 01:33:44 +0000
+++ b/lisp/ChangeLog    2014-10-21 01:35:30 +0000
@@ -1,5 +1,8 @@
 2014-10-21  Stefan Monnier  <address@hidden>
 
+       * net/newst-reader.el (newsticker--image-read): Simplify.
+       (newsticker--icon-read): Use dolist and fix free var error.
+
        * imenu.el (imenu--menubar-keymap): New var.
        (imenu-add-to-menubar): Set it to remember the keymap we used.
        (imenu-update-menubar): Use it instead of asking lookup-key.

=== modified file 'lisp/net/newst-reader.el'
--- a/lisp/net/newst-reader.el  2014-10-19 16:50:15 +0000
+++ b/lisp/net/newst-reader.el  2014-10-21 01:35:30 +0000
@@ -262,50 +262,46 @@
 Optional argument MAX-HEIGHT specifies the maximal image height.
 Return the image."
   (let ((image-name (concat (newsticker--images-dir)
-                            (symbol-name feed-name-symbol)))
-        (img nil))
+                            (symbol-name feed-name-symbol))))
     (when (file-exists-p image-name)
       (condition-case error-data
-          (setq img (create-image
-                     image-name
-                     (and (fboundp 'imagemagick-types)
-                          (imagemagick-types)
-                          'imagemagick)
-                     nil
-                     :conversion (and newsticker-enable-logo-manipulations
-                                      disabled
-                                      'disabled)
-                     :mask (and newsticker-enable-logo-manipulations
-                                'heuristic)
-                     :ascent 100
-                     :max-height max-height))
+          (create-image
+           image-name
+           (and (fboundp 'imagemagick-types)
+                (imagemagick-types)
+                'imagemagick)
+           nil
+           :conversion (and newsticker-enable-logo-manipulations
+                            disabled
+                            'disabled)
+           :mask (and newsticker-enable-logo-manipulations
+                      'heuristic)
+           :ascent 100
+           :max-height max-height)
         (error
          (message "Error: cannot create image for %s: %s"
-                  feed-name-symbol error-data))))
-    img))
+                  feed-name-symbol error-data))))))
 
 (defun newsticker--icon-read (feed-name-symbol)
   "Read the cached icon for FEED-NAME-SYMBOL from disk.
 Return the image."
   (catch 'icon
     (when (file-exists-p (newsticker--icons-dir))
-      (mapc (lambda (file)
-              (condition-case error-data
-                  (progn (setq img (create-image
-                                    file (and (fboundp 'imagemagick-types)
-                                              (imagemagick-types)
-                                              'imagemagick)
-                                    nil
-                                    :ascent 'center
-                                    :max-width 16
-                                    :max-height 16))
-                         (throw 'icon img))
-                (error
-                 (message "Error: cannot create icon for %s: %s"
-                          feed-name-symbol error-data))))
-            (directory-files (newsticker--icons-dir) t
-                             (concat (symbol-name feed-name-symbol) "\\..*"))))
-    ;; fallback: default icon
+      (dolist (file (directory-files (newsticker--icons-dir) t
+                             (concat (symbol-name feed-name-symbol) "\\..*")))
+        (condition-case error-data
+            (throw 'icon (create-image
+                          file (and (fboundp 'imagemagick-types)
+                                    (imagemagick-types)
+                                    'imagemagick)
+                          nil
+                          :ascent 'center
+                          :max-width 16
+                          :max-height 16))
+          (error
+           (message "Error: cannot create icon for %s: %s"
+                    feed-name-symbol error-data)))))
+    ;; Fallback: default icon.
     (find-image '((:type png :file "newsticker/rss-feed.png" :ascent 
center)))))
 
 ;; the functions we need for retrieval and display