Sync with Tramp 2.3.0

[gnu-emacs] / lisp / net / newst-reader.el

diff --git a/lisp/net/newst-reader.el b/lisp/net/newst-reader.el
index fcf4d19503ee13a1fbd4347014a30fc6bfe1425c..9c29216ccaf5cf34e9bccc8f68e175cc9d432734 100644 (file)
--- a/lisp/net/newst-reader.el
+++ b/lisp/net/newst-reader.el
@@ -1,6 +1,6 @@
 ;;; newst-reader.el --- Generic RSS reader functions.
 
-;; Copyright (C) 2003-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2016 Free Software Foundation, Inc.
 
 ;; Author:      Ulf Jasper <ulf.jasper@web.de>
 ;; Filename:    newst-reader.el
@@ -69,6 +69,7 @@ This must be one of the functions `newsticker-plainview' or
 (defcustom newsticker-download-logos
   t
   "If non-nil newsticker downloads logo images of subscribed feeds."
+  :version "25.1"
   :type 'boolean
   :group 'newsticker-reader)
 
@@ -258,54 +259,50 @@ for formatting."
 (defun newsticker--image-read (feed-name-symbol disabled &optional max-height)
   "Read the cached image for FEED-NAME-SYMBOL from disk.
 If DISABLED is non-nil the image will be converted to a disabled look
-\(unless `newsticker-enable-logo-manipulations' is not t\).
+\(unless `newsticker-enable-logo-manipulations' is not t).
 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