summaryrefslogtreecommitdiff
path: root/lisp/net/newst-backend.el
diff options
context:
space:
mode:
authorUlf Jasper <ulf.jasper@web.de>2011-05-13 21:06:36 +0200
committerUlf Jasper <ulf.jasper@web.de>2011-05-13 21:06:36 +0200
commit42c7e61e8832e02ce977b1f7772a0aa9c45985aa (patch)
treefda254b46f71d4cbcfe86a57d20a47cb30a5021a /lisp/net/newst-backend.el
parentf278f87fe6b2556d2152c72b0f9460b44bb4ff24 (diff)
downloademacs-42c7e61e8832e02ce977b1f7772a0aa9c45985aa.tar.gz
newsticker: Moved icons to etc/newsticker/images
lisp/ChangeLog: 2011-05-13 Ulf Jasper <ulf.jasper@web.de> * net/newst-treeview.el (newsticker-treeview-face): Changed default family from helvetica to sans. (newsticker-treeview-tool-bar-map): Moved tool-bar icons to etc/images/newsticker. * net/newst-reader.el (newsticker-feed-face): Changed default family from helvetica to sans. * net/newst-plainview.el (newsticker-new-item-face) (newsticker-old-item-face, newsticker-immortal-item-face) (newsticker-obsolete-item-face, newsticker-date-face) (newsticker-statistics-face): Changed default family from helvetica to sans. (newsticker--plainview-tool-bar-map): Moved tool-bar icons to etc/images/newsticker. * net/newst-backend.el (newsticker--do-run-auto-mark-filter), (newsticker--process-auto-mark-filter-match): : Tell user about auto-marking. etc/ChangeLog: 2011-05-13 Ulf Jasper <ulf.jasper@web.de> * images/newsticker: Added. * images/newsticker/browse-url.xpm: Added. * images/newsticker/get-all.xpm: Added. * images/newsticker/mark-immortal.xpm: Added. * images/newsticker/mark-read.xpm: Added. * images/newsticker/narrow.xpm: Added. * images/newsticker/next-feed.xpm: Added. * images/newsticker/next-item.xpm: Added. * images/newsticker/prev-feed.xpm: Added. * images/newsticker/prev-item.xpm: Added. * images/newsticker/update.xpm: Added.
Diffstat (limited to 'lisp/net/newst-backend.el')
-rw-r--r--lisp/net/newst-backend.el25
1 files changed, 16 insertions, 9 deletions
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index 039d709770e..fca36c70f2d 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -6,7 +6,7 @@
;; Filename: newst-backend.el
;; URL: http://www.nongnu.org/newsticker
;; Keywords: News, RSS, Atom
-;; Time-stamp: "6. Dezember 2009, 19:15:32 (ulf)"
+;; Time-stamp: "13. Mai 2011, 20:47:05 (ulf)"
;; Package: newsticker
;; ======================================================================
@@ -2264,23 +2264,30 @@ for an entry that matches FEED and ITEM."
"Actually compare ITEM against the pattern-LIST.
LIST must be an element of `newsticker-auto-mark-filter-list'."
(mapc (lambda (pattern)
- (let ((age (nth 0 pattern))
- (place (nth 1 pattern))
+ (let ((place (nth 1 pattern))
(regexp (nth 2 pattern))
(title (newsticker--title item))
(desc (newsticker--desc item)))
(when (or (eq place 'title) (eq place 'all))
(when (and title (string-match regexp title))
- (newsticker--debug-msg "Auto-marking as %s: `%s'"
- age (newsticker--title item))
- (setcar (nthcdr 4 item) age)))
+ (newsticker--process-auto-mark-filter-match item pattern)))
(when (or (eq place 'description) (eq place 'all))
(when (and desc (string-match regexp desc))
- (newsticker--debug-msg "Auto-marking as %s: `%s'"
- age (newsticker--title item))
- (setcar (nthcdr 4 item) age)))))
+ (newsticker--process-auto-mark-filter-match item pattern)))))
list))
+(defun newsticker--process-auto-mark-filter-match (item pattern)
+ "Process ITEM that matches an auto-mark-filter PATTERN."
+ (let ((age (nth 0 pattern))
+ (place (nth 1 pattern))
+ (regexp (nth 2 pattern)))
+ (newsticker--debug-msg "Auto-mark-filter %s matches `%s'"
+ pattern (newsticker--title item))
+ (setcar (nthcdr 4 item) age)
+ (nconc (newsticker--extra item)
+ (list (list 'newsticker-auto-mark nil
+ (format "age=%s, title/desc=%s, regexp=%s"
+ age place regexp))))))
;; ======================================================================
;;; Hook samples