From e0c9412d071e09eda4ba543aa12c9a73fc93b391 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Thu, 31 Oct 2019 17:14:16 +0100 Subject: [PATCH] update tldr --- elpa/tldr-20180122.1112/tldr-pkg.el | 2 -- .../tldr-autoloads.el | 10 ++----- elpa/tldr-20191006.1059/tldr-pkg.el | 2 ++ .../tldr.el | 28 +++++++++++++++---- 4 files changed, 27 insertions(+), 15 deletions(-) delete mode 100644 elpa/tldr-20180122.1112/tldr-pkg.el rename elpa/{tldr-20180122.1112 => tldr-20191006.1059}/tldr-autoloads.el (63%) create mode 100644 elpa/tldr-20191006.1059/tldr-pkg.el rename elpa/{tldr-20180122.1112 => tldr-20191006.1059}/tldr.el (92%) diff --git a/elpa/tldr-20180122.1112/tldr-pkg.el b/elpa/tldr-20180122.1112/tldr-pkg.el deleted file mode 100644 index 2a2dd572..00000000 --- a/elpa/tldr-20180122.1112/tldr-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "tldr" "20180122.1112" "tldr client for Emacs" '((emacs "24.3")) :commit "398b197c8d2238628b07e1b32d0f373876279f4c" :keywords '("tools" "docs") :authors '(("Ono Hiroko" . "azazabc123@gmail.com")) :maintainer '("Ono Hiroko" . "azazabc123@gmail.com") :url "https://github.com/kuanyui/tldr.el") diff --git a/elpa/tldr-20180122.1112/tldr-autoloads.el b/elpa/tldr-20191006.1059/tldr-autoloads.el similarity index 63% rename from elpa/tldr-20180122.1112/tldr-autoloads.el rename to elpa/tldr-20191006.1059/tldr-autoloads.el index ef3d3d10..2d0ce643 100644 --- a/elpa/tldr-20180122.1112/tldr-autoloads.el +++ b/elpa/tldr-20191006.1059/tldr-autoloads.el @@ -1,12 +1,9 @@ ;;; tldr-autoloads.el --- automatically extracted autoloads ;; ;;; Code: - -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) - +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "tldr" "tldr.el" (0 0 0 0)) +;;;### (autoloads nil "tldr" "tldr.el" (23994 46377 473082 731000)) ;;; Generated autoloads from tldr.el (autoload 'tldr-update-docs "tldr" "\ @@ -24,14 +21,11 @@ Helm interface for `tldr'. \(fn)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "tldr" '("tldr-"))) - ;;;*** ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 ;; End: ;;; tldr-autoloads.el ends here diff --git a/elpa/tldr-20191006.1059/tldr-pkg.el b/elpa/tldr-20191006.1059/tldr-pkg.el new file mode 100644 index 00000000..0f83d5f3 --- /dev/null +++ b/elpa/tldr-20191006.1059/tldr-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "tldr" "20191006.1059" "tldr client for Emacs" '((emacs "24.3") (request "0.3.0")) :commit "b7f3e3e2171eab5707a42641f4470b69777feaea" :keywords '("tools" "docs") :authors '(("Ono Hiroko" . "azazabc123@gmail.com")) :maintainer '("Ono Hiroko" . "azazabc123@gmail.com") :url "https://github.com/kuanyui/tldr.el") diff --git a/elpa/tldr-20180122.1112/tldr.el b/elpa/tldr-20191006.1059/tldr.el similarity index 92% rename from elpa/tldr-20180122.1112/tldr.el rename to elpa/tldr-20191006.1059/tldr.el index 85bab6ba..d727cd79 100644 --- a/elpa/tldr-20180122.1112/tldr.el +++ b/elpa/tldr-20191006.1059/tldr.el @@ -2,8 +2,8 @@ ;; Author: Ono Hiroko ;; Keywords: tools, docs -;; Package-Version: 20180122.1112 -;; Package-Requires: ((emacs "24.3")) +;; Package-Version: 20191006.1059 +;; Package-Requires: ((emacs "24.3") (request "0.3.0")) ;; X-URL: https://github.com/kuanyui/tldr.el ;; Version: {{VERSION}} @@ -34,6 +34,7 @@ (require 'url) (require 'cl-lib) +(require 'request) (defgroup tldr nil "tldr client for Emacs" @@ -142,13 +143,30 @@ (progn (if (file-exists-p tldr-directory-path) (delete-directory tldr-directory-path 'recursive 'no-trash)) - (url-copy-file tldr-source-zip-url tldr-saved-zip-path 'overwrite) - (shell-command (format "unzip -d %s %s" (file-truename user-emacs-directory) tldr-saved-zip-path)) + (tldr-request-data tldr-source-zip-url tldr-saved-zip-path) + (shell-command-to-string (format "unzip -d %s %s" (file-truename user-emacs-directory) tldr-saved-zip-path)) (delete-file tldr-saved-zip-path) - (shell-command (format "mv '%s' '%s'" (concat (file-truename user-emacs-directory) "tldr-master") tldr-directory-path)) + (shell-command-to-string (format "mv '%s' '%s'" (concat (file-truename user-emacs-directory) "tldr-master") tldr-directory-path)) (message "Now tldr docs is updated!")))) +(defun tldr-request-data (url file) + "Resuest data from URL and save file at the location of FILE." + (request + url + :parser 'buffer-string + :success + (cl-function (lambda (&key data &allow-other-keys) + (when data + (with-temp-buffer (get-buffer-create "*request data*") + (erase-buffer) + (insert data) + (write-file file) + (kill-buffer "*request data*"))))) + :error + (cl-function (lambda (&rest args &key error-thrown &allow-other-keys) + (message "Got error: %S" error-thrown))))) + (defun tldr-get-commands-list () "For `completing-read'" (mapcar (lambda (file.md) (substring file.md 0 -3)) -- 2.47.3