[Emacs-diffs] master 8de2edd 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

branch: master
commit 8de2edd9ef8b4776fd7226de285c1d135b3e6938
Merge: e2e3856 abab4b0
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 lisp/net/newst-backend.el | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lisp/net/newst-backend.el b/lisp/net/newst-backend.el
index 3f8c996..8f748c1 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."
     "https://www.emacswiki.org/emacs?action=rss";
     nil
     3600)
-    ("Freshmeat.net"
-    "http://freshmeat.net/index.atom";)
-    ("Kuro5hin.org"
-    "http://www.kuro5hin.org/backend.rdf";)
     ("LWN (Linux Weekly News)"
     "http://lwn.net/headlines/rss";)
     ("NY Times: Technology"
@@ -102,9 +98,7 @@ considered to be running if the newsticker timer list is not 
empty."
     ("Tagesschau (german)"
     "http://www.tagesschau.de/newsticker.rdf";
     nil
-    1800)
-    ("Telepolis (german)"
-    "http://www.heise.de/tp/news.rdf";))
+    1800))
   "Default URL list in raw form.
 This list is fed into defcustom via `newsticker--splicer'.")