aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2017-08-13 18:58:24 +0300
committerEli Zaretskii2017-08-13 18:58:24 +0300
commit8de2edd9ef8b4776fd7226de285c1d135b3e6938 (patch)
tree919ba4adce9f249caa2477ea05b82d316fbb24fc
parente2e3856141a315ea4a7acbd0534feaa848c4bf6b (diff)
parentabab4b091f2412b435c51b29c4d501f4fc806cb3 (diff)
downloademacs-8de2edd9ef8b4776fd7226de285c1d135b3e6938.tar.gz
emacs-8de2edd9ef8b4776fd7226de285c1d135b3e6938.zip
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
-rw-r--r--lisp/net/newst-backend.el8
1 files changed, 1 insertions, 7 deletions
diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index 3f8c9961b89..8f748c1eba1 100644
--- a/lisp/net/newst-backend.el
+++ b/lisp/net/newst-backend.el
@@ -75,10 +75,6 @@ considered to be running if the newsticker timer list is not empty."
75 "https://www.emacswiki.org/emacs?action=rss" 75 "https://www.emacswiki.org/emacs?action=rss"
76 nil 76 nil
77 3600) 77 3600)
78 ("Freshmeat.net"
79 "http://freshmeat.net/index.atom")
80 ("Kuro5hin.org"
81 "http://www.kuro5hin.org/backend.rdf")
82 ("LWN (Linux Weekly News)" 78 ("LWN (Linux Weekly News)"
83 "http://lwn.net/headlines/rss") 79 "http://lwn.net/headlines/rss")
84 ("NY Times: Technology" 80 ("NY Times: Technology"
@@ -102,9 +98,7 @@ considered to be running if the newsticker timer list is not empty."
102 ("Tagesschau (german)" 98 ("Tagesschau (german)"
103 "http://www.tagesschau.de/newsticker.rdf" 99 "http://www.tagesschau.de/newsticker.rdf"
104 nil 100 nil
105 1800) 101 1800))
106 ("Telepolis (german)"
107 "http://www.heise.de/tp/news.rdf"))
108 "Default URL list in raw form. 102 "Default URL list in raw form.
109This list is fed into defcustom via `newsticker--splicer'.") 103This list is fed into defcustom via `newsticker--splicer'.")
110 104