diff options
author | Johnson Denen <johnson.denen@gmail.com> | 2017-04-29 12:52:01 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-29 12:52:01 -0400 |
commit | ac10d7a647aa77aa933076a523a48ec0a283dd15 (patch) | |
tree | fc07a18846ae5268ffebc52b75a9900b997883bc /lisp | |
parent | d011f39b8d638dbb5f13dae1f31fb311724f64c6 (diff) | |
parent | 0aa660ec3afe3be1819d02fee7f3187dc62c09a2 (diff) |
Merge pull request #106 from jdenen/develop
v0.6.2
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/mastodon-auth.el | 2 | ||||
-rw-r--r-- | lisp/mastodon-client.el | 2 | ||||
-rw-r--r-- | lisp/mastodon-http.el | 2 | ||||
-rw-r--r-- | lisp/mastodon-inspect.el | 2 | ||||
-rw-r--r-- | lisp/mastodon-tl.el | 7 | ||||
-rw-r--r-- | lisp/mastodon-toot.el | 14 | ||||
-rw-r--r-- | lisp/mastodon.el | 4 |
7 files changed, 18 insertions, 15 deletions
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" |