diff --git a/.gitignore b/.gitignore index d026d072..ac2e26ba 100755 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ elpy/rpc-venv/ .emacs.desktop .emacs.desktop.lock **/elpy/ +/network-security.data +session.* diff --git a/bundle/custom.el b/bundle/custom.el index e71daad5..b51ad865 100644 --- a/bundle/custom.el +++ b/bundle/custom.el @@ -83,7 +83,7 @@ '(package-enable-at-startup t) '(package-selected-packages (quote - (org-pomodoro olivetti elm-mode dashboard pickle poet-theme flymake-eslint json-mode elpy darkroom dockerfile-mode ein spacemacs-theme flucui-themes leuven-theme htmlize scss-mode berrys-theme web-mode python-docstring sphinx-doc sphinx-frontend sphinx-mode ox-nikola racket-mode slime gherkin-mode powershell typescript-mode ob-http ob-ipython ob-restclient nord-theme restclient request restclient-test yaml-mode magit))) + (flymake-racket google-translate org-pomodoro olivetti elm-mode dashboard pickle poet-theme flymake-eslint json-mode elpy darkroom dockerfile-mode ein spacemacs-theme flucui-themes leuven-theme htmlize scss-mode berrys-theme web-mode python-docstring sphinx-doc sphinx-frontend sphinx-mode ox-nikola racket-mode slime gherkin-mode powershell typescript-mode ob-http ob-ipython ob-restclient nord-theme restclient request restclient-test yaml-mode magit))) '(python-shell-interpreter "python3") '(register-preview-delay 2) '(register-separator 43) diff --git a/elpa/archives/gnu/archive-contents b/elpa/archives/gnu/archive-contents index 244ced18..cf4c654d 100644 --- a/elpa/archives/gnu/archive-contents +++ b/elpa/archives/gnu/archive-contents @@ -1411,7 +1411,7 @@ (:maintainer "Michael Heerdegen" . "michael_heerdegen@web.de") (:url . "https://github.com/michael-heerdegen/on-screen.el"))]) (org . - [(9 3 3) + [(9 3 6) nil "Outline-based notes management and organizer" tar ((:url . "https://orgmode.org") (:maintainer "Bastien Guerry" . "bzg@gnu.org") @@ -2271,7 +2271,7 @@ ("Ivan Kanis" . "ivan@kanis.fr")) (:maintainer "Ivan Kanis" . "ivan@kanis.fr"))]) (xclip . - [(1 9) + [(1 10) nil "Copy&paste GUI clipboard from text terminal" single ((:url . "http://elpa.gnu.org/packages/xclip.html") (:keywords "convenience" "tools") diff --git a/elpa/archives/gnu/archive-contents.signed b/elpa/archives/gnu/archive-contents.signed index 1f8de0aa..44cd7785 100644 --- a/elpa/archives/gnu/archive-contents.signed +++ b/elpa/archives/gnu/archive-contents.signed @@ -1 +1 @@ -Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) (trust undefined) created at 2020-02-08T11:05:02+0100 using RSA \ No newline at end of file +Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) (trust undefined) created at 2020-02-14T11:05:02+0100 using RSA \ No newline at end of file diff --git a/elpa/dashboard-20200121.1429/banners/1.txt b/elpa/dashboard-20200214.525/banners/1.txt similarity index 100% rename from elpa/dashboard-20200121.1429/banners/1.txt rename to elpa/dashboard-20200214.525/banners/1.txt diff --git a/elpa/dashboard-20200121.1429/banners/2.txt b/elpa/dashboard-20200214.525/banners/2.txt similarity index 100% rename from elpa/dashboard-20200121.1429/banners/2.txt rename to elpa/dashboard-20200214.525/banners/2.txt diff --git a/elpa/dashboard-20200121.1429/banners/3.txt b/elpa/dashboard-20200214.525/banners/3.txt similarity index 100% rename from elpa/dashboard-20200121.1429/banners/3.txt rename to elpa/dashboard-20200214.525/banners/3.txt diff --git a/elpa/dashboard-20200121.1429/banners/emacs.png b/elpa/dashboard-20200214.525/banners/emacs.png similarity index 100% rename from elpa/dashboard-20200121.1429/banners/emacs.png rename to elpa/dashboard-20200214.525/banners/emacs.png diff --git a/elpa/dashboard-20200121.1429/banners/logo.png b/elpa/dashboard-20200214.525/banners/logo.png similarity index 100% rename from elpa/dashboard-20200121.1429/banners/logo.png rename to elpa/dashboard-20200214.525/banners/logo.png diff --git a/elpa/dashboard-20200121.1429/dashboard-autoloads.el b/elpa/dashboard-20200214.525/dashboard-autoloads.el similarity index 100% rename from elpa/dashboard-20200121.1429/dashboard-autoloads.el rename to elpa/dashboard-20200214.525/dashboard-autoloads.el diff --git a/elpa/dashboard-20200121.1429/dashboard-pkg.el b/elpa/dashboard-20200214.525/dashboard-pkg.el similarity index 76% rename from elpa/dashboard-20200121.1429/dashboard-pkg.el rename to elpa/dashboard-20200214.525/dashboard-pkg.el index 37cc6036..323e3d9f 100644 --- a/elpa/dashboard-20200121.1429/dashboard-pkg.el +++ b/elpa/dashboard-20200214.525/dashboard-pkg.el @@ -1,4 +1,4 @@ -(define-package "dashboard" "20200121.1429" "A startup screen extracted from Spacemacs" +(define-package "dashboard" "20200214.525" "A startup screen extracted from Spacemacs" '((emacs "25.3") (page-break-lines "0.11")) :keywords diff --git a/elpa/dashboard-20200121.1429/dashboard-widgets.el b/elpa/dashboard-20200214.525/dashboard-widgets.el similarity index 96% rename from elpa/dashboard-20200121.1429/dashboard-widgets.el rename to elpa/dashboard-20200214.525/dashboard-widgets.el index 07a3c5d7..d2c7dc7a 100644 --- a/elpa/dashboard-20200121.1429/dashboard-widgets.el +++ b/elpa/dashboard-20200214.525/dashboard-widgets.el @@ -91,6 +91,21 @@ to the specified width, with aspect ratio preserved." :type 'boolean :group 'dashboard) +(defcustom dashboard-footer-messages + '("The one true editor, Emacs!" + "Who the hell uses VIM anyway? Go Evil!" + "Free as free speech, free as free Beer" + "Richard Stallman is proud of you" + "Happy coding!" + "Vi Vi Vi, the editor of the beast" + "Welcome to the church of Emacs" + "While any text editor can save your files,\ + only Emacs can save your soul" + "I showed you my source code,pls respond") + "A list of messages, one of which dashboard chooses to display." + :type 'list + :group 'dashboard) + (defcustom dashboard-show-shortcuts t "Whether to show shortcut keys for each section." :type 'boolean @@ -532,7 +547,7 @@ WIDGET-PARAMS are passed to the \"widget-create\" function." ((string-equal ,section-name "Agenda for today:") (all-the-icons-octicon "primitive-dot" :height 1.0 :v-adjust 0.01)) ((file-remote-p path) - (all-the-icons-octicon "radio-tower" :height 1.1 :v-adjust 0.01)) + (all-the-icons-octicon "radio-tower" :height 1.0 :v-adjust 0.01)) (t (all-the-icons-icon-for-file (file-name-nondirectory path))))))) (setq tag (concat icon " " ,@rest)))) @@ -547,15 +562,20 @@ WIDGET-PARAMS are passed to the \"widget-create\" function." ,list))) ;; Footer +(defun dashboard-random-footer () + "Return a random footer from `dashboard-footer-messages'." + (nth (random (length dashboard-footer-messages)) dashboard-footer-messages)) + (defun dashboard-insert-footer () "Insert footer of dashboard." - (when dashboard-set-footer - (insert "\n") - (dashboard-center-line dashboard-footer) - (insert dashboard-footer-icon) - (insert " ") - (insert (propertize dashboard-footer 'face 'dashboard-footer)) - (insert "\n"))) + (let ((footer (and dashboard-set-footer (dashboard-random-footer)))) + (when footer + (insert "\n") + (dashboard-center-line footer) + (insert dashboard-footer-icon) + (insert " ") + (insert (propertize footer 'face 'dashboard-footer)) + (insert "\n")))) ;; ;; Recentf diff --git a/elpa/dashboard-20200121.1429/dashboard-widgets.elc b/elpa/dashboard-20200214.525/dashboard-widgets.elc similarity index 86% rename from elpa/dashboard-20200121.1429/dashboard-widgets.elc rename to elpa/dashboard-20200214.525/dashboard-widgets.elc index 8e7b1f12..f3c58123 100644 Binary files a/elpa/dashboard-20200121.1429/dashboard-widgets.elc and b/elpa/dashboard-20200214.525/dashboard-widgets.elc differ diff --git a/elpa/dashboard-20200121.1429/dashboard.el b/elpa/dashboard-20200214.525/dashboard.el similarity index 100% rename from elpa/dashboard-20200121.1429/dashboard.el rename to elpa/dashboard-20200214.525/dashboard.el diff --git a/elpa/dashboard-20200121.1429/dashboard.elc b/elpa/dashboard-20200214.525/dashboard.elc similarity index 100% rename from elpa/dashboard-20200121.1429/dashboard.elc rename to elpa/dashboard-20200214.525/dashboard.elc diff --git a/elpa/flymake-racket-20180912.109/flymake-racket-autoloads.el b/elpa/flymake-racket-20180912.109/flymake-racket-autoloads.el new file mode 100644 index 00000000..201c3ac5 --- /dev/null +++ b/elpa/flymake-racket-20180912.109/flymake-racket-autoloads.el @@ -0,0 +1,33 @@ +;;; flymake-racket-autoloads.el --- automatically extracted autoloads +;; +;;; Code: + +(add-to-list 'load-path (directory-file-name + (or (file-name-directory #$) (car load-path)))) + + +;;;### (autoloads nil "flymake-racket" "flymake-racket.el" (0 0 0 +;;;;;; 0)) +;;; Generated autoloads from flymake-racket.el + +(autoload 'flymake-racket-setup "flymake-racket" "\ +Set up Flymake for Racket. + +\(fn)" t nil) + +(autoload 'flymake-racket-add-hook "flymake-racket" "\ +Add `flymake-racket-lint' to `flymake-diagnostic-functions'. + +\(fn)" nil nil) + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "flymake-racket" '("flymake-racket-"))) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; coding: utf-8 +;; End: +;;; flymake-racket-autoloads.el ends here diff --git a/elpa/flymake-racket-20180912.109/flymake-racket-pkg.el b/elpa/flymake-racket-20180912.109/flymake-racket-pkg.el new file mode 100644 index 00000000..c98b1cad --- /dev/null +++ b/elpa/flymake-racket-20180912.109/flymake-racket-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "flymake-racket" "20180912.109" "Flymake extension for Racket." '((emacs "26.1")) :commit "d20fa60d66db3f7c2df0133814564ee5b36d2aba" :keywords '("languages" "racket" "scheme") :maintainer '("James Nguyen" . "james@jojojames.com") :url "https://github.com/jojojames/flymake-racket") diff --git a/elpa/flymake-racket-20180912.109/flymake-racket.el b/elpa/flymake-racket-20180912.109/flymake-racket.el new file mode 100644 index 00000000..5966b701 --- /dev/null +++ b/elpa/flymake-racket-20180912.109/flymake-racket.el @@ -0,0 +1,235 @@ +;;; flymake-racket.el --- Flymake extension for Racket. -*- lexical-binding: t -*- + +;; Copyright (C) 2018 James Nguyen + +;; Authors: James Nguyen +;; Maintainer: James Nguyen +;; URL: https://github.com/jojojames/flymake-racket +;; Package-Version: 20180912.109 +;; Version: 1.0 +;; Package-Requires: ((emacs "26.1")) +;; Keywords: languages racket scheme + +;; This file is not part of GNU Emacs. + +;; This program is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Commentary: +;; Flymake extension for Racket. +;; +;; (with-eval-after-load 'flymake +;; (flymake-racket-setup)) + +;;; Code: + +(require 'flymake) +(require 'cl-lib) +(eval-when-compile (require 'subr-x)) + +;;; Flymake + +(defcustom flymake-racket-executable "raco" + "Executable for racket." + :type 'string + :group 'flymake-racket) + +(defcustom flymake-racket-args '("expand") + "Args to pass to racket." + :type 'list + :group 'flymake-racket) + +(defvar-local flymake-racket--lint-process nil + "Buffer-local process started for linting the buffer.") + +(defvar flymake-racket-raco-has-expand-p nil + "Boolean to check if `flymake-racket-executable' contains expand.") + +;;;###autoload +(defun flymake-racket-setup () + "Set up Flymake for Racket." + (interactive) + (add-hook 'racket-mode-hook #'flymake-racket-add-hook) + (add-hook 'scheme-mode-hook #'flymake-racket-add-hook)) + +;;;###autoload +(defun flymake-racket-add-hook () + "Add `flymake-racket-lint' to `flymake-diagnostic-functions'." + ;; Checking if raco expand exists is really slow (200ms~), so + ;; try to do it using the `async' library. + (if (and (fboundp 'async-start) + (eq flymake-racket-raco-has-expand-p nil)) + (let ((buffer (current-buffer))) + (async-start + `(lambda () + (load ,(locate-library "flymake-racket")) + (require 'flymake-racket) + (flymake-racket--check-shell-raco-expand)) + `(lambda (result) + (setq flymake-racket-raco-has-expand-p (if result 'yes 'no)) + (with-current-buffer ,buffer + (flymake-racket-add-hook) + ;; Because we did this asynchronously, we should explicitly + ;; start a syntax check.. but only if `flymake-start-on-flymake-mode' + ;; is t. + (when flymake-start-on-flymake-mode + (flymake-start)))))) + (when (flymake-racket--raco-has-expand) + (add-hook 'flymake-diagnostic-functions + 'flymake-racket-lint-if-possible nil t)))) + +(defun flymake-racket-lint-if-possible (report-fn &rest args) + "Run `flymake-racket-lint' if possible. + +REPORT-FN is called when `flymake-racket-lint' runs. + +ARGS is passed straight through to `flymake-racket-lint'." + (when (or + (eq major-mode 'racket-mode) + (and (eq major-mode 'scheme-mode) + (boundp 'geiser-impl--implementation) + (eq geiser-impl--implementation 'racket))) + (apply #'flymake-racket-lint report-fn args))) + +(defun flymake-racket-lint (report-fn &rest _args) + "A Flymake backend for racket check. + +REPORT-FN will be called when racket process finishes." + (when (and flymake-racket--lint-process + (process-live-p flymake-racket--lint-process)) + (kill-process flymake-racket--lint-process)) + (let ((source-buffer (current-buffer)) + (output-buffer (generate-new-buffer " *flymake-racket-lint*"))) + (setq flymake-racket--lint-process + (make-process + :name "flymake-racket-lint" + :buffer output-buffer + :command `(,flymake-racket-executable + ,@flymake-racket-args + ,buffer-file-name) + :connection-type 'pipe + :sentinel + (lambda (proc _event) + (when (eq (process-status proc) 'exit) + (unwind-protect + (cond + ((not (and (buffer-live-p source-buffer) + (eq proc (with-current-buffer source-buffer + flymake-racket--lint-process)))) + (flymake-log :warning + "racket process %s obsolete" proc)) + ((zerop (process-exit-status proc)) + ;; No racket errors/warnings.. + (funcall report-fn nil)) + ((= 1 (process-exit-status proc)) + (flymake-racket--lint-done report-fn + source-buffer + output-buffer)) + (:error + (funcall report-fn + :panic + :explanation + (format "racket process %s errored." proc)))) + (kill-buffer output-buffer)))))))) + +;; Helpers +(defun flymake-racket--lint-done (report-fn + source-buffer + output-buffer) + "Process racket result and call REPORT-FN. + +SOURCE-BUFFER is the buffer to apply flymake to. +OUTPUT-BUFFER is the result of running racket on SOURCE-BUFFER." + (with-current-buffer + source-buffer + (save-excursion + (save-restriction + (widen) + (funcall + report-fn + (with-current-buffer output-buffer + (let* ((result '()) ;; Accumulate results here. + (lines (split-string (buffer-string) "\n" t)) + (numLines (length lines)) + (i 0) + (source-buffer-name + (with-current-buffer source-buffer + (file-name-nondirectory buffer-file-name)))) + ;; Example error message: + ;; racket_file.rkt:24:0: read-syntax: expected a `)` to close `(` + ;; possible cause: indentation suggests a missing `)` before line 34 + (while (< i numLines) + ;; Filter out messages that don't match buffer name. + (when (string-prefix-p source-buffer-name (nth i lines)) + (let* ((line (nth i lines)) + (split (split-string line ":" t)) + (_ (nth 0 split)) ; filename + (line (string-to-number (nth 1 split))) + (column (string-to-number (nth 2 split))) + (message (mapconcat (lambda (str) str) + (cdddr split) + "")) + (point (flymake-racket--find-point + source-buffer + line + column))) + (when (and (< (1+ i) numLines) + (string-match-p "possible cause" + (nth (1+ i) lines))) + (setq message (concat message "\n" (nth (1+ i) lines))) + ;; Skip next line when processing. + (setq i (1+ i))) + ;; Accumulate the result. + (push (flymake-make-diagnostic source-buffer + point + (1+ point) + :warning + message) + result))) + (setq i (1+ i))) + result))))))) + +(defun flymake-racket--find-point (source-buffer line column) + "Return point given LINE and COLUMN in SOURCE-BUFFER." + (with-current-buffer source-buffer + (save-excursion + (goto-char (point-min)) + (forward-line (1- line)) + (move-to-column column) + (point)))) + +(defun flymake-racket--raco-has-expand () + "Check if raco has expand." + (cond + ((eq flymake-racket-raco-has-expand-p 'yes) t) + ((eq flymake-racket-raco-has-expand-p 'no) nil) + (:default + (setq flymake-racket-raco-has-expand-p + (flymake-racket--check-shell-raco-expand)) + (if flymake-racket-raco-has-expand-p + (setq flymake-racket-raco-has-expand-p 'yes) + (setq flymake-racket-raco-has-expand-p 'no)) + (flymake-racket--raco-has-expand)))) + +(defun flymake-racket--check-shell-raco-expand () + "Check if raco has expand using `call-process'." + (with-temp-buffer + (call-process flymake-racket-executable nil t nil "expand") + (goto-char (point-min)) + (not (looking-at-p + (rx bol (1+ not-newline) + "Unrecognized command: expand" + eol))))) + +(provide 'flymake-racket) +;;; flymake-racket.el ends here diff --git a/elpa/flymake-racket-20180912.109/flymake-racket.elc b/elpa/flymake-racket-20180912.109/flymake-racket.elc new file mode 100644 index 00000000..e8671ba9 Binary files /dev/null and b/elpa/flymake-racket-20180912.109/flymake-racket.elc differ diff --git a/elpa/google-translate-20190620.1416/.bump-version.el b/elpa/google-translate-20190620.1416/.bump-version.el new file mode 100644 index 00000000..58fa1190 --- /dev/null +++ b/elpa/google-translate-20190620.1416/.bump-version.el @@ -0,0 +1,10 @@ +((:files + ("google-translate.el" + "google-translate-core.el" + "google-translate-tk.el" + "google-translate-core-ui.el" + "google-translate-default-ui.el" + "google-translate-pkg.el" + "google-translate-smooth-ui.el" + "Makefile")) + (:current-version "0.11.18")) diff --git a/elpa/google-translate-20190620.1416/.bump-version.elc b/elpa/google-translate-20190620.1416/.bump-version.elc new file mode 100644 index 00000000..f08d7b8f Binary files /dev/null and b/elpa/google-translate-20190620.1416/.bump-version.elc differ diff --git a/elpa/google-translate-20190620.1416/google-translate-autoloads.el b/elpa/google-translate-20190620.1416/google-translate-autoloads.el new file mode 100644 index 00000000..22f6bf09 --- /dev/null +++ b/elpa/google-translate-20190620.1416/google-translate-autoloads.el @@ -0,0 +1,151 @@ +;;; google-translate-autoloads.el --- automatically extracted autoloads +;; +;;; Code: + +(add-to-list 'load-path (directory-file-name + (or (file-name-directory #$) (car load-path)))) + + +;;;### (autoloads nil "google-translate-backend" "google-translate-backend.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from google-translate-backend.el + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "google-translate-backend" '("google-translate-backend-"))) + +;;;*** + +;;;### (autoloads nil "google-translate-core" "google-translate-core.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from google-translate-core.el + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "google-translate-core" '("google-translate-"))) + +;;;*** + +;;;### (autoloads nil "google-translate-core-ui" "google-translate-core-ui.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from google-translate-core-ui.el + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "google-translate-core-ui" '("gtos" "google-translate-"))) + +;;;*** + +;;;### (autoloads nil "google-translate-default-ui" "google-translate-default-ui.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from google-translate-default-ui.el + +(autoload 'google-translate-query-translate "google-translate-default-ui" "\ +Interactively translate text with Google Translate. + +Query a text (a word or a phrase), and pop up a buffer named *Google +Translate* displaying available translations of the text. + +If no defaults for the source and target languages are specified (by +setting the variables `google-translate-default-source-language' and +`google-translate-default-target-language'), interactively query the +missing parts. For example, a reasonable option may be to specify a +default for the target language and always be queried for the source +language. + +With a `C-u' prefix argument, query the source and target languages, +even if any defaults are specified. For example, you may frequently +need to translate from English to Russian, and you may choose to set +the default source and target languages to \"en\" and \"ru\", resp. +However, occasionally you may also need to translate from Russian to +English. With a `C-u' prefix argument you can override the defaults +and specify the source and target languages explicitly. + +The languages are queried with completion, and the null input at the +source language prompt is considered as an instruction for Google +Translate to detect the source language. + +\(fn &optional OVERRIDE-P)" t nil) + +(autoload 'google-translate-query-translate-reverse "google-translate-default-ui" "\ +Like `google-translate-query-translate', but performs translation +in the reverse direction. + +The value of the variable `google-translate-default-source-language' +\(if set) becomes the target language, and the value of the variable +`google-translate-default-target-language' (if also set) becomes the +source language. + +In particular, when both variables are set, translation is performed +in the reverse direction. + +\(fn &optional OVERRIDE-P)" t nil) + +(autoload 'google-translate-at-point "google-translate-default-ui" "\ +Translate the word at point or the words in the active region. + +For the meaning of OVERRIDE-P, see `google-translate-query-translate'. + +\(fn &optional OVERRIDE-P)" t nil) + +(autoload 'google-translate-at-point-reverse "google-translate-default-ui" "\ +Like `google-translate-at-point', but performs translation in the +reverse direction. + +\(fn &optional OVERRIDE-P)" t nil) + +(autoload 'google-translate-buffer "google-translate-default-ui" "\ +Translate current buffer. + +For the meaning of OVERRIDE-P, see `google-translate-query-translate'. + +\(fn &optional OVERRIDE-P REVERSE-P)" t nil) + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "google-translate-default-ui" '("%google-translate-" "google-translate-"))) + +;;;*** + +;;;### (autoloads nil "google-translate-smooth-ui" "google-translate-smooth-ui.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from google-translate-smooth-ui.el + +(autoload 'google-translate-smooth-translate "google-translate-smooth-ui" "\ +Translate a text using translation directions. + +Make a prompt in minibuffer for a text to translate. Default text +is word at point. + +In case of `google-translate-translation-directions-alist' is +empty list then after inputed translating text prompts for source +language and then for target languages. + +In case of `google-translate-translation-directions-alist' is not +empty list takes current translation direction and makes +appropriate translation. Current translation direction indicates +in the minibuffers' prompt. + +A current translation direction could be changed directly in the +minibuffer by means of key bindings such as C-n and C-p for +changing to the next translation direction and to the previous +one respectively. + +\(fn)" t nil) + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "google-translate-smooth-ui" '("google-translate-"))) + +;;;*** + +;;;### (autoloads nil "google-translate-tk" "google-translate-tk.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from google-translate-tk.el + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "google-translate-tk" '("google-translate--"))) + +;;;*** + +;;;### (autoloads nil nil ("google-translate-pkg.el" "google-translate.el") +;;;;;; (0 0 0 0)) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; coding: utf-8 +;; End: +;;; google-translate-autoloads.el ends here diff --git a/elpa/google-translate-20190620.1416/google-translate-backend.el b/elpa/google-translate-20190620.1416/google-translate-backend.el new file mode 100644 index 00000000..461b4be2 --- /dev/null +++ b/elpa/google-translate-20190620.1416/google-translate-backend.el @@ -0,0 +1,142 @@ +;;; google-translate-backend.el --- Backend methods for url retrieve. + +;; Copyright (C) 2019 Tomotaka SUWA + +;; Author: Oleksandr Manzyuk +;; Maintainer: Andrey Tykhonov +;; URL: https://github.com/atykhonov/google-translate +;; Version: 0.11.17 +;; Keywords: convenience + +;; This file is NOT part of GNU Emacs. + +;; This is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + +;; This file is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;; Provide backend facilities to cope with google translate. + +;;; Code: + +(defvar google-translate-backend-method 'emacs + "The backend method for URL retrieve. + +Valid symbols are below: + + - emacs: use built in `url-retrieve-synchronously' + - curl: invoke curl command + - wget: invoke wget command + +and any other keys of `google-translate-backend-commands'.") + +(defvar google-translate-backend-user-agent "Emacs" + "The user agent string for HTTP request header.") + +(defvar google-translate-backend-commands + '((curl :args ("-s" "-L" "-A")) + (wget :args ("-q" "-O" "-" "-U"))) + "An alist of external program specifications. + +The form of each element is (KEY P-LIST). The variable +`google-translate-backend-method' may have one of KEYs and is +used for determine the command to execute. The P-LIST of each +element represents command specific information. + +Available properties: + + - Property `:name': the program name(optional) + - Property `:args': a list of arguments passed to the program + +If you omit the `:name' property, (symbol-name KEY) will be used +as the program name. The `:args' property must be composed to +satisfy all the following conditions: + + - Output content to standard output + - Suppress non-content(HTTP headers, progress messages, etc) + - Handle location response header + - Place User-Agent option at last + +So if you would like to use another program \"foo\", for example: + +\(push \\='(foo :name \"foo-x86\" + :args (\"-q\" \"--agent\")) + google-translate-backend-commands) + +\(setq google-translate-backend-method \\='foo) + +And the command line looks like: + +foo-x86 -q --agent ['google-translate-backend-user-agent] [URL]") + +(defvar google-translate-backend-debug nil + "Non-nil means log http activities to the *google-translate-debug* buffer.") + +(defun google-translate-backend--log (&rest args) + "Log http activities to the *google-translate-debug* buffer along with ARGS. + +Disabled if `google-translate-backend-debug' is nil." + (when google-translate-backend-debug + (let ((message (mapconcat 'identity + (list (current-time-string) + (prin1-to-string args) + "-- begin --" + (buffer-string) + "-- end --") + "\n"))) + (with-current-buffer + (get-buffer-create "*google-translate-backend-debug*") + (goto-char (point-max)) + (insert message) + (newline))))) + +(defun google-translate-backend--emacs (url) + "Get URL contents by `url-retrieve-synchronously'." + (insert + (let ((url-user-agent google-translate-backend-user-agent)) + (with-current-buffer (url-retrieve-synchronously url) + (set-buffer-multibyte t) + (google-translate-backend--log url 'emacs) + (goto-char (point-min)) + (re-search-forward "\n\n") + (prog1 (buffer-substring (point) + (point-max)) + (kill-buffer)))))) + +(defun google-translate-backend--process (url key spec) + "Get URL contents by `call-process'. + +\(KEY SPEC) would be exist in `google-translate-backend-commands'." + (let ((name (or (plist-get spec :name) + (symbol-name key))) + (args (plist-get spec :args)) + (agent google-translate-backend-user-agent)) + (apply 'call-process + (append (list name nil t nil) + args + (list agent url))) + (google-translate-backend--log url key spec))) + +(defun google-translate-backend-retrieve (url) + "Get URL contents via `google-translate-backend-method'." + (let ((method google-translate-backend-method)) + (if (eq method 'emacs) + (google-translate-backend--emacs url) + (let ((spec (cdr (assq method + google-translate-backend-commands)))) + (if (null spec) + (error "Unknown backend method: %s" method) + (google-translate-backend--process url method spec)))))) + +(provide 'google-translate-backend) +;;; google-translate-backend.el ends here diff --git a/elpa/google-translate-20190620.1416/google-translate-backend.elc b/elpa/google-translate-20190620.1416/google-translate-backend.elc new file mode 100644 index 00000000..3f00a9e6 Binary files /dev/null and b/elpa/google-translate-20190620.1416/google-translate-backend.elc differ diff --git a/elpa/google-translate-20190620.1416/google-translate-core-ui.el b/elpa/google-translate-20190620.1416/google-translate-core-ui.el new file mode 100644 index 00000000..6d9374ab --- /dev/null +++ b/elpa/google-translate-20190620.1416/google-translate-core-ui.el @@ -0,0 +1,848 @@ +;;; google-translate-core-ui.el --- google translate core UI + +;; Copyright (C) 2012 Oleksandr Manzyuk + +;; Author: Oleksandr Manzyuk +;; Maintainer: Andrey Tykhonov +;; URL: https://github.com/atykhonov/google-translate +;; Version: 0.11.18 +;; Keywords: convenience + +;; Contributors: +;; Tassilo Horn +;; Bernard Hurley +;; Chris Bilson +;; Takumi Kinjo +;; momomo5717 + +;; This file is NOT part of GNU Emacs. + +;; This is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + +;; This file is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;; This script provides the most common functions and variables for +;; UI. It does not contain any interactive functions and overall is +;; not going to be used directly by means of +;; `execute-extended-command' (M-x). Its purpose to provide the most +;; valuable and useful functionality for packages and scripts which +;; provide UI. +;; +;; The most important functions are the following: +;; +;; - `google-translate-translate' +;; +;; - `google-translate-read-source-language' +;; +;; - `google-translate-read-target-language' +;; +;; `google-translate-translate' translates the given text from source +;; language to target language and shows a translation. +;; +;; `google-translate-read-source-language' reads source language from +;; minibuffer and returns language +;; abbreviation. `google-translate-read-target-language' reads target +;; language from minibuffer and returns language abbreviation. + +;; Customization: + +;; You can customize the following variables: +;; +;; - `google-translate-output-destination' +;; +;; - `google-translate-enable-ido-completion' +;; +;; - `google-translate-show-phonetic' +;; +;; - `google-translate-listen-program' +;; +;; - `google-translate-pop-up-buffer-set-focus' +;; +;; - `google-translate-preferable-input-methods-alist' +;; +;; `google-translate-output-destination' determines translation output +;; destination. If `nil' the translation output will be displayed in +;; the pop up buffer. If value equal to `echo-area' then translation +;; outputs in the Echo Area. In case of `popup' the translation +;; outputs to the popup tooltip using `popup' package. In case of +;; `kill-ring' the translation outputs to the kill ring. And in case +;; of `current-buffer' the translation outputs to the current +;; buffer. If you would like output translation to the Echo Area you +;; would probably like to increase it because only part of translation +;; could visible there with the default settings. To increase Echo +;; Area you could increase the value of `max-mini-window-height' +;; variable, for example: `(setq max-mini-window-height 0.5)'. +;; +;; If `google-translate-enable-ido-completion' is non-NIL, the input +;; will be read with ido-style completion. +;; +;; The variable `google-translate-show-phonetic' controls whether the +;; phonetic spelling of the original text and its translation is +;; displayed if available. If you want to see the phonetics, set this +;; variable to t. +;; +;; The variable `google-translate-listen-program' determines the +;; program to use to listen translations. By default the program looks +;; for `mplayer' in the PATH, if `mplayer' is found then listening +;; function will be available and you'll see `Listen' button in the +;; buffer with the translation. You can use any other suitable +;; program. If you use Windows please download and unpack `mplayer' +;; and add its path (directory) to the system PATH variable. Please +;; note that translation listening is not available if +;; `google-translate-output-destination' is set to `echo-area' or +;; `popup'. +;; +;; The variable `google-translate-pop-up-buffer-set-focus' determines +;; whether window (buffer) with translation gets focus when it pop +;; ups. If `nil', it doesn't get focus and focus remains in the same +;; window as was before translation. If `t', window (buffer with +;; translation) gets focus. Please note that that setting works only +;; for pop up buffer, i.e. when `google-translate-output-destination' +;; is `nil'. +;; +;; The `google-translate-input-method-auto-toggling' variable +;; determines whether input method auto toggling is enabled or not. +;; +;; While switching among languages I noticed that I change input +;; method quite often. Input method auto toggling allows switch on +;; appropriate input method while switching among languages. Auto +;; toggling will work in case of +;; `google-translate-input-method-auto-toggling' is set to `t' and +;; `google-translate-preferable-input-methods-alist' is defined +;; properly. +;; +;; This variable may be defined as follow (just for example): +;; +;; (setq google-translate-preferable-input-methods-alist '((nil . ("en")) +;; (ukrainian-programmer-dvorak . ("ru" "uk")))) +;; +;; In this way, input method is disabled (because of nil) for the +;; minibuffer when source language is English. And +;; "ukrainian-programmer-dvorak" input method is enabled when source +;; language is Russian or Ukrainian. + +;; Customization of faces: + +;; - `google-translate-text-face', used to display the original text +;; (defaults to `default') +;; +;; - `google-translate-phonetic-face', used to display the phonetics +;; (defaults to `shadow') +;; +;; - `google-translate-translation-face', used to display the highest +;; ranking translation (defaults to `default' with the `weight' +;; attribute set to `bold') +;; +;; - `google-translate-suggestion-label-face' used to display the +;; label for suggestion (defaults to `default' with the `foreground' +;; attribute set to `red') +;; +;; - `google-translate-suggestion-face' used to display the suggestion +;; in case of word is misspelled (defaults to `default' with the +;; `slant' attribute set to `italic' and `underline' attribute set +;; to `t') +;; +;; - `google-translate-listen-button-face' used to display the "Listen" +;; button (defaults to `height' 0.8). +;; +;; For example, to show the translation in a larger font change the +;; `height' attribute of the face `google-translate-translation-face' +;; like so: +;; +;; (set-face-attribute 'google-translate-translation-face nil :height 1.4) +;; +;; +;;; Code: +;; + +(eval-when-compile (require 'cl)) +(require 'google-translate-core) +(require 'ido) + + +(defvar google-translate-supported-languages-alist + '(("Afrikaans" . "af") + ("Albanian" . "sq") + ("Amharic" . "am") + ("Arabic" . "ar") + ("Armenian" . "hy") + ("Azerbaijani" . "az") + ("Basque" . "eu") + ("Belarusian" . "be") + ("Bengali" . "bn") + ("Bosnian" . "bs") + ("Bulgarian" . "bg") + ("Catalan" . "ca") + ("Cebuano" . "ceb") + ("Chichewa" . "ny") + ("Chinese Simplified" . "zh-CN") + ("Chinese Traditional" . "zh-TW") + ("Corsican" . "co") + ("Croatian" . "hr") + ("Czech" . "cs") + ("Danish" . "da") + ("Dutch" . "nl") + ("English" . "en") + ("Esperanto" . "eo") + ("Estonian" . "et") + ("Filipino" . "tl") + ("Finnish" . "fi") + ("French" . "fr") + ("Frisian" . "fy") + ("Galician" . "gl") + ("Georgian" . "ka") + ("German" . "de") + ("Greek" . "el") + ("Gujarati" . "gu") + ("Haitian Creole" . "ht") + ("Hausa" . "ha") + ("Hawaiian" . "haw") + ("Hebrew" . "iw") + ("Hindi" . "hi") + ("Hmong" . "hmn") + ("Hungarian" . "hu") + ("Icelandic" . "is") + ("Igbo" . "ig") + ("Indonesian" . "id") + ("Irish" . "ga") + ("Italian" . "it") + ("Japanese" . "ja") + ("Javanese" . "jw") + ("Kannada" . "kn") + ("Kazakh" . "kk") + ("Khmer" . "km") + ("Korean" . "ko") + ("Kurdish (Kurmanji)" . "ku") + ("Kyrgyz" . "ky") + ("Lao" . "lo") + ("Latin" . "la") + ("Latvian" . "lv") + ("Lithuanian" . "lt") + ("Luxembourgish" . "lb") + ("Macedonian" . "mk") + ("Malagasy" . "mg") + ("Malay" . "ms") + ("Malayalam" . "ml") + ("Maltese" . "mt") + ("Maori" . "mi") + ("Marathi" . "mr") + ("Mongolian" . "mn") + ("Myanmar (Burmese)" . "my") + ("Nepali" . "ne") + ("Norwegian" . "no") + ("Pashto" . "ps") + ("Persian" . "fa") + ("Polish" . "pl") + ("Portuguese" . "pt") + ("Punjabi" . "pa") + ("Romanian" . "ro") + ("Russian" . "ru") + ("Samoan" . "sm") + ("Scots Gaelic" . "gd") + ("Serbian" . "sr") + ("Sesotho" . "st") + ("Shona" . "sn") + ("Sindhi" . "sd") + ("Sinhala" . "si") + ("Slovak" . "sk") + ("Slovenian" . "sl") + ("Somali" . "so") + ("Spanish" . "es") + ("Sundanese" . "su") + ("Swahili" . "sw") + ("Swedish" . "sv") + ("Tajik" . "tg") + ("Tamil" . "ta") + ("Telugu" . "te") + ("Thai" . "th") + ("Turkish" . "tr") + ("Ukrainian" . "uk") + ("Urdu" . "ur") + ("Uzbek" . "uz") + ("Vietnamese" . "vi") + ("Welsh" . "cy") + ("Xhosa" . "xh") + ("Yiddish" . "yi") + ("Yoruba" . "yo") + ("Zulu" . "zu")) + "Alist of the languages supported by Google Translate. + +Each element is a cons-cell of the form (NAME . CODE), where NAME +is a human-readable language name and CODE is its code used as a +query parameter in HTTP requests.") + +(defvar google-translate-translation-listening-debug nil + "For debug translation listening purposes.") + +(defstruct gtos + "google translate output structure contains miscellaneous + information which intended to be outputed to the buffer, echo + area or popup tooltip." + source-language target-language text + auto-detected-language text-phonetic translation + translation-phonetic detailed-translation suggestion detailed-definition) + +(defgroup google-translate-core-ui nil + "Emacs core UI script for the Google Translate package." + :group 'processes) + +(defcustom google-translate-enable-ido-completion nil + "If non-NIL, use `ido-completing-read' rather than + `completing-read' for reading input." + :group 'google-translate-core-ui + :type '(choice (const :tag "No" nil) + (other :tag "Yes" t))) + +(defcustom google-translate-show-phonetic nil + "If non-NIL, try to show the phonetic spelling." + :group 'google-translate-core-ui + :type '(choice (const :tag "No" nil) + (const :tag "Yes" t))) + +(defcustom google-translate-listen-program + (executable-find "mplayer") + "The program to use to listen translations. By default the +program looks for `mplayer' in the PATH, if `mplayer' is found +then listening function will be available and you'll see `Listen' +button in the buffer with the translation. You can use any other +suitable program." + :group 'google-translate-core-ui + :type '(string)) + +(defcustom google-translate-output-destination + nil + "Determines where translation output will be displayed. If +`nil' the translation output will be displayed in the pop up +buffer (default). If value equals to `echo-area' then translation +outputs in the Echo Area. And in case of `popup' the translation +outputs to the popup tooltip using `popup' package." + :group 'google-translate-core-ui + :type '(symbol)) + +(defcustom google-translate-pop-up-buffer-set-focus + nil + "Determines whether window (buffer) with translation gets focus +when it pop ups. If `nil', it doesn't get focus and focus remains +in the same window as was before translation. If `t', +window (buffer with translation) gets focus.") + +(defcustom google-translate-listen-button-label + "[Listen]" + "Label of the 'Listen' button." + :group 'google-translate-core-ui + :type 'string) + +(defface google-translate-text-face + '((t (:inherit default))) + "Face used to display the original text." + :group 'google-translate-core-ui) + +(defface google-translate-phonetic-face + '((t (:inherit shadow))) + "Face used to display the phonetic spelling." + :group 'google-translate-core-ui) + +(defface google-translate-translation-face + '((t (:weight bold))) + "Face used to display the probable translation." + :group 'google-translate-core-ui) + +(defface google-translate-suggestion-label-face + '((t (:foreground "red"))) + "Face used to display the suggestion label." + :group 'google-translate-core-ui) + +(defface google-translate-suggestion-face + '((t (:slant italic :underline t))) + "Face used to display the suggestion." + :group 'google-translate-core-ui) + +(defface google-translate-listen-button-face + '((t (:inherit button :height 0.8))) + "Face used to display button \"Listen\"." + :group 'google-translate-core-ui) + +(defvar google-translate-input-method-auto-toggling nil + "When `t' the current source language is compared with the +values from `google-translate-preferable-input-methods-alist' and +enables appropriate input method for the minibuffer. So this +feature may allow to avoid switching between input methods while +translating using different languages.") + +(defvar google-translate-preferable-input-methods-alist + '((nil . nil)) + "Alist of preferable input methods for certain languages. + +Each element is a cons-cell of the form (INPUT-METHOD +. LANGUAGES-LIST), where INPUT-METHOD is the input method which +will be switched on, when translation source language equals to +one of the language from the LANGUAGE-LIST. + +INPUT-METHOD could be specified as nil. In such case input method +disables. + +As example, this alist could looks like the following: + + '((nil . \"en\") + (ukrainian-programmer-dvorak . (\"ru\" \"uk\"))) + +In this way, `ukrainian-programmer-dvorak' will be auto enabled +for the minibuffer when Russian or Ukrainian (as source language) +is active.") + +(defun google-translate-supported-languages () + "Return a list of names of languages supported by Google Translate." + (mapcar #'car google-translate-supported-languages-alist)) + +(defun google-translate-language-abbreviation (language) + "Return the abbreviation of LANGUAGE." + (if (string-equal language "Detect language") + "auto" + (cdr (assoc language google-translate-supported-languages-alist)))) + +(defun google-translate-language-display-name (abbreviation) + "Return a name suitable for use in prompts of the language whose +abbreviation is ABBREVIATION." + (if (string-equal abbreviation "auto") + "unspecified language" + (car (rassoc abbreviation google-translate-supported-languages-alist)))) + +(defun google-translate-paragraph (text face &optional output-format) + "Return TEXT as a filled paragraph into the current buffer and +apply FACE to it. Optionally use OUTPUT-FORMAT." + (let ((beg (point)) + (output-format + (if output-format output-format "\n%s\n"))) + (with-temp-buffer + (insert (format output-format text)) + (facemenu-set-face face beg (point)) + (fill-region beg (point)) + (buffer-substring (point-min) (point-max))))) + +(defun google-translate-setup-preferable-input-method (source-language) + "Set input method which takes from the value of +`google-translate-preferable-input-methods-alist' variable." + (interactive) + (let* ((preferable-input-method + (google-translate-find-preferable-input-method source-language))) + (set-input-method preferable-input-method))) + +(defun google-translate-find-preferable-input-method (source-language) + "Look for the SOURCE-LANGUAGE in the +`google-translate-preferable-input-methods-alist' and return +input method for it." + (let ((input-method nil)) + (dolist (item google-translate-preferable-input-methods-alist) + (dolist (language (cdr item)) + (when (string-equal source-language language) + (setq input-method (car item))))) + input-method)) + +(defun google-translate--translation-title (gtos format) + "Return translation title which contains information about used +source and target languages." + (let ((source-language (gtos-source-language gtos)) + (target-language (gtos-target-language gtos)) + (auto-detected-language (gtos-auto-detected-language gtos))) + (format format + (if (string-equal source-language "auto") + (format "%s (detected)" + (google-translate-language-display-name + auto-detected-language)) + (google-translate-language-display-name + source-language)) + (google-translate-language-display-name + target-language)))) + +(defun google-translate--translating-text (gtos format) + "Outputs in buffer translating text." + (let ((text (gtos-text gtos))) + (let ((output-format format)) + (google-translate-paragraph + text + 'google-translate-text-face + output-format)))) + +(defun google-translate--text-phonetic (gtos format) + "Outputs in buffer text phonetic in case of +`google-translate-show-phonetic' is set to t." + (let ((text-phonetic (gtos-text-phonetic gtos))) + (if (and google-translate-show-phonetic + (not (string-equal text-phonetic ""))) + (google-translate-paragraph + text-phonetic + 'google-translate-phonetic-face + format) + ""))) + +(defun google-translate--translated-text (gtos format) + "Output in buffer translation." + (let ((translation (gtos-translation gtos))) + (google-translate-paragraph + translation + 'google-translate-translation-face + format))) + +(defun google-translate--translation-phonetic (gtos format) + "Output in buffer translation phonetic in case of +`google-translate-show-phonetic' is set to t." + (let ((translation-phonetic (gtos-translation-phonetic gtos))) + (if (and google-translate-show-phonetic + (not (string-equal translation-phonetic ""))) + (google-translate-paragraph + translation-phonetic + 'google-translate-phonetic-face + format) + ""))) + +(defun google-translate--detailed-translation (detailed-translation translation + format1 + format2) + "Return detailed translation." + (with-temp-buffer + (loop for item across detailed-translation do + (let ((index 0) + (label (aref item 0))) + (unless (string-equal label "") + (put-text-property 0 (length label) + 'font-lock-face + 'google-translate-translation-face + label) + (insert (format format1 label)) + (loop for translation across (aref item 2) do + (let ((content + (format "%s (%s)" + (aref translation 0) + (mapconcat 'identity + (aref translation 1) + ", ")))) + (insert (format format2 + (incf index) + content))))))) + (buffer-substring (point-min) (point-max)))) + +(defun google-translate--detailed-definition (detailed-definition definition + format1 + format2) + "Return detailed definition." + (with-temp-buffer + (let ((section "DEFINITION")) + (put-text-property 0 (length section) + 'font-lock-face + 'google-translate-translation-face + section) + (insert (format "\n%s\n" section))) + (loop for item across detailed-definition do + (let ((index 0) + (label (aref item 0))) + (unless (string-equal label "") + (put-text-property 0 (length label) + 'font-lock-face + 'google-translate-translation-face + label) + (insert (format format1 label)) + (loop for definition across (aref item 1) do + (insert (format format2 + (incf index) + (if (> (length definition) 2) + (format "%s\n \"%s\"" + (aref definition 0) + (aref definition 2)) + (format "%s" (aref definition 0))))))))) + (buffer-substring (point-min) (point-max)))) + +(defun google-translate--suggestion (gtos) + "Return suggestion." + (let ((source-language (gtos-source-language gtos)) + (target-language (gtos-target-language gtos)) + (suggestion (gtos-suggestion gtos))) + (if suggestion + (with-temp-buffer + (insert "\n") + (let ((beg (point))) + (insert "Did you mean: ") + (facemenu-set-face 'google-translate-suggestion-label-face + beg (point))) + (goto-char (+ (point) 1)) + (let ((beg (point))) + (insert-text-button suggestion + 'action 'google-translate--suggestion-action + 'follow-link t + 'suggestion suggestion + 'source-language source-language + 'target-language target-language) + (facemenu-set-face 'google-translate-suggestion-face + beg (point)) + (insert "\n")) + (buffer-substring (point-min) (point-max))) + ""))) + +(defun google-translate--suggestion-action (button) + "Suggestion action which occur when suggestion button is +clicked." + (interactive) + (let ((suggestion (button-get button 'suggestion)) + (source-language (button-get button 'source-language)) + (target-language (button-get button 'target-language))) + (google-translate-translate source-language + target-language + suggestion))) + +(defun google-translate--listen-button (language text) + "Return listen button." + (with-temp-buffer + (insert " ") + (insert-text-button google-translate-listen-button-label + 'action 'google-translate--listen-action + 'face 'google-translate-listen-button-face + 'follow-link t + 'text text + 'language language) + (insert "\n") + (buffer-substring (point-min) (point-max)))) + +(defun google-translate--listen-action (button) + "Do translation listening." + (interactive) + (let ((text (button-get button 'text)) + (language (button-get button 'language))) + (google-translate-listen-translation language text))) + +(defun google-translate-listen-translation (language text) + (let ((buf "*mplayer output*")) + (message "Retrieving audio message...") + (if google-translate-translation-listening-debug + (with-current-buffer (get-buffer-create buf) + (insert (format "Listen program: %s\r\n" google-translate-listen-program)) + (insert (format "Listen URL: %s\r\n" (google-translate-format-listen-url text language))) + (call-process google-translate-listen-program nil t nil + (format "%s" (google-translate-format-listen-url text language))) + (switch-to-buffer buf)) + (call-process google-translate-listen-program nil nil nil + (format "%s" (google-translate-format-listen-url text language)))))) + +(defun google-translate-translate (source-language target-language text &optional output-destination) + "Translate TEXT from SOURCE-LANGUAGE to TARGET-LANGUAGE. + +In case of `google-translate-output-destination' is nil pops up a +buffer named *Google Translate* with available translations of +TEXT. In case of `google-translate-output-destination' is +`echo-area' outputs translation in the echo area. If +`google-translate-output-destination' is `popup' outputs +translation in the popup tooltip using `popup' package. + +To deal with multi-line regions, sequences of white space +are replaced with a single space. If the region contains not text, a +message is printed." + (let* ((json (google-translate-request source-language + target-language + text))) + (if (null json) + (message "Nothing to translate.") + (let* ((detailed-translation + (google-translate-json-detailed-translation json)) + (detailed-definition + (google-translate-json-detailed-definition json)) + (gtos + (make-gtos + :source-language source-language + :target-language target-language + :auto-detected-language (aref json 2) + :text text + :text-phonetic (google-translate-json-text-phonetic json) + :translation (google-translate-json-translation json) + :translation-phonetic (google-translate-json-translation-phonetic json) + :detailed-translation detailed-translation + :detailed-definition detailed-definition + :suggestion (when (null detailed-translation) + (google-translate-json-suggestion json)))) + (output-destination (if (null output-destination) + google-translate-output-destination + output-destination))) + (cond + ((null output-destination) + (google-translate-buffer-output-translation gtos)) + ((equal output-destination 'echo-area) + (google-translate-echo-area-output-translation gtos)) + ((equal output-destination 'popup) + (google-translate-popup-output-translation gtos)) + ((equal output-destination 'kill-ring) + (google-translate-kill-ring-output-translation gtos)) + ((equal output-destination 'current-buffer) + (google-translate-current-buffer-output-translation gtos)) + ((equal output-destination 'help) + (let ((describe-func + (function + (lambda (gtos) + (google-translate-help-buffer-output-translation gtos))))) + (help-setup-xref (list 'google-translate-translate source-language target-language text) nil) + (with-help-window (help-buffer) + (funcall describe-func gtos))))))))) + +(defun google-translate-popup-output-translation (gtos) + "Output translation to the popup tooltip using `popup' +package." + (require 'popup) + (popup-tip + (with-temp-buffer + (google-translate-insert-translation gtos) + (google-translate--trim-string + (buffer-substring (point-min) (point-max)))))) + +(defun google-translate-echo-area-output-translation (gtos) + "Output translation to the echo area (See +http://www.gnu.org/software/emacs/manual/html_node/elisp/The-Echo-Area.html)" + (message + (with-temp-buffer + (google-translate-insert-translation gtos) + (google-translate--trim-string + (buffer-substring (point-min) (point-max)))))) + +(defun google-translate-kill-ring-output-translation (gtos) + "Output translation to the kill ring." + (kill-new + (with-temp-buffer + (insert + (gtos-translation gtos)) + (google-translate--trim-string + (buffer-substring (point-min) (point-max))))) + (message "Translated text was added to the kill ring.")) + +(defun google-translate-current-buffer-output-translation (gtos) + "Output translation to current buffer." + (insert + (gtos-translation gtos)) + (message "Translated text was added to current buffer.")) + +(defun google-translate-insert-translation (gtos) + "Insert translation to the current buffer." + (let ((translation (gtos-translation gtos)) + (detailed-translation (gtos-detailed-translation gtos))) + (insert + (google-translate--translation-title gtos "%s -> %s:") + (google-translate--translating-text gtos " %s") + (google-translate--text-phonetic gtos " [%s]") + " - " + (google-translate--translated-text gtos "%s") + (google-translate--translation-phonetic gtos " [%s]") + (if detailed-translation + (google-translate--detailed-translation + detailed-translation translation + "\n* %s " "%d. %s ") + (google-translate--suggestion gtos))))) + +(defun google-translate-buffer-output-translation (gtos) + "Output translation to the temp buffer." + (let ((buffer-name "*Google Translate*")) + (with-output-to-temp-buffer buffer-name + (if google-translate-pop-up-buffer-set-focus + (select-window (display-buffer buffer-name)) + (set-buffer buffer-name)) + (google-translate-buffer-insert-translation gtos)))) + +(defun google-translate-help-buffer-output-translation (gtos) + "Output translation to the help buffer." + (and google-translate-pop-up-buffer-set-focus + (select-window (display-buffer "*Help*"))) + (google-translate-buffer-insert-translation gtos)) + +(defun google-translate-buffer-insert-translation (gtos) + "Insert translation to the current temp buffer." + (let ((translation (gtos-translation gtos)) + (detailed-translation (gtos-detailed-translation gtos)) + (detailed-definition (gtos-detailed-definition gtos)) + (source-language (gtos-source-language gtos)) + (target-language (gtos-target-language gtos)) + (auto-detected-language (gtos-auto-detected-language gtos)) + (text (gtos-text gtos))) + (insert + (google-translate--translation-title gtos "Translate from %s to %s:\n") + "\n" + (google-translate--translating-text + gtos + (if (null google-translate-listen-program) + "%s\n" + "%s")) + (if google-translate-listen-program + (google-translate--listen-button + (if (string-equal source-language "auto") + auto-detected-language + source-language) text) "") + (google-translate--text-phonetic gtos "\n%s\n") + "\n" + (google-translate--translated-text + gtos + (if (null google-translate-listen-program) + "%s\n" + "%s")) + (if google-translate-listen-program + (google-translate--listen-button target-language translation) "") + (google-translate--translation-phonetic gtos "\n%s\n") + (if detailed-translation + (google-translate--detailed-translation + detailed-translation translation + "\n%s\n" "%2d. %s\n") + (google-translate--suggestion gtos)) + (if detailed-definition + (google-translate--detailed-definition + detailed-definition translation + "\n%s\n" "%2d. %s\n") + "")))) + +(defun google-translate-read-source-language (&optional prompt) + "Read a source language, with completion, and return its abbreviation. + +The null input is equivalent to \"Detect language\"." + (let ((completion-ignore-case t) + (prompt + (if (null prompt) + "Translate from: " + prompt))) + (google-translate-language-abbreviation + (google-translate-completing-read + prompt + (google-translate-supported-languages) + "Detect language")))) + +(defun google-translate-read-target-language (&optional prompt) + "Read a target language, with completion, and return its abbreviation. + +The input is guaranteed to be non-null." + (let ((completion-ignore-case t) + (prompt + (if (null prompt) + "Translate to: " + prompt))) + (cl-flet ((read-language () + (google-translate-completing-read + prompt + (google-translate-supported-languages)))) + (let ((target-language (read-language))) + (while (string-equal target-language "") + (setq target-language (read-language))) + (google-translate-language-abbreviation target-language))))) + +(defun google-translate-completing-read (prompt choices &optional def) + "Read a string in the minibuffer with completion. + +If `google-translate-enable-ido-completion' is non-NIL, use +ido-style completion." + (funcall (if google-translate-enable-ido-completion + #'ido-completing-read + #'completing-read) + prompt choices nil t nil nil def)) + +(provide 'google-translate-core-ui) + +;;; google-translate-core-ui.el ends here diff --git a/elpa/google-translate-20190620.1416/google-translate-core-ui.elc b/elpa/google-translate-20190620.1416/google-translate-core-ui.elc new file mode 100644 index 00000000..9d53330c Binary files /dev/null and b/elpa/google-translate-20190620.1416/google-translate-core-ui.elc differ diff --git a/elpa/google-translate-20190620.1416/google-translate-core.el b/elpa/google-translate-20190620.1416/google-translate-core.el new file mode 100644 index 00000000..3ce73298 --- /dev/null +++ b/elpa/google-translate-20190620.1416/google-translate-core.el @@ -0,0 +1,265 @@ +;;; google-translate-core.el --- google-translate core script. + +;; Copyright (C) 2012 Oleksandr Manzyuk + +;; Author: Oleksandr Manzyuk +;; Maintainer: Andrey Tykhonov +;; URL: https://github.com/atykhonov/google-translate +;; Version: 0.11.18 +;; Keywords: convenience + +;; Contributors: +;; Tassilo Horn +;; Bernard Hurley +;; Chris Bilson +;; Takumi Kinjo +;; momomo5717 + +;; This file is NOT part of GNU Emacs. + +;; This is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + +;; This file is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;; This file is the core of `google-translate' package. It does contains +;; the most important and vital functions and variables for the +;; package functionality. +;; +;; The most important is the `google-translate-request' function which +;; is intended to be used by other scripts and packages, expecially by +;; the packages which provides UI. +;; +;; This, `google-translate-core', package doesn't provide any UI. +;; +;; `google-translate-request' function sends http request to the +;; google service and returns JSON response which contains translation +;; and other info. +;; +;; There are also a set of helper functions which are going to be +;; useful to retrieve data from the mentioned JSON response: +;; +;; `google-translate-json-text-phonetic' - retrieves text phonetic; +;; +;; `google-translate-json-translation' - retrieves translation; +;; +;; `google-translate-json-translation-phonetic' - retrieves +;; phonetic translation; +;; +;; `google-translate-json-detailed-translation' - retrieves +;; additional, detailed information which relates to the +;; translation. +;; + +;;; Code: + +(eval-when-compile (require 'cl)) + +(require 'json) +(require 'url) +(require 'google-translate-tk) + +(defgroup google-translate-core nil + "Google Translate core script." + :group 'processes) + +(defvar google-translate-base-url + "http://translate.google.com/translate_a/single") + +(defvar google-translate-listen-url + "http://translate.google.com/translate_tts") + +(defun google-translate--format-query-string (query-params) + "Format QUERY-PARAMS as a query string. + +QUERY-PARAMS must be an alist of field-value pairs." + (mapconcat #'(lambda (p) + (format "%s=%s" + (url-hexify-string (car p)) + (url-hexify-string (cdr p)))) + query-params "&")) + +(defun google-translate--format-request-url (query-params) + "Format QUERY-PARAMS as a Google Translate HTTP request URL. + +QUERY-PARAMS must be an alist of field-value pairs." + (concat google-translate-base-url + "?" + (google-translate--format-query-string query-params))) + +(defun google-translate--format-listen-url (query-params) + "Format QUERY-PARAMS as a Google Translate HTTP request URL for listen translation. + +QUERY-PARAMS must be an alist of field-value pairs." + (concat google-translate-listen-url + "?" + (google-translate--format-query-string query-params))) + +(defun google-translate-format-listen-url (text language) + "Format listen url for TEXT and TARGET-LANGUAGE." + (google-translate--format-listen-url `(("ie" . "UTF-8") + ("q" . ,text) + ("tl" . ,language) + ("total" . "1") + ("idx" . "0") + ("textlen" . ,(number-to-string (length text))) + ("client" . "t") + ("prev" . "input") + ("tk" . ,(google-translate--gen-tk text))))) + +(defun google-translate--http-response-body (url &optional for-test-purposes) + "Retrieve URL and return the response body as a string." + (let ((google-translate-backend-debug (or for-test-purposes + google-translate-backend-debug))) + (with-temp-buffer + (save-excursion + (google-translate-backend-retrieve url)) + (set-buffer-multibyte t) + (buffer-string)))) + +(defun google-translate--insert-nulls (string) + "Google Translate responses with an almost valid JSON string +respresentation except that the nulls appear to be dropped. In +particular the response may contain the substrings \"[,\", +\",,\", and \",]\". This function undoes that." + (with-temp-buffer + (set-buffer-multibyte t) + (insert string) + (goto-char (point-min)) + (while (re-search-forward "\\(\\[,\\|,,\\|,\\]\\)" (point-max) t) + (backward-char) + (insert "null")) + (buffer-string))) + +(defun google-translate--trim-string (string) + "Remove whitespaces in beginning and ending of STRING. + White space here is any of: space, tab, emacs newline (line feed, ASCII 10)." + (replace-regexp-in-string "\\`[ \t\n\r]*" "" + (replace-regexp-in-string "[ \t\n\r]*\\'" "" string))) + +(defun google-translate--strip-string (string) + "Replace spaces, tabs, line feeds (ASCII 10) and carridge +returns (ASCII 13) by a single space symbol." + (replace-regexp-in-string "[[:space:]\n\r]+" " " string)) + +(defun google-translate-prepare-text-for-request (text) + "Make TEXT as clean as possible berofe sending it in the +request." + (google-translate--trim-string + (google-translate--strip-string text))) + +(defun google-translate-request (source-language target-language text) + "Send to the Google Translate http request which consigned to +translate TEXT from SOURCE-LANGUAGE to TARGET-LANGUAGE. Returns +response in json format." + (let ((cleaned-text (google-translate-prepare-text-for-request text))) + (when (and + (stringp cleaned-text) + (> (length cleaned-text) 0)) + (json-read-from-string + (google-translate--insert-nulls + (google-translate--request source-language target-language text)))))) + +(defun google-translate--request (source-language + target-language + text + &optional for-test-purposes) + "Send to the Google Translate http request which consigned to +translate TEXT from SOURCE-LANGUAGE to TARGET-LANGUAGE." + (google-translate--http-response-body + (google-translate--format-request-url + `(("client" . "t") + ("ie" . "UTF-8") + ("oe" . "UTF-8") + ("sl" . ,source-language) + ("tl" . ,target-language) + ("q" . ,text) + ("dt" . "bd") + ("dt" . "ex") + ("dt" . "ld") + ("dt" . "md") + ("dt" . "qc") + ("dt" . "rw") + ("dt" . "rm") + ("dt" . "ss") + ("dt" . "t") + ("dt" . "at") + ("pc" . "1") + ("otf" . "1") + ("srcrom" . "1") + ("ssel" . "0") + ("tsel" . "0") + ("tk" . ,(google-translate--gen-tk text)))) + for-test-purposes)) + +(defun google-translate-json-text-phonetic (json) + "Retrieve from the JSON (which returns by the +`google-translate-request' function) phonetic transcription of +the translating text." + (mapconcat (lambda (item) (if (> (length item) 3) (aref item 3) "")) + (aref json 0) "")) + +(defun google-translate-json-translation (json) + "Retrieve from the JSON (which returns by the +`google-translate-request' function) translation of the +translating text." + (mapconcat #'(lambda (item) (aref item 0)) + (aref json 0) "")) + +(defun google-translate-json-translation-phonetic (json) + "Retrieve from the JSON (which returns by the +`google-translate-request' function) phonetic transcription of +the translating text." + (mapconcat #'(lambda (item) (if (> (length item) 2) (aref item 2) "")) + (aref json 0) "")) + +(defun google-translate-json-detailed-translation (json) + "Retrieve from the JSON (which returns by the +`google-translate-request' function) a dictionary article +represented by a vector of items, where each item is a 2-element +vector whose zeroth element is the name of a part of speech and +whose first element is a vector of translations for that part of +speech." + (aref json 1)) + +(defun google-translate-json-detailed-definition (json) + "Retrieve the definition of translating text in source language from the JSON +which returned by the `google-translate-request' function. + +This function returns the definition if it's included within the JSON as 12th +element, or returns nil if not included. + +The definition is a dictionary article represented by a vector of items, where +each item is a 2-element vector whose zeroth element is the name of a part of +speech and whose first element is a vector of definitions for that part of +speech." + (if (> (length json) 12) + (aref json 12))) + +(defun google-translate-json-suggestion (json) + "Retrieve from JSON (which returns by the +`google-translate-request' function) suggestion. This function +does matter when translating misspelled word. So instead of +translation it is possible to get suggestion." + (let ((info (aref json 7))) + (when info + (aref info 1)))) + +(defun google-translate-version () + (interactive) + (message "Google Translate (version): %s" "0.11.18")) + + +(provide 'google-translate-core) + +;;; google-translate-core.el ends here diff --git a/elpa/google-translate-20190620.1416/google-translate-core.elc b/elpa/google-translate-20190620.1416/google-translate-core.elc new file mode 100644 index 00000000..71d1be05 Binary files /dev/null and b/elpa/google-translate-20190620.1416/google-translate-core.elc differ diff --git a/elpa/google-translate-20190620.1416/google-translate-default-ui.el b/elpa/google-translate-20190620.1416/google-translate-default-ui.el new file mode 100644 index 00000000..c20daf5e --- /dev/null +++ b/elpa/google-translate-20190620.1416/google-translate-default-ui.el @@ -0,0 +1,302 @@ +;;; google-translate-default-ui.el --- default UI for Google Translate +;;; package + +;; Copyright (C) 2012 Oleksandr Manzyuk + +;; Author: Oleksandr Manzyuk +;; Maintainer: Andrey Tykhonov +;; URL: https://github.com/atykhonov/google-translate +;; Version: 0.11.18 +;; Keywords: convenience + +;; Contributors: +;; Tassilo Horn +;; Bernard Hurley +;; Chris Bilson +;; Takumi Kinjo +;; momomo5717 + +;; This file is NOT part of GNU Emacs. + +;; This is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + +;; This file is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;; This file provides default UI for the Google Translate package. It +;; was originally written by Oleksandr Manzyuk and was part of +;; google-translate.el. It was extracted to this, +;; google-translate-default-ui.el file due to refactoring (the goal of +;; which is to separate backend from UI and provide better way for +;; having different UIs for Google Translate package). +;; +;; Invoking the function `google-translate-query-translate' queries the source +;; and target languages and text to translate, and shows a buffer with +;; available translations of the text. Invoking the function +;; `google-translate-at-point' translates the word at point or the active +;; region. + +;; Customization: + +;; You can customize the following variables: +;;;; +;; - `google-translate-default-source-language' +;; +;; - `google-translate-default-target-language' + +;; If the variable `google-translate-default-source-language' is set +;; to a non-NIL value, the source language won't be queried and that +;; value will be used instead. Analogously, if you set the variable +;; `google-translate-default-target-language' to some non-NIL value, +;; that value will be used without querying. + +;; You can always override this behavior by supplying a `C-u' prefix +;; argument to the function `google-translate-query-translate'. + +;; Here is an example. Suppose that your native language is Russian +;; and you frequently need to translate from various languages to +;; Russian. Then it is reasonable +;; +;; - to set the variable `google-translate-default-target-language' +;; to "ru", and +;; +;; - to leave `google-translate-default-source-language' set to its +;; default value, NIL. +;; +;; In this case, the function `google-translate-query-translate' is +;; only going to query the source language and text to translate. +;; If you need to translate to some language other than Russian, you +;; can override the default for the target language by supplying a +;; `C-u' prefix argument, in which case you will be queried for both +;; the source and target languages, as well as text to translate. + +;; If you frequently translate from some fixed language, it is also +;; reasonable to set `google-translate-default-source-language' to +;; an appropriate value. +;; +;; If you have both the default source and target languages specified, +;; you may like to bind functions `google-translate-at-point-reverse' +;; and `google-translate-query-translate-reverse' to some keys, e.g.: +;; +;; (global-set-key (kbd "C-c r") 'google-translate-at-point-reverse) +;; (global-set-key (kbd "C-c R") 'google-translate-query-translate-reverse) +;; +;; This will allow you to quickly translate in the reverse direction. +;; When the default source (resp. target) language is not set, the +;; target (resp. source) language of the reverse translation will be +;; queried interactively. + +;; The admitted values of `google-translate-default-source-language' +;; and `google-translate-default-target-language' are the codes of the +;; languages supported by Google Translate (like "ru" for Russian +;; above). See `google-translate-supported-languages' for the list of +;; the supported languages, or customize the defaults using the +;; customization mechanism of Emacs. Setting a default language to +;; NIL means that language will always be queried. Moreover, the +;; variable `google-translate-default-source-language' can be set to a +;; special value "auto" that is interpreted as the instruction for +;; Google Translate to detect the source language. This option is +;; also available when you are queried for the source language: simply +;; leave this parameter blank by pressing RET. (If you have enabled +;; the ido-style completion, "Detect language" is going to be the +;; first option, which you can select simply by hitting RET.) +;; + +;;; Code: + + +(require 'google-translate-core-ui) + + +(defgroup google-translate-default-ui nil + "Default UI interface to the Google Translate package." + :group 'processes) + +(defcustom google-translate-default-source-language nil + "Default source language. + +A string designating a language supported by Google Translate. +Set this variable to NIL (the default value) if you want to +always be queried for the source language, or to \"auto\" if you +want Google Translate to always detect the source language. + +See the variable `google-translate-supported-languages-alist' for +the list of available languages." + :group 'google-translate-manzyuk-ui + :type `(radio ,@(mapcar #'(lambda (lang) + `(const :tag ,(car lang) ,(cdr lang))) + google-translate-supported-languages-alist) + (const :tag "Detect language" "auto") + (other :tag "Always ask" nil))) + +(defcustom google-translate-default-target-language nil + "Default target language. + +A string designating a language supported by Google Translate. +Set this variable to NIL (the default value) if you want to +always be queried for the target language. + +See the variable `google-translate-supported-languages-alist' for +the list of available languages." + :group 'google-translate-manzyuk-ui + :type `(radio ,@(mapcar #'(lambda (lang) + `(const :tag ,(car lang) ,(cdr lang))) + google-translate-supported-languages-alist) + (other :tag "Always ask" nil))) + +(defun google-translate-read-args (override-p reverse-p) + "Query and return the language arguments of `google-translate-translate'. + +When OVERRIDE-P is NIL, the source (resp. target) language is queried +only if the variable `google-translate-default-source-language' (resp. +`google-translate-default-target-language') is NIL. If OVERRIDE-P is +non-NIL, both the source and target languages are queried, allowing +one to override the defaults if they are specified. + +REVERSE-P is used to reverse the default direction of translation: if +it's non-NIL, the value of `google-translate-default-source-language' +becomes the default target language and vice versa." + (let* ((default-source-language + (if reverse-p + google-translate-default-target-language + google-translate-default-source-language)) + (default-target-language + (if reverse-p + google-translate-default-source-language + google-translate-default-target-language)) + (source-language + (if (and default-source-language + (not override-p)) + default-source-language + (google-translate-read-source-language + "Translate from: "))) + (target-language + (if (and default-target-language + (not override-p)) + default-target-language + (google-translate-read-target-language + (format "Translate from %s to: " + (google-translate-language-display-name + source-language)))))) + (list source-language target-language))) + +(defun %google-translate-query-translate (override-p reverse-p) + (let* ((langs (google-translate-read-args override-p reverse-p)) + (source-language (car langs)) + (target-language (cadr langs))) + (google-translate-translate + source-language target-language + (if google-translate-input-method-auto-toggling + (minibuffer-with-setup-hook + (lambda () + (google-translate-setup-preferable-input-method source-language)) + (%google-translate-default-ui-read-from-minibuffer source-language target-language)) + (%google-translate-default-ui-read-from-minibuffer source-language target-language))))) + +(defun %google-translate-default-ui-read-from-minibuffer (source-language target-language) + (read-from-minibuffer + (format "Translate from %s to %s: " + (google-translate-language-display-name source-language) + (google-translate-language-display-name target-language)))) + +;;;###autoload +(defun google-translate-query-translate (&optional override-p) + "Interactively translate text with Google Translate. + +Query a text (a word or a phrase), and pop up a buffer named *Google +Translate* displaying available translations of the text. + +If no defaults for the source and target languages are specified (by +setting the variables `google-translate-default-source-language' and +`google-translate-default-target-language'), interactively query the +missing parts. For example, a reasonable option may be to specify a +default for the target language and always be queried for the source +language. + +With a `C-u' prefix argument, query the source and target languages, +even if any defaults are specified. For example, you may frequently +need to translate from English to Russian, and you may choose to set +the default source and target languages to \"en\" and \"ru\", resp. +However, occasionally you may also need to translate from Russian to +English. With a `C-u' prefix argument you can override the defaults +and specify the source and target languages explicitly. + +The languages are queried with completion, and the null input at the +source language prompt is considered as an instruction for Google +Translate to detect the source language." + (interactive "P") + (%google-translate-query-translate override-p nil)) + +;;;###autoload +(defun google-translate-query-translate-reverse (&optional override-p) + "Like `google-translate-query-translate', but performs translation +in the reverse direction. + +The value of the variable `google-translate-default-source-language' +\(if set) becomes the target language, and the value of the variable +`google-translate-default-target-language' (if also set) becomes the +source language. + +In particular, when both variables are set, translation is performed +in the reverse direction." + (interactive "P") + (%google-translate-query-translate override-p t)) + +(defun %google-translate-at-point (override-p reverse-p) + (let* ((langs (google-translate-read-args override-p reverse-p)) + (source-language (car langs)) + (target-language (cadr langs)) + (bounds nil)) + (google-translate-translate + source-language target-language + (if (use-region-p) + (buffer-substring-no-properties (region-beginning) (region-end)) + (or (and (setq bounds (bounds-of-thing-at-point 'word)) + (buffer-substring-no-properties (car bounds) (cdr bounds))) + (error "No word at point.")))))) + +;;;###autoload +(defun google-translate-at-point (&optional override-p) + "Translate the word at point or the words in the active region. + +For the meaning of OVERRIDE-P, see `google-translate-query-translate'." + (interactive "P") + (%google-translate-at-point override-p nil)) + +;;;###autoload +(defun google-translate-at-point-reverse (&optional override-p) + "Like `google-translate-at-point', but performs translation in the +reverse direction." + (interactive "P") + (%google-translate-at-point override-p t)) + +;;;###autoload +(defun google-translate-buffer (&optional override-p reverse-p) + "Translate current buffer. + +For the meaning of OVERRIDE-P, see `google-translate-query-translate'." + (interactive "P") + (let* ((langs (google-translate-read-args override-p reverse-p)) + (source-language (car langs)) + (target-language (cadr langs))) + (google-translate-translate + source-language target-language + (if (use-region-p) + (buffer-substring-no-properties (region-beginning) (region-end)) + (or (buffer-substring-no-properties (point-min) (point-max)) + (error "Translate current buffer error.")))))) + +(provide 'google-translate-default-ui) + + +;;; google-translate-default-ui.el ends here diff --git a/elpa/google-translate-20190620.1416/google-translate-default-ui.elc b/elpa/google-translate-20190620.1416/google-translate-default-ui.elc new file mode 100644 index 00000000..08747c6e Binary files /dev/null and b/elpa/google-translate-20190620.1416/google-translate-default-ui.elc differ diff --git a/elpa/google-translate-20190620.1416/google-translate-pkg.el b/elpa/google-translate-20190620.1416/google-translate-pkg.el new file mode 100644 index 00000000..2749c4c2 --- /dev/null +++ b/elpa/google-translate-20190620.1416/google-translate-pkg.el @@ -0,0 +1,4 @@ +(define-package "google-translate" "20190620.1416" "Emacs interface to Google Translate." 'nil) +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/google-translate-20190620.1416/google-translate-smooth-ui.el b/elpa/google-translate-20190620.1416/google-translate-smooth-ui.el new file mode 100644 index 00000000..c021f86c --- /dev/null +++ b/elpa/google-translate-20190620.1416/google-translate-smooth-ui.el @@ -0,0 +1,323 @@ +;;; google-translate-smooth-ui.el --- Just another UI to Google +;;; Translate package + +;; Copyright (C) 2012 Oleksandr Manzyuk + +;; Author: Oleksandr Manzyuk +;; Maintainer: Andrey Tykhonov +;; URL: https://github.com/atykhonov/google-translate +;; Version: 0.11.18 +;; Keywords: convenience + +;; Contributors: +;; Tassilo Horn +;; Bernard Hurley +;; Chris Bilson +;; Takumi Kinjo +;; momomo5717 + +;; This file is NOT part of GNU Emacs. + +;; This is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + +;; This file is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;; `google-translate-smooth-ui' is a just alternative to the default +;; `google-translate-default-ui'. It was written with mind to provide +;; impoved user interface and, especially, to achieve better +;; supporting of many default languages. `google-translate-default-ui' +;; supports two default languages very well but there is no space for +;; the third one. +;; +;; Invoking the function `google-translate-smooth-translate' queries +;; text and (optionally) the source and target languages to translate, +;; and shows a buffer with available translations of the text. + +;; Installation: + +;; Assuming that the files `google-translate.el', +;; `google-translate-core.el', `google-translate-core-ui.el' and +;; `google-translate-smooth-ui.el' are somewhere on the load path, add +;; the following lines to your .emacs file: +;; +;; (require 'google-translate-smooth-ui) +;; (global-set-key "\C-ct" 'google-translate-smooth-translate) +;; +;; Change the key bindings to your liking. +;; +;; Configuration: +;; +;; `google-translate-translation-directions-alist' alist is intended +;; to contain translation directions. +;; +;; For example it could be defined (in your .emacs or init.el) as: +;; +;; (setq google-translate-translation-directions-alist '(("en" . "ru")) +;; +;; in this way one translation direction ("en" > "ru") is defined and +;; when `google-translate-smooth-translate' function executes it will +;; output the prompt (in minibuffer) which will looks like as the +;; following: +;; +;; [English > Russian] Translate: +;; +;; You may set as many translation directions as you would like +;; to. For example such piece of code will define four translation +;; directions: +;; +;; (setq google-translate-translation-directions-alist +;; '(("de" . "en") ("en" . "de") ("de" . "fr") ("fr" . "de"))) +;; +;; in this way, when `google-translate-smooth-translate' function +;; executes you'll be queried by the prompt which will looks like the +;; following: +;; +;; [German > English] Translate: +;; +;; and, also in this way, you'll be able to switch between different +;; translation directions directly from minibuffer by using "C-n" and +;; "C-p" key bindings. "C-n" key binding changes current translation +;; direction to the next direction defined in the +;; `google-translate-translation-directions-alist' variable. And "C-p" +;; key binding changes current translation direction to the previous +;; one. Thus, while executing `google-translate-smooth-translate' +;; function and having in minibuffer such prompt: +;; +;; [German > English] Translate: +;; +;; then after pressing "C-n" you'll get the following prompt: +;; +;; [English > German] Translate: +;; +;; By default `google-translate-translation-directions-alist' is empty +;; and thus during execution of `google-translate-smooth-translate' +;; you'll be queried (to input a text) by the prompt: +;; +;; Translate: +;; +;; And after inputed text you'll be queried also for the source and +;; target languages. To let the package to be known which languages +;; you would like to always use and to avoid repetitive language +;; quering it is reasonable to define them in the mentioned +;; `google-translate-translation-directions-alist' variable. + +;; Customization: + +;; `google-translate-smooth-ui' doesn't contain any customizable +;; variables. But `google-translate-smooth-ui' extends +;; `google-translate-core-ui' and thus it could be customized via this +;; package's variables. Please read documentation for the +;; `google-translate-core-ui' package. +;; + +;;; Code: + + +(require 'google-translate-core-ui) + + +(defgroup google-translate-smooth-ui nil + "Just Another UI for Google Translate package." + :group 'processes) + +(defvar google-translate-translation-directions-alist + '() + "Alist of translation directions. Each of direction could be +selected directly in the minibuffer during translation. + +Each element is a cons-cell of the form (SOURCE_CODE +. TARGET_CODE), where SOURCE_CODE is a source language code and +TARGET_CODE is a target language code. + +Language codes are defined in +`google-translate-supported-languages-alist' variable. + +As example, this alist could looks like the following: + + '((\"en\" . \"ru\") + (\"ru\" . \"en\") + (\"uk\" . \"ru\") + (\"ru\" . \"uk\"))") + +(defvar google-translate-current-translation-direction 0 + "Points to nth element of +`google-translate-translation-directions-alist' variable and +keeps current translation direction while changing translation +directions.") + +(defvar google-translate-translation-direction-query "" + "Temporal variable which keeps a minibuffer text while +switching translation directions.") + +(defvar google-translate-try-other-direction nil + "Indicates that other translation direction is going to be +used.") + +(defvar google-translate-minibuffer-keymap nil + "Keymap for minibuffer for changing translation directions.") + +(defun google-translate-change-translation-direction (direction) + "Change translation direction. If DIRECTION is 'next then +change current direction by the next one. Otherwise change it to +the previous one." + (let ((current google-translate-current-translation-direction) + (length (length google-translate-translation-directions-alist))) + (setq current + (if (equal direction 'next) + (+ current 1) + (- current 1))) + (when (< current 0) + (setq current (- length 1))) + (when (> current (- length 1)) + (setq current 0)) + (setq google-translate-current-translation-direction current) + (setq google-translate-translation-direction-query + (minibuffer-contents)))) + +(defun google-translate-next-translation-direction () + "Switch to the next translation direction. If current direction +is the last in the list of existing directions then switch to the +first one." + (interactive) + (google-translate-change-translation-direction 'next) + (setq google-translate-try-other-direction t) + (exit-minibuffer)) + +(defun google-translate-previous-translation-direction () + "Switch to the previous translation direction. If current +direction is the first in the list of existing directions then +switch to the last one." + (interactive) + (google-translate-change-translation-direction 'previous) + (setq google-translate-try-other-direction t) + (exit-minibuffer)) + +(defun google-translate-query-translate-using-directions () + "Tranlate query using translation directions described by +`google-translate-translation-directions-alist' variable. + +This function allows to select desired translation direction +directly in the minibuffer while translating a word or a +sentence. + +This function defines two key bindings for the minibuffer which +allow to select direction: +C-p - to select previous direction, +C-n - to select next direction." + (interactive) + (let ((text "")) + (setq google-translate-try-other-direction nil) + (setq text + (if google-translate-input-method-auto-toggling + (minibuffer-with-setup-hook + (lambda () + (google-translate-setup-preferable-input-method + (google-translate--current-direction-source-language))) + 'google-translate-setup-preferable-input-method + (google-translate--read-from-minibuffer)) + (google-translate--read-from-minibuffer))) + (if google-translate-try-other-direction + (call-interactively 'google-translate-query-translate-using-directions) + text))) + +(defun google-translate--setup-minibuffer-keymap () + "Setup additional key bindings for minibuffer." + (unless google-translate-minibuffer-keymap + (setq google-translate-minibuffer-keymap + (let ((map (make-sparse-keymap))) + (define-key map "\C-p" 'google-translate-previous-translation-direction) + (define-key map "\C-n" 'google-translate-next-translation-direction) + (define-key map "\C-l" 'google-translate-clear-minibuffer) + (set-keymap-parent map minibuffer-local-map) + map)))) + +(defun google-translate-clear-minibuffer () + "Delete minibuffer contents." + (interactive) + (delete-minibuffer-contents)) + +(defun google-translate--read-from-minibuffer () + "Read string from minibuffer." + (let* ((source-language + (google-translate--current-direction-source-language)) + (target-language + (google-translate--current-direction-target-language)) + (prompt (if (or (null source-language) + (null target-language)) + "Translate: " + (format "[%s > %s] Translate: " + (google-translate-language-display-name source-language) + (google-translate-language-display-name target-language))))) + (google-translate--setup-minibuffer-keymap) + (read-from-minibuffer + prompt + google-translate-translation-direction-query + google-translate-minibuffer-keymap nil nil + google-translate-translation-direction-query t))) + +(defun google-translate--current-direction-source-language () + "Retrieve source language from the current translation +direction." + (car (nth google-translate-current-translation-direction + google-translate-translation-directions-alist))) + +(defun google-translate--current-direction-target-language () + "Retrieve target language from the current translation +direction." + (cdr (nth google-translate-current-translation-direction + google-translate-translation-directions-alist))) + +;;;###autoload +(defun google-translate-smooth-translate () + "Translate a text using translation directions. + +Make a prompt in minibuffer for a text to translate. Default text +is word at point. + +In case of `google-translate-translation-directions-alist' is +empty list then after inputed translating text prompts for source +language and then for target languages. + +In case of `google-translate-translation-directions-alist' is not +empty list takes current translation direction and makes +appropriate translation. Current translation direction indicates +in the minibuffers' prompt. + +A current translation direction could be changed directly in the +minibuffer by means of key bindings such as C-n and C-p for +changing to the next translation direction and to the previous +one respectively." + (interactive) + + (setq google-translate-translation-direction-query + (if (use-region-p) + (google-translate--strip-string + (buffer-substring-no-properties (region-beginning) (region-end))) + (current-word t t))) + + (setq google-translate-current-translation-direction 0) + + (let* ((text (google-translate-query-translate-using-directions)) + (source-language (google-translate--current-direction-source-language)) + (target-language (google-translate--current-direction-target-language))) + (when (null source-language) + (setq source-language (google-translate-read-source-language))) + (when (null target-language) + (setq target-language (google-translate-read-target-language))) + (google-translate-translate source-language target-language text))) + + +(provide 'google-translate-smooth-ui) + +;;; google-translate-smooth-ui.el ends here diff --git a/elpa/google-translate-20190620.1416/google-translate-smooth-ui.elc b/elpa/google-translate-20190620.1416/google-translate-smooth-ui.elc new file mode 100644 index 00000000..1667b5a3 Binary files /dev/null and b/elpa/google-translate-20190620.1416/google-translate-smooth-ui.elc differ diff --git a/elpa/google-translate-20190620.1416/google-translate-tk.el b/elpa/google-translate-20190620.1416/google-translate-tk.el new file mode 100644 index 00000000..09c93e41 --- /dev/null +++ b/elpa/google-translate-20190620.1416/google-translate-tk.el @@ -0,0 +1,176 @@ +;;; google-translate-tk.el --- functions for generation `tk' +;;; parameter. + +;; Copyright (C) 2012 Oleksandr Manzyuk + +;; Author: Oleksandr Manzyuk +;; Maintainer: Andrey Tykhonov +;; URL: https://github.com/atykhonov/google-translate +;; Version: 0.11.18 +;; Keywords: convenience + +;; Contributors: +;; Tassilo Horn +;; Bernard Hurley +;; Chris Bilson +;; Takumi Kinjo +;; momomo5717 + +;; This file is NOT part of GNU Emacs. + +;; This is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + +;; This file is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;; This file contains functions for generation `tk' parameter which is +;; required to make a valid request to the Google Translate. + +;;; Code: + +(require 'cl-lib) +(require 'google-translate-backend) + + +(defvar google-translate--bit-v-len 32) + +(defvar google-translate--tkk-url + "http://translate.google.com/") + + +(defun google-translate--bit-v-2comp (v) + "Return the two's complement of V." + (let* ((vc (vconcat v)) + (len (length vc))) + ;; Complement of v + (cl-loop for i from 0 below len do + (aset vc i (logxor (aref vc i) 1))) + ;; vc = complement of v + 1 + (cl-loop for i downfrom (1- len) to 0 + do (aset vc i (logxor (aref vc i) 1)) + when (> (aref vc i) 0) return nil) + vc)) + +(defun google-translate--number-to-bit-v (n) + "Return a bit vector from N." + (if (< n 0) (google-translate--bit-v-2comp + (google-translate--number-to-bit-v (abs n))) + (let ((v (make-vector google-translate--bit-v-len 0))) + (cl-loop for i downfrom (1- google-translate--bit-v-len) to 0 + with q + when (< n 1) return nil do + (setq q (ffloor (* n 0.5))) + (aset v i (floor (- n (* 2.0 q)))) + (setq n q)) + v))) + +(defun google-translate--bit-v-to-number (v) + "Return a floating-point number from V." + (if (and (> (aref v 0) 0) + ;; Exclude [1 0 ... 0] + (cl-loop for i from 1 below google-translate--bit-v-len + thereis (> (aref v i) 0))) + (- (google-translate--bit-v-to-number (google-translate--bit-v-2comp v))) + (funcall (if (> (aref v 0) 0) #'- #'+) + (cl-reduce (lambda (acc e) (+ (* acc 2.0) e)) + v :initial-value 0.0)))) + +(defun google-translate--logfn (fn n1 n2) + "Helper function for logical FN." + (let ((v1 (google-translate--number-to-bit-v n1)) + (v2 (google-translate--number-to-bit-v n2)) + (v (make-vector google-translate--bit-v-len 0))) + (cl-loop for i from 0 below google-translate--bit-v-len do + (aset v i (funcall fn (aref v1 i) (aref v2 i)))) + (google-translate--bit-v-to-number v))) + +(defun google-translate--logand (n1 n2) + "Return a floating-point number from N1 and N2." + (google-translate--logfn #'logand n1 n2)) + +(defun google-translate--logxor (n1 n2) + "Return a floating-point number from N1 and N2." + (google-translate--logfn #'logxor n1 n2)) + +(defun google-translate--lsh (n d) + "Return a floating-point number. +Shift the bits in N to the left or rihgt D places. +D is an integer." + (let ((v (google-translate--number-to-bit-v n)) + (v-result (make-vector google-translate--bit-v-len 0))) + (if (< d 0) ;; Shift Right Logical + ;; [x0 x1 ... xn-d ... xn] => [0 ... 0 x0 x1 ... xn-d] + (cl-loop for i from (abs d) below google-translate--bit-v-len + for j from 0 do + (aset v-result i (aref v j))) + ;; Shift Left Logical + ;; [x0 x1 ... xd ... xn] => [xd ... xn 0 ... 0] + (cl-loop for i from d below google-translate--bit-v-len + for j from 0 do + (aset v-result j (aref v i)))) + (google-translate--bit-v-to-number v-result))) + +(defun google-translate--search-tkk () + "Search TKK." + (let ((start nil) + (tkk nil) + (nums '())) + (setq start (search-forward ",tkk:'")) + (search-forward "',") + (backward-char 2) + (setq tkk (buffer-substring start (point))) + (setq nums (split-string tkk "\\.")) + (list (string-to-number (car nums)) + (string-to-number (car (cdr nums)))))) + +(defun google-translate--get-b-d1 () + "Return a list of b and d1 for `google-translate--gen-tk'." + (let ((url-request-extra-headers '(("Connection" . "close")))) + (with-temp-buffer + (save-excursion (google-translate-backend-retrieve + google-translate--tkk-url)) + (google-translate--search-tkk)))) + +(defun google-translate--gen-rl (a b) + (cl-loop for c from 0 below (- (length b) 2) by 3 + for d = (aref b (+ c 2)) do + (setq d (if (>= d ?a) (- d 87) (- d ?0))) + (setq d (if (= (aref b (1+ c)) ?+) + (google-translate--lsh a (- d)) + (google-translate--lsh a d))) + (setq a (if (= (aref b c) ?+) + (google-translate--logand (+ a d) 4294967295.0) + (google-translate--logxor a d)))) + a) + +(defun google-translate--gen-tk (text &optional b-d1) + (setq b-d1 (or b-d1 (google-translate--get-b-d1))) + (let* ((b (cl-first b-d1)) + (d1 (cl-second b-d1)) + (ub "+-3^+b+-f") + (vb "+-a^+6") + (a (cl-reduce (lambda (a e) (google-translate--gen-rl (+ a e) vb)) + (encode-coding-string text 'utf-8) :initial-value b))) + (setq a (google-translate--gen-rl a ub)) + (setq a (google-translate--logxor a d1)) + (when (< a 0) ;; (abs a) + 2^31 + (setq a (+ (google-translate--logand a 2147483647.0) 2147483648.0))) + (setq a (ffloor (mod a 1e6))) + (format "%s.%s" + (car (split-string (number-to-string a) "\\.")) + (car (split-string (number-to-string + (google-translate--logxor a b)) "\\."))))) + + +(provide 'google-translate-tk) +;;; google-translate-tk.el ends here diff --git a/elpa/google-translate-20190620.1416/google-translate-tk.elc b/elpa/google-translate-20190620.1416/google-translate-tk.elc new file mode 100644 index 00000000..e7e5d0c0 Binary files /dev/null and b/elpa/google-translate-20190620.1416/google-translate-tk.elc differ diff --git a/elpa/google-translate-20190620.1416/google-translate.el b/elpa/google-translate-20190620.1416/google-translate.el new file mode 100644 index 00000000..8845a1d8 --- /dev/null +++ b/elpa/google-translate-20190620.1416/google-translate.el @@ -0,0 +1,84 @@ +;;; google-translate.el --- Emacs interface to Google Translate + +;; Copyright (C) 2012 Oleksandr Manzyuk + +;; Author: Oleksandr Manzyuk +;; Maintainer: Andrey Tykhonov +;; URL: https://github.com/atykhonov/google-translate +;; Version: 0.11.18 +;; Keywords: convenience + +;; Contributors: +;; Tassilo Horn +;; Bernard Hurley +;; Chris Bilson +;; Takumi Kinjo +;; momomo5717 + +;; This file is NOT part of GNU Emacs. + +;; This is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + +;; This file is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: + +;; Installation: + +;; From MELPA or Marmalade. + +;; Just run `M-x package-install RET google-translate RET` + +;; Manual installation. + +;; Assuming that the file `google-translate.el' and other files which +;; relates to this package is somewhere on the load path, add the +;; following lines to your `.emacs' file: + +;; (require 'google-translate) +;; (require 'google-translate-default-ui) +;; (global-set-key "\C-ct" 'google-translate-at-point) +;; (global-set-key "\C-cT" 'google-translate-query-translate) + +;; or + +;; (require 'google-translate) +;; (require 'google-translate-smooth-ui) +;; (global-set-key "\C-ct" 'google-translate-smooth-translate) +;; +;; Change the key bindings to your liking. + +;; The difference between these configurations is in UI which will be +;; used: Default UI or Smooth UI. +;; +;; Please read the source of `google-translate-default-ui.el' and +;; `google-translate-smooth-ui.el' for more details. + +;; Customization: + +;; Variables which are available for customization are depends on UI +;; package which is selected for the google-translate +;; package. google-translate-default-ui - is UI which is selected by +;; default. It loads by default and is available right after +;; google-translate installation and its initialization. Please read +;; documentation for the `google-translate-core-ui.el' and +;; `google-translate-default-ui.el' packages for more info about +;; customization. +;; + +;;; Code: + +(require 'google-translate-default-ui) + +(provide 'google-translate) + +;;; google-translate.el ends here diff --git a/elpa/google-translate-20190620.1416/google-translate.elc b/elpa/google-translate-20190620.1416/google-translate.elc new file mode 100644 index 00000000..5d4b324b Binary files /dev/null and b/elpa/google-translate-20190620.1416/google-translate.elc differ diff --git a/elpa/olivetti-20200207.749/olivetti-pkg.el b/elpa/olivetti-20200207.749/olivetti-pkg.el deleted file mode 100644 index d9212a80..00000000 --- a/elpa/olivetti-20200207.749/olivetti-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "olivetti" "20200207.749" "Minor mode for a nice writing environment" '((emacs "25.3")) :commit "37da7d49117ee2128a18e022d630e43f15660f4a" :keywords '("wp" "text") :authors '(("Paul W. Rankin" . "code@paulwrankin.com")) :maintainer '("Paul W. Rankin" . "code@paulwrankin.com") :url "https://gthub.com/rnkn/olivetti") diff --git a/elpa/olivetti-20200207.749/olivetti-autoloads.el b/elpa/olivetti-20200212.1439/olivetti-autoloads.el similarity index 100% rename from elpa/olivetti-20200207.749/olivetti-autoloads.el rename to elpa/olivetti-20200212.1439/olivetti-autoloads.el diff --git a/elpa/olivetti-20200212.1439/olivetti-pkg.el b/elpa/olivetti-20200212.1439/olivetti-pkg.el new file mode 100644 index 00000000..799c48d2 --- /dev/null +++ b/elpa/olivetti-20200212.1439/olivetti-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "olivetti" "20200212.1439" "Minor mode for a nice writing environment" '((emacs "24.5")) :commit "4b113151308c1214e8e70a7846558dad9c918859" :keywords '("wp" "text") :authors '(("Paul W. Rankin" . "code@paulwrankin.com")) :maintainer '("Paul W. Rankin" . "code@paulwrankin.com") :url "https://gthub.com/rnkn/olivetti") diff --git a/elpa/olivetti-20200207.749/olivetti.el b/elpa/olivetti-20200212.1439/olivetti.el similarity index 96% rename from elpa/olivetti-20200207.749/olivetti.el rename to elpa/olivetti-20200212.1439/olivetti.el index 1ed0a853..3e6f6f9d 100644 --- a/elpa/olivetti-20200207.749/olivetti.el +++ b/elpa/olivetti-20200212.1439/olivetti.el @@ -1,13 +1,14 @@ ;;; olivetti.el --- Minor mode for a nice writing environment -*- lexical-binding: t; -*- -;; Copyright (c) 2014-2019 Free Software Foundation, Inc. -;; Copyright (c) 2019 Paul W. Rankin +;; Copyright (c) 2014-2019 Paul W. Rankin +;; Copyright (c) 2019 Free Software Foundation, Inc. +;; Copyright (c) 2019-2020 Paul W. Rankin ;; Author: Paul W. Rankin ;; Keywords: wp, text -;; Package-Version: 20200207.749 -;; Version: 1.9.1 -;; Package-Requires: ((emacs "25.3")) +;; Package-Version: 20200212.1439 +;; Version: 1.9.2 +;; Package-Requires: ((emacs "24.5")) ;; URL: https://gthub.com/rnkn/olivetti ;; This file is not part of GNU Emacs. @@ -37,9 +38,9 @@ ;; keep the text comfortably in the middle of the window. ;; - Text body width can be the number of characters (an integer) or a fraction ;; of the window width (a float between 0.0 and 1.0). -;; - Interactively change body width with: -;; olivetti-shrink C-c { { { ... -;; olivetti-expand C-c } } } ... +;; - Interactively change body width with: +;; olivetti-shrink C-c { { { ... +;; olivetti-expand C-c } } } ... ;; olivetti-set-width C-c \ ;; - If olivetti-body-width is an integer, the text body width will scale with ;; use of text-scale-mode, whereas if a fraction (float) then the text body @@ -295,8 +296,6 @@ fraction of the window width." (olivetti-set-all-margins) (message "Text body width set to %s" olivetti-body-width)) -(require 'seq) - (defun olivetti-expand (&optional arg) "Incrementally increase the value of `olivetti-body-width'. @@ -311,10 +310,10 @@ If prefixed with ARG, incrementally decrease." (olivetti-set-all-margins) (message "Text body width set to %s" olivetti-body-width) (unless overriding-terminal-local-map - (let ((keys (seq-subseq (this-single-command-keys) 0 -1)) + (let ((keys (substring (this-single-command-keys) 0 -1)) (map (cdr olivetti-mode-map))) - (seq-do (lambda (k) (setq map (assq k map))) keys) - (set-transient-map (cdr map) t)))) + (mapc (lambda (k) (setq map (assq k map))) keys) + (when (consp map) (set-transient-map (cdr map) t))))) (defun olivetti-shrink (&optional arg) "Incrementally decrease the value of `olivetti-body-width'. diff --git a/elpa/olivetti-20200207.749/olivetti.elc b/elpa/olivetti-20200212.1439/olivetti.elc similarity index 93% rename from elpa/olivetti-20200207.749/olivetti.elc rename to elpa/olivetti-20200212.1439/olivetti.elc index 68c4e836..93ebd511 100644 Binary files a/elpa/olivetti-20200207.749/olivetti.elc and b/elpa/olivetti-20200212.1439/olivetti.elc differ diff --git a/elpa/org-9.3.3.signed b/elpa/org-9.3.6.signed similarity index 83% rename from elpa/org-9.3.3.signed rename to elpa/org-9.3.6.signed index 3bd9b4a6..9829a7e5 100644 --- a/elpa/org-9.3.3.signed +++ b/elpa/org-9.3.6.signed @@ -1 +1 @@ -Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) (trust undefined) created at 2020-02-05T11:05:09+0100 using RSA \ No newline at end of file +Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) (trust undefined) created at 2020-02-13T11:05:02+0100 using RSA \ No newline at end of file diff --git a/elpa/org-9.3.3/COPYING b/elpa/org-9.3.6/COPYING similarity index 100% rename from elpa/org-9.3.3/COPYING rename to elpa/org-9.3.6/COPYING diff --git a/elpa/org-9.3.3/README_ELPA b/elpa/org-9.3.6/README_ELPA similarity index 100% rename from elpa/org-9.3.3/README_ELPA rename to elpa/org-9.3.6/README_ELPA diff --git a/elpa/org-9.3.3/dir b/elpa/org-9.3.6/dir similarity index 100% rename from elpa/org-9.3.3/dir rename to elpa/org-9.3.6/dir diff --git a/elpa/org-9.3.3/etc/ORG-NEWS b/elpa/org-9.3.6/etc/ORG-NEWS similarity index 100% rename from elpa/org-9.3.3/etc/ORG-NEWS rename to elpa/org-9.3.6/etc/ORG-NEWS diff --git a/elpa/org-9.3.3/etc/styles/OrgOdtContentTemplate.xml b/elpa/org-9.3.6/etc/styles/OrgOdtContentTemplate.xml similarity index 100% rename from elpa/org-9.3.3/etc/styles/OrgOdtContentTemplate.xml rename to elpa/org-9.3.6/etc/styles/OrgOdtContentTemplate.xml diff --git a/elpa/org-9.3.3/etc/styles/OrgOdtStyles.xml b/elpa/org-9.3.6/etc/styles/OrgOdtStyles.xml similarity index 100% rename from elpa/org-9.3.3/etc/styles/OrgOdtStyles.xml rename to elpa/org-9.3.6/etc/styles/OrgOdtStyles.xml diff --git a/elpa/org-9.3.3/etc/styles/README b/elpa/org-9.3.6/etc/styles/README similarity index 100% rename from elpa/org-9.3.3/etc/styles/README rename to elpa/org-9.3.6/etc/styles/README diff --git a/elpa/org-9.3.3/ob-C.el b/elpa/org-9.3.6/ob-C.el similarity index 100% rename from elpa/org-9.3.3/ob-C.el rename to elpa/org-9.3.6/ob-C.el diff --git a/elpa/org-9.3.3/ob-C.elc b/elpa/org-9.3.6/ob-C.elc similarity index 100% rename from elpa/org-9.3.3/ob-C.elc rename to elpa/org-9.3.6/ob-C.elc diff --git a/elpa/org-9.3.3/ob-J.el b/elpa/org-9.3.6/ob-J.el similarity index 100% rename from elpa/org-9.3.3/ob-J.el rename to elpa/org-9.3.6/ob-J.el diff --git a/elpa/org-9.3.3/ob-J.elc b/elpa/org-9.3.6/ob-J.elc similarity index 100% rename from elpa/org-9.3.3/ob-J.elc rename to elpa/org-9.3.6/ob-J.elc diff --git a/elpa/org-9.3.3/ob-R.el b/elpa/org-9.3.6/ob-R.el similarity index 100% rename from elpa/org-9.3.3/ob-R.el rename to elpa/org-9.3.6/ob-R.el diff --git a/elpa/org-9.3.3/ob-R.elc b/elpa/org-9.3.6/ob-R.elc similarity index 100% rename from elpa/org-9.3.3/ob-R.elc rename to elpa/org-9.3.6/ob-R.elc diff --git a/elpa/org-9.3.3/ob-abc.el b/elpa/org-9.3.6/ob-abc.el similarity index 100% rename from elpa/org-9.3.3/ob-abc.el rename to elpa/org-9.3.6/ob-abc.el diff --git a/elpa/org-9.3.3/ob-abc.elc b/elpa/org-9.3.6/ob-abc.elc similarity index 100% rename from elpa/org-9.3.3/ob-abc.elc rename to elpa/org-9.3.6/ob-abc.elc diff --git a/elpa/org-9.3.3/ob-asymptote.el b/elpa/org-9.3.6/ob-asymptote.el similarity index 100% rename from elpa/org-9.3.3/ob-asymptote.el rename to elpa/org-9.3.6/ob-asymptote.el diff --git a/elpa/org-9.3.3/ob-asymptote.elc b/elpa/org-9.3.6/ob-asymptote.elc similarity index 100% rename from elpa/org-9.3.3/ob-asymptote.elc rename to elpa/org-9.3.6/ob-asymptote.elc diff --git a/elpa/org-9.3.3/ob-awk.el b/elpa/org-9.3.6/ob-awk.el similarity index 100% rename from elpa/org-9.3.3/ob-awk.el rename to elpa/org-9.3.6/ob-awk.el diff --git a/elpa/org-9.3.3/ob-awk.elc b/elpa/org-9.3.6/ob-awk.elc similarity index 100% rename from elpa/org-9.3.3/ob-awk.elc rename to elpa/org-9.3.6/ob-awk.elc diff --git a/elpa/org-9.3.3/ob-calc.el b/elpa/org-9.3.6/ob-calc.el similarity index 100% rename from elpa/org-9.3.3/ob-calc.el rename to elpa/org-9.3.6/ob-calc.el diff --git a/elpa/org-9.3.3/ob-calc.elc b/elpa/org-9.3.6/ob-calc.elc similarity index 100% rename from elpa/org-9.3.3/ob-calc.elc rename to elpa/org-9.3.6/ob-calc.elc diff --git a/elpa/org-9.3.3/ob-clojure.el b/elpa/org-9.3.6/ob-clojure.el similarity index 98% rename from elpa/org-9.3.3/ob-clojure.el rename to elpa/org-9.3.6/ob-clojure.el index 0d6d1c0a..ac5c4c99 100644 --- a/elpa/org-9.3.3/ob-clojure.el +++ b/elpa/org-9.3.6/ob-clojure.el @@ -104,6 +104,8 @@ If the value is nil, timeout is disabled." (result-params (cdr (assq :result-params params))) (print-level nil) (print-length nil) + ;; Remove comments, they break (let [...] ...) bindings + (body (replace-regexp-in-string "^[ ]*;+.*$" "" body)) (body (org-trim (concat ;; Source block specified namespace :ns. @@ -113,7 +115,7 @@ If the value is nil, timeout is disabled." (format "(let [%s]\n%s)" (mapconcat (lambda (var) - (format "%S (quote %S)" (car var) (cdr var))) + (format "%S %S" (car var) (cdr var))) vars "\n ") body)))))) diff --git a/elpa/org-9.3.3/ob-clojure.elc b/elpa/org-9.3.6/ob-clojure.elc similarity index 87% rename from elpa/org-9.3.3/ob-clojure.elc rename to elpa/org-9.3.6/ob-clojure.elc index 29cc1cfc..418bd2f1 100644 Binary files a/elpa/org-9.3.3/ob-clojure.elc and b/elpa/org-9.3.6/ob-clojure.elc differ diff --git a/elpa/org-9.3.3/ob-comint.el b/elpa/org-9.3.6/ob-comint.el similarity index 100% rename from elpa/org-9.3.3/ob-comint.el rename to elpa/org-9.3.6/ob-comint.el diff --git a/elpa/org-9.3.3/ob-comint.elc b/elpa/org-9.3.6/ob-comint.elc similarity index 100% rename from elpa/org-9.3.3/ob-comint.elc rename to elpa/org-9.3.6/ob-comint.elc diff --git a/elpa/org-9.3.3/ob-coq.el b/elpa/org-9.3.6/ob-coq.el similarity index 100% rename from elpa/org-9.3.3/ob-coq.el rename to elpa/org-9.3.6/ob-coq.el diff --git a/elpa/org-9.3.3/ob-coq.elc b/elpa/org-9.3.6/ob-coq.elc similarity index 100% rename from elpa/org-9.3.3/ob-coq.elc rename to elpa/org-9.3.6/ob-coq.elc diff --git a/elpa/org-9.3.3/ob-core.el b/elpa/org-9.3.6/ob-core.el similarity index 99% rename from elpa/org-9.3.3/ob-core.el rename to elpa/org-9.3.6/ob-core.el index 651561a2..a6368ad8 100644 --- a/elpa/org-9.3.3/ob-core.el +++ b/elpa/org-9.3.6/ob-core.el @@ -2764,11 +2764,12 @@ block but are passed literally to the \"example-block\"." (lambda (s) ;; Comment, according to LANG mode, ;; string S. Return new string. - (with-temp-buffer - (funcall (org-src-get-lang-mode lang)) - (comment-region (point) - (progn (insert s) (point))) - (org-trim (buffer-string))))) + (unless org-babel-tangle-uncomment-comments + (with-temp-buffer + (funcall (org-src-get-lang-mode lang)) + (comment-region (point) + (progn (insert s) (point))) + (org-trim (buffer-string)))))) (expand-body (lambda (i) ;; Expand body of code blocked diff --git a/elpa/org-9.3.3/ob-core.elc b/elpa/org-9.3.6/ob-core.elc similarity index 98% rename from elpa/org-9.3.3/ob-core.elc rename to elpa/org-9.3.6/ob-core.elc index 05b2df79..13ca8123 100644 Binary files a/elpa/org-9.3.3/ob-core.elc and b/elpa/org-9.3.6/ob-core.elc differ diff --git a/elpa/org-9.3.3/ob-css.el b/elpa/org-9.3.6/ob-css.el similarity index 100% rename from elpa/org-9.3.3/ob-css.el rename to elpa/org-9.3.6/ob-css.el diff --git a/elpa/org-9.3.3/ob-css.elc b/elpa/org-9.3.6/ob-css.elc similarity index 100% rename from elpa/org-9.3.3/ob-css.elc rename to elpa/org-9.3.6/ob-css.elc diff --git a/elpa/org-9.3.3/ob-ditaa.el b/elpa/org-9.3.6/ob-ditaa.el similarity index 100% rename from elpa/org-9.3.3/ob-ditaa.el rename to elpa/org-9.3.6/ob-ditaa.el diff --git a/elpa/org-9.3.3/ob-ditaa.elc b/elpa/org-9.3.6/ob-ditaa.elc similarity index 100% rename from elpa/org-9.3.3/ob-ditaa.elc rename to elpa/org-9.3.6/ob-ditaa.elc diff --git a/elpa/org-9.3.3/ob-dot.el b/elpa/org-9.3.6/ob-dot.el similarity index 100% rename from elpa/org-9.3.3/ob-dot.el rename to elpa/org-9.3.6/ob-dot.el diff --git a/elpa/org-9.3.3/ob-dot.elc b/elpa/org-9.3.6/ob-dot.elc similarity index 100% rename from elpa/org-9.3.3/ob-dot.elc rename to elpa/org-9.3.6/ob-dot.elc diff --git a/elpa/org-9.3.3/ob-ebnf.el b/elpa/org-9.3.6/ob-ebnf.el similarity index 100% rename from elpa/org-9.3.3/ob-ebnf.el rename to elpa/org-9.3.6/ob-ebnf.el diff --git a/elpa/org-9.3.3/ob-ebnf.elc b/elpa/org-9.3.6/ob-ebnf.elc similarity index 100% rename from elpa/org-9.3.3/ob-ebnf.elc rename to elpa/org-9.3.6/ob-ebnf.elc diff --git a/elpa/org-9.3.3/ob-emacs-lisp.el b/elpa/org-9.3.6/ob-emacs-lisp.el similarity index 100% rename from elpa/org-9.3.3/ob-emacs-lisp.el rename to elpa/org-9.3.6/ob-emacs-lisp.el diff --git a/elpa/org-9.3.3/ob-emacs-lisp.elc b/elpa/org-9.3.6/ob-emacs-lisp.elc similarity index 100% rename from elpa/org-9.3.3/ob-emacs-lisp.elc rename to elpa/org-9.3.6/ob-emacs-lisp.elc diff --git a/elpa/org-9.3.3/ob-eshell.el b/elpa/org-9.3.6/ob-eshell.el similarity index 100% rename from elpa/org-9.3.3/ob-eshell.el rename to elpa/org-9.3.6/ob-eshell.el diff --git a/elpa/org-9.3.3/ob-eshell.elc b/elpa/org-9.3.6/ob-eshell.elc similarity index 100% rename from elpa/org-9.3.3/ob-eshell.elc rename to elpa/org-9.3.6/ob-eshell.elc diff --git a/elpa/org-9.3.3/ob-eval.el b/elpa/org-9.3.6/ob-eval.el similarity index 100% rename from elpa/org-9.3.3/ob-eval.el rename to elpa/org-9.3.6/ob-eval.el diff --git a/elpa/org-9.3.3/ob-eval.elc b/elpa/org-9.3.6/ob-eval.elc similarity index 100% rename from elpa/org-9.3.3/ob-eval.elc rename to elpa/org-9.3.6/ob-eval.elc diff --git a/elpa/org-9.3.3/ob-exp.el b/elpa/org-9.3.6/ob-exp.el similarity index 100% rename from elpa/org-9.3.3/ob-exp.el rename to elpa/org-9.3.6/ob-exp.el diff --git a/elpa/org-9.3.3/ob-exp.elc b/elpa/org-9.3.6/ob-exp.elc similarity index 100% rename from elpa/org-9.3.3/ob-exp.elc rename to elpa/org-9.3.6/ob-exp.elc diff --git a/elpa/org-9.3.3/ob-forth.el b/elpa/org-9.3.6/ob-forth.el similarity index 100% rename from elpa/org-9.3.3/ob-forth.el rename to elpa/org-9.3.6/ob-forth.el diff --git a/elpa/org-9.3.3/ob-forth.elc b/elpa/org-9.3.6/ob-forth.elc similarity index 100% rename from elpa/org-9.3.3/ob-forth.elc rename to elpa/org-9.3.6/ob-forth.elc diff --git a/elpa/org-9.3.3/ob-fortran.el b/elpa/org-9.3.6/ob-fortran.el similarity index 100% rename from elpa/org-9.3.3/ob-fortran.el rename to elpa/org-9.3.6/ob-fortran.el diff --git a/elpa/org-9.3.3/ob-fortran.elc b/elpa/org-9.3.6/ob-fortran.elc similarity index 100% rename from elpa/org-9.3.3/ob-fortran.elc rename to elpa/org-9.3.6/ob-fortran.elc diff --git a/elpa/org-9.3.3/ob-gnuplot.el b/elpa/org-9.3.6/ob-gnuplot.el similarity index 99% rename from elpa/org-9.3.3/ob-gnuplot.el rename to elpa/org-9.3.6/ob-gnuplot.el index d11c55f7..99f3dab7 100644 --- a/elpa/org-9.3.3/ob-gnuplot.el +++ b/elpa/org-9.3.6/ob-gnuplot.el @@ -35,7 +35,7 @@ ;; - gnuplot :: http://www.gnuplot.info/ ;; -;; - gnuplot-mode :: http://cars9.uchicago.edu/~ravel/software/gnuplot-mode.html +;; - gnuplot-mode :: you can search the web for the latest active one. ;;; Code: (require 'ob) diff --git a/elpa/org-9.3.3/ob-gnuplot.elc b/elpa/org-9.3.6/ob-gnuplot.elc similarity index 100% rename from elpa/org-9.3.3/ob-gnuplot.elc rename to elpa/org-9.3.6/ob-gnuplot.elc diff --git a/elpa/org-9.3.3/ob-groovy.el b/elpa/org-9.3.6/ob-groovy.el similarity index 100% rename from elpa/org-9.3.3/ob-groovy.el rename to elpa/org-9.3.6/ob-groovy.el diff --git a/elpa/org-9.3.3/ob-groovy.elc b/elpa/org-9.3.6/ob-groovy.elc similarity index 100% rename from elpa/org-9.3.3/ob-groovy.elc rename to elpa/org-9.3.6/ob-groovy.elc diff --git a/elpa/org-9.3.3/ob-haskell.el b/elpa/org-9.3.6/ob-haskell.el similarity index 100% rename from elpa/org-9.3.3/ob-haskell.el rename to elpa/org-9.3.6/ob-haskell.el diff --git a/elpa/org-9.3.3/ob-haskell.elc b/elpa/org-9.3.6/ob-haskell.elc similarity index 100% rename from elpa/org-9.3.3/ob-haskell.elc rename to elpa/org-9.3.6/ob-haskell.elc diff --git a/elpa/org-9.3.3/ob-hledger.el b/elpa/org-9.3.6/ob-hledger.el similarity index 100% rename from elpa/org-9.3.3/ob-hledger.el rename to elpa/org-9.3.6/ob-hledger.el diff --git a/elpa/org-9.3.3/ob-hledger.elc b/elpa/org-9.3.6/ob-hledger.elc similarity index 100% rename from elpa/org-9.3.3/ob-hledger.elc rename to elpa/org-9.3.6/ob-hledger.elc diff --git a/elpa/org-9.3.3/ob-io.el b/elpa/org-9.3.6/ob-io.el similarity index 100% rename from elpa/org-9.3.3/ob-io.el rename to elpa/org-9.3.6/ob-io.el diff --git a/elpa/org-9.3.3/ob-io.elc b/elpa/org-9.3.6/ob-io.elc similarity index 100% rename from elpa/org-9.3.3/ob-io.elc rename to elpa/org-9.3.6/ob-io.elc diff --git a/elpa/org-9.3.3/ob-java.el b/elpa/org-9.3.6/ob-java.el similarity index 100% rename from elpa/org-9.3.3/ob-java.el rename to elpa/org-9.3.6/ob-java.el diff --git a/elpa/org-9.3.3/ob-java.elc b/elpa/org-9.3.6/ob-java.elc similarity index 100% rename from elpa/org-9.3.3/ob-java.elc rename to elpa/org-9.3.6/ob-java.elc diff --git a/elpa/org-9.3.3/ob-js.el b/elpa/org-9.3.6/ob-js.el similarity index 100% rename from elpa/org-9.3.3/ob-js.el rename to elpa/org-9.3.6/ob-js.el diff --git a/elpa/org-9.3.3/ob-js.elc b/elpa/org-9.3.6/ob-js.elc similarity index 100% rename from elpa/org-9.3.3/ob-js.elc rename to elpa/org-9.3.6/ob-js.elc diff --git a/elpa/org-9.3.3/ob-latex.el b/elpa/org-9.3.6/ob-latex.el similarity index 100% rename from elpa/org-9.3.3/ob-latex.el rename to elpa/org-9.3.6/ob-latex.el diff --git a/elpa/org-9.3.3/ob-latex.elc b/elpa/org-9.3.6/ob-latex.elc similarity index 100% rename from elpa/org-9.3.3/ob-latex.elc rename to elpa/org-9.3.6/ob-latex.elc diff --git a/elpa/org-9.3.3/ob-ledger.el b/elpa/org-9.3.6/ob-ledger.el similarity index 100% rename from elpa/org-9.3.3/ob-ledger.el rename to elpa/org-9.3.6/ob-ledger.el diff --git a/elpa/org-9.3.3/ob-ledger.elc b/elpa/org-9.3.6/ob-ledger.elc similarity index 100% rename from elpa/org-9.3.3/ob-ledger.elc rename to elpa/org-9.3.6/ob-ledger.elc diff --git a/elpa/org-9.3.3/ob-lilypond.el b/elpa/org-9.3.6/ob-lilypond.el similarity index 99% rename from elpa/org-9.3.3/ob-lilypond.el rename to elpa/org-9.3.6/ob-lilypond.el index eb3372fa..e207784f 100644 --- a/elpa/org-9.3.3/ob-lilypond.el +++ b/elpa/org-9.3.6/ob-lilypond.el @@ -67,12 +67,15 @@ the midi file is not automatically played. Default value is t") (defvar org-babel-lilypond-ly-command "" "Command to execute lilypond on your system. Do not set it directly. Customize `org-babel-lilypond-commands' instead.") + (defvar org-babel-lilypond-pdf-command "" "Command to show a PDF file on your system. Do not set it directly. Customize `org-babel-lilypond-commands' instead.") + (defvar org-babel-lilypond-midi-command "" "Command to play a MIDI file on your system. Do not set it directly. Customize `org-babel-lilypond-commands' instead.") + (defcustom org-babel-lilypond-commands (cond ((eq system-type 'darwin) @@ -94,7 +97,8 @@ you can leave the string empty on this case." :version "24.4" :package-version '(Org . "8.2.7") :set - (lambda (_symbol value) + (lambda (symbol value) + (set symbol value) (setq org-babel-lilypond-ly-command (nth 0 value) org-babel-lilypond-pdf-command (nth 1 value) diff --git a/elpa/org-9.3.3/ob-lilypond.elc b/elpa/org-9.3.6/ob-lilypond.elc similarity index 91% rename from elpa/org-9.3.3/ob-lilypond.elc rename to elpa/org-9.3.6/ob-lilypond.elc index 92a70397..26689181 100644 Binary files a/elpa/org-9.3.3/ob-lilypond.elc and b/elpa/org-9.3.6/ob-lilypond.elc differ diff --git a/elpa/org-9.3.3/ob-lisp.el b/elpa/org-9.3.6/ob-lisp.el similarity index 100% rename from elpa/org-9.3.3/ob-lisp.el rename to elpa/org-9.3.6/ob-lisp.el diff --git a/elpa/org-9.3.3/ob-lisp.elc b/elpa/org-9.3.6/ob-lisp.elc similarity index 100% rename from elpa/org-9.3.3/ob-lisp.elc rename to elpa/org-9.3.6/ob-lisp.elc diff --git a/elpa/org-9.3.3/ob-lob.el b/elpa/org-9.3.6/ob-lob.el similarity index 100% rename from elpa/org-9.3.3/ob-lob.el rename to elpa/org-9.3.6/ob-lob.el diff --git a/elpa/org-9.3.3/ob-lob.elc b/elpa/org-9.3.6/ob-lob.elc similarity index 100% rename from elpa/org-9.3.3/ob-lob.elc rename to elpa/org-9.3.6/ob-lob.elc diff --git a/elpa/org-9.3.3/ob-lua.el b/elpa/org-9.3.6/ob-lua.el similarity index 100% rename from elpa/org-9.3.3/ob-lua.el rename to elpa/org-9.3.6/ob-lua.el diff --git a/elpa/org-9.3.3/ob-lua.elc b/elpa/org-9.3.6/ob-lua.elc similarity index 100% rename from elpa/org-9.3.3/ob-lua.elc rename to elpa/org-9.3.6/ob-lua.elc diff --git a/elpa/org-9.3.3/ob-makefile.el b/elpa/org-9.3.6/ob-makefile.el similarity index 100% rename from elpa/org-9.3.3/ob-makefile.el rename to elpa/org-9.3.6/ob-makefile.el diff --git a/elpa/org-9.3.3/ob-makefile.elc b/elpa/org-9.3.6/ob-makefile.elc similarity index 100% rename from elpa/org-9.3.3/ob-makefile.elc rename to elpa/org-9.3.6/ob-makefile.elc diff --git a/elpa/org-9.3.3/ob-matlab.el b/elpa/org-9.3.6/ob-matlab.el similarity index 100% rename from elpa/org-9.3.3/ob-matlab.el rename to elpa/org-9.3.6/ob-matlab.el diff --git a/elpa/org-9.3.3/ob-matlab.elc b/elpa/org-9.3.6/ob-matlab.elc similarity index 100% rename from elpa/org-9.3.3/ob-matlab.elc rename to elpa/org-9.3.6/ob-matlab.elc diff --git a/elpa/org-9.3.3/ob-maxima.el b/elpa/org-9.3.6/ob-maxima.el similarity index 100% rename from elpa/org-9.3.3/ob-maxima.el rename to elpa/org-9.3.6/ob-maxima.el diff --git a/elpa/org-9.3.3/ob-maxima.elc b/elpa/org-9.3.6/ob-maxima.elc similarity index 100% rename from elpa/org-9.3.3/ob-maxima.elc rename to elpa/org-9.3.6/ob-maxima.elc diff --git a/elpa/org-9.3.3/ob-mscgen.el b/elpa/org-9.3.6/ob-mscgen.el similarity index 100% rename from elpa/org-9.3.3/ob-mscgen.el rename to elpa/org-9.3.6/ob-mscgen.el diff --git a/elpa/org-9.3.3/ob-mscgen.elc b/elpa/org-9.3.6/ob-mscgen.elc similarity index 100% rename from elpa/org-9.3.3/ob-mscgen.elc rename to elpa/org-9.3.6/ob-mscgen.elc diff --git a/elpa/org-9.3.3/ob-ocaml.el b/elpa/org-9.3.6/ob-ocaml.el similarity index 100% rename from elpa/org-9.3.3/ob-ocaml.el rename to elpa/org-9.3.6/ob-ocaml.el diff --git a/elpa/org-9.3.3/ob-ocaml.elc b/elpa/org-9.3.6/ob-ocaml.elc similarity index 100% rename from elpa/org-9.3.3/ob-ocaml.elc rename to elpa/org-9.3.6/ob-ocaml.elc diff --git a/elpa/org-9.3.3/ob-octave.el b/elpa/org-9.3.6/ob-octave.el similarity index 100% rename from elpa/org-9.3.3/ob-octave.el rename to elpa/org-9.3.6/ob-octave.el diff --git a/elpa/org-9.3.3/ob-octave.elc b/elpa/org-9.3.6/ob-octave.elc similarity index 100% rename from elpa/org-9.3.3/ob-octave.elc rename to elpa/org-9.3.6/ob-octave.elc diff --git a/elpa/org-9.3.3/ob-org.el b/elpa/org-9.3.6/ob-org.el similarity index 100% rename from elpa/org-9.3.3/ob-org.el rename to elpa/org-9.3.6/ob-org.el diff --git a/elpa/org-9.3.3/ob-org.elc b/elpa/org-9.3.6/ob-org.elc similarity index 100% rename from elpa/org-9.3.3/ob-org.elc rename to elpa/org-9.3.6/ob-org.elc diff --git a/elpa/org-9.3.3/ob-perl.el b/elpa/org-9.3.6/ob-perl.el similarity index 100% rename from elpa/org-9.3.3/ob-perl.el rename to elpa/org-9.3.6/ob-perl.el diff --git a/elpa/org-9.3.3/ob-perl.elc b/elpa/org-9.3.6/ob-perl.elc similarity index 100% rename from elpa/org-9.3.3/ob-perl.elc rename to elpa/org-9.3.6/ob-perl.elc diff --git a/elpa/org-9.3.3/ob-picolisp.el b/elpa/org-9.3.6/ob-picolisp.el similarity index 100% rename from elpa/org-9.3.3/ob-picolisp.el rename to elpa/org-9.3.6/ob-picolisp.el diff --git a/elpa/org-9.3.3/ob-picolisp.elc b/elpa/org-9.3.6/ob-picolisp.elc similarity index 100% rename from elpa/org-9.3.3/ob-picolisp.elc rename to elpa/org-9.3.6/ob-picolisp.elc diff --git a/elpa/org-9.3.3/ob-plantuml.el b/elpa/org-9.3.6/ob-plantuml.el similarity index 100% rename from elpa/org-9.3.3/ob-plantuml.el rename to elpa/org-9.3.6/ob-plantuml.el diff --git a/elpa/org-9.3.3/ob-plantuml.elc b/elpa/org-9.3.6/ob-plantuml.elc similarity index 100% rename from elpa/org-9.3.3/ob-plantuml.elc rename to elpa/org-9.3.6/ob-plantuml.elc diff --git a/elpa/org-9.3.3/ob-processing.el b/elpa/org-9.3.6/ob-processing.el similarity index 100% rename from elpa/org-9.3.3/ob-processing.el rename to elpa/org-9.3.6/ob-processing.el diff --git a/elpa/org-9.3.3/ob-processing.elc b/elpa/org-9.3.6/ob-processing.elc similarity index 100% rename from elpa/org-9.3.3/ob-processing.elc rename to elpa/org-9.3.6/ob-processing.elc diff --git a/elpa/org-9.3.3/ob-python.el b/elpa/org-9.3.6/ob-python.el similarity index 100% rename from elpa/org-9.3.3/ob-python.el rename to elpa/org-9.3.6/ob-python.el diff --git a/elpa/org-9.3.3/ob-python.elc b/elpa/org-9.3.6/ob-python.elc similarity index 100% rename from elpa/org-9.3.3/ob-python.elc rename to elpa/org-9.3.6/ob-python.elc diff --git a/elpa/org-9.3.3/ob-ref.el b/elpa/org-9.3.6/ob-ref.el similarity index 100% rename from elpa/org-9.3.3/ob-ref.el rename to elpa/org-9.3.6/ob-ref.el diff --git a/elpa/org-9.3.3/ob-ref.elc b/elpa/org-9.3.6/ob-ref.elc similarity index 100% rename from elpa/org-9.3.3/ob-ref.elc rename to elpa/org-9.3.6/ob-ref.elc diff --git a/elpa/org-9.3.3/ob-ruby.el b/elpa/org-9.3.6/ob-ruby.el similarity index 100% rename from elpa/org-9.3.3/ob-ruby.el rename to elpa/org-9.3.6/ob-ruby.el diff --git a/elpa/org-9.3.3/ob-ruby.elc b/elpa/org-9.3.6/ob-ruby.elc similarity index 100% rename from elpa/org-9.3.3/ob-ruby.elc rename to elpa/org-9.3.6/ob-ruby.elc diff --git a/elpa/org-9.3.3/ob-sass.el b/elpa/org-9.3.6/ob-sass.el similarity index 100% rename from elpa/org-9.3.3/ob-sass.el rename to elpa/org-9.3.6/ob-sass.el diff --git a/elpa/org-9.3.3/ob-sass.elc b/elpa/org-9.3.6/ob-sass.elc similarity index 100% rename from elpa/org-9.3.3/ob-sass.elc rename to elpa/org-9.3.6/ob-sass.elc diff --git a/elpa/org-9.3.3/ob-scheme.el b/elpa/org-9.3.6/ob-scheme.el similarity index 100% rename from elpa/org-9.3.3/ob-scheme.el rename to elpa/org-9.3.6/ob-scheme.el diff --git a/elpa/org-9.3.3/ob-scheme.elc b/elpa/org-9.3.6/ob-scheme.elc similarity index 100% rename from elpa/org-9.3.3/ob-scheme.elc rename to elpa/org-9.3.6/ob-scheme.elc diff --git a/elpa/org-9.3.3/ob-screen.el b/elpa/org-9.3.6/ob-screen.el similarity index 98% rename from elpa/org-9.3.3/ob-screen.el rename to elpa/org-9.3.6/ob-screen.el index ad00ee07..bba7b790 100644 --- a/elpa/org-9.3.3/ob-screen.el +++ b/elpa/org-9.3.6/ob-screen.el @@ -126,7 +126,7 @@ The terminal should shortly flicker." ;; XXX: need to find a better way to do the following (while (not (file-readable-p tmpfile)) ;; do something, otherwise this will be optimized away - (format "org-babel-screen: File not readable yet.")) + (message "org-babel-screen: File not readable yet.")) (setq tmp-string (with-temp-buffer (insert-file-contents-literally tmpfile) (buffer-substring (point-min) (point-max)))) diff --git a/elpa/org-9.3.3/ob-screen.elc b/elpa/org-9.3.6/ob-screen.elc similarity index 88% rename from elpa/org-9.3.3/ob-screen.elc rename to elpa/org-9.3.6/ob-screen.elc index 8bd275e5..66089d8a 100644 Binary files a/elpa/org-9.3.3/ob-screen.elc and b/elpa/org-9.3.6/ob-screen.elc differ diff --git a/elpa/org-9.3.3/ob-sed.el b/elpa/org-9.3.6/ob-sed.el similarity index 100% rename from elpa/org-9.3.3/ob-sed.el rename to elpa/org-9.3.6/ob-sed.el diff --git a/elpa/org-9.3.3/ob-sed.elc b/elpa/org-9.3.6/ob-sed.elc similarity index 100% rename from elpa/org-9.3.3/ob-sed.elc rename to elpa/org-9.3.6/ob-sed.elc diff --git a/elpa/org-9.3.3/ob-shell.el b/elpa/org-9.3.6/ob-shell.el similarity index 100% rename from elpa/org-9.3.3/ob-shell.el rename to elpa/org-9.3.6/ob-shell.el diff --git a/elpa/org-9.3.3/ob-shell.elc b/elpa/org-9.3.6/ob-shell.elc similarity index 100% rename from elpa/org-9.3.3/ob-shell.elc rename to elpa/org-9.3.6/ob-shell.elc diff --git a/elpa/org-9.3.3/ob-shen.el b/elpa/org-9.3.6/ob-shen.el similarity index 100% rename from elpa/org-9.3.3/ob-shen.el rename to elpa/org-9.3.6/ob-shen.el diff --git a/elpa/org-9.3.3/ob-shen.elc b/elpa/org-9.3.6/ob-shen.elc similarity index 100% rename from elpa/org-9.3.3/ob-shen.elc rename to elpa/org-9.3.6/ob-shen.elc diff --git a/elpa/org-9.3.3/ob-sql.el b/elpa/org-9.3.6/ob-sql.el similarity index 100% rename from elpa/org-9.3.3/ob-sql.el rename to elpa/org-9.3.6/ob-sql.el diff --git a/elpa/org-9.3.3/ob-sql.elc b/elpa/org-9.3.6/ob-sql.elc similarity index 100% rename from elpa/org-9.3.3/ob-sql.elc rename to elpa/org-9.3.6/ob-sql.elc diff --git a/elpa/org-9.3.3/ob-sqlite.el b/elpa/org-9.3.6/ob-sqlite.el similarity index 100% rename from elpa/org-9.3.3/ob-sqlite.el rename to elpa/org-9.3.6/ob-sqlite.el diff --git a/elpa/org-9.3.3/ob-sqlite.elc b/elpa/org-9.3.6/ob-sqlite.elc similarity index 100% rename from elpa/org-9.3.3/ob-sqlite.elc rename to elpa/org-9.3.6/ob-sqlite.elc diff --git a/elpa/org-9.3.3/ob-stan.el b/elpa/org-9.3.6/ob-stan.el similarity index 100% rename from elpa/org-9.3.3/ob-stan.el rename to elpa/org-9.3.6/ob-stan.el diff --git a/elpa/org-9.3.3/ob-stan.elc b/elpa/org-9.3.6/ob-stan.elc similarity index 100% rename from elpa/org-9.3.3/ob-stan.elc rename to elpa/org-9.3.6/ob-stan.elc diff --git a/elpa/org-9.3.3/ob-table.el b/elpa/org-9.3.6/ob-table.el similarity index 100% rename from elpa/org-9.3.3/ob-table.el rename to elpa/org-9.3.6/ob-table.el diff --git a/elpa/org-9.3.3/ob-table.elc b/elpa/org-9.3.6/ob-table.elc similarity index 100% rename from elpa/org-9.3.3/ob-table.elc rename to elpa/org-9.3.6/ob-table.elc diff --git a/elpa/org-9.3.3/ob-tangle.el b/elpa/org-9.3.6/ob-tangle.el similarity index 100% rename from elpa/org-9.3.3/ob-tangle.el rename to elpa/org-9.3.6/ob-tangle.el diff --git a/elpa/org-9.3.3/ob-tangle.elc b/elpa/org-9.3.6/ob-tangle.elc similarity index 100% rename from elpa/org-9.3.3/ob-tangle.elc rename to elpa/org-9.3.6/ob-tangle.elc diff --git a/elpa/org-9.3.3/ob-vala.el b/elpa/org-9.3.6/ob-vala.el similarity index 100% rename from elpa/org-9.3.3/ob-vala.el rename to elpa/org-9.3.6/ob-vala.el diff --git a/elpa/org-9.3.3/ob-vala.elc b/elpa/org-9.3.6/ob-vala.elc similarity index 100% rename from elpa/org-9.3.3/ob-vala.elc rename to elpa/org-9.3.6/ob-vala.elc diff --git a/elpa/org-9.3.3/ob.el b/elpa/org-9.3.6/ob.el similarity index 100% rename from elpa/org-9.3.3/ob.el rename to elpa/org-9.3.6/ob.el diff --git a/elpa/org-9.3.3/ob.elc b/elpa/org-9.3.6/ob.elc similarity index 100% rename from elpa/org-9.3.3/ob.elc rename to elpa/org-9.3.6/ob.elc diff --git a/elpa/org-9.3.3/ol-bbdb.el b/elpa/org-9.3.6/ol-bbdb.el similarity index 100% rename from elpa/org-9.3.3/ol-bbdb.el rename to elpa/org-9.3.6/ol-bbdb.el diff --git a/elpa/org-9.3.3/ol-bbdb.elc b/elpa/org-9.3.6/ol-bbdb.elc similarity index 100% rename from elpa/org-9.3.3/ol-bbdb.elc rename to elpa/org-9.3.6/ol-bbdb.elc diff --git a/elpa/org-9.3.3/ol-bibtex.el b/elpa/org-9.3.6/ol-bibtex.el similarity index 100% rename from elpa/org-9.3.3/ol-bibtex.el rename to elpa/org-9.3.6/ol-bibtex.el diff --git a/elpa/org-9.3.3/ol-bibtex.elc b/elpa/org-9.3.6/ol-bibtex.elc similarity index 100% rename from elpa/org-9.3.3/ol-bibtex.elc rename to elpa/org-9.3.6/ol-bibtex.elc diff --git a/elpa/org-9.3.3/ol-docview.el b/elpa/org-9.3.6/ol-docview.el similarity index 100% rename from elpa/org-9.3.3/ol-docview.el rename to elpa/org-9.3.6/ol-docview.el diff --git a/elpa/org-9.3.3/ol-docview.elc b/elpa/org-9.3.6/ol-docview.elc similarity index 100% rename from elpa/org-9.3.3/ol-docview.elc rename to elpa/org-9.3.6/ol-docview.elc diff --git a/elpa/org-9.3.3/ol-eshell.el b/elpa/org-9.3.6/ol-eshell.el similarity index 100% rename from elpa/org-9.3.3/ol-eshell.el rename to elpa/org-9.3.6/ol-eshell.el diff --git a/elpa/org-9.3.3/ol-eshell.elc b/elpa/org-9.3.6/ol-eshell.elc similarity index 100% rename from elpa/org-9.3.3/ol-eshell.elc rename to elpa/org-9.3.6/ol-eshell.elc diff --git a/elpa/org-9.3.3/ol-eww.el b/elpa/org-9.3.6/ol-eww.el similarity index 100% rename from elpa/org-9.3.3/ol-eww.el rename to elpa/org-9.3.6/ol-eww.el diff --git a/elpa/org-9.3.3/ol-eww.elc b/elpa/org-9.3.6/ol-eww.elc similarity index 100% rename from elpa/org-9.3.3/ol-eww.elc rename to elpa/org-9.3.6/ol-eww.elc diff --git a/elpa/org-9.3.3/ol-gnus.el b/elpa/org-9.3.6/ol-gnus.el similarity index 95% rename from elpa/org-9.3.3/ol-gnus.el rename to elpa/org-9.3.6/ol-gnus.el index 99472315..cc1f717e 100644 --- a/elpa/org-9.3.3/ol-gnus.el +++ b/elpa/org-9.3.6/ol-gnus.el @@ -61,7 +61,7 @@ ;;; Customization variables (defcustom org-gnus-prefer-web-links nil - "If non-nil, `org-store-link' creates web links to Google groups or Gmane. + "If non-nil, `org-store-link' creates web links to Google groups. \\When nil, Gnus will be used for such links. Using a prefix argument to the command `\\[org-store-link]' (`org-store-link') negates this setting for the duration of the command." @@ -87,8 +87,8 @@ negates this setting for the duration of the command." (defun org-gnus-group-link (group) "Create a link to the Gnus group GROUP. If GROUP is a newsgroup and `org-gnus-prefer-web-links' is -non-nil, create a link to groups.google.com or gmane.org. -Otherwise create a link to the group inside Gnus. +non-nil, create a link to groups.google.com. Otherwise create a +link to the group inside Gnus. If `org-store-link' was called with a prefix arg the meaning of `org-gnus-prefer-web-links' is reversed." @@ -96,10 +96,7 @@ If `org-store-link' was called with a prefix arg the meaning of (if (and (string-prefix-p "nntp" group) ;; Only for nntp groups (org-xor current-prefix-arg org-gnus-prefer-web-links)) - (concat (if (string-match "gmane" unprefixed-group) - "http://news.gmane.org/" - "http://groups.google.com/group/") - unprefixed-group) + (concat "https://groups.google.com/group/" unprefixed-group) (concat "gnus:" group)))) (defun org-gnus-article-link (group newsgroups message-id x-no-archive) @@ -110,7 +107,7 @@ parameters are the Gnus GROUP, the NEWSGROUPS the article was posted to and the X-NO-ARCHIVE header value of that article. If GROUP is a newsgroup and `org-gnus-prefer-web-links' is -non-nil, create a link to groups.google.com or gmane.org. +non-nil, create a link to groups.google.com. Otherwise create a link to the article inside Gnus. If `org-store-link' was called with a prefix arg the meaning of @@ -118,9 +115,7 @@ If `org-store-link' was called with a prefix arg the meaning of (if (and (org-xor current-prefix-arg org-gnus-prefer-web-links) newsgroups ;make web links only for nntp groups (not x-no-archive)) ;and if X-No-Archive isn't set - (format (if (string-match-p "gmane\\." newsgroups) - "http://mid.gmane.org/%s" - "http://groups.google.com/groups/search?as_umsgid=%s") + (format "https://groups.google.com/groups/search?as_umsgid=%s" (url-encode-url message-id)) (concat "gnus:" group "#" message-id))) diff --git a/elpa/org-9.3.3/ol-gnus.elc b/elpa/org-9.3.6/ol-gnus.elc similarity index 79% rename from elpa/org-9.3.3/ol-gnus.elc rename to elpa/org-9.3.6/ol-gnus.elc index a666078a..cdcd04e5 100644 Binary files a/elpa/org-9.3.3/ol-gnus.elc and b/elpa/org-9.3.6/ol-gnus.elc differ diff --git a/elpa/org-9.3.3/ol-info.el b/elpa/org-9.3.6/ol-info.el similarity index 100% rename from elpa/org-9.3.3/ol-info.el rename to elpa/org-9.3.6/ol-info.el diff --git a/elpa/org-9.3.3/ol-info.elc b/elpa/org-9.3.6/ol-info.elc similarity index 100% rename from elpa/org-9.3.3/ol-info.elc rename to elpa/org-9.3.6/ol-info.elc diff --git a/elpa/org-9.3.3/ol-irc.el b/elpa/org-9.3.6/ol-irc.el similarity index 100% rename from elpa/org-9.3.3/ol-irc.el rename to elpa/org-9.3.6/ol-irc.el diff --git a/elpa/org-9.3.3/ol-irc.elc b/elpa/org-9.3.6/ol-irc.elc similarity index 100% rename from elpa/org-9.3.3/ol-irc.elc rename to elpa/org-9.3.6/ol-irc.elc diff --git a/elpa/org-9.3.3/ol-mhe.el b/elpa/org-9.3.6/ol-mhe.el similarity index 100% rename from elpa/org-9.3.3/ol-mhe.el rename to elpa/org-9.3.6/ol-mhe.el diff --git a/elpa/org-9.3.3/ol-mhe.elc b/elpa/org-9.3.6/ol-mhe.elc similarity index 100% rename from elpa/org-9.3.3/ol-mhe.elc rename to elpa/org-9.3.6/ol-mhe.elc diff --git a/elpa/org-9.3.3/ol-rmail.el b/elpa/org-9.3.6/ol-rmail.el similarity index 100% rename from elpa/org-9.3.3/ol-rmail.el rename to elpa/org-9.3.6/ol-rmail.el diff --git a/elpa/org-9.3.3/ol-rmail.elc b/elpa/org-9.3.6/ol-rmail.elc similarity index 100% rename from elpa/org-9.3.3/ol-rmail.elc rename to elpa/org-9.3.6/ol-rmail.elc diff --git a/elpa/org-9.3.3/ol-w3m.el b/elpa/org-9.3.6/ol-w3m.el similarity index 100% rename from elpa/org-9.3.3/ol-w3m.el rename to elpa/org-9.3.6/ol-w3m.el diff --git a/elpa/org-9.3.3/ol-w3m.elc b/elpa/org-9.3.6/ol-w3m.elc similarity index 100% rename from elpa/org-9.3.3/ol-w3m.elc rename to elpa/org-9.3.6/ol-w3m.elc diff --git a/elpa/org-9.3.3/ol.el b/elpa/org-9.3.6/ol.el similarity index 100% rename from elpa/org-9.3.3/ol.el rename to elpa/org-9.3.6/ol.el diff --git a/elpa/org-9.3.3/ol.elc b/elpa/org-9.3.6/ol.elc similarity index 100% rename from elpa/org-9.3.3/ol.elc rename to elpa/org-9.3.6/ol.elc diff --git a/elpa/org-9.3.3/org b/elpa/org-9.3.6/org similarity index 97% rename from elpa/org-9.3.3/org rename to elpa/org-9.3.6/org index 03fa52e5..e20eb442 100644 --- a/elpa/org-9.3.3/org +++ b/elpa/org-9.3.6/org @@ -15,7 +15,7 @@ This manual is for Org version 9.3. (a) The FSF’s Back-Cover Text is: “You have the freedom to copy and modify this GNU manual.” -INFO-DIR-SECTION Emacs +INFO-DIR-SECTION Emacs editing modes START-INFO-DIR-ENTRY * Org Mode: (org). Outline-based notes management and organizer. END-INFO-DIR-ENTRY @@ -413,6 +413,7 @@ Sample Configuration Working with Source Code +* Features:: Enjoy the versatility of source blocks. * Structure of Code Blocks:: Code block syntax described. * Using Header Arguments:: Different ways to set header arguments. * Environment of a Code Block:: Arguments, sessions, working directory... @@ -619,7 +620,7 @@ Using Org’s git repository You can clone Org’s repository and install Org like this: $ cd ~/src/ - $ git clone git@code.orgmode.org:bzg/org-mode.git + $ git clone https://code.orgmode.org/bzg/org-mode.git $ cd org-mode/ $ make autoloads @@ -14255,22 +14256,48 @@ or within a fixed width section. (if a (not b) b)) #+END_SRC - Org can manage the source code in the block delimited by -‘#+BEGIN_SRC’ ... ‘#+END_SRC’ in several ways that can simplify -housekeeping tasks essential to modern source code maintenance. Org can -edit, format, extract, export, and publish source code blocks. Org can -also compile and execute a source code block, then capture the results. -The Org mode literature sometimes refers to source code blocks as _live -code_ blocks because they can alter the content of the Org document or -the material that it exports. Users can control how live they want each -source code block by tweaking the header arguments (see *note Using -Header Arguments::) for compiling, execution, extraction, and exporting. - Source code blocks are one of many Org block types, which also include “center”, “comment”, “dynamic”, “example”, “export”, “quote”, “special”, and “verse”. This section pertains to blocks between ‘#+BEGIN_SRC’ and ‘#+END_SRC’. + Details of Org’s facilities for working with source code are +described in the following sections. + +* Menu: + +* Features:: Enjoy the versatility of source blocks. +* Structure of Code Blocks:: Code block syntax described. +* Using Header Arguments:: Different ways to set header arguments. +* Environment of a Code Block:: Arguments, sessions, working directory... +* Evaluating Code Blocks:: Place results of evaluation in the Org buffer. +* Results of Evaluation:: Choosing a results type, post-processing... +* Exporting Code Blocks:: Export contents and/or results. +* Extracting Source Code:: Create pure source code files. +* Languages:: List of supported code block languages. +* Editing Source Code:: Language major-mode editing. +* Noweb Reference Syntax:: Literate programming in Org mode. +* Library of Babel:: Use and contribute to a library of useful code blocks. +* Key bindings and Useful Functions:: Work quickly with code blocks. +* Batch Execution:: Call functions from the command line. + + +File: org, Node: Features, Next: Structure of Code Blocks, Up: Working with Source Code + +15.1 Features +============= + +Org can manage the source code in the block delimited by ‘#+BEGIN_SRC’ +... ‘#+END_SRC’ in several ways that can simplify housekeeping tasks +essential to modern source code maintenance. Org can edit, format, +extract, export, and publish source code blocks. Org can also compile +and execute a source code block, then capture the results. The Org mode +literature sometimes refers to source code blocks as _live code_ blocks +because they can alter the content of the Org document or the material +that it exports. Users can control how live they want each source code +block by tweaking the header arguments (see *note Using Header +Arguments::) for compiling, execution, extraction, and exporting. + For editing and formatting a source code block, Org uses an appropriate Emacs major mode that includes features specifically designed for source code in that language. @@ -14307,29 +14334,10 @@ configuration settings of the execution environment, the results of the execution, and associated narratives, claims, references, and internal and external links in a single Org document. - Details of Org’s facilities for working with source code are -described in the following sections. - -* Menu: - -* Structure of Code Blocks:: Code block syntax described. -* Using Header Arguments:: Different ways to set header arguments. -* Environment of a Code Block:: Arguments, sessions, working directory... -* Evaluating Code Blocks:: Place results of evaluation in the Org buffer. -* Results of Evaluation:: Choosing a results type, post-processing... -* Exporting Code Blocks:: Export contents and/or results. -* Extracting Source Code:: Create pure source code files. -* Languages:: List of supported code block languages. -* Editing Source Code:: Language major-mode editing. -* Noweb Reference Syntax:: Literate programming in Org mode. -* Library of Babel:: Use and contribute to a library of useful code blocks. -* Key bindings and Useful Functions:: Work quickly with code blocks. -* Batch Execution:: Call functions from the command line. -  -File: org, Node: Structure of Code Blocks, Next: Using Header Arguments, Up: Working with Source Code +File: org, Node: Structure of Code Blocks, Next: Using Header Arguments, Prev: Features, Up: Working with Source Code -15.1 Structure of Code Blocks +15.2 Structure of Code Blocks ============================= Org offers two ways to structure source code in Org documents: in a @@ -14395,7 +14403,7 @@ or  File: org, Node: Using Header Arguments, Next: Environment of a Code Block, Prev: Structure of Code Blocks, Up: Working with Source Code -15.2 Using Header Arguments +15.3 Using Header Arguments =========================== Org comes with many header arguments common to all languages. New @@ -14553,7 +14561,7 @@ evaluation of ‘factorial’ code block.  File: org, Node: Environment of a Code Block, Next: Evaluating Code Blocks, Prev: Using Header Arguments, Up: Working with Source Code -15.3 Environment of a Code Block +15.4 Environment of a Code Block ================================ Passing arguments @@ -14908,7 +14916,7 @@ appending to the end of the code block for execution.  File: org, Node: Evaluating Code Blocks, Next: Results of Evaluation, Prev: Environment of a Code Block, Up: Working with Source Code -15.4 Evaluating Code Blocks +15.5 Evaluating Code Blocks =========================== A note about security: With code evaluation comes the risk of harm. Org @@ -15082,7 +15090,7 @@ Settings::).  File: org, Node: Results of Evaluation, Next: Exporting Code Blocks, Prev: Evaluating Code Blocks, Up: Working with Source Code -15.5 Results of Evaluation +15.6 Results of Evaluation ========================== How Org handles results of a code block execution depends on many header @@ -15286,12 +15294,12 @@ follows from the type specified above. ‘link’ ‘graphics’ - Result is a link to the file specified in ‘:file’ header argument. - However, unlike plain ‘:file’, nothing is written to the disk. The - block is used for its side-effects only, as in the following - example: + When used along with ‘file’ type, the result is a link to the file + specified in ‘:file’ header argument. However, unlike plain ‘file’ + type, nothing is written to the disk. The block is used for its + side-effects only, as in the following example: - #+begin_src shell :results link :file "download.tar.gz" + #+begin_src shell :results file link :file "download.tar.gz" wget -c "http://example.com/download.tar.gz" #+end_src @@ -15409,7 +15417,7 @@ to pass data between code blocks.  File: org, Node: Exporting Code Blocks, Next: Extracting Source Code, Prev: Results of Evaluation, Up: Working with Source Code -15.6 Exporting Code Blocks +15.7 Exporting Code Blocks ========================== It is possible to export the _code_ of code blocks, the _results_ of @@ -15461,7 +15469,7 @@ blocks in sub-trees excluded from export (see *note Export Settings::).  File: org, Node: Extracting Source Code, Next: Languages, Prev: Exporting Code Blocks, Up: Working with Source Code -15.7 Extracting Source Code +15.8 Extracting Source Code =========================== Extracting source code from code blocks is a basic task in literate @@ -15600,7 +15608,7 @@ block header arguments:  File: org, Node: Languages, Next: Editing Source Code, Prev: Extracting Source Code, Up: Working with Source Code -15.8 Languages +15.9 Languages ============== Code blocks in the following languages are supported. @@ -15665,8 +15673,8 @@ language.  File: org, Node: Editing Source Code, Next: Noweb Reference Syntax, Prev: Languages, Up: Working with Source Code -15.9 Editing Source Code -======================== +15.10 Editing Source Code +========================= Use ‘C-c '’ to edit the current code block. It opens a new major mode edit buffer containing the body of the source code block, ready for any @@ -15724,7 +15732,7 @@ and Emacs Lisp languages.  File: org, Node: Noweb Reference Syntax, Next: Library of Babel, Prev: Editing Source Code, Up: Working with Source Code -15.10 Noweb Reference Syntax +15.11 Noweb Reference Syntax ============================ Org supports named blocks in Noweb(1) style syntax: @@ -15923,7 +15931,7 @@ Note that now the expansion contains the results of the code block  File: org, Node: Library of Babel, Next: Key bindings and Useful Functions, Prev: Noweb Reference Syntax, Up: Working with Source Code -15.11 Library of Babel +15.12 Library of Babel ====================== The “Library of Babel” is a collection of code blocks. Like a function @@ -15939,7 +15947,7 @@ regular code blocks of an Org file, and then load the Org file with  File: org, Node: Key bindings and Useful Functions, Next: Batch Execution, Prev: Library of Babel, Up: Working with Source Code -15.12 Key bindings and Useful Functions +15.13 Key bindings and Useful Functions ======================================= Many common Org mode key sequences are re-bound depending on the @@ -15984,7 +15992,7 @@ Key binding Function  File: org, Node: Batch Execution, Prev: Key bindings and Useful Functions, Up: Working with Source Code -15.13 Batch Execution +15.14 Batch Execution ===================== Org mode features, including working with source code facilities can be @@ -22434,569 +22442,570 @@ org-customize’ and then click yourself through the tree.  Tag Table: -Node: Top865 -Node: Introduction22116 -Node: Summary22573 -Node: Installation25285 -Ref: Using Emacs packaging system25910 -Ref: Downloading Org as an archive26467 -Ref: Using Org's git repository27125 -Node: Activation28021 -Ref: Activation-Footnote-129636 -Node: Feedback29763 -Ref: How to create a useful backtrace32356 -Ref: Feedback-Footnote-133508 -Node: Conventions33634 -Ref: TODO keywords tags properties etc33800 -Ref: Key bindings and commands34685 -Node: Document Structure35315 -Node: Headlines36482 -Ref: Headlines-Footnote-137763 -Node: Visibility Cycling38042 -Node: Global and local cycling38427 -Ref: Global and local cycling-Footnote-141161 -Ref: Global and local cycling-Footnote-241223 -Node: Initial visibility41527 -Ref: Initial visibility-Footnote-142595 -Node: Catching invisible edits42788 -Node: Motion43259 -Node: Structure Editing44718 -Node: Sparse Trees51177 -Ref: Sparse Trees-Footnote-153733 -Ref: Sparse Trees-Footnote-253848 -Node: Plain Lists53924 -Ref: Plain Lists-Footnote-161433 -Ref: Plain Lists-Footnote-261797 -Ref: Plain Lists-Footnote-361897 -Ref: Plain Lists-Footnote-462154 -Ref: Plain Lists-Footnote-562331 -Ref: Plain Lists-Footnote-662435 -Ref: Plain Lists-Footnote-762541 -Node: Drawers62611 -Ref: Drawers-Footnote-164276 -Node: Blocks64388 -Node: Tables64976 -Node: Built-in Table Editor65654 -Ref: Creation and conversion67383 -Ref: Re-aligning and field motion68321 -Ref: Column and row editing69248 -Ref: Regions71605 -Ref: Calculations73004 -Ref: Miscellaneous (1)73817 -Ref: Built-in Table Editor-Footnote-175877 -Node: Column Width and Alignment75985 -Node: Column Groups79317 -Node: Orgtbl Mode80879 -Node: The Spreadsheet81688 -Node: References83157 -Ref: Field references83611 -Ref: Range references86050 -Ref: Field coordinates in formulas87272 -Ref: Named references88257 -Ref: Remote references89228 -Ref: References-Footnote-190150 -Ref: References-Footnote-290378 -Ref: References-Footnote-390481 -Node: Formula syntax for Calc90806 -Ref: Formula syntax for Calc-Footnote-196328 -Node: Formula syntax for Lisp96667 -Node: Durations and time values98445 -Node: Field and range formulas99827 -Node: Column formulas102291 -Node: Lookup functions104398 -Node: Editing and debugging formulas106362 -Ref: Using multiple TBLFM lines110874 -Ref: Debugging formulas111717 -Node: Updating the table112141 -Node: Advanced features113508 -Ref: Advanced features-Footnote-1117954 -Node: Org Plot118062 -Ref: Graphical plots using Gnuplot118258 -Ref: Plot options119457 -Ref: ASCII bar plots121230 -Node: Hyperlinks122480 -Node: Link Format123339 -Ref: Link Format-Footnote-1125397 -Ref: Link Format-Footnote-2125629 -Node: Internal Links125761 -Ref: Internal Links-Footnote-1128318 -Ref: Internal Links-Footnote-2128558 -Node: Radio Targets128699 -Node: External Links129411 -Ref: External Links-Footnote-1134881 -Node: Handling Links135305 -Ref: Handling Links-Footnote-1142987 -Ref: Handling Links-Footnote-2143148 -Ref: Handling Links-Footnote-3143338 -Ref: Handling Links-Footnote-4143634 -Ref: Handling Links-Footnote-5143896 -Ref: Handling Links-Footnote-6144018 -Node: Using Links Outside Org144093 -Node: Link Abbreviations144563 -Node: Search Options147449 -Ref: Search Options-Footnote-1149548 -Node: Custom Searches149629 -Node: TODO Items150658 -Ref: TODO Items-Footnote-1151778 -Node: TODO Basics151892 -Node: TODO Extensions154522 -Node: Workflow states155570 -Ref: Workflow states-Footnote-1156964 -Node: TODO types157080 -Ref: TODO types-Footnote-1158894 -Node: Multiple sets in one file158966 -Node: Fast access to TODO states160906 -Ref: Fast access to TODO states-Footnote-1161784 -Ref: Fast access to TODO states-Footnote-2161891 -Node: Per-file keywords162193 -Ref: Per-file keywords-Footnote-1163637 -Node: Faces for TODO keywords163841 -Node: TODO dependencies164909 -Node: Progress Logging167371 -Node: Closing items168503 -Ref: Closing items-Footnote-1169498 -Ref: Closing items-Footnote-2169572 -Node: Tracking TODO state changes169650 -Ref: Tracking TODO state changes-Footnote-1172777 -Ref: Tracking TODO state changes-Footnote-2172839 -Ref: Tracking TODO state changes-Footnote-3172997 -Node: Tracking your habits173275 -Node: Priorities177691 -Ref: Priorities-Footnote-1179810 -Node: Breaking Down Tasks179883 -Ref: Breaking Down Tasks-Footnote-1181919 -Node: Checkboxes182026 -Ref: Checkboxes-Footnote-1186563 -Ref: Checkboxes-Footnote-2186691 -Ref: Checkboxes-Footnote-3186871 -Node: Tags186985 -Node: Tag Inheritance188073 -Ref: Tag Inheritance-Footnote-1189940 -Ref: Tag Inheritance-Footnote-2190044 -Node: Setting Tags190174 -Ref: Setting Tags-Footnote-1196645 -Ref: Setting Tags-Footnote-2196823 -Node: Tag Hierarchy196901 -Node: Tag Searches200462 -Node: Properties and Columns201768 -Node: Property Syntax203161 -Node: Special Properties207431 -Node: Property Searches209178 -Node: Property Inheritance210613 -Node: Column View212480 -Node: Defining columns213726 -Node: Scope of column definitions214106 -Node: Column attributes215016 -Ref: Column attributes-Footnote-1219422 -Ref: Column attributes-Footnote-2219553 -Ref: Column attributes-Footnote-3219751 -Node: Using column view219890 -Ref: Turning column view on or off220051 -Ref: Editing values221029 -Ref: Modifying column view on-the-fly222399 -Node: Capturing column view222771 -Ref: Capturing column view-Footnote-1226153 -Node: Dates and Times226290 -Node: Timestamps227204 -Ref: Timestamps-Footnote-1229555 -Ref: Timestamps-Footnote-2229851 -Node: Creating Timestamps230600 -Node: The date/time prompt233609 -Ref: The date/time prompt-Footnote-1238344 -Ref: The date/time prompt-Footnote-2238515 -Ref: The date/time prompt-Footnote-3238626 -Node: Custom time format238724 -Node: Deadlines and Scheduling240488 -Ref: Deadlines and Scheduling-Footnote-1244053 -Node: Inserting deadline/schedule244216 -Ref: Inserting deadline/schedule-Footnote-1246203 -Ref: Inserting deadline/schedule-Footnote-2246364 -Ref: Inserting deadline/schedule-Footnote-3246490 -Node: Repeated tasks246616 -Ref: Repeated tasks-Footnote-1251102 -Ref: Repeated tasks-Footnote-2251185 -Ref: Repeated tasks-Footnote-3251468 -Node: Clocking Work Time251690 -Ref: Clocking Work Time-Footnote-1252890 -Ref: Clocking Work Time-Footnote-2253043 -Node: Clocking commands253185 -Ref: Clocking commands-Footnote-1258285 -Ref: Clocking commands-Footnote-2258400 -Ref: Clocking commands-Footnote-3258482 -Ref: Clocking commands-Footnote-4258545 -Node: The clock table258628 -Ref: The clock table-Footnote-1266641 -Ref: The clock table-Footnote-2266750 -Ref: The clock table-Footnote-3266848 -Node: Resolving idle time266974 -Ref: Resolving idle time (1)267165 -Ref: Continuous clocking270362 -Ref: Resolving idle time-Footnote-1270904 -Node: Effort Estimates271383 -Ref: Effort Estimates-Footnote-1274159 -Node: Timers274270 -Node: Refiling and Archiving276484 -Node: Refile and Copy277042 -Ref: Refile and Copy-Footnote-1279490 -Node: Archiving279604 -Node: Moving subtrees280312 -Node: Internal archiving282336 -Node: Capture and Attachments285056 -Node: Capture285856 -Node: Setting up capture286375 -Node: Using capture286733 -Node: Capture templates289126 -Node: Template elements291160 -Ref: Template elements-Footnote-1297916 -Ref: Template elements-Footnote-2298249 -Ref: Template elements-Footnote-3298436 -Node: Template expansion298531 -Ref: Template expansion-Footnote-1302448 -Ref: Template expansion-Footnote-2302539 -Ref: Template expansion-Footnote-3302729 -Node: Templates in contexts302828 -Node: Attachments303664 -Node: Attachment defaults and dispatcher304685 -Ref: Attachment defaults and dispatcher-Footnote-1308031 -Node: Attachment options308182 -Node: Attachment links311652 -Node: Automatic version-control with Git312286 -Node: Attach from Dired312796 -Node: RSS Feeds314155 -Node: Agenda Views315600 -Node: Agenda Files318002 -Ref: Agenda Files-Footnote-1320908 -Ref: Agenda Files-Footnote-2321052 -Node: Agenda Dispatcher321250 -Ref: Agenda Dispatcher-Footnote-1324052 -Ref: Agenda Dispatcher-Footnote-2324150 -Node: Built-in Agenda Views324256 -Node: Weekly/daily agenda324848 -Ref: Calendar/Diary integration326183 -Ref: Anniversaries from BBDB328259 -Ref: Appointment reminders330050 -Ref: Weekly/daily agenda-Footnote-1330600 -Ref: Weekly/daily agenda-Footnote-2330844 -Node: Global TODO list331064 -Node: Matching tags and properties333909 -Node: Search view340977 -Node: Stuck projects342619 -Node: Presentation and Sorting344751 -Node: Categories345723 -Node: Time-of-day specifications346464 -Ref: Time-of-day specifications-Footnote-1348450 -Node: Sorting of agenda items348573 -Node: Filtering/limiting agenda items350186 -Ref: Filtering in the agenda350886 -Ref: Computed tag filtering354981 -Ref: Setting limits for the agenda356475 -Ref: Filtering/limiting agenda items-Footnote-1358024 -Node: Agenda Commands358576 -Ref: Motion (1)359304 -Ref: View/Go to Org file359507 -Ref: Change display361013 -Ref: Remote editing368523 -Ref: Bulk remote editing selected entries373761 -Ref: Calendar commands376856 -Ref: Quit and exit378737 -Ref: Agenda Commands-Footnote-1379099 -Ref: Agenda Commands-Footnote-2379175 -Ref: Agenda Commands-Footnote-3379279 -Node: Custom Agenda Views379366 -Node: Storing searches380013 -Ref: Storing searches-Footnote-1382960 -Ref: Storing searches-Footnote-2383077 -Node: Block agenda383324 -Node: Setting options384575 -Node: Exporting Agenda Views388184 -Ref: Exporting Agenda Views-Footnote-1392718 -Ref: Exporting Agenda Views-Footnote-2392906 -Ref: Exporting Agenda Views-Footnote-3393056 -Ref: Exporting Agenda Views-Footnote-4393243 -Node: Agenda Column View393325 -Node: Markup for Rich Contents396668 -Node: Paragraphs397961 -Node: Emphasis and Monospace399091 -Node: Subscripts and Superscripts399737 -Node: Special Symbols400789 -Ref: Special Symbols-Footnote-1402697 -Ref: Special Symbols-Footnote-2402862 -Node: Embedded LaTeX402959 -Ref: Embedded LaTeX-Footnote-1403803 -Node: LaTeX fragments403999 -Ref: LaTeX fragments-Footnote-1406150 -Node: Previewing LaTeX fragments406343 -Ref: Previewing LaTeX fragments-Footnote-1407821 -Node: CDLaTeX mode408069 -Ref: CDLaTeX mode-Footnote-1410794 -Node: Literal Examples410941 -Ref: Literal Examples-Footnote-1416047 -Ref: Literal Examples-Footnote-2416417 -Ref: Literal Examples-Footnote-3416595 -Ref: Literal Examples-Footnote-4416780 -Node: Images416878 -Ref: Images-Footnote-1417960 -Ref: Images-Footnote-2418083 -Node: Captions418244 -Node: Horizontal Rules418939 -Node: Creating Footnotes419190 -Ref: Creating Footnotes-Footnote-1422314 -Ref: Creating Footnotes-Footnote-2422420 -Node: Exporting422527 -Node: The Export Dispatcher425292 -Node: Export Settings428005 -Ref: Export Settings-Footnote-1436099 -Ref: Export Settings-Footnote-2436211 -Ref: Export Settings-Footnote-3436312 -Node: Table of Contents436510 -Ref: Table of Contents-Footnote-1439179 -Node: Include Files439346 -Ref: Include Files-Footnote-1442278 -Node: Macro Replacement442456 -Ref: Macro Replacement-Footnote-1446331 -Node: Comment Lines446548 -Ref: Comment Lines-Footnote-1447406 -Node: ASCII/Latin-1/UTF-8 export447510 -Ref: ASCII export commands448359 -Ref: ASCII specific export settings448892 -Ref: Header and sectioning structure449336 -Ref: Quoting ASCII text449610 -Ref: ASCII specific attributes449982 -Ref: ASCII special blocks450259 -Node: Beamer Export450606 -Node: Beamer export commands451351 -Node: Beamer specific export settings452051 -Node: Frames and Blocks in Beamer453951 -Ref: Frames and Blocks in Beamer-Footnote-1457318 -Node: Beamer specific syntax457477 -Node: Editing support459451 -Node: A Beamer example459917 -Node: HTML Export461166 -Node: HTML export commands462271 -Node: HTML specific export settings462817 -Node: HTML doctypes464906 -Node: HTML preamble and postamble467082 -Node: Quoting HTML tags468272 -Node: Headlines in HTML export468966 -Node: Links in HTML export469556 -Node: Tables in HTML export471021 -Node: Images in HTML export472476 -Node: Math formatting in HTML export473961 -Ref: Math formatting in HTML export-Footnote-1475496 -Ref: Math formatting in HTML export-Footnote-2475620 -Ref: Math formatting in HTML export-Footnote-3475881 -Node: Text areas in HTML export476053 -Node: CSS support477193 -Ref: CSS support-Footnote-1480840 -Node: JavaScript support481020 -Node: LaTeX Export484273 -Node: LaTeX/PDF export commands486046 -Ref: LaTeX/PDF export commands-Footnote-1487544 -Node: LaTeX specific export settings487746 -Node: LaTeX header and sectioning490973 -Node: Quoting LaTeX code493085 -Node: Tables in LaTeX export493876 -Node: Images in LaTeX export498289 -Node: Plain lists in LaTeX export500887 -Node: Source blocks in LaTeX export501902 -Node: Example blocks in LaTeX export503327 -Node: Special blocks in LaTeX export504048 -Node: Horizontal rules in LaTeX export505306 -Node: Markdown Export505701 -Ref: Markdown export commands506163 -Ref: Header and sectioning structure (1)506600 -Node: OpenDocument Text Export507017 -Ref: OpenDocument Text Export-Footnote-1508118 -Node: Pre-requisites for ODT export508267 -Node: ODT export commands508640 -Node: ODT specific export settings509816 -Node: Extending ODT export510862 -Ref: Automatically exporting to other formats511668 -Ref: Converting between document formats512094 -Node: Applying custom styles512636 -Ref: Applying custom styles the easy way513163 -Ref: Using third-party styles and templates514121 -Node: Links in ODT export514418 -Node: Tables in ODT export515075 -Node: Images in ODT export517080 -Ref: Embedding images517279 -Ref: Embedding clickable images517596 -Ref: Sizing and scaling of embedded images517930 -Ref: Anchoring of images519614 -Node: Math formatting in ODT export519936 -Node: LaTeX math snippets520360 -Ref: LaTeX math snippets-Footnote-1522608 -Ref: LaTeX math snippets-Footnote-2522684 -Node: MathML and OpenDocument formula files522729 -Node: Labels and captions in ODT export523232 -Node: Literal examples in ODT export524503 -Node: Advanced topics in ODT export525339 -Ref: Configuring a document converter525644 -Ref: Working with OpenDocument style files526585 -Ref: x-orgodtstyles-xml527051 -Ref: x-orgodtcontenttemplate-xml527393 -Ref: x-overriding-factory-styles528037 -Ref: Creating one-off styles529281 -Ref: Customizing tables in ODT export531285 -Ref: Validating OpenDocument XML536145 -Ref: Advanced topics in ODT export-Footnote-1536942 -Ref: Advanced topics in ODT export-Footnote-2537046 -Ref: Advanced topics in ODT export-Footnote-3537139 -Node: Org Export537487 -Ref: Org export commands537838 -Node: Texinfo Export538144 -Node: Texinfo export commands539122 -Node: Texinfo specific export settings539742 -Node: Texinfo file header540890 -Node: Texinfo title and copyright page541868 -Node: Info directory file543227 -Node: Headings and sectioning structure543947 -Node: Indices545972 -Node: Quoting Texinfo code546996 -Node: Plain lists in Texinfo export547489 -Node: Tables in Texinfo export549210 -Node: Images in Texinfo export549701 -Node: Quotations in Texinfo export550334 -Node: Special blocks in Texinfo export551282 -Node: A Texinfo example551930 -Node: iCalendar Export554027 -Node: Other Built-in Back-ends558311 -Node: Advanced Export Configuration558938 -Ref: Hooks559145 -Ref: Filters560068 -Ref: Defining filters for individual files562577 -Ref: Extending an existing back-end563383 -Node: Export in Foreign Buffers565623 -Node: Publishing566771 -Node: Configuration567649 -Node: Project alist568426 -Node: Sources and destinations569563 -Node: Selecting files570876 -Node: Publishing action571826 -Ref: Publishing action-Footnote-1573650 -Node: Publishing options573813 -Ref: Generic properties574560 -Ref: ASCII specific properties576447 -Ref: Beamer specific properties578047 -Ref: HTML specific properties578612 -Ref: LaTeX specific properties583004 -Ref: Markdown specific properties585928 -Ref: ODT specific properties586166 -Ref: Texinfo specific properties587098 -Node: Publishing links588445 -Node: Site map589820 -Node: Generating an index593132 -Node: Uploading Files593919 -Node: Sample Configuration595697 -Node: Simple example596190 -Node: Complex example596838 -Node: Triggering Publication598882 -Node: Working with Source Code599903 -Node: Structure of Code Blocks604758 -Node: Using Header Arguments607237 -Ref: System-wide header arguments607959 -Ref: Header arguments in Org mode properties608882 -Ref: Code block specific header arguments610710 -Ref: Header arguments in function calls612209 -Node: Environment of a Code Block612883 -Ref: Passing arguments613092 -Ref: Using sessions620962 -Ref: Choosing a working directory622361 -Ref: Inserting headers and footers624215 -Node: Evaluating Code Blocks624725 -Ref: How to evaluate source code625175 -Ref: Limit code block evaluation628077 -Ref: Cache results of evaluation628937 -Ref: Evaluating Code Blocks-Footnote-1631523 -Ref: Evaluating Code Blocks-Footnote-2631657 -Node: Results of Evaluation631815 -Ref: Collection632617 -Ref: Type634877 -Ref: Format638170 -Ref: Handling640419 -Ref: Post-processing641134 -Node: Exporting Code Blocks642848 -Node: Extracting Source Code645196 -Ref: Header arguments646172 -Ref: Functions649713 -Ref: Hooks (1)649964 -Ref: Jumping between code and Org650199 -Node: Languages650709 -Ref: Languages-Footnote-1653428 -Ref: Languages-Footnote-2653586 -Node: Editing Source Code653740 -Node: Noweb Reference Syntax656463 -Ref: Noweb Reference Syntax-Footnote-1661970 -Node: Library of Babel662060 -Node: Key bindings and Useful Functions662773 -Node: Batch Execution665193 -Node: Miscellaneous665971 -Node: Completion667144 -Node: Structure Templates669061 -Ref: Structure Templates-Footnote-1670806 -Node: Speed Keys670898 -Node: Clean View672070 -Node: Org Indent Mode673256 -Ref: Org Indent Mode-Footnote-1674457 -Node: Hard indentation674681 -Ref: Hard indentation-Footnote-1676156 -Node: Dynamic Headline Numbering676262 -Node: The Very Busy C-c C-c Key677223 -Node: In-buffer Settings679132 -Ref: In-buffer Settings-Footnote-1687830 -Node: Org Syntax688028 -Node: Documentation Access689678 -Node: Escape Character690092 -Node: Code Evaluation Security690948 -Node: Interaction693810 -Node: Cooperation694228 -Node: Conflicts697115 -Node: TTY Keys701712 -Node: Protocols703309 -Node: The store-link protocol704763 -Node: The capture protocol705606 -Node: The open-source protocol706765 -Node: Org Crypt709997 -Node: Org Mobile711529 -Node: Setting up the staging area712848 -Ref: Setting up the staging area-Footnote-1714083 -Ref: Setting up the staging area-Footnote-2714290 -Node: Pushing to the mobile application714462 -Ref: Pushing to the mobile application-Footnote-1715468 -Ref: Pushing to the mobile application-Footnote-2715559 -Ref: Pushing to the mobile application-Footnote-3715926 -Node: Pulling from the mobile application716002 -Ref: Pulling from the mobile application-Footnote-1718310 -Node: Hacking718363 -Node: Hooks (2)719309 -Node: Add-on Packages719632 -Node: Adding Hyperlink Types720170 -Node: Adding Export Back-ends723582 -Node: Tables in Arbitrary Syntax724834 -Node: Radio tables726098 -Node: A LaTeX example728230 -Ref: A LaTeX example-Footnote-1732077 -Ref: A LaTeX example-Footnote-2732120 -Ref: A LaTeX example-Footnote-3732281 -Node: Translator functions732733 -Node: Dynamic Blocks734904 -Node: Special Agenda Views737145 -Ref: Special Agenda Views-Footnote-1740851 -Ref: Special Agenda Views-Footnote-2741058 -Node: Speeding Up Your Agendas741190 -Node: Extracting Agenda Information742244 -Node: Using the Property API746044 -Node: Using the Mapping API749394 -Node: History and Acknowledgments753425 -Ref: From Carsten753618 -Ref: From Bastien757049 -Ref: List of Contributions759181 -Node: GNU Free Documentation License767384 -Ref: ADDENDUM How to use this License for your documents791335 -Node: Main Index792728 -Node: Key Index889110 -Node: Command and Function Index944839 -Node: Variable Index991030 +Node: Top879 +Node: Introduction22203 +Node: Summary22660 +Node: Installation25372 +Ref: Using Emacs packaging system25997 +Ref: Downloading Org as an archive26554 +Ref: Using Org's git repository27212 +Node: Activation28112 +Ref: Activation-Footnote-129727 +Node: Feedback29854 +Ref: How to create a useful backtrace32447 +Ref: Feedback-Footnote-133599 +Node: Conventions33725 +Ref: TODO keywords tags properties etc33891 +Ref: Key bindings and commands34776 +Node: Document Structure35406 +Node: Headlines36573 +Ref: Headlines-Footnote-137854 +Node: Visibility Cycling38133 +Node: Global and local cycling38518 +Ref: Global and local cycling-Footnote-141252 +Ref: Global and local cycling-Footnote-241314 +Node: Initial visibility41618 +Ref: Initial visibility-Footnote-142686 +Node: Catching invisible edits42879 +Node: Motion43350 +Node: Structure Editing44809 +Node: Sparse Trees51268 +Ref: Sparse Trees-Footnote-153824 +Ref: Sparse Trees-Footnote-253939 +Node: Plain Lists54015 +Ref: Plain Lists-Footnote-161524 +Ref: Plain Lists-Footnote-261888 +Ref: Plain Lists-Footnote-361988 +Ref: Plain Lists-Footnote-462245 +Ref: Plain Lists-Footnote-562422 +Ref: Plain Lists-Footnote-662526 +Ref: Plain Lists-Footnote-762632 +Node: Drawers62702 +Ref: Drawers-Footnote-164367 +Node: Blocks64479 +Node: Tables65067 +Node: Built-in Table Editor65745 +Ref: Creation and conversion67474 +Ref: Re-aligning and field motion68412 +Ref: Column and row editing69339 +Ref: Regions71696 +Ref: Calculations73095 +Ref: Miscellaneous (1)73908 +Ref: Built-in Table Editor-Footnote-175968 +Node: Column Width and Alignment76076 +Node: Column Groups79408 +Node: Orgtbl Mode80970 +Node: The Spreadsheet81779 +Node: References83248 +Ref: Field references83702 +Ref: Range references86141 +Ref: Field coordinates in formulas87363 +Ref: Named references88348 +Ref: Remote references89319 +Ref: References-Footnote-190241 +Ref: References-Footnote-290469 +Ref: References-Footnote-390572 +Node: Formula syntax for Calc90897 +Ref: Formula syntax for Calc-Footnote-196419 +Node: Formula syntax for Lisp96758 +Node: Durations and time values98536 +Node: Field and range formulas99918 +Node: Column formulas102382 +Node: Lookup functions104489 +Node: Editing and debugging formulas106453 +Ref: Using multiple TBLFM lines110965 +Ref: Debugging formulas111808 +Node: Updating the table112232 +Node: Advanced features113599 +Ref: Advanced features-Footnote-1118045 +Node: Org Plot118153 +Ref: Graphical plots using Gnuplot118349 +Ref: Plot options119548 +Ref: ASCII bar plots121321 +Node: Hyperlinks122571 +Node: Link Format123430 +Ref: Link Format-Footnote-1125488 +Ref: Link Format-Footnote-2125720 +Node: Internal Links125852 +Ref: Internal Links-Footnote-1128409 +Ref: Internal Links-Footnote-2128649 +Node: Radio Targets128790 +Node: External Links129502 +Ref: External Links-Footnote-1134972 +Node: Handling Links135396 +Ref: Handling Links-Footnote-1143078 +Ref: Handling Links-Footnote-2143239 +Ref: Handling Links-Footnote-3143429 +Ref: Handling Links-Footnote-4143725 +Ref: Handling Links-Footnote-5143987 +Ref: Handling Links-Footnote-6144109 +Node: Using Links Outside Org144184 +Node: Link Abbreviations144654 +Node: Search Options147540 +Ref: Search Options-Footnote-1149639 +Node: Custom Searches149720 +Node: TODO Items150749 +Ref: TODO Items-Footnote-1151869 +Node: TODO Basics151983 +Node: TODO Extensions154613 +Node: Workflow states155661 +Ref: Workflow states-Footnote-1157055 +Node: TODO types157171 +Ref: TODO types-Footnote-1158985 +Node: Multiple sets in one file159057 +Node: Fast access to TODO states160997 +Ref: Fast access to TODO states-Footnote-1161875 +Ref: Fast access to TODO states-Footnote-2161982 +Node: Per-file keywords162284 +Ref: Per-file keywords-Footnote-1163728 +Node: Faces for TODO keywords163932 +Node: TODO dependencies165000 +Node: Progress Logging167462 +Node: Closing items168594 +Ref: Closing items-Footnote-1169589 +Ref: Closing items-Footnote-2169663 +Node: Tracking TODO state changes169741 +Ref: Tracking TODO state changes-Footnote-1172868 +Ref: Tracking TODO state changes-Footnote-2172930 +Ref: Tracking TODO state changes-Footnote-3173088 +Node: Tracking your habits173366 +Node: Priorities177782 +Ref: Priorities-Footnote-1179901 +Node: Breaking Down Tasks179974 +Ref: Breaking Down Tasks-Footnote-1182010 +Node: Checkboxes182117 +Ref: Checkboxes-Footnote-1186654 +Ref: Checkboxes-Footnote-2186782 +Ref: Checkboxes-Footnote-3186962 +Node: Tags187076 +Node: Tag Inheritance188164 +Ref: Tag Inheritance-Footnote-1190031 +Ref: Tag Inheritance-Footnote-2190135 +Node: Setting Tags190265 +Ref: Setting Tags-Footnote-1196736 +Ref: Setting Tags-Footnote-2196914 +Node: Tag Hierarchy196992 +Node: Tag Searches200553 +Node: Properties and Columns201859 +Node: Property Syntax203252 +Node: Special Properties207522 +Node: Property Searches209269 +Node: Property Inheritance210704 +Node: Column View212571 +Node: Defining columns213817 +Node: Scope of column definitions214197 +Node: Column attributes215107 +Ref: Column attributes-Footnote-1219513 +Ref: Column attributes-Footnote-2219644 +Ref: Column attributes-Footnote-3219842 +Node: Using column view219981 +Ref: Turning column view on or off220142 +Ref: Editing values221120 +Ref: Modifying column view on-the-fly222490 +Node: Capturing column view222862 +Ref: Capturing column view-Footnote-1226244 +Node: Dates and Times226381 +Node: Timestamps227295 +Ref: Timestamps-Footnote-1229646 +Ref: Timestamps-Footnote-2229942 +Node: Creating Timestamps230691 +Node: The date/time prompt233700 +Ref: The date/time prompt-Footnote-1238435 +Ref: The date/time prompt-Footnote-2238606 +Ref: The date/time prompt-Footnote-3238717 +Node: Custom time format238815 +Node: Deadlines and Scheduling240579 +Ref: Deadlines and Scheduling-Footnote-1244144 +Node: Inserting deadline/schedule244307 +Ref: Inserting deadline/schedule-Footnote-1246294 +Ref: Inserting deadline/schedule-Footnote-2246455 +Ref: Inserting deadline/schedule-Footnote-3246581 +Node: Repeated tasks246707 +Ref: Repeated tasks-Footnote-1251193 +Ref: Repeated tasks-Footnote-2251276 +Ref: Repeated tasks-Footnote-3251559 +Node: Clocking Work Time251781 +Ref: Clocking Work Time-Footnote-1252981 +Ref: Clocking Work Time-Footnote-2253134 +Node: Clocking commands253276 +Ref: Clocking commands-Footnote-1258376 +Ref: Clocking commands-Footnote-2258491 +Ref: Clocking commands-Footnote-3258573 +Ref: Clocking commands-Footnote-4258636 +Node: The clock table258719 +Ref: The clock table-Footnote-1266732 +Ref: The clock table-Footnote-2266841 +Ref: The clock table-Footnote-3266939 +Node: Resolving idle time267065 +Ref: Resolving idle time (1)267256 +Ref: Continuous clocking270453 +Ref: Resolving idle time-Footnote-1270995 +Node: Effort Estimates271474 +Ref: Effort Estimates-Footnote-1274250 +Node: Timers274361 +Node: Refiling and Archiving276575 +Node: Refile and Copy277133 +Ref: Refile and Copy-Footnote-1279581 +Node: Archiving279695 +Node: Moving subtrees280403 +Node: Internal archiving282427 +Node: Capture and Attachments285147 +Node: Capture285947 +Node: Setting up capture286466 +Node: Using capture286824 +Node: Capture templates289217 +Node: Template elements291251 +Ref: Template elements-Footnote-1298007 +Ref: Template elements-Footnote-2298340 +Ref: Template elements-Footnote-3298527 +Node: Template expansion298622 +Ref: Template expansion-Footnote-1302539 +Ref: Template expansion-Footnote-2302630 +Ref: Template expansion-Footnote-3302820 +Node: Templates in contexts302919 +Node: Attachments303755 +Node: Attachment defaults and dispatcher304776 +Ref: Attachment defaults and dispatcher-Footnote-1308122 +Node: Attachment options308273 +Node: Attachment links311743 +Node: Automatic version-control with Git312377 +Node: Attach from Dired312887 +Node: RSS Feeds314246 +Node: Agenda Views315691 +Node: Agenda Files318093 +Ref: Agenda Files-Footnote-1320999 +Ref: Agenda Files-Footnote-2321143 +Node: Agenda Dispatcher321341 +Ref: Agenda Dispatcher-Footnote-1324143 +Ref: Agenda Dispatcher-Footnote-2324241 +Node: Built-in Agenda Views324347 +Node: Weekly/daily agenda324939 +Ref: Calendar/Diary integration326274 +Ref: Anniversaries from BBDB328350 +Ref: Appointment reminders330141 +Ref: Weekly/daily agenda-Footnote-1330691 +Ref: Weekly/daily agenda-Footnote-2330935 +Node: Global TODO list331155 +Node: Matching tags and properties334000 +Node: Search view341068 +Node: Stuck projects342710 +Node: Presentation and Sorting344842 +Node: Categories345814 +Node: Time-of-day specifications346555 +Ref: Time-of-day specifications-Footnote-1348541 +Node: Sorting of agenda items348664 +Node: Filtering/limiting agenda items350277 +Ref: Filtering in the agenda350977 +Ref: Computed tag filtering355072 +Ref: Setting limits for the agenda356566 +Ref: Filtering/limiting agenda items-Footnote-1358115 +Node: Agenda Commands358667 +Ref: Motion (1)359395 +Ref: View/Go to Org file359598 +Ref: Change display361104 +Ref: Remote editing368614 +Ref: Bulk remote editing selected entries373852 +Ref: Calendar commands376947 +Ref: Quit and exit378828 +Ref: Agenda Commands-Footnote-1379190 +Ref: Agenda Commands-Footnote-2379266 +Ref: Agenda Commands-Footnote-3379370 +Node: Custom Agenda Views379457 +Node: Storing searches380104 +Ref: Storing searches-Footnote-1383051 +Ref: Storing searches-Footnote-2383168 +Node: Block agenda383415 +Node: Setting options384666 +Node: Exporting Agenda Views388275 +Ref: Exporting Agenda Views-Footnote-1392809 +Ref: Exporting Agenda Views-Footnote-2392997 +Ref: Exporting Agenda Views-Footnote-3393147 +Ref: Exporting Agenda Views-Footnote-4393334 +Node: Agenda Column View393416 +Node: Markup for Rich Contents396759 +Node: Paragraphs398052 +Node: Emphasis and Monospace399182 +Node: Subscripts and Superscripts399828 +Node: Special Symbols400880 +Ref: Special Symbols-Footnote-1402788 +Ref: Special Symbols-Footnote-2402953 +Node: Embedded LaTeX403050 +Ref: Embedded LaTeX-Footnote-1403894 +Node: LaTeX fragments404090 +Ref: LaTeX fragments-Footnote-1406241 +Node: Previewing LaTeX fragments406434 +Ref: Previewing LaTeX fragments-Footnote-1407912 +Node: CDLaTeX mode408160 +Ref: CDLaTeX mode-Footnote-1410885 +Node: Literal Examples411032 +Ref: Literal Examples-Footnote-1416138 +Ref: Literal Examples-Footnote-2416508 +Ref: Literal Examples-Footnote-3416686 +Ref: Literal Examples-Footnote-4416871 +Node: Images416969 +Ref: Images-Footnote-1418051 +Ref: Images-Footnote-2418174 +Node: Captions418335 +Node: Horizontal Rules419030 +Node: Creating Footnotes419281 +Ref: Creating Footnotes-Footnote-1422405 +Ref: Creating Footnotes-Footnote-2422511 +Node: Exporting422618 +Node: The Export Dispatcher425383 +Node: Export Settings428096 +Ref: Export Settings-Footnote-1436190 +Ref: Export Settings-Footnote-2436302 +Ref: Export Settings-Footnote-3436403 +Node: Table of Contents436601 +Ref: Table of Contents-Footnote-1439270 +Node: Include Files439437 +Ref: Include Files-Footnote-1442369 +Node: Macro Replacement442547 +Ref: Macro Replacement-Footnote-1446422 +Node: Comment Lines446639 +Ref: Comment Lines-Footnote-1447497 +Node: ASCII/Latin-1/UTF-8 export447601 +Ref: ASCII export commands448450 +Ref: ASCII specific export settings448983 +Ref: Header and sectioning structure449427 +Ref: Quoting ASCII text449701 +Ref: ASCII specific attributes450073 +Ref: ASCII special blocks450350 +Node: Beamer Export450697 +Node: Beamer export commands451442 +Node: Beamer specific export settings452142 +Node: Frames and Blocks in Beamer454042 +Ref: Frames and Blocks in Beamer-Footnote-1457409 +Node: Beamer specific syntax457568 +Node: Editing support459542 +Node: A Beamer example460008 +Node: HTML Export461257 +Node: HTML export commands462362 +Node: HTML specific export settings462908 +Node: HTML doctypes464997 +Node: HTML preamble and postamble467173 +Node: Quoting HTML tags468363 +Node: Headlines in HTML export469057 +Node: Links in HTML export469647 +Node: Tables in HTML export471112 +Node: Images in HTML export472567 +Node: Math formatting in HTML export474052 +Ref: Math formatting in HTML export-Footnote-1475587 +Ref: Math formatting in HTML export-Footnote-2475711 +Ref: Math formatting in HTML export-Footnote-3475972 +Node: Text areas in HTML export476144 +Node: CSS support477284 +Ref: CSS support-Footnote-1480931 +Node: JavaScript support481111 +Node: LaTeX Export484364 +Node: LaTeX/PDF export commands486137 +Ref: LaTeX/PDF export commands-Footnote-1487635 +Node: LaTeX specific export settings487837 +Node: LaTeX header and sectioning491064 +Node: Quoting LaTeX code493176 +Node: Tables in LaTeX export493967 +Node: Images in LaTeX export498380 +Node: Plain lists in LaTeX export500978 +Node: Source blocks in LaTeX export501993 +Node: Example blocks in LaTeX export503418 +Node: Special blocks in LaTeX export504139 +Node: Horizontal rules in LaTeX export505397 +Node: Markdown Export505792 +Ref: Markdown export commands506254 +Ref: Header and sectioning structure (1)506691 +Node: OpenDocument Text Export507108 +Ref: OpenDocument Text Export-Footnote-1508209 +Node: Pre-requisites for ODT export508358 +Node: ODT export commands508731 +Node: ODT specific export settings509907 +Node: Extending ODT export510953 +Ref: Automatically exporting to other formats511759 +Ref: Converting between document formats512185 +Node: Applying custom styles512727 +Ref: Applying custom styles the easy way513254 +Ref: Using third-party styles and templates514212 +Node: Links in ODT export514509 +Node: Tables in ODT export515166 +Node: Images in ODT export517171 +Ref: Embedding images517370 +Ref: Embedding clickable images517687 +Ref: Sizing and scaling of embedded images518021 +Ref: Anchoring of images519705 +Node: Math formatting in ODT export520027 +Node: LaTeX math snippets520451 +Ref: LaTeX math snippets-Footnote-1522699 +Ref: LaTeX math snippets-Footnote-2522775 +Node: MathML and OpenDocument formula files522820 +Node: Labels and captions in ODT export523323 +Node: Literal examples in ODT export524594 +Node: Advanced topics in ODT export525430 +Ref: Configuring a document converter525735 +Ref: Working with OpenDocument style files526676 +Ref: x-orgodtstyles-xml527142 +Ref: x-orgodtcontenttemplate-xml527484 +Ref: x-overriding-factory-styles528128 +Ref: Creating one-off styles529372 +Ref: Customizing tables in ODT export531376 +Ref: Validating OpenDocument XML536236 +Ref: Advanced topics in ODT export-Footnote-1537033 +Ref: Advanced topics in ODT export-Footnote-2537137 +Ref: Advanced topics in ODT export-Footnote-3537230 +Node: Org Export537578 +Ref: Org export commands537929 +Node: Texinfo Export538235 +Node: Texinfo export commands539213 +Node: Texinfo specific export settings539833 +Node: Texinfo file header540981 +Node: Texinfo title and copyright page541959 +Node: Info directory file543318 +Node: Headings and sectioning structure544038 +Node: Indices546063 +Node: Quoting Texinfo code547087 +Node: Plain lists in Texinfo export547580 +Node: Tables in Texinfo export549301 +Node: Images in Texinfo export549792 +Node: Quotations in Texinfo export550425 +Node: Special blocks in Texinfo export551373 +Node: A Texinfo example552021 +Node: iCalendar Export554118 +Node: Other Built-in Back-ends558402 +Node: Advanced Export Configuration559029 +Ref: Hooks559236 +Ref: Filters560159 +Ref: Defining filters for individual files562668 +Ref: Extending an existing back-end563474 +Node: Export in Foreign Buffers565714 +Node: Publishing566862 +Node: Configuration567740 +Node: Project alist568517 +Node: Sources and destinations569654 +Node: Selecting files570967 +Node: Publishing action571917 +Ref: Publishing action-Footnote-1573741 +Node: Publishing options573904 +Ref: Generic properties574651 +Ref: ASCII specific properties576538 +Ref: Beamer specific properties578138 +Ref: HTML specific properties578703 +Ref: LaTeX specific properties583095 +Ref: Markdown specific properties586019 +Ref: ODT specific properties586257 +Ref: Texinfo specific properties587189 +Node: Publishing links588536 +Node: Site map589911 +Node: Generating an index593223 +Node: Uploading Files594010 +Node: Sample Configuration595788 +Node: Simple example596281 +Node: Complex example596929 +Node: Triggering Publication598973 +Node: Working with Source Code599994 +Node: Features602321 +Node: Structure of Code Blocks605043 +Node: Using Header Arguments607539 +Ref: System-wide header arguments608261 +Ref: Header arguments in Org mode properties609184 +Ref: Code block specific header arguments611012 +Ref: Header arguments in function calls612511 +Node: Environment of a Code Block613185 +Ref: Passing arguments613394 +Ref: Using sessions621264 +Ref: Choosing a working directory622663 +Ref: Inserting headers and footers624517 +Node: Evaluating Code Blocks625027 +Ref: How to evaluate source code625477 +Ref: Limit code block evaluation628379 +Ref: Cache results of evaluation629239 +Ref: Evaluating Code Blocks-Footnote-1631825 +Ref: Evaluating Code Blocks-Footnote-2631959 +Node: Results of Evaluation632117 +Ref: Collection632919 +Ref: Type635179 +Ref: Format638472 +Ref: Handling640773 +Ref: Post-processing641488 +Node: Exporting Code Blocks643202 +Node: Extracting Source Code645550 +Ref: Header arguments646526 +Ref: Functions650067 +Ref: Hooks (1)650318 +Ref: Jumping between code and Org650553 +Node: Languages651063 +Ref: Languages-Footnote-1653782 +Ref: Languages-Footnote-2653940 +Node: Editing Source Code654094 +Node: Noweb Reference Syntax656819 +Ref: Noweb Reference Syntax-Footnote-1662326 +Node: Library of Babel662416 +Node: Key bindings and Useful Functions663129 +Node: Batch Execution665549 +Node: Miscellaneous666327 +Node: Completion667500 +Node: Structure Templates669417 +Ref: Structure Templates-Footnote-1671162 +Node: Speed Keys671254 +Node: Clean View672426 +Node: Org Indent Mode673612 +Ref: Org Indent Mode-Footnote-1674813 +Node: Hard indentation675037 +Ref: Hard indentation-Footnote-1676512 +Node: Dynamic Headline Numbering676618 +Node: The Very Busy C-c C-c Key677579 +Node: In-buffer Settings679488 +Ref: In-buffer Settings-Footnote-1688186 +Node: Org Syntax688384 +Node: Documentation Access690034 +Node: Escape Character690448 +Node: Code Evaluation Security691304 +Node: Interaction694166 +Node: Cooperation694584 +Node: Conflicts697471 +Node: TTY Keys702068 +Node: Protocols703665 +Node: The store-link protocol705119 +Node: The capture protocol705962 +Node: The open-source protocol707121 +Node: Org Crypt710353 +Node: Org Mobile711885 +Node: Setting up the staging area713204 +Ref: Setting up the staging area-Footnote-1714439 +Ref: Setting up the staging area-Footnote-2714646 +Node: Pushing to the mobile application714818 +Ref: Pushing to the mobile application-Footnote-1715824 +Ref: Pushing to the mobile application-Footnote-2715915 +Ref: Pushing to the mobile application-Footnote-3716282 +Node: Pulling from the mobile application716358 +Ref: Pulling from the mobile application-Footnote-1718666 +Node: Hacking718719 +Node: Hooks (2)719665 +Node: Add-on Packages719988 +Node: Adding Hyperlink Types720526 +Node: Adding Export Back-ends723938 +Node: Tables in Arbitrary Syntax725190 +Node: Radio tables726454 +Node: A LaTeX example728586 +Ref: A LaTeX example-Footnote-1732433 +Ref: A LaTeX example-Footnote-2732476 +Ref: A LaTeX example-Footnote-3732637 +Node: Translator functions733089 +Node: Dynamic Blocks735260 +Node: Special Agenda Views737501 +Ref: Special Agenda Views-Footnote-1741207 +Ref: Special Agenda Views-Footnote-2741414 +Node: Speeding Up Your Agendas741546 +Node: Extracting Agenda Information742600 +Node: Using the Property API746400 +Node: Using the Mapping API749750 +Node: History and Acknowledgments753781 +Ref: From Carsten753974 +Ref: From Bastien757405 +Ref: List of Contributions759537 +Node: GNU Free Documentation License767740 +Ref: ADDENDUM How to use this License for your documents791691 +Node: Main Index793084 +Node: Key Index889466 +Node: Command and Function Index945195 +Node: Variable Index991386  End Tag Table diff --git a/elpa/org-9.3.3/org-agenda.el b/elpa/org-9.3.6/org-agenda.el similarity index 99% rename from elpa/org-9.3.3/org-agenda.el rename to elpa/org-9.3.6/org-agenda.el index 692703c6..aed1b24a 100644 --- a/elpa/org-9.3.3/org-agenda.el +++ b/elpa/org-9.3.6/org-agenda.el @@ -9584,7 +9584,7 @@ Called with a universal prefix arg, show the priority instead of setting it." (list 'display (org-add-props stamp nil 'face '(secondary-selection default)))) (beginning-of-line 1)) - (org-agenda-previous-line))))) + (beginning-of-line 0))))) (defun org-agenda-date-prompt (arg) "Change the date of this item. Date is prompted for, with default today. @@ -10098,13 +10098,13 @@ When ARG is greater than one mark ARG lines." (goto-char (point-min)) (goto-char (next-single-property-change (point) 'org-hd-marker)) (while (and (re-search-forward regexp nil t) - (setq txt-at-point (get-text-property (point) 'txt))) + (setq txt-at-point + (get-text-property (match-beginning 0) 'txt))) (if (get-char-property (point) 'invisible) (beginning-of-line 2) - (when (string-match regexp txt-at-point) + (when (string-match-p regexp txt-at-point) (setq entries-marked (1+ entries-marked)) (call-interactively 'org-agenda-bulk-mark))))) - (unless entries-marked (message "No entry matching this regexp.")))) diff --git a/elpa/org-9.3.3/org-agenda.elc b/elpa/org-9.3.6/org-agenda.elc similarity index 99% rename from elpa/org-9.3.3/org-agenda.elc rename to elpa/org-9.3.6/org-agenda.elc index 03d46685..22befb8a 100644 Binary files a/elpa/org-9.3.3/org-agenda.elc and b/elpa/org-9.3.6/org-agenda.elc differ diff --git a/elpa/org-9.3.3/org-archive.el b/elpa/org-9.3.6/org-archive.el similarity index 100% rename from elpa/org-9.3.3/org-archive.el rename to elpa/org-9.3.6/org-archive.el diff --git a/elpa/org-9.3.3/org-archive.elc b/elpa/org-9.3.6/org-archive.elc similarity index 100% rename from elpa/org-9.3.3/org-archive.elc rename to elpa/org-9.3.6/org-archive.elc diff --git a/elpa/org-9.3.3/org-attach-git.el b/elpa/org-9.3.6/org-attach-git.el similarity index 100% rename from elpa/org-9.3.3/org-attach-git.el rename to elpa/org-9.3.6/org-attach-git.el diff --git a/elpa/org-9.3.3/org-attach-git.elc b/elpa/org-9.3.6/org-attach-git.elc similarity index 100% rename from elpa/org-9.3.3/org-attach-git.elc rename to elpa/org-9.3.6/org-attach-git.elc diff --git a/elpa/org-9.3.3/org-attach.el b/elpa/org-9.3.6/org-attach.el similarity index 99% rename from elpa/org-9.3.3/org-attach.el rename to elpa/org-9.3.6/org-attach.el index 62acc229..f26aee77 100644 --- a/elpa/org-9.3.3/org-attach.el +++ b/elpa/org-9.3.6/org-attach.el @@ -428,7 +428,7 @@ attachment-folder. Change of attachment-folder due to unset might be if an ID property is set on the node, or if a separate inherited -DIR-property exists (that is different than the unset one)." +DIR-property exists (that is different from the unset one)." (interactive) (let ((old (org-attach-dir)) (new diff --git a/elpa/org-9.3.3/org-attach.elc b/elpa/org-9.3.6/org-attach.elc similarity index 99% rename from elpa/org-9.3.3/org-attach.elc rename to elpa/org-9.3.6/org-attach.elc index 3919548b..40f9ba13 100644 Binary files a/elpa/org-9.3.3/org-attach.elc and b/elpa/org-9.3.6/org-attach.elc differ diff --git a/elpa/org-9.3.3/org-autoloads.el b/elpa/org-9.3.6/org-autoloads.el similarity index 100% rename from elpa/org-9.3.3/org-autoloads.el rename to elpa/org-9.3.6/org-autoloads.el diff --git a/elpa/org-9.3.3/org-capture.el b/elpa/org-9.3.6/org-capture.el similarity index 99% rename from elpa/org-9.3.3/org-capture.el rename to elpa/org-9.3.6/org-capture.el index 2d5e2f13..c4feae7b 100644 --- a/elpa/org-9.3.3/org-capture.el +++ b/elpa/org-9.3.6/org-capture.el @@ -1151,7 +1151,7 @@ may have been stored before." (org-capture-empty-lines-after) (unless (org-at-heading-p) (outline-next-heading)) (org-capture-mark-kill-region origin (point)) - (org-capture-narrow beg (1- (point))) + (org-capture-narrow beg (point)) (when (or (search-backward "%?" beg t) (search-forward "%?" nil t)) (replace-match "")))))) diff --git a/elpa/org-9.3.3/org-capture.elc b/elpa/org-9.3.6/org-capture.elc similarity index 97% rename from elpa/org-9.3.3/org-capture.elc rename to elpa/org-9.3.6/org-capture.elc index 35d3aece..6fe754be 100644 Binary files a/elpa/org-9.3.3/org-capture.elc and b/elpa/org-9.3.6/org-capture.elc differ diff --git a/elpa/org-9.3.3/org-clock.el b/elpa/org-9.3.6/org-clock.el similarity index 100% rename from elpa/org-9.3.3/org-clock.el rename to elpa/org-9.3.6/org-clock.el diff --git a/elpa/org-9.3.3/org-clock.elc b/elpa/org-9.3.6/org-clock.elc similarity index 100% rename from elpa/org-9.3.3/org-clock.elc rename to elpa/org-9.3.6/org-clock.elc diff --git a/elpa/org-9.3.3/org-colview.el b/elpa/org-9.3.6/org-colview.el similarity index 100% rename from elpa/org-9.3.3/org-colview.el rename to elpa/org-9.3.6/org-colview.el diff --git a/elpa/org-9.3.3/org-colview.elc b/elpa/org-9.3.6/org-colview.elc similarity index 100% rename from elpa/org-9.3.3/org-colview.elc rename to elpa/org-9.3.6/org-colview.elc diff --git a/elpa/org-9.3.3/org-compat.el b/elpa/org-9.3.6/org-compat.el similarity index 100% rename from elpa/org-9.3.3/org-compat.el rename to elpa/org-9.3.6/org-compat.el diff --git a/elpa/org-9.3.3/org-compat.elc b/elpa/org-9.3.6/org-compat.elc similarity index 100% rename from elpa/org-9.3.3/org-compat.elc rename to elpa/org-9.3.6/org-compat.elc diff --git a/elpa/org-9.3.3/org-crypt.el b/elpa/org-9.3.6/org-crypt.el similarity index 100% rename from elpa/org-9.3.3/org-crypt.el rename to elpa/org-9.3.6/org-crypt.el diff --git a/elpa/org-9.3.3/org-crypt.elc b/elpa/org-9.3.6/org-crypt.elc similarity index 100% rename from elpa/org-9.3.3/org-crypt.elc rename to elpa/org-9.3.6/org-crypt.elc diff --git a/elpa/org-9.3.3/org-ctags.el b/elpa/org-9.3.6/org-ctags.el similarity index 100% rename from elpa/org-9.3.3/org-ctags.el rename to elpa/org-9.3.6/org-ctags.el diff --git a/elpa/org-9.3.3/org-ctags.elc b/elpa/org-9.3.6/org-ctags.elc similarity index 100% rename from elpa/org-9.3.3/org-ctags.elc rename to elpa/org-9.3.6/org-ctags.elc diff --git a/elpa/org-9.3.3/org-datetree.el b/elpa/org-9.3.6/org-datetree.el similarity index 100% rename from elpa/org-9.3.3/org-datetree.el rename to elpa/org-9.3.6/org-datetree.el diff --git a/elpa/org-9.3.3/org-datetree.elc b/elpa/org-9.3.6/org-datetree.elc similarity index 100% rename from elpa/org-9.3.3/org-datetree.elc rename to elpa/org-9.3.6/org-datetree.elc diff --git a/elpa/org-9.3.3/org-duration.el b/elpa/org-9.3.6/org-duration.el similarity index 100% rename from elpa/org-9.3.3/org-duration.el rename to elpa/org-9.3.6/org-duration.el diff --git a/elpa/org-9.3.3/org-duration.elc b/elpa/org-9.3.6/org-duration.elc similarity index 100% rename from elpa/org-9.3.3/org-duration.elc rename to elpa/org-9.3.6/org-duration.elc diff --git a/elpa/org-9.3.3/org-element.el b/elpa/org-9.3.6/org-element.el similarity index 99% rename from elpa/org-9.3.3/org-element.el rename to elpa/org-9.3.6/org-element.el index 2788a8b7..a214a6db 100644 --- a/elpa/org-9.3.3/org-element.el +++ b/elpa/org-9.3.6/org-element.el @@ -4023,7 +4023,8 @@ When PARSE is non-nil, values from keywords belonging to (skip-chars-backward " \t") (point)))) (if parsed? - (org-element--parse-objects beg end nil restrict) + (save-match-data + (org-element--parse-objects beg end nil restrict)) (org-trim (buffer-substring-no-properties beg end))))) ;; If KWD is a dual keyword, find its secondary value. ;; Maybe parse it. @@ -5810,7 +5811,7 @@ element. Possible types are defined in `org-element-all-elements'. Properties depend on element or object type, but always include -`:begin', `:end', `:parent' and `:post-blank' properties. +`:begin', `:end', and `:post-blank' properties. As a special case, if point is at the very beginning of the first item in a list or sub-list, returned element will be that list diff --git a/elpa/org-9.3.3/org-element.elc b/elpa/org-9.3.6/org-element.elc similarity index 98% rename from elpa/org-9.3.3/org-element.elc rename to elpa/org-9.3.6/org-element.elc index bcfbfc5b..2e465965 100644 Binary files a/elpa/org-9.3.3/org-element.elc and b/elpa/org-9.3.6/org-element.elc differ diff --git a/elpa/org-9.3.3/org-entities.el b/elpa/org-9.3.6/org-entities.el similarity index 100% rename from elpa/org-9.3.3/org-entities.el rename to elpa/org-9.3.6/org-entities.el diff --git a/elpa/org-9.3.3/org-entities.elc b/elpa/org-9.3.6/org-entities.elc similarity index 100% rename from elpa/org-9.3.3/org-entities.elc rename to elpa/org-9.3.6/org-entities.elc diff --git a/elpa/org-9.3.3/org-faces.el b/elpa/org-9.3.6/org-faces.el similarity index 100% rename from elpa/org-9.3.3/org-faces.el rename to elpa/org-9.3.6/org-faces.el diff --git a/elpa/org-9.3.3/org-faces.elc b/elpa/org-9.3.6/org-faces.elc similarity index 100% rename from elpa/org-9.3.3/org-faces.elc rename to elpa/org-9.3.6/org-faces.elc diff --git a/elpa/org-9.3.3/org-feed.el b/elpa/org-9.3.6/org-feed.el similarity index 100% rename from elpa/org-9.3.3/org-feed.el rename to elpa/org-9.3.6/org-feed.el diff --git a/elpa/org-9.3.3/org-feed.elc b/elpa/org-9.3.6/org-feed.elc similarity index 100% rename from elpa/org-9.3.3/org-feed.elc rename to elpa/org-9.3.6/org-feed.elc diff --git a/elpa/org-9.3.3/org-footnote.el b/elpa/org-9.3.6/org-footnote.el similarity index 100% rename from elpa/org-9.3.3/org-footnote.el rename to elpa/org-9.3.6/org-footnote.el diff --git a/elpa/org-9.3.3/org-footnote.elc b/elpa/org-9.3.6/org-footnote.elc similarity index 100% rename from elpa/org-9.3.3/org-footnote.elc rename to elpa/org-9.3.6/org-footnote.elc diff --git a/elpa/org-9.3.3/org-goto.el b/elpa/org-9.3.6/org-goto.el similarity index 100% rename from elpa/org-9.3.3/org-goto.el rename to elpa/org-9.3.6/org-goto.el diff --git a/elpa/org-9.3.3/org-goto.elc b/elpa/org-9.3.6/org-goto.elc similarity index 100% rename from elpa/org-9.3.3/org-goto.elc rename to elpa/org-9.3.6/org-goto.elc diff --git a/elpa/org-9.3.3/org-habit.el b/elpa/org-9.3.6/org-habit.el similarity index 100% rename from elpa/org-9.3.3/org-habit.el rename to elpa/org-9.3.6/org-habit.el diff --git a/elpa/org-9.3.3/org-habit.elc b/elpa/org-9.3.6/org-habit.elc similarity index 100% rename from elpa/org-9.3.3/org-habit.elc rename to elpa/org-9.3.6/org-habit.elc diff --git a/elpa/org-9.3.3/org-id.el b/elpa/org-9.3.6/org-id.el similarity index 100% rename from elpa/org-9.3.3/org-id.el rename to elpa/org-9.3.6/org-id.el diff --git a/elpa/org-9.3.3/org-id.elc b/elpa/org-9.3.6/org-id.elc similarity index 100% rename from elpa/org-9.3.3/org-id.elc rename to elpa/org-9.3.6/org-id.elc diff --git a/elpa/org-9.3.3/org-indent.el b/elpa/org-9.3.6/org-indent.el similarity index 100% rename from elpa/org-9.3.3/org-indent.el rename to elpa/org-9.3.6/org-indent.el diff --git a/elpa/org-9.3.3/org-indent.elc b/elpa/org-9.3.6/org-indent.elc similarity index 100% rename from elpa/org-9.3.3/org-indent.elc rename to elpa/org-9.3.6/org-indent.elc diff --git a/elpa/org-9.3.3/org-inlinetask.el b/elpa/org-9.3.6/org-inlinetask.el similarity index 100% rename from elpa/org-9.3.3/org-inlinetask.el rename to elpa/org-9.3.6/org-inlinetask.el diff --git a/elpa/org-9.3.3/org-inlinetask.elc b/elpa/org-9.3.6/org-inlinetask.elc similarity index 100% rename from elpa/org-9.3.3/org-inlinetask.elc rename to elpa/org-9.3.6/org-inlinetask.elc diff --git a/elpa/org-9.3.3/org-install.el b/elpa/org-9.3.6/org-install.el similarity index 100% rename from elpa/org-9.3.3/org-install.el rename to elpa/org-9.3.6/org-install.el diff --git a/elpa/org-9.3.3/org-keys.el b/elpa/org-9.3.6/org-keys.el similarity index 100% rename from elpa/org-9.3.3/org-keys.el rename to elpa/org-9.3.6/org-keys.el diff --git a/elpa/org-9.3.3/org-keys.elc b/elpa/org-9.3.6/org-keys.elc similarity index 100% rename from elpa/org-9.3.3/org-keys.elc rename to elpa/org-9.3.6/org-keys.elc diff --git a/elpa/org-9.3.3/org-lint.el b/elpa/org-9.3.6/org-lint.el similarity index 100% rename from elpa/org-9.3.3/org-lint.el rename to elpa/org-9.3.6/org-lint.el diff --git a/elpa/org-9.3.3/org-lint.elc b/elpa/org-9.3.6/org-lint.elc similarity index 100% rename from elpa/org-9.3.3/org-lint.elc rename to elpa/org-9.3.6/org-lint.elc diff --git a/elpa/org-9.3.3/org-list.el b/elpa/org-9.3.6/org-list.el similarity index 100% rename from elpa/org-9.3.3/org-list.el rename to elpa/org-9.3.6/org-list.el diff --git a/elpa/org-9.3.3/org-list.elc b/elpa/org-9.3.6/org-list.elc similarity index 100% rename from elpa/org-9.3.3/org-list.elc rename to elpa/org-9.3.6/org-list.elc diff --git a/elpa/org-9.3.3/org-loaddefs.el b/elpa/org-9.3.6/org-loaddefs.el similarity index 99% rename from elpa/org-9.3.3/org-loaddefs.el rename to elpa/org-9.3.6/org-loaddefs.el index 789a2898..aca20576 100644 --- a/elpa/org-9.3.3/org-loaddefs.el +++ b/elpa/org-9.3.6/org-loaddefs.el @@ -72,7 +72,7 @@ ;;;*** -;;;### (autoloads nil "ob-core" "ob-core.el" "5cd3ac73828f7d2edfbcd2e1bdfa1650") +;;;### (autoloads nil "ob-core" "ob-core.el" "a30deb7fdf38be4229c562e7c669959a") ;;; Generated autoloads from ob-core.el (autoload 'org-babel-execute-safely-maybe "ob-core" "\ @@ -1037,7 +1037,7 @@ This command is set with the variable `org-archive-default-command'. ;;;*** -;;;### (autoloads nil "org-attach" "org-attach.el" "615f9751ee146d0bc438026f3fbc667a") +;;;### (autoloads nil "org-attach" "org-attach.el" "af7192dc7063c7f6628ad08730b86bc2") ;;; Generated autoloads from org-attach.el (autoload 'org-attach "org-attach" "\ @@ -1494,7 +1494,7 @@ with \"H:MM:SS\" format, return `h:mm:ss'. Otherwise, return ;;;*** -;;;### (autoloads nil "org-element" "org-element.el" "14bbacf67ee8e6e7343ab0af0ee2f893") +;;;### (autoloads nil "org-element" "org-element.el" "7cf23eb0d866686004b5967f5b6b4467") ;;; Generated autoloads from org-element.el (autoload 'org-element-update-syntax "org-element" "\ @@ -1530,7 +1530,7 @@ element. Possible types are defined in `org-element-all-elements'. Properties depend on element or object type, but always include -`:begin', `:end', `:parent' and `:post-blank' properties. +`:begin', `:end', and `:post-blank' properties. As a special case, if point is at the very beginning of the first item in a list or sub-list, returned element will be that list @@ -3002,7 +3002,7 @@ Call the customize function with org as argument. ;;;*** -;;;### (autoloads nil "ox" "ox.el" "bf7e0d6c4b1ca15b2856f8064e1161e8") +;;;### (autoloads nil "ox" "ox.el" "d39a3b5f2053b7fd088cbffada421a3e") ;;; Generated autoloads from ox.el (autoload 'org-export-get-backend "ox" "\ @@ -3592,7 +3592,7 @@ The file is stored under the name chosen in ;;;*** -;;;### (autoloads nil "ox-latex" "ox-latex.el" "34c654817cdf3847334af5ef9e5d7fc8") +;;;### (autoloads nil "ox-latex" "ox-latex.el" "a487b2142b7292793da2aee19bf203c7") ;;; Generated autoloads from ox-latex.el (autoload 'org-latex-make-preamble "ox-latex" "\ diff --git a/elpa/org-9.3.3/org-macro.el b/elpa/org-9.3.6/org-macro.el similarity index 100% rename from elpa/org-9.3.3/org-macro.el rename to elpa/org-9.3.6/org-macro.el diff --git a/elpa/org-9.3.3/org-macro.elc b/elpa/org-9.3.6/org-macro.elc similarity index 100% rename from elpa/org-9.3.3/org-macro.elc rename to elpa/org-9.3.6/org-macro.elc diff --git a/elpa/org-9.3.3/org-macs.el b/elpa/org-9.3.6/org-macs.el similarity index 100% rename from elpa/org-9.3.3/org-macs.el rename to elpa/org-9.3.6/org-macs.el diff --git a/elpa/org-9.3.3/org-macs.elc b/elpa/org-9.3.6/org-macs.elc similarity index 100% rename from elpa/org-9.3.3/org-macs.elc rename to elpa/org-9.3.6/org-macs.elc diff --git a/elpa/org-9.3.3/org-mobile.el b/elpa/org-9.3.6/org-mobile.el similarity index 100% rename from elpa/org-9.3.3/org-mobile.el rename to elpa/org-9.3.6/org-mobile.el diff --git a/elpa/org-9.3.3/org-mobile.elc b/elpa/org-9.3.6/org-mobile.elc similarity index 100% rename from elpa/org-9.3.3/org-mobile.elc rename to elpa/org-9.3.6/org-mobile.elc diff --git a/elpa/org-9.3.3/org-mouse.el b/elpa/org-9.3.6/org-mouse.el similarity index 100% rename from elpa/org-9.3.3/org-mouse.el rename to elpa/org-9.3.6/org-mouse.el diff --git a/elpa/org-9.3.3/org-mouse.elc b/elpa/org-9.3.6/org-mouse.elc similarity index 100% rename from elpa/org-9.3.3/org-mouse.elc rename to elpa/org-9.3.6/org-mouse.elc diff --git a/elpa/org-9.3.3/org-num.el b/elpa/org-9.3.6/org-num.el similarity index 100% rename from elpa/org-9.3.3/org-num.el rename to elpa/org-9.3.6/org-num.el diff --git a/elpa/org-9.3.3/org-num.elc b/elpa/org-9.3.6/org-num.elc similarity index 100% rename from elpa/org-9.3.3/org-num.elc rename to elpa/org-9.3.6/org-num.elc diff --git a/elpa/org-9.3.3/org-pcomplete.el b/elpa/org-9.3.6/org-pcomplete.el similarity index 100% rename from elpa/org-9.3.3/org-pcomplete.el rename to elpa/org-9.3.6/org-pcomplete.el diff --git a/elpa/org-9.3.3/org-pcomplete.elc b/elpa/org-9.3.6/org-pcomplete.elc similarity index 100% rename from elpa/org-9.3.3/org-pcomplete.elc rename to elpa/org-9.3.6/org-pcomplete.elc diff --git a/elpa/org-9.3.3/org-pkg.el b/elpa/org-9.3.6/org-pkg.el similarity index 81% rename from elpa/org-9.3.3/org-pkg.el rename to elpa/org-9.3.6/org-pkg.el index 0024ecb5..ac7baf50 100644 --- a/elpa/org-9.3.3/org-pkg.el +++ b/elpa/org-9.3.6/org-pkg.el @@ -1,2 +1,2 @@ ;; Generated package description from org.el -*- no-byte-compile: t -*- -(define-package "org" "9.3.3" "Outline-based notes management and organizer" 'nil :keywords '("outlines" "hypermedia" "calendar" "wp") :authors '(("Carsten Dominik ")) :maintainer '("Bastien Guerry" . "bzg@gnu.org") :url "https://orgmode.org") +(define-package "org" "9.3.6" "Outline-based notes management and organizer" 'nil :keywords '("outlines" "hypermedia" "calendar" "wp") :authors '(("Carsten Dominik ")) :maintainer '("Bastien Guerry" . "bzg@gnu.org") :url "https://orgmode.org") diff --git a/elpa/org-9.3.3/org-plot.el b/elpa/org-9.3.6/org-plot.el similarity index 100% rename from elpa/org-9.3.3/org-plot.el rename to elpa/org-9.3.6/org-plot.el diff --git a/elpa/org-9.3.3/org-plot.elc b/elpa/org-9.3.6/org-plot.elc similarity index 100% rename from elpa/org-9.3.3/org-plot.elc rename to elpa/org-9.3.6/org-plot.elc diff --git a/elpa/org-9.3.3/org-protocol.el b/elpa/org-9.3.6/org-protocol.el similarity index 100% rename from elpa/org-9.3.3/org-protocol.el rename to elpa/org-9.3.6/org-protocol.el diff --git a/elpa/org-9.3.3/org-protocol.elc b/elpa/org-9.3.6/org-protocol.elc similarity index 100% rename from elpa/org-9.3.3/org-protocol.elc rename to elpa/org-9.3.6/org-protocol.elc diff --git a/elpa/org-9.3.3/org-src.el b/elpa/org-9.3.6/org-src.el similarity index 100% rename from elpa/org-9.3.3/org-src.el rename to elpa/org-9.3.6/org-src.el diff --git a/elpa/org-9.3.3/org-src.elc b/elpa/org-9.3.6/org-src.elc similarity index 100% rename from elpa/org-9.3.3/org-src.elc rename to elpa/org-9.3.6/org-src.elc diff --git a/elpa/org-9.3.3/org-table.el b/elpa/org-9.3.6/org-table.el similarity index 100% rename from elpa/org-9.3.3/org-table.el rename to elpa/org-9.3.6/org-table.el diff --git a/elpa/org-9.3.3/org-table.elc b/elpa/org-9.3.6/org-table.elc similarity index 100% rename from elpa/org-9.3.3/org-table.elc rename to elpa/org-9.3.6/org-table.elc diff --git a/elpa/org-9.3.3/org-tempo.el b/elpa/org-9.3.6/org-tempo.el similarity index 100% rename from elpa/org-9.3.3/org-tempo.el rename to elpa/org-9.3.6/org-tempo.el diff --git a/elpa/org-9.3.3/org-tempo.elc b/elpa/org-9.3.6/org-tempo.elc similarity index 100% rename from elpa/org-9.3.3/org-tempo.elc rename to elpa/org-9.3.6/org-tempo.elc diff --git a/elpa/org-9.3.3/org-timer.el b/elpa/org-9.3.6/org-timer.el similarity index 100% rename from elpa/org-9.3.3/org-timer.el rename to elpa/org-9.3.6/org-timer.el diff --git a/elpa/org-9.3.3/org-timer.elc b/elpa/org-9.3.6/org-timer.elc similarity index 100% rename from elpa/org-9.3.3/org-timer.elc rename to elpa/org-9.3.6/org-timer.elc diff --git a/elpa/org-9.3.3/org-version.el b/elpa/org-9.3.6/org-version.el similarity index 87% rename from elpa/org-9.3.3/org-version.el rename to elpa/org-9.3.6/org-version.el index 66ae832a..d126415f 100644 --- a/elpa/org-9.3.3/org-version.el +++ b/elpa/org-9.3.6/org-version.el @@ -5,13 +5,13 @@ (defun org-release () "The release version of Org. Inserted by installing Org mode or when a release is made." - (let ((org-release "9.3.3")) + (let ((org-release "9.3.6")) org-release)) ;;;###autoload (defun org-git-version () "The Git version of Org mode. Inserted by installing Org or when a release is made." - (let ((org-git-version "9.3.3-elpa")) + (let ((org-git-version "9.3.6-elpa")) org-git-version)) (provide 'org-version) diff --git a/elpa/org-9.3.3/org.el b/elpa/org-9.3.6/org.el similarity index 99% rename from elpa/org-9.3.3/org.el rename to elpa/org-9.3.6/org.el index fceb894c..09b1d54c 100644 --- a/elpa/org-9.3.3/org.el +++ b/elpa/org-9.3.6/org.el @@ -7,7 +7,7 @@ ;; Maintainer: Bastien Guerry ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: https://orgmode.org -;; Version: 9.3.3 +;; Version: 9.3.6 ;; ;; This file is part of GNU Emacs. ;; @@ -216,7 +216,8 @@ and then loads the resulting file using `load-file'. With optional prefix argument COMPILE, the tangled Emacs Lisp file is byte-compiled before it is loaded." (interactive "fFile to load: \nP") - (let* ((tangled-file (concat (file-name-sans-extension file) ".el"))) + (let* ((file (file-truename file)) + (tangled-file (concat (file-name-sans-extension file) ".el"))) ;; Tangle only if the Org file is newer than the Elisp file. (unless (org-file-newer-than-p tangled-file @@ -5078,9 +5079,10 @@ stacked delimiters is N. Escaping delimiters is not possible." ;; Do not span over cells in table rows. (not (and (save-match-data (org-match-line "[ \t]*|")) (string-match-p "|" (match-string 4)))))) - (pcase-let ((`(,_ ,face ,_) (assoc marker org-emphasis-alist))) + (pcase-let ((`(,_ ,face ,_) (assoc marker org-emphasis-alist)) + (m (if org-hide-emphasis-markers 4 2))) (font-lock-prepend-text-property - (match-beginning 2) (match-end 2) 'face face) + (match-beginning m) (match-end m) 'face face) (when verbatim? (org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0)) @@ -6403,11 +6405,15 @@ Use `\\[org-edit-special]' to edit table.el tables")) (setq eos (save-excursion (org-end-of-subtree t t) (when (bolp) (backward-char)) (point))) (setq has-children - (save-excursion - (let ((level (funcall outline-level))) - (outline-next-heading) - (and (org-at-heading-p t) - (> (funcall outline-level) level)))))) + (or + (save-excursion + (let ((level (funcall outline-level))) + (outline-next-heading) + (and (org-at-heading-p t) + (> (funcall outline-level) level)))) + (and (eq org-cycle-include-plain-lists 'integrate) + (save-excursion + (org-list-search-forward (org-item-beginning-re) eos t)))))) ;; Determine end invisible part of buffer (EOL) (beginning-of-line 2) (while (and (not (eobp)) ;This is like `next-line'. @@ -8305,7 +8311,7 @@ the value of the drawer property." (defun org-refresh-property (tprop p &optional inherit) "Refresh the buffer text property TPROP from the drawer property P. The refresh happens only for the current headline, or the whole -sub-tree if optional argument INHERIT is non-nil." +subtree if optional argument INHERIT is non-nil." (unless (org-before-first-heading-p) (save-excursion (org-back-to-heading t) @@ -8348,7 +8354,7 @@ sub-tree if optional argument INHERIT is non-nil." (throw 'buffer-category (org-element-property :value element))))) default-category)) - ;; Set sub-tree specific categories. + ;; Set subtree specific categories. (goto-char (point-min)) (let ((regexp (org-re-property "CATEGORY"))) (while (re-search-forward regexp nil t) @@ -13018,6 +13024,10 @@ variables is set." (not (get-text-property 0 'org-unrestricted (caar allowed)))))) (completing-read "Effort: " allowed nil must-match)))))) + ;; Test whether the value can be interpreted as a duration before + ;; inserting it in the buffer: + (org-duration-to-minutes value) + ;; Maybe update the effort value: (unless (equal current value) (org-entry-put nil org-effort-property value)) (org-refresh-property '((effort . identity) @@ -18699,13 +18709,14 @@ With prefix arg UNCOMPILED, load the uncompiled versions." (and (string= org-dir contrib-dir) (org-load-noerror-mustsuffix (concat contrib-dir f))) (and (org-load-noerror-mustsuffix (concat (org-find-library-dir f) f)) - (add-to-list 'load-uncore f 'append) + (push f load-uncore) 't) f)) lfeat))) (when load-uncore (message "The following feature%s found in load-path, please check if that's correct:\n%s" - (if (> (length load-uncore) 1) "s were" " was") load-uncore)) + (if (> (length load-uncore) 1) "s were" " was") + (reverse load-uncore))) (if load-misses (message "Some error occurred while reloading Org feature%s\n%s\nPlease check *Messages*!\n%s" (if (> (length load-misses) 1) "s" "") load-misses (org-version nil 'full)) @@ -19280,7 +19291,7 @@ indent. The function will not indent contents of example blocks, verse blocks and export blocks as leading white spaces are assumed to be significant there." (interactive "r") - (save-window-excursion + (save-excursion (goto-char start) (skip-chars-forward " \r\t\n") (unless (eobp) (beginning-of-line)) diff --git a/elpa/org-9.3.3/org.elc b/elpa/org-9.3.6/org.elc similarity index 94% rename from elpa/org-9.3.3/org.elc rename to elpa/org-9.3.6/org.elc index 29c7f352..c119ffa8 100644 Binary files a/elpa/org-9.3.3/org.elc and b/elpa/org-9.3.6/org.elc differ diff --git a/elpa/org-9.3.3/orgcard.pdf b/elpa/org-9.3.6/orgcard.pdf similarity index 64% rename from elpa/org-9.3.3/orgcard.pdf rename to elpa/org-9.3.6/orgcard.pdf index d2dc08b1..4d5394f0 100644 Binary files a/elpa/org-9.3.3/orgcard.pdf and b/elpa/org-9.3.6/orgcard.pdf differ diff --git a/elpa/org-9.3.3/ox-ascii.el b/elpa/org-9.3.6/ox-ascii.el similarity index 100% rename from elpa/org-9.3.3/ox-ascii.el rename to elpa/org-9.3.6/ox-ascii.el diff --git a/elpa/org-9.3.3/ox-ascii.elc b/elpa/org-9.3.6/ox-ascii.elc similarity index 100% rename from elpa/org-9.3.3/ox-ascii.elc rename to elpa/org-9.3.6/ox-ascii.elc diff --git a/elpa/org-9.3.3/ox-beamer.el b/elpa/org-9.3.6/ox-beamer.el similarity index 100% rename from elpa/org-9.3.3/ox-beamer.el rename to elpa/org-9.3.6/ox-beamer.el diff --git a/elpa/org-9.3.3/ox-beamer.elc b/elpa/org-9.3.6/ox-beamer.elc similarity index 100% rename from elpa/org-9.3.3/ox-beamer.elc rename to elpa/org-9.3.6/ox-beamer.elc diff --git a/elpa/org-9.3.3/ox-html.el b/elpa/org-9.3.6/ox-html.el similarity index 100% rename from elpa/org-9.3.3/ox-html.el rename to elpa/org-9.3.6/ox-html.el diff --git a/elpa/org-9.3.3/ox-html.elc b/elpa/org-9.3.6/ox-html.elc similarity index 100% rename from elpa/org-9.3.3/ox-html.elc rename to elpa/org-9.3.6/ox-html.elc diff --git a/elpa/org-9.3.3/ox-icalendar.el b/elpa/org-9.3.6/ox-icalendar.el similarity index 100% rename from elpa/org-9.3.3/ox-icalendar.el rename to elpa/org-9.3.6/ox-icalendar.el diff --git a/elpa/org-9.3.3/ox-icalendar.elc b/elpa/org-9.3.6/ox-icalendar.elc similarity index 100% rename from elpa/org-9.3.3/ox-icalendar.elc rename to elpa/org-9.3.6/ox-icalendar.elc diff --git a/elpa/org-9.3.3/ox-latex.el b/elpa/org-9.3.6/ox-latex.el similarity index 99% rename from elpa/org-9.3.3/ox-latex.el rename to elpa/org-9.3.6/ox-latex.el index 5db1ed74..46983bf4 100644 --- a/elpa/org-9.3.3/ox-latex.el +++ b/elpa/org-9.3.6/ox-latex.el @@ -1586,6 +1586,7 @@ INFO is a plist used as a communication channel." lang)))) `((?a . ,(org-export-data (plist-get info :author) info)) (?t . ,(org-export-data (plist-get info :title) info)) + (?s . ,(org-export-data (plist-get info :subtitle) info)) (?k . ,(org-export-data (org-latex--wrap-latex-math-block (plist-get info :keywords) info) info)) @@ -2208,9 +2209,9 @@ contextual information." "\\item" (cond ((and checkbox tag) - (format "[{%s %s}] %s" checkbox tag tag-footnotes)) + (format "{%s %s} %s" checkbox tag tag-footnotes)) ((or checkbox tag) - (format "[{%s}] %s" (or checkbox tag) tag-footnotes)) + (format "{%s} %s" (or checkbox tag) tag-footnotes)) ;; Without a tag or a check-box, if CONTENTS starts with ;; an opening square bracket, add "\relax" to "\item", ;; unless the brackets comes from an initial export diff --git a/elpa/org-9.3.3/ox-latex.elc b/elpa/org-9.3.6/ox-latex.elc similarity index 96% rename from elpa/org-9.3.3/ox-latex.elc rename to elpa/org-9.3.6/ox-latex.elc index df5ce87b..96eda6a1 100644 Binary files a/elpa/org-9.3.3/ox-latex.elc and b/elpa/org-9.3.6/ox-latex.elc differ diff --git a/elpa/org-9.3.3/ox-man.el b/elpa/org-9.3.6/ox-man.el similarity index 100% rename from elpa/org-9.3.3/ox-man.el rename to elpa/org-9.3.6/ox-man.el diff --git a/elpa/org-9.3.3/ox-man.elc b/elpa/org-9.3.6/ox-man.elc similarity index 100% rename from elpa/org-9.3.3/ox-man.elc rename to elpa/org-9.3.6/ox-man.elc diff --git a/elpa/org-9.3.3/ox-md.el b/elpa/org-9.3.6/ox-md.el similarity index 100% rename from elpa/org-9.3.3/ox-md.el rename to elpa/org-9.3.6/ox-md.el diff --git a/elpa/org-9.3.3/ox-md.elc b/elpa/org-9.3.6/ox-md.elc similarity index 100% rename from elpa/org-9.3.3/ox-md.elc rename to elpa/org-9.3.6/ox-md.elc diff --git a/elpa/org-9.3.3/ox-odt.el b/elpa/org-9.3.6/ox-odt.el similarity index 100% rename from elpa/org-9.3.3/ox-odt.el rename to elpa/org-9.3.6/ox-odt.el diff --git a/elpa/org-9.3.3/ox-odt.elc b/elpa/org-9.3.6/ox-odt.elc similarity index 100% rename from elpa/org-9.3.3/ox-odt.elc rename to elpa/org-9.3.6/ox-odt.elc diff --git a/elpa/org-9.3.3/ox-org.el b/elpa/org-9.3.6/ox-org.el similarity index 100% rename from elpa/org-9.3.3/ox-org.el rename to elpa/org-9.3.6/ox-org.el diff --git a/elpa/org-9.3.3/ox-org.elc b/elpa/org-9.3.6/ox-org.elc similarity index 100% rename from elpa/org-9.3.3/ox-org.elc rename to elpa/org-9.3.6/ox-org.elc diff --git a/elpa/org-9.3.3/ox-publish.el b/elpa/org-9.3.6/ox-publish.el similarity index 100% rename from elpa/org-9.3.3/ox-publish.el rename to elpa/org-9.3.6/ox-publish.el diff --git a/elpa/org-9.3.3/ox-publish.elc b/elpa/org-9.3.6/ox-publish.elc similarity index 100% rename from elpa/org-9.3.3/ox-publish.elc rename to elpa/org-9.3.6/ox-publish.elc diff --git a/elpa/org-9.3.3/ox-texinfo.el b/elpa/org-9.3.6/ox-texinfo.el similarity index 100% rename from elpa/org-9.3.3/ox-texinfo.el rename to elpa/org-9.3.6/ox-texinfo.el diff --git a/elpa/org-9.3.3/ox-texinfo.elc b/elpa/org-9.3.6/ox-texinfo.elc similarity index 100% rename from elpa/org-9.3.3/ox-texinfo.elc rename to elpa/org-9.3.6/ox-texinfo.elc diff --git a/elpa/org-9.3.3/ox.el b/elpa/org-9.3.6/ox.el similarity index 99% rename from elpa/org-9.3.3/ox.el rename to elpa/org-9.3.6/ox.el index 22cf1d53..86916473 100644 --- a/elpa/org-9.3.3/ox.el +++ b/elpa/org-9.3.6/ox.el @@ -3461,15 +3461,16 @@ Move point after the link." (goto-char (org-element-property :end link)) (let ((new-path (file-relative-name (expand-file-name path file-dir) includer-dir)) - (new-link (org-element-copy link)) - (contents (and (org-element-property :contents-begin link) - (buffer-substring - (org-element-property :contents-begin link) - (org-element-property :contents-end link))))) + (new-link (org-element-copy link))) (org-element-put-property new-link :path new-path) + (when (org-element-property :contents-begin link) + (org-element-adopt-elements new-link + (buffer-substring + (org-element-property :contents-begin link) + (org-element-property :contents-end link)))) (delete-region (org-element-property :begin link) (org-element-property :end link)) - (insert (org-element-link-interpreter new-link contents)))))) + (insert (org-element-interpret-data new-link)))))) (defun org-export--prepare-file-contents (file &optional lines ind minlevel id footnotes includer) diff --git a/elpa/org-9.3.3/ox.elc b/elpa/org-9.3.6/ox.elc similarity index 97% rename from elpa/org-9.3.3/ox.elc rename to elpa/org-9.3.6/ox.elc index 19b83ab0..9e02c7d5 100644 Binary files a/elpa/org-9.3.3/ox.elc and b/elpa/org-9.3.6/ox.elc differ diff --git a/elpa/slime-20200209.1437/contrib/README.md b/elpa/slime-20200213.1710/contrib/README.md similarity index 100% rename from elpa/slime-20200209.1437/contrib/README.md rename to elpa/slime-20200213.1710/contrib/README.md diff --git a/elpa/slime-20200209.1437/contrib/bridge.el b/elpa/slime-20200213.1710/contrib/bridge.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/bridge.el rename to elpa/slime-20200213.1710/contrib/bridge.el diff --git a/elpa/slime-20200209.1437/contrib/bridge.elc b/elpa/slime-20200213.1710/contrib/bridge.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/bridge.elc rename to elpa/slime-20200213.1710/contrib/bridge.elc diff --git a/elpa/slime-20200209.1437/contrib/inferior-slime.el b/elpa/slime-20200213.1710/contrib/inferior-slime.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/inferior-slime.el rename to elpa/slime-20200213.1710/contrib/inferior-slime.el diff --git a/elpa/slime-20200209.1437/contrib/inferior-slime.elc b/elpa/slime-20200213.1710/contrib/inferior-slime.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/inferior-slime.elc rename to elpa/slime-20200213.1710/contrib/inferior-slime.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-asdf.el b/elpa/slime-20200213.1710/contrib/slime-asdf.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-asdf.el rename to elpa/slime-20200213.1710/contrib/slime-asdf.el diff --git a/elpa/slime-20200209.1437/contrib/slime-asdf.elc b/elpa/slime-20200213.1710/contrib/slime-asdf.elc similarity index 99% rename from elpa/slime-20200209.1437/contrib/slime-asdf.elc rename to elpa/slime-20200213.1710/contrib/slime-asdf.elc index b7b31d49..7ceb57c2 100644 Binary files a/elpa/slime-20200209.1437/contrib/slime-asdf.elc and b/elpa/slime-20200213.1710/contrib/slime-asdf.elc differ diff --git a/elpa/slime-20200209.1437/contrib/slime-autodoc.el b/elpa/slime-20200213.1710/contrib/slime-autodoc.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-autodoc.el rename to elpa/slime-20200213.1710/contrib/slime-autodoc.el diff --git a/elpa/slime-20200209.1437/contrib/slime-autodoc.elc b/elpa/slime-20200213.1710/contrib/slime-autodoc.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-autodoc.elc rename to elpa/slime-20200213.1710/contrib/slime-autodoc.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-banner.el b/elpa/slime-20200213.1710/contrib/slime-banner.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-banner.el rename to elpa/slime-20200213.1710/contrib/slime-banner.el diff --git a/elpa/slime-20200209.1437/contrib/slime-banner.elc b/elpa/slime-20200213.1710/contrib/slime-banner.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-banner.elc rename to elpa/slime-20200213.1710/contrib/slime-banner.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-buffer-streams.el b/elpa/slime-20200213.1710/contrib/slime-buffer-streams.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-buffer-streams.el rename to elpa/slime-20200213.1710/contrib/slime-buffer-streams.el diff --git a/elpa/slime-20200209.1437/contrib/slime-buffer-streams.elc b/elpa/slime-20200213.1710/contrib/slime-buffer-streams.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-buffer-streams.elc rename to elpa/slime-20200213.1710/contrib/slime-buffer-streams.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-c-p-c.el b/elpa/slime-20200213.1710/contrib/slime-c-p-c.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-c-p-c.el rename to elpa/slime-20200213.1710/contrib/slime-c-p-c.el diff --git a/elpa/slime-20200209.1437/contrib/slime-c-p-c.elc b/elpa/slime-20200213.1710/contrib/slime-c-p-c.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-c-p-c.elc rename to elpa/slime-20200213.1710/contrib/slime-c-p-c.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-cl-indent.el b/elpa/slime-20200213.1710/contrib/slime-cl-indent.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-cl-indent.el rename to elpa/slime-20200213.1710/contrib/slime-cl-indent.el diff --git a/elpa/slime-20200209.1437/contrib/slime-cl-indent.elc b/elpa/slime-20200213.1710/contrib/slime-cl-indent.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-cl-indent.elc rename to elpa/slime-20200213.1710/contrib/slime-cl-indent.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-clipboard.el b/elpa/slime-20200213.1710/contrib/slime-clipboard.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-clipboard.el rename to elpa/slime-20200213.1710/contrib/slime-clipboard.el diff --git a/elpa/slime-20200209.1437/contrib/slime-clipboard.elc b/elpa/slime-20200213.1710/contrib/slime-clipboard.elc similarity index 97% rename from elpa/slime-20200209.1437/contrib/slime-clipboard.elc rename to elpa/slime-20200213.1710/contrib/slime-clipboard.elc index 889550c8..00976f4c 100644 Binary files a/elpa/slime-20200209.1437/contrib/slime-clipboard.elc and b/elpa/slime-20200213.1710/contrib/slime-clipboard.elc differ diff --git a/elpa/slime-20200209.1437/contrib/slime-compiler-notes-tree.el b/elpa/slime-20200213.1710/contrib/slime-compiler-notes-tree.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-compiler-notes-tree.el rename to elpa/slime-20200213.1710/contrib/slime-compiler-notes-tree.el diff --git a/elpa/slime-20200209.1437/contrib/slime-compiler-notes-tree.elc b/elpa/slime-20200213.1710/contrib/slime-compiler-notes-tree.elc similarity index 99% rename from elpa/slime-20200209.1437/contrib/slime-compiler-notes-tree.elc rename to elpa/slime-20200213.1710/contrib/slime-compiler-notes-tree.elc index 88a78640..130ae3ff 100644 Binary files a/elpa/slime-20200209.1437/contrib/slime-compiler-notes-tree.elc and b/elpa/slime-20200213.1710/contrib/slime-compiler-notes-tree.elc differ diff --git a/elpa/slime-20200209.1437/contrib/slime-editing-commands.el b/elpa/slime-20200213.1710/contrib/slime-editing-commands.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-editing-commands.el rename to elpa/slime-20200213.1710/contrib/slime-editing-commands.el diff --git a/elpa/slime-20200209.1437/contrib/slime-editing-commands.elc b/elpa/slime-20200213.1710/contrib/slime-editing-commands.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-editing-commands.elc rename to elpa/slime-20200213.1710/contrib/slime-editing-commands.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-enclosing-context.el b/elpa/slime-20200213.1710/contrib/slime-enclosing-context.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-enclosing-context.el rename to elpa/slime-20200213.1710/contrib/slime-enclosing-context.el diff --git a/elpa/slime-20200209.1437/contrib/slime-enclosing-context.elc b/elpa/slime-20200213.1710/contrib/slime-enclosing-context.elc similarity index 99% rename from elpa/slime-20200209.1437/contrib/slime-enclosing-context.elc rename to elpa/slime-20200213.1710/contrib/slime-enclosing-context.elc index c752531d..b521078f 100644 Binary files a/elpa/slime-20200209.1437/contrib/slime-enclosing-context.elc and b/elpa/slime-20200213.1710/contrib/slime-enclosing-context.elc differ diff --git a/elpa/slime-20200209.1437/contrib/slime-fancy-inspector.el b/elpa/slime-20200213.1710/contrib/slime-fancy-inspector.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-fancy-inspector.el rename to elpa/slime-20200213.1710/contrib/slime-fancy-inspector.el diff --git a/elpa/slime-20200209.1437/contrib/slime-fancy-inspector.elc b/elpa/slime-20200213.1710/contrib/slime-fancy-inspector.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-fancy-inspector.elc rename to elpa/slime-20200213.1710/contrib/slime-fancy-inspector.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-fancy-trace.el b/elpa/slime-20200213.1710/contrib/slime-fancy-trace.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-fancy-trace.el rename to elpa/slime-20200213.1710/contrib/slime-fancy-trace.el diff --git a/elpa/slime-20200209.1437/contrib/slime-fancy-trace.elc b/elpa/slime-20200213.1710/contrib/slime-fancy-trace.elc similarity index 97% rename from elpa/slime-20200209.1437/contrib/slime-fancy-trace.elc rename to elpa/slime-20200213.1710/contrib/slime-fancy-trace.elc index 29f92d00..12ef28cc 100644 Binary files a/elpa/slime-20200209.1437/contrib/slime-fancy-trace.elc and b/elpa/slime-20200213.1710/contrib/slime-fancy-trace.elc differ diff --git a/elpa/slime-20200209.1437/contrib/slime-fancy.el b/elpa/slime-20200213.1710/contrib/slime-fancy.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-fancy.el rename to elpa/slime-20200213.1710/contrib/slime-fancy.el diff --git a/elpa/slime-20200209.1437/contrib/slime-fancy.elc b/elpa/slime-20200213.1710/contrib/slime-fancy.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-fancy.elc rename to elpa/slime-20200213.1710/contrib/slime-fancy.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-fontifying-fu.el b/elpa/slime-20200213.1710/contrib/slime-fontifying-fu.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-fontifying-fu.el rename to elpa/slime-20200213.1710/contrib/slime-fontifying-fu.el diff --git a/elpa/slime-20200209.1437/contrib/slime-fontifying-fu.elc b/elpa/slime-20200213.1710/contrib/slime-fontifying-fu.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-fontifying-fu.elc rename to elpa/slime-20200213.1710/contrib/slime-fontifying-fu.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-fuzzy.el b/elpa/slime-20200213.1710/contrib/slime-fuzzy.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-fuzzy.el rename to elpa/slime-20200213.1710/contrib/slime-fuzzy.el diff --git a/elpa/slime-20200209.1437/contrib/slime-fuzzy.elc b/elpa/slime-20200213.1710/contrib/slime-fuzzy.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-fuzzy.elc rename to elpa/slime-20200213.1710/contrib/slime-fuzzy.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-highlight-edits.el b/elpa/slime-20200213.1710/contrib/slime-highlight-edits.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-highlight-edits.el rename to elpa/slime-20200213.1710/contrib/slime-highlight-edits.el diff --git a/elpa/slime-20200209.1437/contrib/slime-highlight-edits.elc b/elpa/slime-20200213.1710/contrib/slime-highlight-edits.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-highlight-edits.elc rename to elpa/slime-20200213.1710/contrib/slime-highlight-edits.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-hyperdoc.el b/elpa/slime-20200213.1710/contrib/slime-hyperdoc.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-hyperdoc.el rename to elpa/slime-20200213.1710/contrib/slime-hyperdoc.el diff --git a/elpa/slime-20200209.1437/contrib/slime-hyperdoc.elc b/elpa/slime-20200213.1710/contrib/slime-hyperdoc.elc similarity index 97% rename from elpa/slime-20200209.1437/contrib/slime-hyperdoc.elc rename to elpa/slime-20200213.1710/contrib/slime-hyperdoc.elc index adca6eb1..f947d0d1 100644 Binary files a/elpa/slime-20200209.1437/contrib/slime-hyperdoc.elc and b/elpa/slime-20200213.1710/contrib/slime-hyperdoc.elc differ diff --git a/elpa/slime-20200209.1437/contrib/slime-indentation.el b/elpa/slime-20200213.1710/contrib/slime-indentation.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-indentation.el rename to elpa/slime-20200213.1710/contrib/slime-indentation.el diff --git a/elpa/slime-20200209.1437/contrib/slime-indentation.elc b/elpa/slime-20200213.1710/contrib/slime-indentation.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-indentation.elc rename to elpa/slime-20200213.1710/contrib/slime-indentation.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-listener-hooks.el b/elpa/slime-20200213.1710/contrib/slime-listener-hooks.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-listener-hooks.el rename to elpa/slime-20200213.1710/contrib/slime-listener-hooks.el diff --git a/elpa/slime-20200209.1437/contrib/slime-listener-hooks.elc b/elpa/slime-20200213.1710/contrib/slime-listener-hooks.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-listener-hooks.elc rename to elpa/slime-20200213.1710/contrib/slime-listener-hooks.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-macrostep.el b/elpa/slime-20200213.1710/contrib/slime-macrostep.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-macrostep.el rename to elpa/slime-20200213.1710/contrib/slime-macrostep.el diff --git a/elpa/slime-20200209.1437/contrib/slime-macrostep.elc b/elpa/slime-20200213.1710/contrib/slime-macrostep.elc similarity index 97% rename from elpa/slime-20200209.1437/contrib/slime-macrostep.elc rename to elpa/slime-20200213.1710/contrib/slime-macrostep.elc index 445a82ed..ab5cdac6 100644 Binary files a/elpa/slime-20200209.1437/contrib/slime-macrostep.elc and b/elpa/slime-20200213.1710/contrib/slime-macrostep.elc differ diff --git a/elpa/slime-20200209.1437/contrib/slime-mdot-fu.el b/elpa/slime-20200213.1710/contrib/slime-mdot-fu.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-mdot-fu.el rename to elpa/slime-20200213.1710/contrib/slime-mdot-fu.el diff --git a/elpa/slime-20200209.1437/contrib/slime-mdot-fu.elc b/elpa/slime-20200213.1710/contrib/slime-mdot-fu.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-mdot-fu.elc rename to elpa/slime-20200213.1710/contrib/slime-mdot-fu.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-media.el b/elpa/slime-20200213.1710/contrib/slime-media.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-media.el rename to elpa/slime-20200213.1710/contrib/slime-media.el diff --git a/elpa/slime-20200209.1437/contrib/slime-media.elc b/elpa/slime-20200213.1710/contrib/slime-media.elc similarity index 90% rename from elpa/slime-20200209.1437/contrib/slime-media.elc rename to elpa/slime-20200213.1710/contrib/slime-media.elc index 2c18749f..16087ad6 100644 Binary files a/elpa/slime-20200209.1437/contrib/slime-media.elc and b/elpa/slime-20200213.1710/contrib/slime-media.elc differ diff --git a/elpa/slime-20200209.1437/contrib/slime-mrepl.el b/elpa/slime-20200213.1710/contrib/slime-mrepl.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-mrepl.el rename to elpa/slime-20200213.1710/contrib/slime-mrepl.el diff --git a/elpa/slime-20200209.1437/contrib/slime-mrepl.elc b/elpa/slime-20200213.1710/contrib/slime-mrepl.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-mrepl.elc rename to elpa/slime-20200213.1710/contrib/slime-mrepl.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-package-fu.el b/elpa/slime-20200213.1710/contrib/slime-package-fu.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-package-fu.el rename to elpa/slime-20200213.1710/contrib/slime-package-fu.el diff --git a/elpa/slime-20200209.1437/contrib/slime-package-fu.elc b/elpa/slime-20200213.1710/contrib/slime-package-fu.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-package-fu.elc rename to elpa/slime-20200213.1710/contrib/slime-package-fu.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-parse.el b/elpa/slime-20200213.1710/contrib/slime-parse.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-parse.el rename to elpa/slime-20200213.1710/contrib/slime-parse.el diff --git a/elpa/slime-20200209.1437/contrib/slime-parse.elc b/elpa/slime-20200213.1710/contrib/slime-parse.elc similarity index 98% rename from elpa/slime-20200209.1437/contrib/slime-parse.elc rename to elpa/slime-20200213.1710/contrib/slime-parse.elc index 24633c00..c1047963 100644 Binary files a/elpa/slime-20200209.1437/contrib/slime-parse.elc and b/elpa/slime-20200213.1710/contrib/slime-parse.elc differ diff --git a/elpa/slime-20200209.1437/contrib/slime-presentation-streams.el b/elpa/slime-20200213.1710/contrib/slime-presentation-streams.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-presentation-streams.el rename to elpa/slime-20200213.1710/contrib/slime-presentation-streams.el diff --git a/elpa/slime-20200209.1437/contrib/slime-presentation-streams.elc b/elpa/slime-20200213.1710/contrib/slime-presentation-streams.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-presentation-streams.elc rename to elpa/slime-20200213.1710/contrib/slime-presentation-streams.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-presentations.el b/elpa/slime-20200213.1710/contrib/slime-presentations.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-presentations.el rename to elpa/slime-20200213.1710/contrib/slime-presentations.el diff --git a/elpa/slime-20200209.1437/contrib/slime-presentations.elc b/elpa/slime-20200213.1710/contrib/slime-presentations.elc similarity index 99% rename from elpa/slime-20200209.1437/contrib/slime-presentations.elc rename to elpa/slime-20200213.1710/contrib/slime-presentations.elc index 80ced045..8442f011 100644 Binary files a/elpa/slime-20200209.1437/contrib/slime-presentations.elc and b/elpa/slime-20200213.1710/contrib/slime-presentations.elc differ diff --git a/elpa/slime-20200209.1437/contrib/slime-quicklisp.el b/elpa/slime-20200213.1710/contrib/slime-quicklisp.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-quicklisp.el rename to elpa/slime-20200213.1710/contrib/slime-quicklisp.el diff --git a/elpa/slime-20200209.1437/contrib/slime-quicklisp.elc b/elpa/slime-20200213.1710/contrib/slime-quicklisp.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-quicklisp.elc rename to elpa/slime-20200213.1710/contrib/slime-quicklisp.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-references.el b/elpa/slime-20200213.1710/contrib/slime-references.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-references.el rename to elpa/slime-20200213.1710/contrib/slime-references.el diff --git a/elpa/slime-20200209.1437/contrib/slime-references.elc b/elpa/slime-20200213.1710/contrib/slime-references.elc similarity index 96% rename from elpa/slime-20200209.1437/contrib/slime-references.elc rename to elpa/slime-20200213.1710/contrib/slime-references.elc index 002d12be..2e3016fa 100644 Binary files a/elpa/slime-20200209.1437/contrib/slime-references.elc and b/elpa/slime-20200213.1710/contrib/slime-references.elc differ diff --git a/elpa/slime-20200209.1437/contrib/slime-repl.el b/elpa/slime-20200213.1710/contrib/slime-repl.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-repl.el rename to elpa/slime-20200213.1710/contrib/slime-repl.el diff --git a/elpa/slime-20200209.1437/contrib/slime-repl.elc b/elpa/slime-20200213.1710/contrib/slime-repl.elc similarity index 98% rename from elpa/slime-20200209.1437/contrib/slime-repl.elc rename to elpa/slime-20200213.1710/contrib/slime-repl.elc index ff1a94be..6fd63da5 100644 Binary files a/elpa/slime-20200209.1437/contrib/slime-repl.elc and b/elpa/slime-20200213.1710/contrib/slime-repl.elc differ diff --git a/elpa/slime-20200209.1437/contrib/slime-sbcl-exts.el b/elpa/slime-20200213.1710/contrib/slime-sbcl-exts.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-sbcl-exts.el rename to elpa/slime-20200213.1710/contrib/slime-sbcl-exts.el diff --git a/elpa/slime-20200209.1437/contrib/slime-sbcl-exts.elc b/elpa/slime-20200213.1710/contrib/slime-sbcl-exts.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-sbcl-exts.elc rename to elpa/slime-20200213.1710/contrib/slime-sbcl-exts.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-scheme.el b/elpa/slime-20200213.1710/contrib/slime-scheme.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-scheme.el rename to elpa/slime-20200213.1710/contrib/slime-scheme.el diff --git a/elpa/slime-20200209.1437/contrib/slime-scheme.elc b/elpa/slime-20200213.1710/contrib/slime-scheme.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-scheme.elc rename to elpa/slime-20200213.1710/contrib/slime-scheme.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-scratch.el b/elpa/slime-20200213.1710/contrib/slime-scratch.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-scratch.el rename to elpa/slime-20200213.1710/contrib/slime-scratch.el diff --git a/elpa/slime-20200209.1437/contrib/slime-scratch.elc b/elpa/slime-20200213.1710/contrib/slime-scratch.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-scratch.elc rename to elpa/slime-20200213.1710/contrib/slime-scratch.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-snapshot.el b/elpa/slime-20200213.1710/contrib/slime-snapshot.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-snapshot.el rename to elpa/slime-20200213.1710/contrib/slime-snapshot.el diff --git a/elpa/slime-20200209.1437/contrib/slime-snapshot.elc b/elpa/slime-20200213.1710/contrib/slime-snapshot.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-snapshot.elc rename to elpa/slime-20200213.1710/contrib/slime-snapshot.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-sprof.el b/elpa/slime-20200213.1710/contrib/slime-sprof.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-sprof.el rename to elpa/slime-20200213.1710/contrib/slime-sprof.el diff --git a/elpa/slime-20200209.1437/contrib/slime-sprof.elc b/elpa/slime-20200213.1710/contrib/slime-sprof.elc similarity index 97% rename from elpa/slime-20200209.1437/contrib/slime-sprof.elc rename to elpa/slime-20200213.1710/contrib/slime-sprof.elc index 45541c5f..0f2dbe3a 100644 Binary files a/elpa/slime-20200209.1437/contrib/slime-sprof.elc and b/elpa/slime-20200213.1710/contrib/slime-sprof.elc differ diff --git a/elpa/slime-20200209.1437/contrib/slime-trace-dialog.el b/elpa/slime-20200213.1710/contrib/slime-trace-dialog.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-trace-dialog.el rename to elpa/slime-20200213.1710/contrib/slime-trace-dialog.el diff --git a/elpa/slime-20200209.1437/contrib/slime-trace-dialog.elc b/elpa/slime-20200213.1710/contrib/slime-trace-dialog.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-trace-dialog.elc rename to elpa/slime-20200213.1710/contrib/slime-trace-dialog.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-tramp.el b/elpa/slime-20200213.1710/contrib/slime-tramp.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-tramp.el rename to elpa/slime-20200213.1710/contrib/slime-tramp.el diff --git a/elpa/slime-20200209.1437/contrib/slime-tramp.elc b/elpa/slime-20200213.1710/contrib/slime-tramp.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-tramp.elc rename to elpa/slime-20200213.1710/contrib/slime-tramp.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-typeout-frame.el b/elpa/slime-20200213.1710/contrib/slime-typeout-frame.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-typeout-frame.el rename to elpa/slime-20200213.1710/contrib/slime-typeout-frame.el diff --git a/elpa/slime-20200209.1437/contrib/slime-typeout-frame.elc b/elpa/slime-20200213.1710/contrib/slime-typeout-frame.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-typeout-frame.elc rename to elpa/slime-20200213.1710/contrib/slime-typeout-frame.elc diff --git a/elpa/slime-20200209.1437/contrib/slime-xref-browser.el b/elpa/slime-20200213.1710/contrib/slime-xref-browser.el similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-xref-browser.el rename to elpa/slime-20200213.1710/contrib/slime-xref-browser.el diff --git a/elpa/slime-20200209.1437/contrib/slime-xref-browser.elc b/elpa/slime-20200213.1710/contrib/slime-xref-browser.elc similarity index 100% rename from elpa/slime-20200209.1437/contrib/slime-xref-browser.elc rename to elpa/slime-20200213.1710/contrib/slime-xref-browser.elc diff --git a/elpa/slime-20200209.1437/contrib/swank-arglists.lisp b/elpa/slime-20200213.1710/contrib/swank-arglists.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-arglists.lisp rename to elpa/slime-20200213.1710/contrib/swank-arglists.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-asdf.lisp b/elpa/slime-20200213.1710/contrib/swank-asdf.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-asdf.lisp rename to elpa/slime-20200213.1710/contrib/swank-asdf.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-buffer-streams.lisp b/elpa/slime-20200213.1710/contrib/swank-buffer-streams.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-buffer-streams.lisp rename to elpa/slime-20200213.1710/contrib/swank-buffer-streams.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-c-p-c.lisp b/elpa/slime-20200213.1710/contrib/swank-c-p-c.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-c-p-c.lisp rename to elpa/slime-20200213.1710/contrib/swank-c-p-c.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-clipboard.lisp b/elpa/slime-20200213.1710/contrib/swank-clipboard.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-clipboard.lisp rename to elpa/slime-20200213.1710/contrib/swank-clipboard.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-fancy-inspector.lisp b/elpa/slime-20200213.1710/contrib/swank-fancy-inspector.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-fancy-inspector.lisp rename to elpa/slime-20200213.1710/contrib/swank-fancy-inspector.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-fuzzy.lisp b/elpa/slime-20200213.1710/contrib/swank-fuzzy.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-fuzzy.lisp rename to elpa/slime-20200213.1710/contrib/swank-fuzzy.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-goo.goo b/elpa/slime-20200213.1710/contrib/swank-goo.goo similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-goo.goo rename to elpa/slime-20200213.1710/contrib/swank-goo.goo diff --git a/elpa/slime-20200209.1437/contrib/swank-hyperdoc.lisp b/elpa/slime-20200213.1710/contrib/swank-hyperdoc.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-hyperdoc.lisp rename to elpa/slime-20200213.1710/contrib/swank-hyperdoc.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-ikarus.ss b/elpa/slime-20200213.1710/contrib/swank-ikarus.ss similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-ikarus.ss rename to elpa/slime-20200213.1710/contrib/swank-ikarus.ss diff --git a/elpa/slime-20200209.1437/contrib/swank-indentation.lisp b/elpa/slime-20200213.1710/contrib/swank-indentation.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-indentation.lisp rename to elpa/slime-20200213.1710/contrib/swank-indentation.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-jolt.k b/elpa/slime-20200213.1710/contrib/swank-jolt.k similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-jolt.k rename to elpa/slime-20200213.1710/contrib/swank-jolt.k diff --git a/elpa/slime-20200209.1437/contrib/swank-kawa.scm b/elpa/slime-20200213.1710/contrib/swank-kawa.scm similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-kawa.scm rename to elpa/slime-20200213.1710/contrib/swank-kawa.scm diff --git a/elpa/slime-20200209.1437/contrib/swank-larceny.scm b/elpa/slime-20200213.1710/contrib/swank-larceny.scm similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-larceny.scm rename to elpa/slime-20200213.1710/contrib/swank-larceny.scm diff --git a/elpa/slime-20200209.1437/contrib/swank-listener-hooks.lisp b/elpa/slime-20200213.1710/contrib/swank-listener-hooks.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-listener-hooks.lisp rename to elpa/slime-20200213.1710/contrib/swank-listener-hooks.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-macrostep.lisp b/elpa/slime-20200213.1710/contrib/swank-macrostep.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-macrostep.lisp rename to elpa/slime-20200213.1710/contrib/swank-macrostep.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-media.lisp b/elpa/slime-20200213.1710/contrib/swank-media.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-media.lisp rename to elpa/slime-20200213.1710/contrib/swank-media.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-mit-scheme.scm b/elpa/slime-20200213.1710/contrib/swank-mit-scheme.scm similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-mit-scheme.scm rename to elpa/slime-20200213.1710/contrib/swank-mit-scheme.scm diff --git a/elpa/slime-20200209.1437/contrib/swank-mlworks.sml b/elpa/slime-20200213.1710/contrib/swank-mlworks.sml similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-mlworks.sml rename to elpa/slime-20200213.1710/contrib/swank-mlworks.sml diff --git a/elpa/slime-20200209.1437/contrib/swank-mrepl.lisp b/elpa/slime-20200213.1710/contrib/swank-mrepl.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-mrepl.lisp rename to elpa/slime-20200213.1710/contrib/swank-mrepl.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-package-fu.lisp b/elpa/slime-20200213.1710/contrib/swank-package-fu.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-package-fu.lisp rename to elpa/slime-20200213.1710/contrib/swank-package-fu.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-presentation-streams.lisp b/elpa/slime-20200213.1710/contrib/swank-presentation-streams.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-presentation-streams.lisp rename to elpa/slime-20200213.1710/contrib/swank-presentation-streams.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-presentations.lisp b/elpa/slime-20200213.1710/contrib/swank-presentations.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-presentations.lisp rename to elpa/slime-20200213.1710/contrib/swank-presentations.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-quicklisp.lisp b/elpa/slime-20200213.1710/contrib/swank-quicklisp.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-quicklisp.lisp rename to elpa/slime-20200213.1710/contrib/swank-quicklisp.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-r6rs.scm b/elpa/slime-20200213.1710/contrib/swank-r6rs.scm similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-r6rs.scm rename to elpa/slime-20200213.1710/contrib/swank-r6rs.scm diff --git a/elpa/slime-20200209.1437/contrib/swank-repl.lisp b/elpa/slime-20200213.1710/contrib/swank-repl.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-repl.lisp rename to elpa/slime-20200213.1710/contrib/swank-repl.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-sbcl-exts.lisp b/elpa/slime-20200213.1710/contrib/swank-sbcl-exts.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-sbcl-exts.lisp rename to elpa/slime-20200213.1710/contrib/swank-sbcl-exts.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-snapshot.lisp b/elpa/slime-20200213.1710/contrib/swank-snapshot.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-snapshot.lisp rename to elpa/slime-20200213.1710/contrib/swank-snapshot.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-sprof.lisp b/elpa/slime-20200213.1710/contrib/swank-sprof.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-sprof.lisp rename to elpa/slime-20200213.1710/contrib/swank-sprof.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-trace-dialog.lisp b/elpa/slime-20200213.1710/contrib/swank-trace-dialog.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-trace-dialog.lisp rename to elpa/slime-20200213.1710/contrib/swank-trace-dialog.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank-util.lisp b/elpa/slime-20200213.1710/contrib/swank-util.lisp similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank-util.lisp rename to elpa/slime-20200213.1710/contrib/swank-util.lisp diff --git a/elpa/slime-20200209.1437/contrib/swank.rb b/elpa/slime-20200213.1710/contrib/swank.rb similarity index 100% rename from elpa/slime-20200209.1437/contrib/swank.rb rename to elpa/slime-20200213.1710/contrib/swank.rb diff --git a/elpa/slime-20200209.1437/dir b/elpa/slime-20200213.1710/dir similarity index 100% rename from elpa/slime-20200209.1437/dir rename to elpa/slime-20200213.1710/dir diff --git a/elpa/slime-20200209.1437/lib/hyperspec.el b/elpa/slime-20200213.1710/lib/hyperspec.el similarity index 100% rename from elpa/slime-20200209.1437/lib/hyperspec.el rename to elpa/slime-20200213.1710/lib/hyperspec.el diff --git a/elpa/slime-20200209.1437/lib/hyperspec.elc b/elpa/slime-20200213.1710/lib/hyperspec.elc similarity index 100% rename from elpa/slime-20200209.1437/lib/hyperspec.elc rename to elpa/slime-20200213.1710/lib/hyperspec.elc diff --git a/elpa/slime-20200209.1437/metering.lisp b/elpa/slime-20200213.1710/metering.lisp similarity index 100% rename from elpa/slime-20200209.1437/metering.lisp rename to elpa/slime-20200213.1710/metering.lisp diff --git a/elpa/slime-20200209.1437/nregex.lisp b/elpa/slime-20200213.1710/nregex.lisp similarity index 100% rename from elpa/slime-20200209.1437/nregex.lisp rename to elpa/slime-20200213.1710/nregex.lisp diff --git a/elpa/slime-20200209.1437/packages.lisp b/elpa/slime-20200213.1710/packages.lisp similarity index 100% rename from elpa/slime-20200209.1437/packages.lisp rename to elpa/slime-20200213.1710/packages.lisp diff --git a/elpa/slime-20200209.1437/sbcl-pprint-patch.lisp b/elpa/slime-20200213.1710/sbcl-pprint-patch.lisp similarity index 100% rename from elpa/slime-20200209.1437/sbcl-pprint-patch.lisp rename to elpa/slime-20200213.1710/sbcl-pprint-patch.lisp diff --git a/elpa/slime-20200209.1437/slime-autoloads.el b/elpa/slime-20200213.1710/slime-autoloads.el similarity index 100% rename from elpa/slime-20200209.1437/slime-autoloads.el rename to elpa/slime-20200213.1710/slime-autoloads.el diff --git a/elpa/slime-20200209.1437/slime-pkg.el b/elpa/slime-20200213.1710/slime-pkg.el similarity index 75% rename from elpa/slime-20200209.1437/slime-pkg.el rename to elpa/slime-20200213.1710/slime-pkg.el index 5febb623..acc6d53d 100644 --- a/elpa/slime-20200209.1437/slime-pkg.el +++ b/elpa/slime-20200213.1710/slime-pkg.el @@ -1,4 +1,4 @@ -(define-package "slime" "20200209.1437" "Superior Lisp Interaction Mode for Emacs" +(define-package "slime" "20200213.1710" "Superior Lisp Interaction Mode for Emacs" '((cl-lib "0.5") (macrostep "0.9")) :keywords diff --git a/elpa/slime-20200209.1437/slime-tests.el b/elpa/slime-20200213.1710/slime-tests.el similarity index 100% rename from elpa/slime-20200209.1437/slime-tests.el rename to elpa/slime-20200213.1710/slime-tests.el diff --git a/elpa/slime-20200209.1437/slime-tests.elc b/elpa/slime-20200213.1710/slime-tests.elc similarity index 98% rename from elpa/slime-20200209.1437/slime-tests.elc rename to elpa/slime-20200213.1710/slime-tests.elc index 2d3e28a5..55001ee6 100644 Binary files a/elpa/slime-20200209.1437/slime-tests.elc and b/elpa/slime-20200213.1710/slime-tests.elc differ diff --git a/elpa/slime-20200209.1437/slime.el b/elpa/slime-20200213.1710/slime.el similarity index 100% rename from elpa/slime-20200209.1437/slime.el rename to elpa/slime-20200213.1710/slime.el diff --git a/elpa/slime-20200209.1437/slime.elc b/elpa/slime-20200213.1710/slime.elc similarity index 99% rename from elpa/slime-20200209.1437/slime.elc rename to elpa/slime-20200213.1710/slime.elc index 44afa0d4..99b87796 100644 Binary files a/elpa/slime-20200209.1437/slime.elc and b/elpa/slime-20200213.1710/slime.elc differ diff --git a/elpa/slime-20200209.1437/slime.info b/elpa/slime-20200213.1710/slime.info similarity index 99% rename from elpa/slime-20200209.1437/slime.info rename to elpa/slime-20200213.1710/slime.info index bf96dd92..94ae7ba0 100644 --- a/elpa/slime-20200209.1437/slime.info +++ b/elpa/slime-20200213.1710/slime.info @@ -15,7 +15,7 @@ SLIME ***** SLIME is the “Superior Lisp Interaction Mode for Emacs”. This is the -manual for version 2.24. (Last updated February 12, 2020) +manual for version 2.24. (Last updated February 14, 2020) Written by Luke Gorrie and others. diff --git a/elpa/slime-20200209.1437/start-swank.lisp b/elpa/slime-20200213.1710/start-swank.lisp similarity index 100% rename from elpa/slime-20200209.1437/start-swank.lisp rename to elpa/slime-20200213.1710/start-swank.lisp diff --git a/elpa/slime-20200209.1437/swank-loader.lisp b/elpa/slime-20200213.1710/swank-loader.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank-loader.lisp rename to elpa/slime-20200213.1710/swank-loader.lisp diff --git a/elpa/slime-20200209.1437/swank.asd b/elpa/slime-20200213.1710/swank.asd similarity index 100% rename from elpa/slime-20200209.1437/swank.asd rename to elpa/slime-20200213.1710/swank.asd diff --git a/elpa/slime-20200209.1437/swank.lisp b/elpa/slime-20200213.1710/swank.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank.lisp rename to elpa/slime-20200213.1710/swank.lisp diff --git a/elpa/slime-20200209.1437/swank/abcl.lisp b/elpa/slime-20200213.1710/swank/abcl.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/abcl.lisp rename to elpa/slime-20200213.1710/swank/abcl.lisp diff --git a/elpa/slime-20200209.1437/swank/allegro.lisp b/elpa/slime-20200213.1710/swank/allegro.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/allegro.lisp rename to elpa/slime-20200213.1710/swank/allegro.lisp diff --git a/elpa/slime-20200209.1437/swank/backend.lisp b/elpa/slime-20200213.1710/swank/backend.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/backend.lisp rename to elpa/slime-20200213.1710/swank/backend.lisp diff --git a/elpa/slime-20200209.1437/swank/ccl.lisp b/elpa/slime-20200213.1710/swank/ccl.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/ccl.lisp rename to elpa/slime-20200213.1710/swank/ccl.lisp diff --git a/elpa/slime-20200209.1437/swank/clasp.lisp b/elpa/slime-20200213.1710/swank/clasp.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/clasp.lisp rename to elpa/slime-20200213.1710/swank/clasp.lisp diff --git a/elpa/slime-20200209.1437/swank/clisp.lisp b/elpa/slime-20200213.1710/swank/clisp.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/clisp.lisp rename to elpa/slime-20200213.1710/swank/clisp.lisp diff --git a/elpa/slime-20200209.1437/swank/cmucl.lisp b/elpa/slime-20200213.1710/swank/cmucl.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/cmucl.lisp rename to elpa/slime-20200213.1710/swank/cmucl.lisp diff --git a/elpa/slime-20200209.1437/swank/corman.lisp b/elpa/slime-20200213.1710/swank/corman.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/corman.lisp rename to elpa/slime-20200213.1710/swank/corman.lisp diff --git a/elpa/slime-20200209.1437/swank/ecl.lisp b/elpa/slime-20200213.1710/swank/ecl.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/ecl.lisp rename to elpa/slime-20200213.1710/swank/ecl.lisp diff --git a/elpa/slime-20200209.1437/swank/gray.lisp b/elpa/slime-20200213.1710/swank/gray.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/gray.lisp rename to elpa/slime-20200213.1710/swank/gray.lisp diff --git a/elpa/slime-20200209.1437/swank/lispworks.lisp b/elpa/slime-20200213.1710/swank/lispworks.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/lispworks.lisp rename to elpa/slime-20200213.1710/swank/lispworks.lisp diff --git a/elpa/slime-20200209.1437/swank/match.lisp b/elpa/slime-20200213.1710/swank/match.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/match.lisp rename to elpa/slime-20200213.1710/swank/match.lisp diff --git a/elpa/slime-20200209.1437/swank/mezzano.lisp b/elpa/slime-20200213.1710/swank/mezzano.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/mezzano.lisp rename to elpa/slime-20200213.1710/swank/mezzano.lisp diff --git a/elpa/slime-20200209.1437/swank/mkcl.lisp b/elpa/slime-20200213.1710/swank/mkcl.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/mkcl.lisp rename to elpa/slime-20200213.1710/swank/mkcl.lisp diff --git a/elpa/slime-20200209.1437/swank/rpc.lisp b/elpa/slime-20200213.1710/swank/rpc.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/rpc.lisp rename to elpa/slime-20200213.1710/swank/rpc.lisp diff --git a/elpa/slime-20200209.1437/swank/sbcl.lisp b/elpa/slime-20200213.1710/swank/sbcl.lisp similarity index 99% rename from elpa/slime-20200209.1437/swank/sbcl.lisp rename to elpa/slime-20200213.1710/swank/sbcl.lisp index 779ca85f..dc7c22dc 100644 --- a/elpa/slime-20200209.1437/swank/sbcl.lisp +++ b/elpa/slime-20200213.1710/swank/sbcl.lisp @@ -807,7 +807,11 @@ QUALITIES is an alist with (quality . value)" (defimplementation find-definitions (name) (loop for type in *definition-types* by #'cddr for defsrcs = (sb-introspect:find-definition-sources-by-name name type) - append (loop for defsrc in defsrcs collect + for filtered-defsrcs = (if (eq type :generic-function) + (remove :invalid defsrcs + :key #'categorize-definition-source) + defsrcs) + append (loop for defsrc in filtered-defsrcs collect (list (make-dspec type name defsrc) (converting-errors-to-error-location (definition-source-for-emacs defsrc @@ -862,7 +866,7 @@ QUALITIES is an alist with (quality . value)" (defun categorize-definition-source (definition-source) (with-definition-source (pathname form-path character-offset plist) - definition-source + definition-source (let ((file-p (and pathname (probe-file pathname) (or form-path character-offset)))) (cond ((and (getf plist :emacs-buffer) file-p) :buffer-and-file) diff --git a/elpa/slime-20200209.1437/swank/scl.lisp b/elpa/slime-20200213.1710/swank/scl.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/scl.lisp rename to elpa/slime-20200213.1710/swank/scl.lisp diff --git a/elpa/slime-20200209.1437/swank/source-file-cache.lisp b/elpa/slime-20200213.1710/swank/source-file-cache.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/source-file-cache.lisp rename to elpa/slime-20200213.1710/swank/source-file-cache.lisp diff --git a/elpa/slime-20200209.1437/swank/source-path-parser.lisp b/elpa/slime-20200213.1710/swank/source-path-parser.lisp similarity index 100% rename from elpa/slime-20200209.1437/swank/source-path-parser.lisp rename to elpa/slime-20200213.1710/swank/source-path-parser.lisp diff --git a/elpa/slime-20200209.1437/xref.lisp b/elpa/slime-20200213.1710/xref.lisp similarity index 100% rename from elpa/slime-20200209.1437/xref.lisp rename to elpa/slime-20200213.1710/xref.lisp diff --git a/init.el b/init.el index 8a14c1d4..ba8a6ed1 100755 --- a/init.el +++ b/init.el @@ -4,13 +4,11 @@ (global-set-key (kbd "C-c c") 'org-capture) (global-set-key (kbd "C-c b") 'org-switchb) (global-set-key (kbd "C-c C-x m") 'org-pomodoro) - (global-set-key (kbd "C-x g") 'magit-status) (global-set-key (kbd "C-x M-g") 'magit-dispatch) - -(global-unset-key "\C-z") - (global-set-key (kbd "M-i") 'imenu) +(global-set-key (kbd "C-c n") 'newsticker-start) +(global-unset-key "\C-z") ;; start a server, unless one is already running (require 'server)