[nongnu] elpa/xkcd b303669b33 39/82: Merge pull request #7 from rafoo/master

[ELPA Syncer]

branch: elpa/xkcd
commit b303669b337f5665b7f16f7720e997f81411cad0
Merge: 4d280972bc 502a36d15e
Author: Vibhav Pant <vibhavp@gmail.com>
Commit: Vibhav Pant <vibhavp@gmail.com>

    Merge pull request #7 from rafoo/master
    
    Some suggestions
---
 README.md |  4 ++--
 xkcd.el   | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 4456de7637..506433b19d 100644
--- a/README.md
+++ b/README.md
@@ -28,8 +28,8 @@ Files are cached by default to ~/.emacs.d/xkcd/. This can be 
changed by changing
 # Current keybindings:
 | Keybinding | Use                            |  Function      |
 |:----------:|:------------------------------:|:--------------:|
-| `C-c r`    | Load a random xkcd             | (xkcd-rand)    |
-| `C-c t`    | Show alt-text in the minibuffer| (xkcd-alt-text)|
+| `r`        | Load a random xkcd             | (xkcd-rand)    |
+| `t`        | Show alt-text in the minibuffer| (xkcd-alt-text)|
 | `<right>`  | Load next xkcd                 | (xkcd-next)    |
 | `<left>`   | Load previous xkcd             | (xkcd-prev)    |
 
diff --git a/xkcd.el b/xkcd.el
index 6b812e8ad6..94963bf61c 100644
--- a/xkcd.el
+++ b/xkcd.el
@@ -44,8 +44,8 @@
   :keymap (let ((map (make-sparse-keymap)))
            (define-key map (kbd "<right>") 'xkcd-next)
            (define-key map (kbd "<left>") 'xkcd-prev)
-           (define-key map (kbd "C-c r") 'xkcd-rand)
-           (define-key map (kbd "C-c t") 'xkcd-alt-text)
+           (define-key map (kbd "r") 'xkcd-rand)
+           (define-key map (kbd "t") 'xkcd-alt-text)
            (define-key map (kbd "q") 'xkcd-kill-buffer)
            map))
 
@@ -139,11 +139,14 @@ be located in xkcd-cache-dir"
     (setq title (format "%d: %s" (cdr (assoc 'num (json-read-from-string out)))
                        (cdr (assoc 'safe_title (json-read-from-string out)))))
     (insert (concat title "\n"))
-    (insert-image (create-image
-                  (concat xkcd-cache-dir
-                          (number-to-string
-                           (cdr
-                            (assoc 'num (json-read-from-string out)))) ".png") 
'png))
+    (let ((start (point)))
+      (insert-image (create-image
+                     (concat xkcd-cache-dir
+                             (number-to-string
+                              (cdr
+                               (assoc 'num (json-read-from-string out)))) 
".png") 'png))
+      (add-text-properties start (point) '(help-echo xkcd-alt))
+      )
     (if (eq xkcd-cur 0)
        (setq xkcd-cur (cdr (assoc 'num (json-read-from-string out)))))
     (xkcd-cache-json num out)
@@ -172,6 +175,8 @@ be located in xkcd-cache-dir"
   (interactive)
   (xkcd-get 0))
 
+(defalias 'xkcd 'xkcd-get-latest)
+
 (defun xkcd-get-latest-cached ()
   "Get the latest cached xkcd"
   (interactive)