package-lint: bump to emacs 26.1, disable stream keybindings

15 files changed, 25 insertions, 29 deletions

diff --git a/README.org b/README.org
index e7960bf..4be82c6 100644
--- a/README.org
+++ b/README.org
@@ -32,19 +32,15 @@ It also makes some small cosmetic changes to make timelines easier to read, and
 
 This updated version is not on MELPA, to use it you need to clone and require it as per the installation instructions below.
 
-The minimum Emacs version is now 25.1. But if you are running an older version it shouldn't be very hard to get it working.
+The minimum Emacs version is now 26.1. But if you are running an older version it shouldn't be very hard to get it working.
 
 I did this for my own use and to learn more Elisp. Feel free to improve it.
 
 ** live-updating timelines
 
-(code adapted from https://github.com/alexjgriffith/mastodon-future.el.)
+(code taken from https://github.com/alexjgriffith/mastodon-future.el.)
 
-Works for federated, local, and home timelines and for notifications. It's pretty necro, sometimes it goes off the rails, so use at your own risk. Not a super high priority for me, but some people dig it. The command prefix is =mastodon-async--stream=, and you can load various timelines from within a mastodon session like so:
-- =C-c h= (home)
-- =C-c f= (federated)
-- =C-c l= (local)
-- =C-c n= (notifications)
+Works for federated, local, and home timelines and for notifications. It's pretty necro, sometimes it goes off the rails, so use at your own risk. Not a super high priority for me, but some people dig it. The command prefix is =mastodon-async--stream=.
 
 ** NB: dependency
 
diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index 4367cc9..6a421d1 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.7.1
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-auth--test.el b/lisp/mastodon-auth--test.el
index b8705f5..9a765b9 100644
--- a/lisp/mastodon-auth--test.el
+++ b/lisp/mastodon-auth--test.el
@@ -5,7 +5,7 @@
 ;; Author: Ian Eure <ian@retrospec.tv>
 ;; Version: 0.9.1
 ;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index 4628e74..3f4ee7d 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -4,7 +4,7 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
 ;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-client.el b/lisp/mastodon-client.el
index 90f1375..6439c0a 100644
--- a/lisp/mastodon-client.el
+++ b/lisp/mastodon-client.el
@@ -4,7 +4,7 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
 ;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-discover.el b/lisp/mastodon-discover.el
index 2387feb..9c946be 100644
--- a/lisp/mastodon-discover.el
+++ b/lisp/mastodon-discover.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 94aa85d..31ea483 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
-;; Package-Requires: ((emacs "25.1") (request "0.2.0"))
+;; Package-Requires: ((emacs "26.1") (request "0.2.0"))
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-inspect.el b/lisp/mastodon-inspect.el
index c5a8d5d..9559b21 100644
--- a/lisp/mastodon-inspect.el
+++ b/lisp/mastodon-inspect.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 2100553..c3873df 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -4,7 +4,7 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
 ;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index caeb9cd..7524038 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -4,7 +4,7 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
 ;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index eb75247..98d11f7 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
-;; Package-Requires: ((emacs "25.1") (seq "1.8"))
+;; Package-Requires: ((emacs "26.1") (seq "1.8"))
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 5e8253f..3b7e399 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -4,7 +4,7 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>, martyhiatt <mousebot@riseup.net>
 ;; Version: 0.9.1
 ;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index c5240db..af6f0a2 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -4,7 +4,7 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
 ;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index d9f895c..c9184fc 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -4,7 +4,7 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
 ;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "26.1"))
 
 ;; This file is not part of GNU Emacs.
 
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index fd00ee9..460fe29 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2017-2019 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;; Version: 0.9.1
-;; Package-Requires: ((emacs "25.1") (request "0.2.0") (seq "1.8"))
+;; Package-Requires: ((emacs "26.1") (request "0.2.0") (seq "1.8"))
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
 ;; This file is not part of GNU Emacs.
@@ -73,10 +73,10 @@
 (autoload 'mastodon-toot--copy-toot-url "mastodon-toot")
 (autoload 'mastodon-toot--pin-toot-toggle "mastodon-toot")
 (autoload 'mastodon-auth--get-account-name "mastodon-auth")
-(autoload 'mastodon-async--stream-federated "mastodon-async")
-(autoload 'mastodon-async--stream-local "mastodon-async")
-(autoload 'mastodon-async--stream-home "mastodon-async")
-(autoload 'mastodon-async--stream-notifications "mastodon-async")
+;; (autoload 'mastodon-async--stream-federated "mastodon-async")
+;; (autoload 'mastodon-async--stream-local "mastodon-async")
+;; (autoload 'mastodon-async--stream-home "mastodon-async")
+;; (autoload 'mastodon-async--stream-notifications "mastodon-async")
 (autoload 'mastodon-profile--update-user-profile-note "mastodon-profile")
 (autoload 'mastodon-auth--user-acct "mastodon-auth")
 (autoload 'mastodon-tl--poll-vote "mastodon-http")
@@ -147,10 +147,10 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (define-key map (kbd "i") #'mastodon-toot--pin-toot-toggle)
     (define-key map (kbd "V") #'mastodon-profile--view-favourites)
     (define-key map (kbd "R") #'mastodon-profile--view-follow-requests)
-    (define-key map (kbd "C-c h") #'mastodon-async--stream-home)
-    (define-key map (kbd "C-c f") #'mastodon-async--stream-federated)
-    (define-key map (kbd "C-c l") #'mastodon-async--stream-local)
-    (define-key map (kbd "C-c n") #'mastodon-async--stream-notifications)
+    ;; (define-key map (kbd "C-c h") #'mastodon-async--stream-home)
+    ;; (define-key map (kbd "C-c f") #'mastodon-async--stream-federated)
+    ;; (define-key map (kbd "C-c l") #'mastodon-async--stream-local)
+    ;; (define-key map (kbd "C-c n") #'mastodon-async--stream-notifications)
     (define-key map (kbd "U") #'mastodon-profile--update-user-profile-note)
     (define-key map (kbd "a") #'mastodon-notifications--follow-request-accept-notifs)
     (define-key map (kbd "j") #'mastodon-notifications--follow-request-reject-notifs)