From: Ulf Jasper <ulf.jasper@web.de>
Date: Fri, 23 Jan 2009 18:49:03 +0000 (+0000)
Subject: newsticker: fixed bug#1710
X-Git-Tag: emacs-pretest-23.0.90~259
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c04ed27eea17c099ebb03338a56934eee0dc279a;p=emacs.git

newsticker: fixed bug#1710
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e29ceac05ac..c86f29d1428 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-23  Ulf Jasper  <ulf.jasper@web.de>
+
+	* net/newst-backend.el (newsticker--cache-read): Offer deletion of
+	old cache file.  Fixes bug#1710.
+
 2009-01-23  Chong Yidong  <cyd@stupidchicken.com>
 
 	* mail/rmail.el (rmail-generate-viewer-buffer): Fix typo.
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index 669b7675f03..7bc6131cf1f 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -7,7 +7,7 @@
 ;; Filename:    newst-backend.el
 ;; URL:         http://www.nongnu.org/newsticker
 ;; Keywords:    News, RSS, Atom
-;; Time-stamp:  "22. Dezember 2008, 19:58:01 (ulf)"
+;; Time-stamp:  "23. Januar 2009, 19:39:22 (ulf)"
 
 ;; ======================================================================
 
@@ -2155,8 +2155,8 @@ FEED is a symbol!"
       (progn
         (when (y-or-n-p "Old newsticker cache file exists.  Read it? ")
           (newsticker--cache-read-version1))
-        (message "Please remove/rename the old cache file (%s) now."
-                 newsticker-cache-filename))
+        (when (y-or-n-p (format "Delete old newsticker cache file? "))
+          (delete-file newsticker-cache-filename)))
     (mapc (lambda (f)
             (newsticker--cache-read-feed (car f)))
           (append newsticker-url-list-defaults newsticker-url-list))))