[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106246: newsticker: Clean up newstic
From: |
Ulf Jasper |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106246: newsticker: Clean up newsticker--group-manage-orphan-feeds |
Date: |
Sun, 30 Oct 2011 16:21:37 +0100 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106246
committer: Ulf Jasper <address@hidden>
branch nick: trunk
timestamp: Sun 2011-10-30 16:21:37 +0100
message:
newsticker: Clean up newsticker--group-manage-orphan-feeds
2011-10-30 Ulf Jasper <address@hidden>
* net/newst-treeview.el: Remove "Time-stamp".
(newsticker--group-manage-orphan-feeds): Do not call
newsticker--treeview-tree-update.
(newsticker-treeview-update, newsticker-treeview): Call
newsticker--treeview-tree-update if necessary.
2011-10-30 Ulf Jasper <address@hidden>
* automated/newsticker-tests.el
(newsticker--group-manage-orphan-feeds): Removed fsetting of
newsticker--treeview-tree-update.
modified:
lisp/ChangeLog
lisp/net/newst-treeview.el
test/ChangeLog
test/automated/newsticker-tests.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-10-30 08:29:56 +0000
+++ b/lisp/ChangeLog 2011-10-30 15:21:37 +0000
@@ -1,3 +1,11 @@
+2011-10-30 Ulf Jasper <address@hidden>
+
+ * net/newst-treeview.el: Remove "Time-stamp".
+ (newsticker--group-manage-orphan-feeds): Do not call
+ newsticker--treeview-tree-update.
+ (newsticker-treeview-update, newsticker-treeview): Call
+ newsticker--treeview-tree-update if necessary.
+
2011-10-30 Martin Rudalics <address@hidden>
* window.el (window-iso-combination-p, window-iso-combined-p)
=== modified file 'lisp/net/newst-treeview.el'
--- a/lisp/net/newst-treeview.el 2011-10-30 01:56:03 +0000
+++ b/lisp/net/newst-treeview.el 2011-10-30 15:21:37 +0000
@@ -7,7 +7,6 @@
;; URL: http://www.nongnu.org/newsticker
;; Created: 2007
;; Keywords: News, RSS, Atom
-;; Time-stamp: "13. Mai 2011, 20:56:49 (ulf)"
;; Package: newsticker
;; ======================================================================
@@ -1193,7 +1192,8 @@
Note: does not update the layout."
(interactive)
(let ((cur-item (newsticker--treeview-get-selected-item)))
- (newsticker--group-manage-orphan-feeds)
+ (if (newsticker--group-manage-orphan-feeds)
+ (newsticker--treeview-tree-update))
(newsticker--treeview-list-update t)
(newsticker--treeview-item-update)
(newsticker--treeview-tree-update-tags)
@@ -1811,7 +1811,8 @@
(defun newsticker--group-manage-orphan-feeds ()
"Put unmanaged feeds into `newsticker-groups'.
-Remove obsolete feeds as well."
+Remove obsolete feeds as well.
+Return t if groups have changed, nil otherwise."
(unless newsticker-groups
(setq newsticker-groups '("Feeds")))
(let ((new-feed nil)
@@ -1823,10 +1824,9 @@
(append newsticker-url-list-defaults newsticker-url-list))
(setq newsticker-groups
(newsticker--group-remove-obsolete-feeds newsticker-groups))
- (if (or new-feed
- (not (= grouped-feeds
- (newsticker--count-grouped-feeds newsticker-groups))))
- (newsticker--treeview-tree-update))))
+ (or new-feed
+ (not (= grouped-feeds
+ (newsticker--count-grouped-feeds newsticker-groups))))))
;; ======================================================================
;;; Modes
@@ -2036,7 +2036,8 @@
(newsticker--treeview-frame-init)
(newsticker--treeview-window-init)
(newsticker--treeview-buffer-init)
- (newsticker--group-manage-orphan-feeds)
+ (if (newsticker--group-manage-orphan-feeds)
+ (newsticker--treeview-tree-update))
(newsticker--treeview-set-current-node newsticker--treeview-feed-tree)
(newsticker-start t) ;; will start only if not running
(newsticker-treeview-update)
=== modified file 'test/ChangeLog'
--- a/test/ChangeLog 2011-10-29 15:29:16 +0000
+++ b/test/ChangeLog 2011-10-30 15:21:37 +0000
@@ -1,3 +1,9 @@
+2011-10-30 Ulf Jasper <address@hidden>
+
+ * automated/newsticker-tests.el
+ (newsticker--group-manage-orphan-feeds): Removed fsetting of
+ newsticker--treeview-tree-update.
+
2011-10-29 Ulf Jasper <address@hidden>
* automated/newsticker-tests.el
=== modified file 'test/automated/newsticker-tests.el'
--- a/test/automated/newsticker-tests.el 2011-10-29 15:29:16 +0000
+++ b/test/automated/newsticker-tests.el 2011-10-30 15:21:37 +0000
@@ -138,14 +138,8 @@
Signals an error if something goes wrong."
(let ((newsticker-groups '("Feeds"))
(newsticker-url-list-defaults nil)
- (newsticker-url-list '(("feed1") ("feed2") ("feed3")))
- t-nttvtu)
- ;; prevent updating the treeview as it does not exist during fully
- ;; automated tests
- (fset 't-nttvtu (symbol-function 'newsticker--treeview-tree-update))
- (fset 'newsticker--treeview-tree-update (lambda() nil))
+ (newsticker-url-list '(("feed1") ("feed2") ("feed3"))))
(newsticker--group-manage-orphan-feeds)
- (fset 'newsticker--treeview-tree-update (symbol-function 't-nttvtu))
(should (equal '("Feeds" "feed3" "feed2" "feed1")
newsticker-groups))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106246: newsticker: Clean up newsticker--group-manage-orphan-feeds,
Ulf Jasper <=