From 77a01f9bb9ba354db370c72fb7adca46b1c1ca87 Mon Sep 17 00:00:00 2001 From: Ulf Jasper Date: Thu, 18 Dec 2008 10:54:21 +0000 Subject: [PATCH] newsticker: fixed problem with missing group definition --- lisp/ChangeLog | 25 +++++++++++++++++-------- lisp/net/newst-backend.el | 9 +++++---- lisp/net/newst-treeview.el | 9 ++++++--- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4158317eba9..3185940ce9a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2008-12-18 Ulf Jasper + + * net/newst-treeview.el (newsticker-groups-filename): Made obsolete. + (newsticker-treeview-quit): Call `newsticker-treeview-save'. + (newsticker--treeview-load): Check whether groups file exists. + + * net/newst-backend.el (newsticker-cache-filename): Made obsolete. + (newsticker-dir): Use `locate-user-emacs-file'. + 2008-12-18 Martin Rudalics * emulation/cua-base.el (cmd): Add beginning-of-visual-line and @@ -703,7 +712,7 @@ * calendar/appt.el (appt-disp-window): Do a set-buffer when the frame can't be split. -2008-11-24 Ulf Jasper +2008-11-24 Ulf Jasper * net/newst-treeview.el (newsticker--treeview-current-feed): Docstring. (newsticker--treeview-item-show): Rename arg FEED to FEED-NAME-SYMBOL. @@ -2404,7 +2413,7 @@ * kmacro.el (kmacro-edit-lossage): Ditto. * edmacro.el (edit-kbd-macro): Ditto. -2008-10-11 Ulf Jasper +2008-10-11 Ulf Jasper * net/newst-treeview.el (newsticker--treeview-list-sort-by-column): Fix variable names. @@ -3748,7 +3757,7 @@ (facemenu-keymap): Bind "\es" to `center-line' and "\eS" to `center-paragraph'. -2008-08-25 Ulf Jasper +2008-08-25 Ulf Jasper * net/newst-treeview.el (newsticker-treeview-own-frame): Doc fixed. (newsticker-treeview-treewindow-width): New. @@ -5311,7 +5320,7 @@ * net/browse-url.el (browse-url-default-browser): Fix argument list in lambda. -2008-07-07 Ulf Jasper +2008-07-07 Ulf Jasper * net/newst-backend.el (newsticker--get-news-by-url): Catch errors from url-retrieve. @@ -6012,7 +6021,7 @@ (COMPILE_FIRST): List the elc files rather than the el files. (ELCFILES): Update. -2008-06-21 Ulf Jasper +2008-06-21 Ulf Jasper * net/newst-treeview.el: Remove dead code. (newsticker--window-config): Remove. @@ -6098,7 +6107,7 @@ * emacs-lisp/checkdoc.el (checkdoc-start-section, checkdoc-error): Bind inhibit-read-only since the buffer is always read-only. -2008-06-20 Ulf Jasper +2008-06-20 Ulf Jasper * net/newst-treeview.el (newsticker-treeview-own-frame): Change default value to nil. @@ -6351,7 +6360,7 @@ * net/tramp-cmds.el (tramp-cleanup-all-connections): Reset `tramp-locked'. -2008-06-15 Ulf Jasper +2008-06-15 Ulf Jasper * net/newst-treeview.el (newsticker--treeview-list-update) (newsticker--treeview-item-update) @@ -6370,7 +6379,7 @@ * wdired.el (wdired-search-and-rename): Fix undocumented change. -2008-06-15 Ulf Jasper +2008-06-15 Ulf Jasper * net/newst-plainview.el (newsticker-faces, newsticker-feed-face) (newsticker-extra-face, newsticker-enclosure-face): Moved to diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el index 0c72968dff5..e676b108055 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: "24. November 2008, 19:39:24 (ulf)" +;; Time-stamp: "28. November 2008, 19:55:34 (ulf)" ;; ====================================================================== @@ -423,11 +423,12 @@ headline after it has been retrieved for the first time." "Name of the newsticker cache file." :type 'string :group 'newsticker-miscellaneous) +(make-obsolete 'newsticker-cache-filename 'newsticker-dir) (defcustom newsticker-dir - "~/.newsticker" - "Name of the directory where newsticker saves cached data." - :type 'string + (locate-user-emacs-file "newsticker/" ".newsticker/") + "Directory where newsticker saves data." + :type 'directory :group 'newsticker-miscellaneous) ;; debugging diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el index 3993e59ca57..219ec7ad41b 100644 --- a/lisp/net/newst-treeview.el +++ b/lisp/net/newst-treeview.el @@ -7,7 +7,7 @@ ;; URL: http://www.nongnu.org/newsticker ;; Created: 2007 ;; Keywords: News, RSS, Atom -;; Time-stamp: "24. November 2008, 19:49:20 (ulf)" +;; Time-stamp: "18. Dezember 2008, 11:26:54 (ulf)" ;; ====================================================================== @@ -143,6 +143,7 @@ Example: (\"Topmost group\" \"feed1\" (\"subgroup1\" \"feed 2\") "Name of the newsticker groups settings file." :type 'string :group 'newsticker-treeview) +(make-obsolete 'newsticker-groups-filename 'newsticker-dir) ;; ====================================================================== ;;; internal variables @@ -1230,7 +1231,8 @@ Note: does not update the layout." (when newsticker--frame (if (frame-live-p newsticker--frame) (delete-frame newsticker--frame)) - (setq newsticker--frame nil))) + (setq newsticker--frame nil)) + (newsticker-treeview-save)) (defun newsticker-treeview-save () "Save newsticker data including treeview settings." @@ -1256,7 +1258,8 @@ Note: does not update the layout." newsticker-groups-filename)) newsticker-groups-filename) (concat newsticker-dir "/groups"))) - (buf (find-file-noselect filename))) + (buf (and (file-exists-p filename) + (find-file-noselect filename)))) (when buf (set-buffer buf) (goto-char (point-min)) -- 2.11.4.GIT