Merge pull request #106 from jdenen/develop

v0.6.2

8 files changed, 19 insertions, 16 deletions

diff --git a/Cask b/Cask
index d692673..d0b73ef 100644
--- a/Cask
+++ b/Cask
@@ -1,7 +1,7 @@
 (source gnu)
 (source melpa)
 
-(package "mastodon" "0.6.1" "Emacs client for Mastodon")
+(package "mastodon" "0.6.2" "Emacs client for Mastodon")
 (files "lisp/*.el")
 
 (development
diff --git a/lisp/mastodon-auth.el b/lisp/mastodon-auth.el
index a8e5185..1586e84 100644
--- a/lisp/mastodon-auth.el
+++ b/lisp/mastodon-auth.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2017 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.6.1
+;; Version: 0.6.2
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
 ;; This file is not part of GNU Emacs.
diff --git a/lisp/mastodon-client.el b/lisp/mastodon-client.el
index 2fd9354..8097bf5 100644
--- a/lisp/mastodon-client.el
+++ b/lisp/mastodon-client.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2017 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.6.1
+;; Version: 0.6.2
 ;; 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 5e140cc..d3facc4 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2017 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.6.1
+;; Version: 0.6.2
 ;; Package-Requires: ((emacs "24.4"))
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
diff --git a/lisp/mastodon-inspect.el b/lisp/mastodon-inspect.el
index fd6f1b0..ad4e8fa 100644
--- a/lisp/mastodon-inspect.el
+++ b/lisp/mastodon-inspect.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2017 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.6.1
+;; Version: 0.6.2
 ;; Package-Requires: ((emacs "24.4"))
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 27531c5..7ea38c4 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2017 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.6.1
+;; Version: 0.6.2
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
 ;; This file is not part of GNU Emacs.
@@ -56,7 +56,10 @@
 (defun mastodon-tl--get-tag-timeline ()
   "Prompts for tag and opens its timeline."
   (interactive)
-  (let ((tag (read-string "Tag: ")))
+  (let* ((word (or (word-at-point) ""))
+	 (input (read-string (format "Tag(%s): " word)))
+	 (tag (if (equal input "") word input)))
+    (print tag)
     (mastodon-tl--get (concat "tag/" tag))))
 
 (defun mastodon-tl--goto-toot-pos (find-pos refresh &optional pos)
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index be2a7da..cb8ce37 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2017 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.6.1
+;; Version: 0.6.2
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
 ;; This file is not part of GNU Emacs.
@@ -147,13 +147,13 @@ Set `mastodon-toot--content-warning' to nil."
 (defun mastodon-toot--get-mode-kbinds ()
   "Get a list of the keybindings in the mastodon-toot-mode."
   (let* ((binds (copy-tree mastodon-toot-mode-map))
-	 (prefix (caadr binds))
-	 (bindings (remove-if-not (lambda (x) (listp x))
-				  (cadr binds))))
+	       (prefix (car (cadr binds)))
+	       (bindings (remove nil (mapcar (lambda (i) (if (listp i) i))
+					                               (cadr binds)))))
     (mapcar (lambda (b)
 	      (progn
-		(setf (car b) (vector prefix (car b)))
-		b))
+		      (setf (car b) (vector prefix (car b)))
+		      b))
 	    bindings)))
 
 (defun mastodon-toot--format-kbind-command (cmd)
@@ -174,7 +174,7 @@ e.g. mastodon-toot--send -> Send."
 
 (defun mastodon-toot--format-kbinds (kbinds)
   "Format a list keybindings, KBINDS, for display in documentation."
-  (string-join (cons "" (mapcar #'mastodon-toot--format-kbind kbinds))
+  (mapconcat 'identity (cons "" (mapcar #'mastodon-toot--format-kbind kbinds))
 	       "\n"))
 
 (defun mastodon-toot--make-mode-docs ()
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 2ebc069..947cc6a 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2017 Johnson Denen
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
-;; Version: 0.6.1
+;; Version: 0.6.2
 ;; Package-Requires: ((emacs "24.4"))
 ;; Homepage: https://github.com/jdenen/mastodon.el
 
@@ -38,7 +38,7 @@
   :prefix "mastodon-"
   :group 'external)
 
-(defconst mastodon-version "0.6.1"
+(defconst mastodon-version "0.6.2"
   "Current `mastodon' package version.")
 
 (defcustom mastodon-instance-url "https://mastodon.social"