aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Jasper2009-01-23 18:49:03 +0000
committerUlf Jasper2009-01-23 18:49:03 +0000
commitc04ed27eea17c099ebb03338a56934eee0dc279a (patch)
treeddd6705fc0932e302b63842a0ed958e41ea4b06d
parente6d76715ebd176edbfd9dcdf9b80cdc8b9df3bf3 (diff)
downloademacs-c04ed27eea17c099ebb03338a56934eee0dc279a.tar.gz
emacs-c04ed27eea17c099ebb03338a56934eee0dc279a.zip
newsticker: fixed bug#1710
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/newst-backend.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e29ceac05ac..c86f29d1428 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-01-23 Ulf Jasper <ulf.jasper@web.de>
2
3 * net/newst-backend.el (newsticker--cache-read): Offer deletion of
4 old cache file. Fixes bug#1710.
5
12009-01-23 Chong Yidong <cyd@stupidchicken.com> 62009-01-23 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * mail/rmail.el (rmail-generate-viewer-buffer): Fix typo. 8 * 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 @@
7;; Filename: newst-backend.el 7;; Filename: newst-backend.el
8;; URL: http://www.nongnu.org/newsticker 8;; URL: http://www.nongnu.org/newsticker
9;; Keywords: News, RSS, Atom 9;; Keywords: News, RSS, Atom
10;; Time-stamp: "22. Dezember 2008, 19:58:01 (ulf)" 10;; Time-stamp: "23. Januar 2009, 19:39:22 (ulf)"
11 11
12;; ====================================================================== 12;; ======================================================================
13 13
@@ -2155,8 +2155,8 @@ FEED is a symbol!"
2155 (progn 2155 (progn
2156 (when (y-or-n-p "Old newsticker cache file exists. Read it? ") 2156 (when (y-or-n-p "Old newsticker cache file exists. Read it? ")
2157 (newsticker--cache-read-version1)) 2157 (newsticker--cache-read-version1))
2158 (message "Please remove/rename the old cache file (%s) now." 2158 (when (y-or-n-p (format "Delete old newsticker cache file? "))
2159 newsticker-cache-filename)) 2159 (delete-file newsticker-cache-filename)))
2160 (mapc (lambda (f) 2160 (mapc (lambda (f)
2161 (newsticker--cache-read-feed (car f))) 2161 (newsticker--cache-read-feed (car f)))
2162 (append newsticker-url-list-defaults newsticker-url-list)))) 2162 (append newsticker-url-list-defaults newsticker-url-list))))