diff --git a/bundle/custom.el b/bundle/custom.el index 54bfd098..e257b466 100644 --- a/bundle/custom.el +++ b/bundle/custom.el @@ -9,7 +9,7 @@ '(column-number-mode t) '(custom-safe-themes (quote - ("4c0739c6ad6fd91ebd737f8f40527d279cc5f85bc286a7c0d7467b4a6ba53166" "6096a2f93610f29bf0f6fe34307587edd21edec95073cbfcfb9d7a3b9206b399" "bffa9739ce0752a37d9b1eee78fc00ba159748f50dc328af4be661484848e476" "64d8237b42b3b01f1487a908836574a5e531ea5efab54b9afa19fb8fda471ab3" "4bdc0dfc53ae06323e031baf691f414babf13c9c9c35014dd07bb42c4db27c24" "d6c5b8dc6049f2e9dabdfcafa9ef2079352640e80dffe3e6cc07c0f89cbf9748" "fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" "fa2af0c40576f3bde32290d7f4e7aa865eb6bf7ebe31eb9e37c32aa6f4ae8d10" "e396098fd5bef4f0dd6cedd01ea48df1ecb0554d8be0d8a924fb1d926f02f90f" "acfac6b14461a344f97fad30e2362c26a3fe56a9f095653832d8fc029cb9d05c" "85d1dbf2fc0e5d30f236712b831fb24faf6052f3114964fdeadede8e1b329832" "4639288d273cbd3dc880992e6032f9c817f17c4a91f00f3872009a099f5b3f84" "14c848e2c4a0a11fcd118e2519078aa50bb6020f89035423b40fff421fb24fbd" "cdb4ffdecc682978da78700a461cdc77456c3a6df1c1803ae2dd55c59fa703e3" "9e31aff9afe3c20a33dd966b4c54c6a5151f07659362e4b06bde38ded5370dae" "24fc62afe2e5f0609e436aa2427b396adf9a958a8fa660edbaab5fb13c08aae6" "82358261c32ebedfee2ca0f87299f74008a2e5ba5c502bde7aaa15db20ee3731" "4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default))) + ("7f6d4aebcc44c264a64e714c3d9d1e903284305fd7e319e7cb73345a9994f5ef" "4c0739c6ad6fd91ebd737f8f40527d279cc5f85bc286a7c0d7467b4a6ba53166" "6096a2f93610f29bf0f6fe34307587edd21edec95073cbfcfb9d7a3b9206b399" "bffa9739ce0752a37d9b1eee78fc00ba159748f50dc328af4be661484848e476" "64d8237b42b3b01f1487a908836574a5e531ea5efab54b9afa19fb8fda471ab3" "4bdc0dfc53ae06323e031baf691f414babf13c9c9c35014dd07bb42c4db27c24" "d6c5b8dc6049f2e9dabdfcafa9ef2079352640e80dffe3e6cc07c0f89cbf9748" "fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" "fa2af0c40576f3bde32290d7f4e7aa865eb6bf7ebe31eb9e37c32aa6f4ae8d10" "e396098fd5bef4f0dd6cedd01ea48df1ecb0554d8be0d8a924fb1d926f02f90f" "acfac6b14461a344f97fad30e2362c26a3fe56a9f095653832d8fc029cb9d05c" "85d1dbf2fc0e5d30f236712b831fb24faf6052f3114964fdeadede8e1b329832" "4639288d273cbd3dc880992e6032f9c817f17c4a91f00f3872009a099f5b3f84" "14c848e2c4a0a11fcd118e2519078aa50bb6020f89035423b40fff421fb24fbd" "cdb4ffdecc682978da78700a461cdc77456c3a6df1c1803ae2dd55c59fa703e3" "9e31aff9afe3c20a33dd966b4c54c6a5151f07659362e4b06bde38ded5370dae" "24fc62afe2e5f0609e436aa2427b396adf9a958a8fa660edbaab5fb13c08aae6" "82358261c32ebedfee2ca0f87299f74008a2e5ba5c502bde7aaa15db20ee3731" "4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default))) '(default-frame-alist (quote ((fullscreen . maximized) diff --git a/elpa/archives/gnu/archive-contents b/elpa/archives/gnu/archive-contents index 41d0693b..853ae68b 100644 --- a/elpa/archives/gnu/archive-contents +++ b/elpa/archives/gnu/archive-contents @@ -206,16 +206,16 @@ (:maintainer "Raffael Stocker" . "r.stocker@mnet-mail.de") (:url . "https://gitlab.com/rstocker/emacs-bluetooth"))]) (bnf-mode . - [(0 4 2) + [(0 4 3) ((cl-lib (0 5)) (emacs (24 3))) "Major mode for editing BNF grammars." tar ((:url . "https://github.com/sergeyklay/bnf-mode") - (:maintainer "Serghei Iakovlev" . "sadhooklay@gmail.com") + (:maintainer "Serghei Iakovlev" . "egrep@protonmail.ch") (:authors - ("Serghei Iakovlev" . "sadhooklay@gmail.com")) + ("Serghei Iakovlev" . "egrep@protonmail.ch")) (:keywords "languages"))]) (brief . [(5 87) @@ -334,7 +334,7 @@ (:maintainer "Clément Pit-Claudel" . "clement.pitclaudel@live.com") (:url . "https://github.com/cpitclaudel/compact-docstrings"))]) (company . - [(0 9 10) + [(0 9 11) ((emacs (24 3))) "Modular text completion framework" tar @@ -445,7 +445,7 @@ ("Daiki Ueno" . "ueno@gnu.org")) (:maintainer nil . "emacs-devel@gnu.org"))]) (debbugs . - [(0 21) + [(0 22) ((emacs (25 1)) (soap-client @@ -581,7 +581,7 @@ ("Leo Liu" . "sdl.web@gmail.com")) (:keywords "killing" "convenience"))]) (ebdb . - [(0 6 11) + [(0 6 13) ((emacs (25 1)) (cl-lib @@ -1321,7 +1321,7 @@ ("Artur Malabarba" . "emacs@endlessparentheses.com")) (:keywords "extensions" "lisp"))]) (nhexl-mode . - [(1 4) + [(1 5) ((emacs (24 4)) (cl-lib @@ -1372,7 +1372,7 @@ ("Julien Danjou" . "julien@danjou.info")) (:maintainer "Julien Danjou" . "julien@danjou.info"))]) (objed . - [(0 8 1) + [(0 8 3) ((emacs (25)) (cl-lib @@ -1411,10 +1411,10 @@ (:maintainer "Michael Heerdegen" . "michael_heerdegen@web.de") (:url . "https://github.com/michael-heerdegen/on-screen.el"))]) (org . - [(9 3 1) + [(9 3 2) nil "Outline-based notes management and organizer" tar ((:url . "https://orgmode.org") - (:maintainer "Carsten Dominik ") + (:maintainer "Bastien Guerry ") (:authors ("Carsten Dominik ")) (:keywords "outlines" "hypermedia" "calendar" "wp"))]) @@ -1433,7 +1433,7 @@ ("Ian Dunn" . "dunni@gnu.org")) (:keywords "convenience" "text" "org"))]) (orgalist . - [(1 9) + [(1 11) ((emacs (24 4))) "Manage Org-like lists in non-Org buffers" single @@ -1517,7 +1517,7 @@ ("Phillip Lord" . "phillip.lord@russet.org.uk")) (:url . "http://elpa.gnu.org/packages/persist.html"))]) (phps-mode . - [(0 3 27) + [(0 3 28) ((emacs (26))) "Major mode for PHP with Semantic integration" tar @@ -1735,9 +1735,9 @@ ("Bastien Guerry" . "bzg@gnu.org")) (:maintainer "Bastien Guerry" . "bzg@gnu.org"))]) (relint . - [(1 11) + [(1 12) ((xr - (1 13))) + (1 14))) "Elisp regexp mistake finder" tar ((:url . "https://github.com/mattiase/relint") (:maintainer "Mattias Engdegård" . "mattiase@acm.org") @@ -1944,9 +1944,9 @@ (svg-clock . [(1 1) ((svg - (0 1)) + (1 0)) (emacs - (25 0))) + (27 0))) "Analog clock using Scalable Vector Graphics" single ((:url . "http://elpa.gnu.org/packages/svg-clock.html") (:keywords "demo" "svg" "clock") @@ -2010,7 +2010,7 @@ ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:keywords "convenience"))]) (tramp . - [(2 4 2 5) + [(2 4 3 1) ((emacs (24 4))) "Transparent Remote Access, Multiple Protocol" tar @@ -2050,7 +2050,7 @@ (:maintainer "Toby Cubitt" . "toby-predictive@dr-qubit.org") (:url . "http://www.dr-qubit.org/emacs.php"))]) (undo-tree . - [(0 6 5) + [(0 7 4) nil "Treat undo history as a tree" single ((:keywords "convenience" "files" "undo" "redo" "history" "tree") (:authors @@ -2063,7 +2063,7 @@ ((:maintainer "Teodor Zlatanov" . "tzz@lifelogs.com") (:url . "http://elpa.gnu.org/packages/uni-confusables.html"))]) (uniquify-files . - [(1 0 1) + [(1 0 2) ((emacs (25 0))) "Completion style for files, minimizing directories" tar @@ -2160,14 +2160,6 @@ ((:url . "https://github.com/m00natic/vlfi") (:maintainer "Andrey Kotlarski" . "m00naticus@gmail.com") (:keywords "large files" "utilities"))]) - (w3 . - [(4 0 49) - nil "Fully customizable, largely undocumented web browser for Emacs" tar - ((:maintainer "William Perry and many more") - (:authors - ("William Perry and many more")) - (:keywords "faces" "help" "comm" "news" "mail" "processes" "mouse" "hypermedia") - (:url . "http://elpa.gnu.org/packages/w3.html"))]) (wcheck-mode . [(2019 6 17) nil "General interface for text checkers" single @@ -2305,7 +2297,7 @@ ("Thien-Thi Nguyen" . "ttn@gnu.org")) (:keywords "multimedia" "xpm"))]) (xr . - [(1 13) + [(1 14) nil "Convert string regexp to rx notation" tar ((:url . "https://github.com/mattiase/xr") (:maintainer "Mattias Engdegård" . "mattiase@acm.org") diff --git a/elpa/archives/gnu/archive-contents.signed b/elpa/archives/gnu/archive-contents.signed index 5dd880fa..78bff843 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 2019-12-07T23:05:03+0100 using RSA \ No newline at end of file +Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) (trust undefined) created at 2020-01-29T11:05:03+0100 using RSA \ No newline at end of file diff --git a/elpa/async-20191226.1227/async-autoloads.el b/elpa/async-20200113.1745/async-autoloads.el similarity index 100% rename from elpa/async-20191226.1227/async-autoloads.el rename to elpa/async-20200113.1745/async-autoloads.el diff --git a/elpa/async-20191226.1227/async-bytecomp.el b/elpa/async-20200113.1745/async-bytecomp.el similarity index 96% rename from elpa/async-20191226.1227/async-bytecomp.el rename to elpa/async-20200113.1745/async-bytecomp.el index 5c8704bc..1198497f 100644 --- a/elpa/async-20191226.1227/async-bytecomp.el +++ b/elpa/async-20200113.1745/async-bytecomp.el @@ -91,9 +91,9 @@ All *.elc files are systematically deleted before proceeding." (cl-incf n))) (if (> n 0) (message "Failed to compile %d files in directory `%s'" n directory) - (message "Directory `%s' compiled asynchronously with warnings" directory))))) - (unless quiet - (message "Directory `%s' compiled asynchronously with success" directory)))))) + (message "Directory `%s' compiled asynchronously with warnings" directory))))) + (unless quiet + (message "Directory `%s' compiled asynchronously with success" directory)))))) (async-start `(lambda () (require 'bytecomp) @@ -151,18 +151,18 @@ All *.elc files are systematically deleted before proceeding." ;; `async-byte-recompile-directory' will add directory ;; as needed to `load-path'. (async-byte-recompile-directory (package-desc-dir pkg-desc) t)) - ad-do-it))) + ad-do-it))) ;;;###autoload (define-minor-mode async-bytecomp-package-mode - "Byte compile asynchronously packages installed with package.el. + "Byte compile asynchronously packages installed with package.el. Async compilation of packages can be controlled by `async-bytecomp-allowed-packages'." :group 'async :global t (if async-bytecomp-package-mode (ad-activate 'package--compile) - (ad-deactivate 'package--compile))) + (ad-deactivate 'package--compile))) ;;;###autoload (defun async-byte-compile-file (file) diff --git a/elpa/async-20191226.1227/async-bytecomp.elc b/elpa/async-20200113.1745/async-bytecomp.elc similarity index 93% rename from elpa/async-20191226.1227/async-bytecomp.elc rename to elpa/async-20200113.1745/async-bytecomp.elc index 81d3585a..1a350c76 100644 Binary files a/elpa/async-20191226.1227/async-bytecomp.elc and b/elpa/async-20200113.1745/async-bytecomp.elc differ diff --git a/elpa/async-20191226.1227/async-pkg.el b/elpa/async-20200113.1745/async-pkg.el similarity index 70% rename from elpa/async-20191226.1227/async-pkg.el rename to elpa/async-20200113.1745/async-pkg.el index 77a08b5c..dbce789b 100644 --- a/elpa/async-20191226.1227/async-pkg.el +++ b/elpa/async-20200113.1745/async-pkg.el @@ -1,4 +1,4 @@ -(define-package "async" "20191226.1227" "Asynchronous processing in Emacs" +(define-package "async" "20200113.1745" "Asynchronous processing in Emacs" '((emacs "24.3")) :keywords '("async") diff --git a/elpa/async-20191226.1227/async.el b/elpa/async-20200113.1745/async.el similarity index 93% rename from elpa/async-20191226.1227/async.el rename to elpa/async-20200113.1745/async.el index 375b47f0..6437a301 100644 --- a/elpa/async-20191226.1227/async.el +++ b/elpa/async-20200113.1745/async.el @@ -87,7 +87,7 @@ is returned unmodified." (t object))) (defun async-inject-variables - (include-regexp &optional predicate exclude-regexp noprops) + (include-regexp &optional predicate exclude-regexp noprops) "Return a `setq' form that replicates part of the calling environment. It sets the value for every variable matching INCLUDE-REGEXP and @@ -177,8 +177,8 @@ It is intended to be used as follows: (defun async--receive-sexp (&optional stream) (let ((sexp (decode-coding-string (base64-decode-string (read stream)) 'utf-8-auto)) - ;; Parent expects UTF-8 encoded text. - (coding-system-for-write 'utf-8-auto)) + ;; Parent expects UTF-8 encoded text. + (coding-system-for-write 'utf-8-auto)) (if async-debug (message "Received sexp {{{%s}}}" (pp-to-string sexp))) (setq sexp (read sexp)) @@ -188,9 +188,9 @@ It is intended to be used as follows: (defun async--insert-sexp (sexp) (let (print-level - print-length - (print-escape-nonascii t) - (print-circle t)) + print-length + (print-escape-nonascii t) + (print-circle t)) (prin1 sexp (current-buffer)) ;; Just in case the string we're sending might contain EOF (encode-coding-region (point-min) (point-max) 'utf-8-auto) @@ -211,17 +211,17 @@ It is intended to be used as follows: ;; process expects. (let ((coding-system-for-write 'utf-8-auto)) (setq async-in-child-emacs t - debug-on-error async-debug) + debug-on-error async-debug) (if debug-on-error - (prin1 (funcall - (async--receive-sexp (unless async-send-over-pipe - command-line-args-left)))) + (prin1 (funcall + (async--receive-sexp (unless async-send-over-pipe + command-line-args-left)))) (condition-case err - (prin1 (funcall - (async--receive-sexp (unless async-send-over-pipe - command-line-args-left)))) - (error - (prin1 (list 'async-signal err))))))) + (prin1 (funcall + (async--receive-sexp (unless async-send-over-pipe + command-line-args-left)))) + (error + (prin1 (list 'async-signal err))))))) (defun async-ready (future) "Query a FUTURE to see if it is ready. @@ -233,7 +233,7 @@ would result from a call to `async-get' on that FUTURE." (if (buffer-live-p buf) (with-current-buffer buf async-callback-value-set) - t)))) + t)))) (defun async-wait (future) "Wait for FUTURE to become ready." @@ -341,8 +341,8 @@ passed to FINISH-FUNC). Call `async-get' on such a future always returns nil. It can still be useful, however, as an argument to `async-ready' or `async-wait'." (let ((sexp start-func) - ;; Subordinate Emacs will send text encoded in UTF-8. - (coding-system-for-read 'utf-8-auto)) + ;; Subordinate Emacs will send text encoded in UTF-8. + (coding-system-for-read 'utf-8-auto)) (setq async--procvar (async-start-process "emacs" (file-truename @@ -356,9 +356,9 @@ returns nil. It can still be useful, however, as an argument to "-batch" "-f" "async-batch-invoke" (if async-send-over-pipe "" - (with-temp-buffer - (async--insert-sexp (list 'quote sexp)) - (buffer-string))))) + (with-temp-buffer + (async--insert-sexp (list 'quote sexp)) + (buffer-string))))) (if async-send-over-pipe (async--transmit-sexp async--procvar (list 'quote sexp))) async--procvar)) @@ -373,7 +373,7 @@ returns nil. It can still be useful, however, as an argument to (setq res (funcall fn res (if (listp binding) binding - (list binding))))) + (list binding))))) res)) (defmacro async-let (bindings &rest forms) diff --git a/elpa/async-20191226.1227/async.elc b/elpa/async-20200113.1745/async.elc similarity index 100% rename from elpa/async-20191226.1227/async.elc rename to elpa/async-20200113.1745/async.elc diff --git a/elpa/async-20191226.1227/dired-async.el b/elpa/async-20200113.1745/dired-async.el similarity index 59% rename from elpa/async-20191226.1227/dired-async.el rename to elpa/async-20200113.1745/dired-async.el index 677c1691..1dba956b 100644 --- a/elpa/async-20191226.1227/dired-async.el +++ b/elpa/async-20200113.1745/dired-async.el @@ -75,22 +75,22 @@ Should take same args as `message'." :type 'sexp) (defface dired-async-message - '((t (:foreground "yellow"))) + '((t (:foreground "yellow"))) "Face used for mode-line message." :group 'dired-async) (defface dired-async-failures - '((t (:foreground "red"))) + '((t (:foreground "red"))) "Face used for mode-line message." :group 'dired-async) (defface dired-async-mode-message - '((t (:foreground "Gold"))) + '((t (:foreground "Gold"))) "Face used for `dired-async--modeline-mode' lighter." :group 'dired-async) (define-minor-mode dired-async--modeline-mode - "Notify mode-line that an async process run." + "Notify mode-line that an async process run." :group 'dired-async :global t :lighter (:eval (propertize (format " [%s Async job(s) running]" @@ -106,7 +106,7 @@ Should take same args as `message'." " " (propertize (if args (apply #'format text args) - text) + text) 'face face)))) (force-mode-line-update) (sit-for 3) @@ -143,35 +143,35 @@ Should take same args as `message'." (special-mode) (shrink-window-if-larger-than-buffer) (delete-file dired-async-log-file)) - (run-with-timer - 0.1 nil - (lambda () - ;; First send error messages. - (cond (failures - (funcall dired-async-message-function - "%s failed for %d of %d file%s -- See *Dired log* buffer" - 'dired-async-failures - (car operation) (length failures) - total (dired-plural-s total))) - (skipped - (funcall dired-async-message-function - "%s: %d of %d file%s skipped -- See *Dired log* buffer" - 'dired-async-failures - (car operation) (length skipped) total - (dired-plural-s total)))) - (when dired-buffers - (cl-loop for (_f . b) in dired-buffers - when (buffer-live-p b) - do (with-current-buffer b + (run-with-timer + 0.1 nil + (lambda () + ;; First send error messages. + (cond (failures + (funcall dired-async-message-function + "%s failed for %d of %d file%s -- See *Dired log* buffer" + 'dired-async-failures + (car operation) (length failures) + total (dired-plural-s total))) + (skipped + (funcall dired-async-message-function + "%s: %d of %d file%s skipped -- See *Dired log* buffer" + 'dired-async-failures + (car operation) (length skipped) total + (dired-plural-s total)))) + (when dired-buffers + (cl-loop for (_f . b) in dired-buffers + when (buffer-live-p b) + do (with-current-buffer b (when (and (not (file-remote-p default-directory nil t)) (file-exists-p default-directory)) - (revert-buffer nil t))))) - ;; Finally send the success message. - (funcall dired-async-message-function - "Asynchronous %s of %s on %s file%s done" - 'dired-async-message - (car operation) (cadr operation) - total (dired-plural-s total))))))) + (revert-buffer nil t))))) + ;; Finally send the success message. + (funcall dired-async-message-function + "Asynchronous %s of %s on %s file%s done" + 'dired-async-message + (car operation) (cadr operation) + total (dired-plural-s total))))))) (defun dired-async-maybe-kill-ftp () "Return a form to kill ftp process in child emacs." @@ -186,7 +186,7 @@ Should take same args as `message'." (defvar overwrite-query) (defun dired-async-create-files (file-creator operation fn-list name-constructor - &optional _marker-char) + &optional _marker-char) "Same as `dired-create-files' but asynchronous. See `dired-create-files' for the behavior of arguments." @@ -205,50 +205,50 @@ See `dired-create-files' for the behavior of arguments." (downcase operation) from))) (if (not to) (setq skipped (cons (dired-make-relative from) skipped)) - (let* ((overwrite (and (null (eq file-creator 'backup-file)) - (file-exists-p to))) - (dired-overwrite-confirmed ; for dired-handle-overwrite - (and overwrite - (let ((help-form `(format "\ + (let* ((overwrite (and (null (eq file-creator 'backup-file)) + (file-exists-p to))) + (dired-overwrite-confirmed ; for dired-handle-overwrite + (and overwrite + (let ((help-form `(format "\ Type SPC or `y' to overwrite file `%s', DEL or `n' to skip to next, ESC or `q' to not overwrite any of the remaining files, `!' to overwrite all remaining files with no more questions." ,to))) - (dired-query 'overwrite-query "Overwrite `%s'?" to))))) - ;; Handle the `dired-copy-file' file-creator specially - ;; When copying a directory to another directory or - ;; possibly to itself or one of its subdirectories. - ;; e.g "~/foo/" => "~/test/" - ;; or "~/foo/" =>"~/foo/" - ;; or "~/foo/ => ~/foo/bar/") - ;; In this case the 'name-constructor' have set the destination - ;; TO to "~/test/foo" because the old emacs23 behavior - ;; of `copy-directory' was to not create the subdirectory - ;; and instead copy the contents. - ;; With the new behavior of `copy-directory' - ;; (similar to the `cp' shell command) we don't - ;; need such a construction of the target directory, - ;; so modify the destination TO to "~/test/" instead of "~/test/foo/". - (let ((destname (file-name-directory to))) - (when (and (file-directory-p from) - (file-directory-p to) - (eq file-creator 'dired-copy-file)) - (setq to destname)) - ;; If DESTNAME is a subdirectory of FROM, not a symlink, - ;; and the method in use is copying, signal an error. - (and (eq t (car (file-attributes destname))) - (eq file-creator 'dired-copy-file) - (file-in-directory-p destname from) - (error "Cannot copy `%s' into its subdirectory `%s'" - from to))) - (if overwrite - (or (and dired-overwrite-confirmed - (push (cons from to) async-fn-list)) - (progn - (push (dired-make-relative from) failures) - (dired-log "%s `%s' to `%s' failed\n" - operation from to))) - (push (cons from to) async-fn-list))))) + (dired-query 'overwrite-query "Overwrite `%s'?" to))))) + ;; Handle the `dired-copy-file' file-creator specially + ;; When copying a directory to another directory or + ;; possibly to itself or one of its subdirectories. + ;; e.g "~/foo/" => "~/test/" + ;; or "~/foo/" =>"~/foo/" + ;; or "~/foo/ => ~/foo/bar/") + ;; In this case the 'name-constructor' have set the destination + ;; TO to "~/test/foo" because the old emacs23 behavior + ;; of `copy-directory' was to not create the subdirectory + ;; and instead copy the contents. + ;; With the new behavior of `copy-directory' + ;; (similar to the `cp' shell command) we don't + ;; need such a construction of the target directory, + ;; so modify the destination TO to "~/test/" instead of "~/test/foo/". + (let ((destname (file-name-directory to))) + (when (and (file-directory-p from) + (file-directory-p to) + (eq file-creator 'dired-copy-file)) + (setq to destname)) + ;; If DESTNAME is a subdirectory of FROM, not a symlink, + ;; and the method in use is copying, signal an error. + (and (eq t (car (file-attributes destname))) + (eq file-creator 'dired-copy-file) + (file-in-directory-p destname from) + (error "Cannot copy `%s' into its subdirectory `%s'" + from to))) + (if overwrite + (or (and dired-overwrite-confirmed + (push (cons from to) async-fn-list)) + (progn + (push (dired-make-relative from) failures) + (dired-log "%s `%s' to `%s' failed\n" + operation from to))) + (push (cons from to) async-fn-list))))) ;; Fix tramp issue #80 with emacs-26, use "-q" only when needed. (setq async-quiet-switch (if (and (boundp 'tramp-cache-read-persistent-data) @@ -278,56 +278,56 @@ ESC or `q' to not overwrite any of the remaining files, ;; Setup callback. (setq callback (lambda (&optional _ignore) - (dired-async-after-file-create - total (list operation (length async-fn-list)) failures skipped) - (when (string= (downcase operation) "rename") - (cl-loop for (file . to) in async-fn-list - for bf = (get-file-buffer file) - for destp = (file-exists-p to) - do (and bf destp - (with-current-buffer bf - (set-visited-file-name to t t)))))))) + (dired-async-after-file-create + total (list operation (length async-fn-list)) failures skipped) + (when (string= (downcase operation) "rename") + (cl-loop for (file . to) in async-fn-list + for bf = (get-file-buffer file) + for destp = (file-exists-p to) + do (and bf destp + (with-current-buffer bf + (set-visited-file-name to t t)))))))) ;; Start async process. (when async-fn-list (async-start `(lambda () (require 'cl-lib) (require 'dired-aux) (require 'dired-x) ,(async-inject-variables dired-async-env-variables-regexp) - (let ((dired-recursive-copies (quote always)) - (dired-copy-preserve-time - ,dired-copy-preserve-time)) - (setq overwrite-backup-query nil) - ;; Inline `backup-file' as long as it is not - ;; available in emacs. - (defalias 'backup-file - ;; Same feature as "cp -f --backup=numbered from to" - ;; Symlinks are copied as file from source unlike - ;; `dired-copy-file' which is same as cp -d. - ;; Directories are omitted. - (lambda (from to ok) - (cond ((file-directory-p from) (ignore)) - (t (let ((count 0)) - (while (let ((attrs (file-attributes to))) - (and attrs (null (nth 0 attrs)))) - (cl-incf count) - (setq to (concat (file-name-sans-versions to) - (format ".~%s~" count))))) - (condition-case err - (copy-file from to ok dired-copy-preserve-time) - (file-date-error - (dired-log "Can't set date on %s:\n%s\n" from err))))))) - ;; Now run the FILE-CREATOR function on files. - (cl-loop with fn = (quote ,file-creator) - for (from . dest) in (quote ,async-fn-list) - do (condition-case err - (funcall fn from dest t) - (file-error - (dired-log "%s: %s\n" (car err) (cdr err))) - nil)) + (let ((dired-recursive-copies (quote always)) + (dired-copy-preserve-time + ,dired-copy-preserve-time)) + (setq overwrite-backup-query nil) + ;; Inline `backup-file' as long as it is not + ;; available in emacs. + (defalias 'backup-file + ;; Same feature as "cp -f --backup=numbered from to" + ;; Symlinks are copied as file from source unlike + ;; `dired-copy-file' which is same as cp -d. + ;; Directories are omitted. + (lambda (from to ok) + (cond ((file-directory-p from) (ignore)) + (t (let ((count 0)) + (while (let ((attrs (file-attributes to))) + (and attrs (null (nth 0 attrs)))) + (cl-incf count) + (setq to (concat (file-name-sans-versions to) + (format ".~%s~" count))))) + (condition-case err + (copy-file from to ok dired-copy-preserve-time) + (file-date-error + (dired-log "Can't set date on %s:\n%s\n" from err))))))) + ;; Now run the FILE-CREATOR function on files. + (cl-loop with fn = (quote ,file-creator) + for (from . dest) in (quote ,async-fn-list) + do (condition-case err + (funcall fn from dest t) + (file-error + (dired-log "%s: %s\n" (car err) (cdr err))) + nil)) (when (get-buffer dired-log-buffer) (dired-log t) (with-current-buffer dired-log-buffer - (write-region (point-min) (point-max) - ,dired-async-log-file)))) + (write-region (point-min) (point-max) + ,dired-async-log-file)))) ,(dired-async-maybe-kill-ftp)) callback) ;; Run mode-line notifications while process running. @@ -363,11 +363,11 @@ ESC or `q' to not overwrite any of the remaining files, (advice-add 'wdired-do-renames :around #'dired-async-wdired-do-renames)) (ad-activate 'dired-create-files) (ad-activate 'wdired-do-renames)) - (if (fboundp 'advice-remove) - (progn (advice-remove 'dired-create-files #'dired-async-create-files) - (advice-remove 'wdired-do-renames #'dired-async-wdired-do-renames)) - (ad-deactivate 'dired-create-files) - (ad-deactivate 'wdired-do-renames)))) + (if (fboundp 'advice-remove) + (progn (advice-remove 'dired-create-files #'dired-async-create-files) + (advice-remove 'wdired-do-renames #'dired-async-wdired-do-renames)) + (ad-deactivate 'dired-create-files) + (ad-deactivate 'wdired-do-renames)))) (defmacro dired-async--with-async-create-files (&rest body) "Evaluate BODY with ‘dired-create-files’ set to ‘dired-async-create-files’." @@ -380,28 +380,28 @@ ESC or `q' to not overwrite any of the remaining files, "Run ‘dired-do-copy’ asynchronously." (interactive "P") (dired-async--with-async-create-files - (dired-do-copy arg))) + (dired-do-copy arg))) ;;;###autoload (defun dired-async-do-symlink (&optional arg) "Run ‘dired-do-symlink’ asynchronously." (interactive "P") (dired-async--with-async-create-files - (dired-do-symlink arg))) + (dired-do-symlink arg))) ;;;###autoload (defun dired-async-do-hardlink (&optional arg) "Run ‘dired-do-hardlink’ asynchronously." (interactive "P") (dired-async--with-async-create-files - (dired-do-hardlink arg))) + (dired-do-hardlink arg))) ;;;###autoload (defun dired-async-do-rename (&optional arg) "Run ‘dired-do-rename’ asynchronously." (interactive "P") (dired-async--with-async-create-files - (dired-do-rename arg))) + (dired-do-rename arg))) (provide 'dired-async) diff --git a/elpa/async-20191226.1227/dired-async.elc b/elpa/async-20200113.1745/dired-async.elc similarity index 100% rename from elpa/async-20191226.1227/dired-async.elc rename to elpa/async-20200113.1745/dired-async.elc diff --git a/elpa/async-20191226.1227/smtpmail-async.el b/elpa/async-20200113.1745/smtpmail-async.el similarity index 100% rename from elpa/async-20191226.1227/smtpmail-async.el rename to elpa/async-20200113.1745/smtpmail-async.el diff --git a/elpa/async-20191226.1227/smtpmail-async.elc b/elpa/async-20200113.1745/smtpmail-async.elc similarity index 100% rename from elpa/async-20191226.1227/smtpmail-async.elc rename to elpa/async-20200113.1745/smtpmail-async.elc diff --git a/elpa/company-20191223.11/company-nxml.elc b/elpa/company-20191223.11/company-nxml.elc deleted file mode 100644 index ac7711b2..00000000 Binary files a/elpa/company-20191223.11/company-nxml.elc and /dev/null differ diff --git a/elpa/company-20191223.11/company-oddmuse.elc b/elpa/company-20191223.11/company-oddmuse.elc deleted file mode 100644 index a80f4410..00000000 Binary files a/elpa/company-20191223.11/company-oddmuse.elc and /dev/null differ diff --git a/elpa/company-20191223.11/company-abbrev.el b/elpa/company-20200110.929/company-abbrev.el similarity index 100% rename from elpa/company-20191223.11/company-abbrev.el rename to elpa/company-20200110.929/company-abbrev.el diff --git a/elpa/company-20191223.11/company-abbrev.elc b/elpa/company-20200110.929/company-abbrev.elc similarity index 60% rename from elpa/company-20191223.11/company-abbrev.elc rename to elpa/company-20200110.929/company-abbrev.elc index 50bb565d..bf5377ac 100644 Binary files a/elpa/company-20191223.11/company-abbrev.elc and b/elpa/company-20200110.929/company-abbrev.elc differ diff --git a/elpa/company-20191223.11/company-autoloads.el b/elpa/company-20200110.929/company-autoloads.el similarity index 100% rename from elpa/company-20191223.11/company-autoloads.el rename to elpa/company-20200110.929/company-autoloads.el diff --git a/elpa/company-20191223.11/company-bbdb.el b/elpa/company-20200110.929/company-bbdb.el similarity index 100% rename from elpa/company-20191223.11/company-bbdb.el rename to elpa/company-20200110.929/company-bbdb.el diff --git a/elpa/company-20191223.11/company-bbdb.elc b/elpa/company-20200110.929/company-bbdb.elc similarity index 71% rename from elpa/company-20191223.11/company-bbdb.elc rename to elpa/company-20200110.929/company-bbdb.elc index 0e8a22e0..a7ab506c 100644 Binary files a/elpa/company-20191223.11/company-bbdb.elc and b/elpa/company-20200110.929/company-bbdb.elc differ diff --git a/elpa/company-20191223.11/company-capf.el b/elpa/company-20200110.929/company-capf.el similarity index 100% rename from elpa/company-20191223.11/company-capf.el rename to elpa/company-20200110.929/company-capf.el diff --git a/elpa/company-20191223.11/company-capf.elc b/elpa/company-20200110.929/company-capf.elc similarity index 99% rename from elpa/company-20191223.11/company-capf.elc rename to elpa/company-20200110.929/company-capf.elc index 38c0a3ef..7c8d5162 100644 Binary files a/elpa/company-20191223.11/company-capf.elc and b/elpa/company-20200110.929/company-capf.elc differ diff --git a/elpa/company-20191223.11/company-clang.el b/elpa/company-20200110.929/company-clang.el similarity index 100% rename from elpa/company-20191223.11/company-clang.el rename to elpa/company-20200110.929/company-clang.el diff --git a/elpa/company-20191223.11/company-clang.elc b/elpa/company-20200110.929/company-clang.elc similarity index 85% rename from elpa/company-20191223.11/company-clang.elc rename to elpa/company-20200110.929/company-clang.elc index 9c106d92..4407fdc0 100644 Binary files a/elpa/company-20191223.11/company-clang.elc and b/elpa/company-20200110.929/company-clang.elc differ diff --git a/elpa/company-20191223.11/company-cmake.el b/elpa/company-20200110.929/company-cmake.el similarity index 100% rename from elpa/company-20191223.11/company-cmake.el rename to elpa/company-20200110.929/company-cmake.el diff --git a/elpa/company-20191223.11/company-cmake.elc b/elpa/company-20200110.929/company-cmake.elc similarity index 88% rename from elpa/company-20191223.11/company-cmake.elc rename to elpa/company-20200110.929/company-cmake.elc index b5bd0fc1..2c0c6dde 100644 Binary files a/elpa/company-20191223.11/company-cmake.elc and b/elpa/company-20200110.929/company-cmake.elc differ diff --git a/elpa/company-20191223.11/company-css.el b/elpa/company-20200110.929/company-css.el similarity index 100% rename from elpa/company-20191223.11/company-css.el rename to elpa/company-20200110.929/company-css.el diff --git a/elpa/company-20191223.11/company-css.elc b/elpa/company-20200110.929/company-css.elc similarity index 94% rename from elpa/company-20191223.11/company-css.elc rename to elpa/company-20200110.929/company-css.elc index 7744c5f9..d02a7522 100644 Binary files a/elpa/company-20191223.11/company-css.elc and b/elpa/company-20200110.929/company-css.elc differ diff --git a/elpa/company-20191223.11/company-dabbrev-code.el b/elpa/company-20200110.929/company-dabbrev-code.el similarity index 100% rename from elpa/company-20191223.11/company-dabbrev-code.el rename to elpa/company-20200110.929/company-dabbrev-code.el diff --git a/elpa/company-20191223.11/company-dabbrev-code.elc b/elpa/company-20200110.929/company-dabbrev-code.elc similarity index 74% rename from elpa/company-20191223.11/company-dabbrev-code.elc rename to elpa/company-20200110.929/company-dabbrev-code.elc index 19c5260b..89ff72ca 100644 Binary files a/elpa/company-20191223.11/company-dabbrev-code.elc and b/elpa/company-20200110.929/company-dabbrev-code.elc differ diff --git a/elpa/company-20191223.11/company-dabbrev.el b/elpa/company-20200110.929/company-dabbrev.el similarity index 100% rename from elpa/company-20191223.11/company-dabbrev.el rename to elpa/company-20200110.929/company-dabbrev.el diff --git a/elpa/company-20191223.11/company-dabbrev.elc b/elpa/company-20200110.929/company-dabbrev.elc similarity index 87% rename from elpa/company-20191223.11/company-dabbrev.elc rename to elpa/company-20200110.929/company-dabbrev.elc index 4494a027..18fba97f 100644 Binary files a/elpa/company-20191223.11/company-dabbrev.elc and b/elpa/company-20200110.929/company-dabbrev.elc differ diff --git a/elpa/company-20191223.11/company-eclim.el b/elpa/company-20200110.929/company-eclim.el similarity index 100% rename from elpa/company-20191223.11/company-eclim.el rename to elpa/company-20200110.929/company-eclim.el diff --git a/elpa/company-20191223.11/company-eclim.elc b/elpa/company-20200110.929/company-eclim.elc similarity index 86% rename from elpa/company-20191223.11/company-eclim.elc rename to elpa/company-20200110.929/company-eclim.elc index 2400aa51..b04acc36 100644 Binary files a/elpa/company-20191223.11/company-eclim.elc and b/elpa/company-20200110.929/company-eclim.elc differ diff --git a/elpa/company-20191223.11/company-elisp.el b/elpa/company-20200110.929/company-elisp.el similarity index 100% rename from elpa/company-20191223.11/company-elisp.el rename to elpa/company-20200110.929/company-elisp.el diff --git a/elpa/company-20191223.11/company-elisp.elc b/elpa/company-20200110.929/company-elisp.elc similarity index 80% rename from elpa/company-20191223.11/company-elisp.elc rename to elpa/company-20200110.929/company-elisp.elc index d9f16ec3..7913dd90 100644 Binary files a/elpa/company-20191223.11/company-elisp.elc and b/elpa/company-20200110.929/company-elisp.elc differ diff --git a/elpa/company-20191223.11/company-etags.el b/elpa/company-20200110.929/company-etags.el similarity index 100% rename from elpa/company-20191223.11/company-etags.el rename to elpa/company-20200110.929/company-etags.el diff --git a/elpa/company-20191223.11/company-etags.elc b/elpa/company-20200110.929/company-etags.elc similarity index 77% rename from elpa/company-20191223.11/company-etags.elc rename to elpa/company-20200110.929/company-etags.elc index e6d90ddb..8f824cab 100644 Binary files a/elpa/company-20191223.11/company-etags.elc and b/elpa/company-20200110.929/company-etags.elc differ diff --git a/elpa/company-20191223.11/company-files.el b/elpa/company-20200110.929/company-files.el similarity index 100% rename from elpa/company-20191223.11/company-files.el rename to elpa/company-20200110.929/company-files.el diff --git a/elpa/company-20191223.11/company-files.elc b/elpa/company-20200110.929/company-files.elc similarity index 86% rename from elpa/company-20191223.11/company-files.elc rename to elpa/company-20200110.929/company-files.elc index ee8d1709..a482bf38 100644 Binary files a/elpa/company-20191223.11/company-files.elc and b/elpa/company-20200110.929/company-files.elc differ diff --git a/elpa/company-20191223.11/company-gtags.el b/elpa/company-20200110.929/company-gtags.el similarity index 92% rename from elpa/company-20191223.11/company-gtags.el rename to elpa/company-20200110.929/company-gtags.el index 2a85f233..598ba60f 100644 --- a/elpa/company-20191223.11/company-gtags.el +++ b/elpa/company-20200110.929/company-gtags.el @@ -1,6 +1,6 @@ ;;; company-gtags.el --- company-mode completion backend for GNU Global -;; Copyright (C) 2009-2011, 2014 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011, 2014-2020 Free Software Foundation, Inc. ;; Author: Nikolaj Schumacher @@ -65,7 +65,9 @@ completion." (defun company-gtags--fetch-tags (prefix) (with-temp-buffer (let (tags) - (when (= 0 (process-file company-gtags-executable nil + ;; For some reason Global v 6.6.3 is prone to returning exit status 1 + ;; even on successful searches when '-T' is used. + (when (/= 3 (process-file company-gtags-executable nil ;; "-T" goes through all the tag files listed in GTAGSLIBPATH (list (current-buffer) nil) nil "-xGqT" (concat "^" prefix))) (goto-char (point-min)) @@ -87,7 +89,7 @@ completion." (defun company-gtags--annotation (arg) (let ((meta (get-text-property 0 'meta arg))) - (when (string-match (concat arg "\\((.*)\\).*") meta) + (when (string-match (concat (regexp-quote arg) "\\((.*)\\).*") meta) (match-string 1 meta)))) ;;;###autoload diff --git a/elpa/company-20191223.11/company-gtags.elc b/elpa/company-20200110.929/company-gtags.elc similarity index 57% rename from elpa/company-20191223.11/company-gtags.elc rename to elpa/company-20200110.929/company-gtags.elc index 60acff78..fb263a2f 100644 Binary files a/elpa/company-20191223.11/company-gtags.elc and b/elpa/company-20200110.929/company-gtags.elc differ diff --git a/elpa/company-20191223.11/company-ispell.el b/elpa/company-20200110.929/company-ispell.el similarity index 100% rename from elpa/company-20191223.11/company-ispell.el rename to elpa/company-20200110.929/company-ispell.el diff --git a/elpa/company-20191223.11/company-ispell.elc b/elpa/company-20200110.929/company-ispell.elc similarity index 70% rename from elpa/company-20191223.11/company-ispell.elc rename to elpa/company-20200110.929/company-ispell.elc index c41fef01..672adc91 100644 Binary files a/elpa/company-20191223.11/company-ispell.elc and b/elpa/company-20200110.929/company-ispell.elc differ diff --git a/elpa/company-20191223.11/company-keywords.el b/elpa/company-20200110.929/company-keywords.el similarity index 100% rename from elpa/company-20191223.11/company-keywords.el rename to elpa/company-20200110.929/company-keywords.el diff --git a/elpa/company-20191223.11/company-keywords.elc b/elpa/company-20200110.929/company-keywords.elc similarity index 97% rename from elpa/company-20191223.11/company-keywords.elc rename to elpa/company-20200110.929/company-keywords.elc index 5fd670a7..401d53bd 100644 Binary files a/elpa/company-20191223.11/company-keywords.elc and b/elpa/company-20200110.929/company-keywords.elc differ diff --git a/elpa/company-20191223.11/company-nxml.el b/elpa/company-20200110.929/company-nxml.el similarity index 100% rename from elpa/company-20191223.11/company-nxml.el rename to elpa/company-20200110.929/company-nxml.el diff --git a/elpa/company-20200110.929/company-nxml.elc b/elpa/company-20200110.929/company-nxml.elc new file mode 100644 index 00000000..1a123e30 Binary files /dev/null and b/elpa/company-20200110.929/company-nxml.elc differ diff --git a/elpa/company-20191223.11/company-oddmuse.el b/elpa/company-20200110.929/company-oddmuse.el similarity index 100% rename from elpa/company-20191223.11/company-oddmuse.el rename to elpa/company-20200110.929/company-oddmuse.el diff --git a/elpa/company-20200110.929/company-oddmuse.elc b/elpa/company-20200110.929/company-oddmuse.elc new file mode 100644 index 00000000..b349c596 Binary files /dev/null and b/elpa/company-20200110.929/company-oddmuse.elc differ diff --git a/elpa/company-20191223.11/company-pkg.el b/elpa/company-20200110.929/company-pkg.el similarity index 76% rename from elpa/company-20191223.11/company-pkg.el rename to elpa/company-20200110.929/company-pkg.el index a85158e0..725ea720 100644 --- a/elpa/company-20191223.11/company-pkg.el +++ b/elpa/company-20200110.929/company-pkg.el @@ -1,4 +1,4 @@ -(define-package "company" "20191223.11" "Modular text completion framework" +(define-package "company" "20200110.929" "Modular text completion framework" '((emacs "24.3")) :keywords '("abbrev" "convenience" "matching") diff --git a/elpa/company-20191223.11/company-semantic.el b/elpa/company-20200110.929/company-semantic.el similarity index 100% rename from elpa/company-20191223.11/company-semantic.el rename to elpa/company-20200110.929/company-semantic.el diff --git a/elpa/company-20191223.11/company-semantic.elc b/elpa/company-20200110.929/company-semantic.elc similarity index 73% rename from elpa/company-20191223.11/company-semantic.elc rename to elpa/company-20200110.929/company-semantic.elc index 2b173eee..9bc181dd 100644 Binary files a/elpa/company-20191223.11/company-semantic.elc and b/elpa/company-20200110.929/company-semantic.elc differ diff --git a/elpa/company-20191223.11/company-template.el b/elpa/company-20200110.929/company-template.el similarity index 100% rename from elpa/company-20191223.11/company-template.el rename to elpa/company-20200110.929/company-template.el diff --git a/elpa/company-20191223.11/company-template.elc b/elpa/company-20200110.929/company-template.elc similarity index 99% rename from elpa/company-20191223.11/company-template.elc rename to elpa/company-20200110.929/company-template.elc index 41bd56fb..c7172445 100644 Binary files a/elpa/company-20191223.11/company-template.elc and b/elpa/company-20200110.929/company-template.elc differ diff --git a/elpa/company-20191223.11/company-tempo.el b/elpa/company-20200110.929/company-tempo.el similarity index 100% rename from elpa/company-20191223.11/company-tempo.el rename to elpa/company-20200110.929/company-tempo.el diff --git a/elpa/company-20191223.11/company-tempo.elc b/elpa/company-20200110.929/company-tempo.elc similarity index 71% rename from elpa/company-20191223.11/company-tempo.elc rename to elpa/company-20200110.929/company-tempo.elc index 1f0c9441..52aab976 100644 Binary files a/elpa/company-20191223.11/company-tempo.elc and b/elpa/company-20200110.929/company-tempo.elc differ diff --git a/elpa/company-20191223.11/company-tng.el b/elpa/company-20200110.929/company-tng.el similarity index 100% rename from elpa/company-20191223.11/company-tng.el rename to elpa/company-20200110.929/company-tng.el diff --git a/elpa/company-20191223.11/company-tng.elc b/elpa/company-20200110.929/company-tng.elc similarity index 70% rename from elpa/company-20191223.11/company-tng.elc rename to elpa/company-20200110.929/company-tng.elc index d4dfcb29..1786a89e 100644 Binary files a/elpa/company-20191223.11/company-tng.elc and b/elpa/company-20200110.929/company-tng.elc differ diff --git a/elpa/company-20191223.11/company-xcode.el b/elpa/company-20200110.929/company-xcode.el similarity index 100% rename from elpa/company-20191223.11/company-xcode.el rename to elpa/company-20200110.929/company-xcode.el diff --git a/elpa/company-20191223.11/company-xcode.elc b/elpa/company-20200110.929/company-xcode.elc similarity index 86% rename from elpa/company-20191223.11/company-xcode.elc rename to elpa/company-20200110.929/company-xcode.elc index a920de20..42bbb9e1 100644 Binary files a/elpa/company-20191223.11/company-xcode.elc and b/elpa/company-20200110.929/company-xcode.elc differ diff --git a/elpa/company-20191223.11/company-yasnippet.el b/elpa/company-20200110.929/company-yasnippet.el similarity index 100% rename from elpa/company-20191223.11/company-yasnippet.el rename to elpa/company-20200110.929/company-yasnippet.el diff --git a/elpa/company-20191223.11/company-yasnippet.elc b/elpa/company-20200110.929/company-yasnippet.elc similarity index 62% rename from elpa/company-20191223.11/company-yasnippet.elc rename to elpa/company-20200110.929/company-yasnippet.elc index 4128dabc..29137786 100644 Binary files a/elpa/company-20191223.11/company-yasnippet.elc and b/elpa/company-20200110.929/company-yasnippet.elc differ diff --git a/elpa/company-20191223.11/company.el b/elpa/company-20200110.929/company.el similarity index 99% rename from elpa/company-20191223.11/company.el rename to elpa/company-20200110.929/company.el index 82223fbd..df01c96d 100644 --- a/elpa/company-20191223.11/company.el +++ b/elpa/company-20200110.929/company.el @@ -1,11 +1,11 @@ ;;; company.el --- Modular text completion framework -*- lexical-binding: t -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Nikolaj Schumacher ;; Maintainer: Dmitry Gutov ;; URL: http://company-mode.github.io/ -;; Version: 0.9.10 +;; Version: 0.9.11 ;; Keywords: abbrev, convenience, matching ;; Package-Requires: ((emacs "24.3")) @@ -641,13 +641,13 @@ commands in the `company-' namespace, abort completion." (defcustom company-show-numbers nil "If enabled, show quick-access numbers for the first ten candidates." :type '(choice (const :tag "off" nil) - (const :tag "on" t))) + (const :tag "left" 'left) + (const :tag "on" 't))) (defcustom company-show-numbers-function #'company--show-numbers - "Function called to get custom quick-access numbers for the first then candidates. + "Function called to get quick-access numbers for the first ten candidates. -If nil falls back to default function that generates 1...8, 9, 0. The function get -the number of candidates (from 1 to 10 means 1st to 10th candidate) and should +The function receives the candidate number (starting from 1) and should return a string prefixed with one space." :type 'function) @@ -2171,9 +2171,9 @@ With ARG, move by that many elements." (current-prefix-arg arg)) (call-interactively 'company-select-next)))))) -(defun company-indent-or-complete-common () +(defun company-indent-or-complete-common (arg) "Indent the current line or region, or complete the common part." - (interactive) + (interactive "P") (cond ((use-region-p) (indent-region (region-beginning) (region-end))) @@ -2183,7 +2183,7 @@ With ARG, move by that many elements." ((let ((old-point (point)) (old-tick (buffer-chars-modified-tick)) (tab-always-indent t)) - (call-interactively #'indent-for-tab-command) + (indent-for-tab-command arg) (when (and (eq old-point (point)) (eq old-tick (buffer-chars-modified-tick))) (company-complete-common)))))) @@ -2818,17 +2818,20 @@ If SHOW-VERSION is non-nil, show the version in the echo area." (let* ((item (pop items)) (str (car item)) (annotation (cdr item)) - (right (company-space-string company-tooltip-margin)) + (margin (company-space-string company-tooltip-margin)) + (left margin) + (right margin) (width width)) (when (< numbered 10) (cl-decf width 2) (cl-incf numbered) - (setq right (concat (funcall company-show-numbers-function numbered) right))) + (setf (if (eq company-show-numbers 'left) left right) + (concat (funcall company-show-numbers-function numbered) + margin))) (push (concat (company-fill-propertize str annotation width (equal i selection) - (company-space-string - company-tooltip-margin) + left right) (when scrollbar-bounds (company--scrollbar i scrollbar-bounds))) @@ -2936,8 +2939,9 @@ Returns a negative number if the tooltip should be displayed above point." (when company-pseudo-tooltip-overlay (let* ((ov company-pseudo-tooltip-overlay) (disp (overlay-get ov 'company-display))) - ;; Beat outline's folding overlays, at least. - (overlay-put ov 'priority 1) + ;; Beat outline's folding overlays. + ;; And Flymake (53). And Flycheck (110). + (overlay-put ov 'priority 111) ;; No (extra) prefix for the first line. (overlay-put ov 'line-prefix "") ;; `display' is better diff --git a/elpa/company-20191223.11/company.elc b/elpa/company-20200110.929/company.elc similarity index 87% rename from elpa/company-20191223.11/company.elc rename to elpa/company-20200110.929/company.elc index 0c471579..84a77ad9 100644 Binary files a/elpa/company-20191223.11/company.elc and b/elpa/company-20200110.929/company.elc differ diff --git a/elpa/dash-20191109.1327/dash-pkg.el b/elpa/dash-20191109.1327/dash-pkg.el deleted file mode 100644 index 33327cb6..00000000 --- a/elpa/dash-20191109.1327/dash-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "dash" "20191109.1327" "A modern list library for Emacs" 'nil :commit "e85ed7aa93ef0959b630607bca17af90c74b34be" :keywords '("lists") :authors '(("Magnar Sveen" . "magnars@gmail.com")) :maintainer '("Magnar Sveen" . "magnars@gmail.com")) diff --git a/elpa/dash-20191109.1327/dash-autoloads.el b/elpa/dash-20200119.2310/dash-autoloads.el similarity index 91% rename from elpa/dash-20191109.1327/dash-autoloads.el rename to elpa/dash-20200119.2310/dash-autoloads.el index 8bacbc83..c5e79028 100644 --- a/elpa/dash-20191109.1327/dash-autoloads.el +++ b/elpa/dash-20200119.2310/dash-autoloads.el @@ -11,6 +11,10 @@ (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "dash" '("dash-" "-keep" "-butlast" "-non" "-only-some" "-zip" "-e" "->" "-a" "-gr" "-when-let" "-d" "-l" "-s" "-p" "-r" "-m" "-i" "-f" "-u" "-value-to-list" "-t" "--" "-c" "!cons" "!cdr"))) +;;;*** + +;;;### (autoloads nil nil ("dash-pkg.el") (0 0 0 0)) + ;;;*** ;; Local Variables: diff --git a/elpa/dash-20200119.2310/dash-pkg.el b/elpa/dash-20200119.2310/dash-pkg.el new file mode 100644 index 00000000..91f8535f --- /dev/null +++ b/elpa/dash-20200119.2310/dash-pkg.el @@ -0,0 +1,9 @@ +(define-package "dash" "20200119.2310" "A modern list library for Emacs" 'nil :keywords + '("lists") + :authors + '(("Magnar Sveen" . "magnars@gmail.com")) + :maintainer + '("Magnar Sveen" . "magnars@gmail.com")) +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/dash-20191109.1327/dash.el b/elpa/dash-20200119.2310/dash.el similarity index 99% rename from elpa/dash-20191109.1327/dash.el rename to elpa/dash-20200119.2310/dash.el index 3f58e2a6..bc713ce2 100644 --- a/elpa/dash-20191109.1327/dash.el +++ b/elpa/dash-20200119.2310/dash.el @@ -3,8 +3,7 @@ ;; Copyright (C) 2012-2016 Free Software Foundation, Inc. ;; Author: Magnar Sveen -;; Version: 2.16.0 -;; Package-Version: 20191109.1327 +;; Version: 2.17.0 ;; Keywords: lists ;; This program is free software; you can redistribute it and/or modify @@ -1264,6 +1263,24 @@ The anaphoric form `--zip-with' binds the elements from LIST1 as symbol `it', and the elements from LIST2 as symbol `other'." (--zip-with (funcall fn it other) list1 list2)) +(defun -zip-lists (&rest lists) + "Zip LISTS together. Group the head of each list, followed by the +second elements of each list, and so on. The lengths of the returned +groupings are equal to the length of the shortest input list. + +The return value is always list of lists, which is a difference +from `-zip-pair' which returns a cons-cell in case two input +lists are provided. + +See also: `-zip'" + (declare (pure t) (side-effect-free t)) + (when lists + (let (results) + (while (-none? 'null lists) + (setq results (cons (mapcar 'car lists) results)) + (setq lists (mapcar 'cdr lists))) + (nreverse results)))) + (defun -zip (&rest lists) "Zip LISTS together. Group the head of each list, followed by the second elements of each list, and so on. The lengths of the returned @@ -1272,11 +1289,12 @@ groupings are equal to the length of the shortest input list. If two lists are provided as arguments, return the groupings as a list of cons cells. Otherwise, return the groupings as a list of lists. -Please note! This distinction is being removed in an upcoming 3.0 -release of Dash. If you rely on this behavior, use `-zip-pair` instead, -which will retain that behaviour in future versions. +Use `-zip-lists' if you need the return value to always be a list +of lists. -Alias: `-zip-pair'" +Alias: `-zip-pair' + +See also: `-zip-lists'" (declare (pure t) (side-effect-free t)) (when lists (let (results) @@ -1309,6 +1327,9 @@ a variable number of arguments, such that is identity (given that the lists are the same length). +Note in particular that calling this on a list of two lists will +return a list of cons-cells such that the aboce identity works. + See also: `-zip'" (apply '-zip lists)) @@ -2922,6 +2943,7 @@ structure such as plist or alist." "--zip-with" "-zip" "-zip-fill" + "-zip-lists" "-zip-pair" "-cycle" "-pad" diff --git a/elpa/dash-20191109.1327/dash.elc b/elpa/dash-20200119.2310/dash.elc similarity index 93% rename from elpa/dash-20191109.1327/dash.elc rename to elpa/dash-20200119.2310/dash.elc index 97887306..3f28baef 100644 Binary files a/elpa/dash-20191109.1327/dash.elc and b/elpa/dash-20200119.2310/dash.elc differ diff --git a/elpa/dash-20200119.2310/dash.info b/elpa/dash-20200119.2310/dash.info new file mode 100644 index 00000000..ee791c47 --- /dev/null +++ b/elpa/dash-20200119.2310/dash.info @@ -0,0 +1,3410 @@ +This is dash.info, produced by makeinfo version 6.5 from dash.texi. + +This manual is for ‘dash.el’ version 2.12.1. + + Copyright © 2012-2015 Magnar Sveen + + 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 + . +INFO-DIR-SECTION Emacs +START-INFO-DIR-ENTRY +* Dash: (dash.info). A modern list library for GNU Emacs +END-INFO-DIR-ENTRY + + +File: dash.info, Node: Top, Next: Installation, Up: (dir) + +dash +**** + +This manual is for ‘dash.el’ version 2.12.1. + + Copyright © 2012-2015 Magnar Sveen + + 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 + . + +* Menu: + +* Installation:: +* Functions:: +* Development:: +* Index:: + +— The Detailed Node Listing — + +Installation + +* Using in a package:: +* Syntax highlighting of dash functions:: + +Functions + +* Maps:: +* Sublist selection:: +* List to list:: +* Reductions:: +* Unfolding:: +* Predicates:: +* Partitioning:: +* Indexing:: +* Set operations:: +* Other list operations:: +* Tree operations:: +* Threading macros:: +* Binding:: +* Side-effects:: +* Destructive operations:: +* Function combinators:: + +Development + +* Contribute:: How to contribute +* Changes:: List of significant changes by version +* Contributors:: List of contributors + + +File: dash.info, Node: Installation, Next: Functions, Prev: Top, Up: Top + +1 Installation +************** + +It’s available on Melpa (https://melpa.org/); use ‘M-x package-install’: + +‘M-x package-install dash’ + Install the dash library. + +‘M-x package-install dash-functional’ + Optional, if you want the function combinators. + + Alternatively, you can just dump dash.el or dash-functional.el in +your load path somewhere. + +* Menu: + +* Using in a package:: +* Syntax highlighting of dash functions:: + + +File: dash.info, Node: Using in a package, Next: Syntax highlighting of dash functions, Up: Installation + +1.1 Using in a package +====================== + +Add this to the big comment block at the top: + + ;; Package-Requires: ((dash "2.12.1")) + +To get function combinators: + + ;; Package-Requires: ((dash "2.12.1") (dash-functional "1.2.0") (emacs "24")) + + +File: dash.info, Node: Syntax highlighting of dash functions, Prev: Using in a package, Up: Installation + +1.2 Syntax highlighting of dash functions +========================================= + +Font lock of dash functions in emacs lisp buffers is now optional. +Include this in your emacs settings to get syntax highlighting: + + (eval-after-load 'dash '(dash-enable-font-lock)) + + +File: dash.info, Node: Functions, Next: Development, Prev: Installation, Up: Top + +2 Functions +*********** + +This chapter contains reference documentation for the dash application +programming interface (API). All functions and constructs in the library +are prefixed with a dash (-). + + There are also anaphoric versions of functions where that makes +sense, prefixed with two dashes instead of one. + + For instance, while ‘-map’ takes a function to map over the list, one +can also use the anaphoric form with double dashes - which will then be +executed with ‘it’ exposed as the list item. Here’s an example: + + (-map (lambda (n) (* n n)) '(1 2 3 4)) ;; normal version + + (--map (* it it) '(1 2 3 4)) ;; anaphoric version + +Of course, the original can also be written like + + (defun square (n) (* n n)) + + (-map 'square '(1 2 3 4)) + +which demonstrates the usefulness of both versions. + +* Menu: + +* Maps:: +* Sublist selection:: +* List to list:: +* Reductions:: +* Unfolding:: +* Predicates:: +* Partitioning:: +* Indexing:: +* Set operations:: +* Other list operations:: +* Tree operations:: +* Threading macros:: +* Binding:: +* Side-effects:: +* Destructive operations:: +* Function combinators:: + + +File: dash.info, Node: Maps, Next: Sublist selection, Up: Functions + +2.1 Maps +======== + +Functions in this category take a transforming function, which is then +applied sequentially to each or selected elements of the input list. +The results are collected in order and returned as new list. + + -- Function: -map (fn list) + Return a new list consisting of the result of applying FN to the + items in LIST. + + (-map (lambda (num) (* num num)) '(1 2 3 4)) + ⇒ '(1 4 9 16) + (-map 'square '(1 2 3 4)) + ⇒ '(1 4 9 16) + (--map (* it it) '(1 2 3 4)) + ⇒ '(1 4 9 16) + + -- Function: -map-when (pred rep list) + Return a new list where the elements in LIST that do not match the + PRED function are unchanged, and where the elements in LIST that do + match the PRED function are mapped through the REP function. + + Alias: ‘-replace-where’ + + See also: ‘-update-at’ (*note -update-at::) + + (-map-when 'even? 'square '(1 2 3 4)) + ⇒ '(1 4 3 16) + (--map-when (> it 2) (* it it) '(1 2 3 4)) + ⇒ '(1 2 9 16) + (--map-when (= it 2) 17 '(1 2 3 4)) + ⇒ '(1 17 3 4) + + -- Function: -map-first (pred rep list) + Replace first item in LIST satisfying PRED with result of REP + called on this item. + + See also: ‘-map-when’ (*note -map-when::), ‘-replace-first’ (*note + -replace-first::) + + (-map-first 'even? 'square '(1 2 3 4)) + ⇒ '(1 4 3 4) + (--map-first (> it 2) (* it it) '(1 2 3 4)) + ⇒ '(1 2 9 4) + (--map-first (= it 2) 17 '(1 2 3 2)) + ⇒ '(1 17 3 2) + + -- Function: -map-last (pred rep list) + Replace last item in LIST satisfying PRED with result of REP called + on this item. + + See also: ‘-map-when’ (*note -map-when::), ‘-replace-last’ (*note + -replace-last::) + + (-map-last 'even? 'square '(1 2 3 4)) + ⇒ '(1 2 3 16) + (--map-last (> it 2) (* it it) '(1 2 3 4)) + ⇒ '(1 2 3 16) + (--map-last (= it 2) 17 '(1 2 3 2)) + ⇒ '(1 2 3 17) + + -- Function: -map-indexed (fn list) + Return a new list consisting of the result of (FN index item) for + each item in LIST. + + In the anaphoric form ‘--map-indexed’, the index is exposed as + symbol ‘it-index’. + + See also: ‘-each-indexed’ (*note -each-indexed::). + + (-map-indexed (lambda (index item) (- item index)) '(1 2 3 4)) + ⇒ '(1 1 1 1) + (--map-indexed (- it it-index) '(1 2 3 4)) + ⇒ '(1 1 1 1) + + -- Function: -annotate (fn list) + Return a list of cons cells where each cell is FN applied to each + element of LIST paired with the unmodified element of LIST. + + (-annotate '1+ '(1 2 3)) + ⇒ '((2 . 1) (3 . 2) (4 . 3)) + (-annotate 'length '(("h" "e" "l" "l" "o") ("hello" "world"))) + ⇒ '((5 "h" "e" "l" "l" "o") (2 "hello" "world")) + (--annotate (< 1 it) '(0 1 2 3)) + ⇒ '((nil . 0) (nil . 1) (t . 2) (t . 3)) + + -- Function: -splice (pred fun list) + Splice lists generated by FUN in place of elements matching PRED in + LIST. + + FUN takes the element matching PRED as input. + + This function can be used as replacement for ‘,@’ in case you need + to splice several lists at marked positions (for example with + keywords). + + See also: ‘-splice-list’ (*note -splice-list::), ‘-insert-at’ + (*note -insert-at::) + + (-splice 'even? (lambda (x) (list x x)) '(1 2 3 4)) + ⇒ '(1 2 2 3 4 4) + (--splice 't (list it it) '(1 2 3 4)) + ⇒ '(1 1 2 2 3 3 4 4) + (--splice (equal it :magic) '((list of) (magical) (code)) '((foo) (bar) :magic (baz))) + ⇒ '((foo) (bar) (list of) (magical) (code) (baz)) + + -- Function: -splice-list (pred new-list list) + Splice NEW-LIST in place of elements matching PRED in LIST. + + See also: ‘-splice’ (*note -splice::), ‘-insert-at’ (*note + -insert-at::) + + (-splice-list 'keywordp '(a b c) '(1 :foo 2)) + ⇒ '(1 a b c 2) + (-splice-list 'keywordp nil '(1 :foo 2)) + ⇒ '(1 2) + (--splice-list (keywordp it) '(a b c) '(1 :foo 2)) + ⇒ '(1 a b c 2) + + -- Function: -mapcat (fn list) + Return the concatenation of the result of mapping FN over LIST. + Thus function FN should return a list. + + (-mapcat 'list '(1 2 3)) + ⇒ '(1 2 3) + (-mapcat (lambda (item) (list 0 item)) '(1 2 3)) + ⇒ '(0 1 0 2 0 3) + (--mapcat (list 0 it) '(1 2 3)) + ⇒ '(0 1 0 2 0 3) + + -- Function: -copy (arg) + Create a shallow copy of LIST. + + (fn LIST) + + (-copy '(1 2 3)) + ⇒ '(1 2 3) + (let ((a '(1 2 3))) (eq a (-copy a))) + ⇒ nil + + +File: dash.info, Node: Sublist selection, Next: List to list, Prev: Maps, Up: Functions + +2.2 Sublist selection +===================== + +Functions returning a sublist of the original list. + + -- Function: -filter (pred list) + Return a new list of the items in LIST for which PRED returns a + non-nil value. + + Alias: ‘-select’ + + See also: ‘-keep’ (*note -keep::), ‘-remove’ (*note -remove::). + + (-filter (lambda (num) (= 0 (% num 2))) '(1 2 3 4)) + ⇒ '(2 4) + (-filter 'even? '(1 2 3 4)) + ⇒ '(2 4) + (--filter (= 0 (% it 2)) '(1 2 3 4)) + ⇒ '(2 4) + + -- Function: -remove (pred list) + Return a new list of the items in LIST for which PRED returns nil. + + Alias: ‘-reject’ + + See also: ‘-filter’ (*note -filter::). + + (-remove (lambda (num) (= 0 (% num 2))) '(1 2 3 4)) + ⇒ '(1 3) + (-remove 'even? '(1 2 3 4)) + ⇒ '(1 3) + (--remove (= 0 (% it 2)) '(1 2 3 4)) + ⇒ '(1 3) + + -- Function: -remove-first (pred list) + Return a new list with the first item matching PRED removed. + + Alias: ‘-reject-first’ + + See also: ‘-remove’ (*note -remove::), ‘-map-first’ (*note + -map-first::) + + (-remove-first 'even? '(1 3 5 4 7 8 10)) + ⇒ '(1 3 5 7 8 10) + (-remove-first 'stringp '(1 2 "first" "second" "third")) + ⇒ '(1 2 "second" "third") + (--remove-first (> it 3) '(1 2 3 4 5 6 7 8 9 10)) + ⇒ '(1 2 3 5 6 7 8 9 10) + + -- Function: -remove-last (pred list) + Return a new list with the last item matching PRED removed. + + Alias: ‘-reject-last’ + + See also: ‘-remove’ (*note -remove::), ‘-map-last’ (*note + -map-last::) + + (-remove-last 'even? '(1 3 5 4 7 8 10 11)) + ⇒ '(1 3 5 4 7 8 11) + (-remove-last 'stringp '(1 2 "last" "second" "third")) + ⇒ '(1 2 "last" "second") + (--remove-last (> it 3) '(1 2 3 4 5 6 7 8 9 10)) + ⇒ '(1 2 3 4 5 6 7 8 9) + + -- Function: -remove-item (item list) + Remove all occurrences of ITEM from LIST. + + Comparison is done with ‘equal’. + + (-remove-item 3 '(1 2 3 2 3 4 5 3)) + ⇒ '(1 2 2 4 5) + (-remove-item 'foo '(foo bar baz foo)) + ⇒ '(bar baz) + (-remove-item "bob" '("alice" "bob" "eve" "bob" "dave")) + ⇒ '("alice" "eve" "dave") + + -- Function: -non-nil (list) + Return all non-nil elements of LIST. + + (-non-nil '(1 nil 2 nil nil 3 4 nil 5 nil)) + ⇒ '(1 2 3 4 5) + + -- Function: -slice (list from &optional to step) + Return copy of LIST, starting from index FROM to index TO. + + FROM or TO may be negative. These values are then interpreted + modulo the length of the list. + + If STEP is a number, only each STEPth item in the resulting section + is returned. Defaults to 1. + + (-slice '(1 2 3 4 5) 1) + ⇒ '(2 3 4 5) + (-slice '(1 2 3 4 5) 0 3) + ⇒ '(1 2 3) + (-slice '(1 2 3 4 5 6 7 8 9) 1 -1 2) + ⇒ '(2 4 6 8) + + -- Function: -take (n list) + Return a new list of the first N items in LIST, or all items if + there are fewer than N. + + See also: ‘-take-last’ (*note -take-last::) + + (-take 3 '(1 2 3 4 5)) + ⇒ '(1 2 3) + (-take 17 '(1 2 3 4 5)) + ⇒ '(1 2 3 4 5) + + -- Function: -take-last (n list) + Return the last N items of LIST in order. + + See also: ‘-take’ (*note -take::) + + (-take-last 3 '(1 2 3 4 5)) + ⇒ '(3 4 5) + (-take-last 17 '(1 2 3 4 5)) + ⇒ '(1 2 3 4 5) + (-take-last 1 '(1 2 3 4 5)) + ⇒ '(5) + + -- Function: -drop (n list) + Return the tail of LIST without the first N items. + + See also: ‘-drop-last’ (*note -drop-last::) + + (fn N LIST) + + (-drop 3 '(1 2 3 4 5)) + ⇒ '(4 5) + (-drop 17 '(1 2 3 4 5)) + ⇒ '() + + -- Function: -drop-last (n list) + Remove the last N items of LIST and return a copy. + + See also: ‘-drop’ (*note -drop::) + + (-drop-last 3 '(1 2 3 4 5)) + ⇒ '(1 2) + (-drop-last 17 '(1 2 3 4 5)) + ⇒ '() + + -- Function: -take-while (pred list) + Return a new list of successive items from LIST while (PRED item) + returns a non-nil value. + + (-take-while 'even? '(1 2 3 4)) + ⇒ '() + (-take-while 'even? '(2 4 5 6)) + ⇒ '(2 4) + (--take-while (< it 4) '(1 2 3 4 3 2 1)) + ⇒ '(1 2 3) + + -- Function: -drop-while (pred list) + Return the tail of LIST starting from the first item for which + (PRED item) returns nil. + + (-drop-while 'even? '(1 2 3 4)) + ⇒ '(1 2 3 4) + (-drop-while 'even? '(2 4 5 6)) + ⇒ '(5 6) + (--drop-while (< it 4) '(1 2 3 4 3 2 1)) + ⇒ '(4 3 2 1) + + -- Function: -select-by-indices (indices list) + Return a list whose elements are elements from LIST selected as + ‘(nth i list)‘ for all i from INDICES. + + (-select-by-indices '(4 10 2 3 6) '("v" "e" "l" "o" "c" "i" "r" "a" "p" "t" "o" "r")) + ⇒ '("c" "o" "l" "o" "r") + (-select-by-indices '(2 1 0) '("a" "b" "c")) + ⇒ '("c" "b" "a") + (-select-by-indices '(0 1 2 0 1 3 3 1) '("f" "a" "r" "l")) + ⇒ '("f" "a" "r" "f" "a" "l" "l" "a") + + -- Function: -select-columns (columns table) + Select COLUMNS from TABLE. + + TABLE is a list of lists where each element represents one row. It + is assumed each row has the same length. + + Each row is transformed such that only the specified COLUMNS are + selected. + + See also: ‘-select-column’ (*note -select-column::), + ‘-select-by-indices’ (*note -select-by-indices::) + + (-select-columns '(0 2) '((1 2 3) (a b c) (:a :b :c))) + ⇒ '((1 3) (a c) (:a :c)) + (-select-columns '(1) '((1 2 3) (a b c) (:a :b :c))) + ⇒ '((2) (b) (:b)) + (-select-columns nil '((1 2 3) (a b c) (:a :b :c))) + ⇒ '(nil nil nil) + + -- Function: -select-column (column table) + Select COLUMN from TABLE. + + TABLE is a list of lists where each element represents one row. It + is assumed each row has the same length. + + The single selected column is returned as a list. + + See also: ‘-select-columns’ (*note -select-columns::), + ‘-select-by-indices’ (*note -select-by-indices::) + + (-select-column 1 '((1 2 3) (a b c) (:a :b :c))) + ⇒ '(2 b :b) + + +File: dash.info, Node: List to list, Next: Reductions, Prev: Sublist selection, Up: Functions + +2.3 List to list +================ + +Functions returning a modified copy of the input list. + + -- Function: -keep (fn list) + Return a new list of the non-nil results of applying FN to the + items in LIST. + + If you want to select the original items satisfying a predicate use + ‘-filter’ (*note -filter::). + + (-keep 'cdr '((1 2 3) (4 5) (6))) + ⇒ '((2 3) (5)) + (-keep (lambda (num) (when (> num 3) (* 10 num))) '(1 2 3 4 5 6)) + ⇒ '(40 50 60) + (--keep (when (> it 3) (* 10 it)) '(1 2 3 4 5 6)) + ⇒ '(40 50 60) + + -- Function: -concat (&rest lists) + Return a new list with the concatenation of the elements in the + supplied LISTS. + + (-concat '(1)) + ⇒ '(1) + (-concat '(1) '(2)) + ⇒ '(1 2) + (-concat '(1) '(2 3) '(4)) + ⇒ '(1 2 3 4) + + -- Function: -flatten (l) + Take a nested list L and return its contents as a single, flat + list. + + Note that because ‘nil’ represents a list of zero elements (an + empty list), any mention of nil in L will disappear after + flattening. If you need to preserve nils, consider ‘-flatten-n’ + (*note -flatten-n::) or map them to some unique symbol and then map + them back. + + Conses of two atoms are considered "terminals", that is, they + aren’t flattened further. + + See also: ‘-flatten-n’ (*note -flatten-n::) + + (-flatten '((1))) + ⇒ '(1) + (-flatten '((1 (2 3) (((4 (5))))))) + ⇒ '(1 2 3 4 5) + (-flatten '(1 2 (3 . 4))) + ⇒ '(1 2 (3 . 4)) + + -- Function: -flatten-n (num list) + Flatten NUM levels of a nested LIST. + + See also: ‘-flatten’ (*note -flatten::) + + (-flatten-n 1 '((1 2) ((3 4) ((5 6))))) + ⇒ '(1 2 (3 4) ((5 6))) + (-flatten-n 2 '((1 2) ((3 4) ((5 6))))) + ⇒ '(1 2 3 4 (5 6)) + (-flatten-n 3 '((1 2) ((3 4) ((5 6))))) + ⇒ '(1 2 3 4 5 6) + + -- Function: -replace (old new list) + Replace all OLD items in LIST with NEW. + + Elements are compared using ‘equal’. + + See also: ‘-replace-at’ (*note -replace-at::) + + (-replace 1 "1" '(1 2 3 4 3 2 1)) + ⇒ '("1" 2 3 4 3 2 "1") + (-replace "foo" "bar" '("a" "nice" "foo" "sentence" "about" "foo")) + ⇒ '("a" "nice" "bar" "sentence" "about" "bar") + (-replace 1 2 nil) + ⇒ nil + + -- Function: -replace-first (old new list) + Replace the first occurrence of OLD with NEW in LIST. + + Elements are compared using ‘equal’. + + See also: ‘-map-first’ (*note -map-first::) + + (-replace-first 1 "1" '(1 2 3 4 3 2 1)) + ⇒ '("1" 2 3 4 3 2 1) + (-replace-first "foo" "bar" '("a" "nice" "foo" "sentence" "about" "foo")) + ⇒ '("a" "nice" "bar" "sentence" "about" "foo") + (-replace-first 1 2 nil) + ⇒ nil + + -- Function: -replace-last (old new list) + Replace the last occurrence of OLD with NEW in LIST. + + Elements are compared using ‘equal’. + + See also: ‘-map-last’ (*note -map-last::) + + (-replace-last 1 "1" '(1 2 3 4 3 2 1)) + ⇒ '(1 2 3 4 3 2 "1") + (-replace-last "foo" "bar" '("a" "nice" "foo" "sentence" "about" "foo")) + ⇒ '("a" "nice" "foo" "sentence" "about" "bar") + (-replace-last 1 2 nil) + ⇒ nil + + -- Function: -insert-at (n x list) + Return a list with X inserted into LIST at position N. + + See also: ‘-splice’ (*note -splice::), ‘-splice-list’ (*note + -splice-list::) + + (-insert-at 1 'x '(a b c)) + ⇒ '(a x b c) + (-insert-at 12 'x '(a b c)) + ⇒ '(a b c x) + + -- Function: -replace-at (n x list) + Return a list with element at Nth position in LIST replaced with X. + + See also: ‘-replace’ (*note -replace::) + + (-replace-at 0 9 '(0 1 2 3 4 5)) + ⇒ '(9 1 2 3 4 5) + (-replace-at 1 9 '(0 1 2 3 4 5)) + ⇒ '(0 9 2 3 4 5) + (-replace-at 4 9 '(0 1 2 3 4 5)) + ⇒ '(0 1 2 3 9 5) + + -- Function: -update-at (n func list) + Return a list with element at Nth position in LIST replaced with + ‘(func (nth n list))‘. + + See also: ‘-map-when’ (*note -map-when::) + + (-update-at 0 (lambda (x) (+ x 9)) '(0 1 2 3 4 5)) + ⇒ '(9 1 2 3 4 5) + (-update-at 1 (lambda (x) (+ x 8)) '(0 1 2 3 4 5)) + ⇒ '(0 9 2 3 4 5) + (--update-at 2 (length it) '("foo" "bar" "baz" "quux")) + ⇒ '("foo" "bar" 3 "quux") + + -- Function: -remove-at (n list) + Return a list with element at Nth position in LIST removed. + + See also: ‘-remove-at-indices’ (*note -remove-at-indices::), + ‘-remove’ (*note -remove::) + + (-remove-at 0 '("0" "1" "2" "3" "4" "5")) + ⇒ '("1" "2" "3" "4" "5") + (-remove-at 1 '("0" "1" "2" "3" "4" "5")) + ⇒ '("0" "2" "3" "4" "5") + (-remove-at 2 '("0" "1" "2" "3" "4" "5")) + ⇒ '("0" "1" "3" "4" "5") + + -- Function: -remove-at-indices (indices list) + Return a list whose elements are elements from LIST without + elements selected as ‘(nth i list)‘ for all i from INDICES. + + See also: ‘-remove-at’ (*note -remove-at::), ‘-remove’ (*note + -remove::) + + (-remove-at-indices '(0) '("0" "1" "2" "3" "4" "5")) + ⇒ '("1" "2" "3" "4" "5") + (-remove-at-indices '(0 2 4) '("0" "1" "2" "3" "4" "5")) + ⇒ '("1" "3" "5") + (-remove-at-indices '(0 5) '("0" "1" "2" "3" "4" "5")) + ⇒ '("1" "2" "3" "4") + + +File: dash.info, Node: Reductions, Next: Unfolding, Prev: List to list, Up: Functions + +2.4 Reductions +============== + +Functions reducing lists into single value. + + -- Function: -reduce-from (fn initial-value list) + Return the result of applying FN to INITIAL-VALUE and the first + item in LIST, then applying FN to that result and the 2nd item, + etc. If LIST contains no items, return INITIAL-VALUE and do not + call FN. + + In the anaphoric form ‘--reduce-from’, the accumulated value is + exposed as symbol ‘acc’. + + See also: ‘-reduce’ (*note -reduce::), ‘-reduce-r’ (*note + -reduce-r::) + + (-reduce-from '- 10 '(1 2 3)) + ⇒ 4 + (-reduce-from (lambda (memo item) (format "(%s - %d)" memo item)) "10" '(1 2 3)) + ⇒ "(((10 - 1) - 2) - 3)" + (--reduce-from (concat acc " " it) "START" '("a" "b" "c")) + ⇒ "START a b c" + + -- Function: -reduce-r-from (fn initial-value list) + Replace conses with FN, nil with INITIAL-VALUE and evaluate the + resulting expression. If LIST is empty, INITIAL-VALUE is returned + and FN is not called. + + Note: this function works the same as ‘-reduce-from’ (*note + -reduce-from::) but the operation associates from right instead of + from left. + + See also: ‘-reduce-r’ (*note -reduce-r::), ‘-reduce’ (*note + -reduce::) + + (-reduce-r-from '- 10 '(1 2 3)) + ⇒ -8 + (-reduce-r-from (lambda (item memo) (format "(%d - %s)" item memo)) "10" '(1 2 3)) + ⇒ "(1 - (2 - (3 - 10)))" + (--reduce-r-from (concat it " " acc) "END" '("a" "b" "c")) + ⇒ "a b c END" + + -- Function: -reduce (fn list) + Return the result of applying FN to the first 2 items in LIST, then + applying FN to that result and the 3rd item, etc. If LIST contains + no items, return the result of calling FN with no arguments. If + LIST contains a single item, return that item and do not call FN. + + In the anaphoric form ‘--reduce’, the accumulated value is exposed + as symbol ‘acc’. + + See also: ‘-reduce-from’ (*note -reduce-from::), ‘-reduce-r’ (*note + -reduce-r::) + + (-reduce '- '(1 2 3 4)) + ⇒ -8 + (-reduce 'list '(1 2 3 4)) + ⇒ '(((1 2) 3) 4) + (--reduce (format "%s-%d" acc it) '(1 2 3)) + ⇒ "1-2-3" + + -- Function: -reduce-r (fn list) + Replace conses with FN and evaluate the resulting expression. The + final nil is ignored. If LIST contains no items, return the result + of calling FN with no arguments. If LIST contains a single item, + return that item and do not call FN. + + The first argument of FN is the new item, the second is the + accumulated value. + + Note: this function works the same as ‘-reduce’ (*note -reduce::) + but the operation associates from right instead of from left. + + See also: ‘-reduce-r-from’ (*note -reduce-r-from::), ‘-reduce’ + (*note -reduce::) + + (-reduce-r '- '(1 2 3 4)) + ⇒ -2 + (-reduce-r (lambda (item memo) (format "%s-%d" memo item)) '(1 2 3)) + ⇒ "3-2-1" + (--reduce-r (format "%s-%d" acc it) '(1 2 3)) + ⇒ "3-2-1" + + -- Function: -reductions-from (fn init list) + Return a list of the intermediate values of the reduction. + + See ‘-reduce-from’ (*note -reduce-from::) for explanation of the + arguments. + + See also: ‘-reductions’ (*note -reductions::), ‘-reductions-r’ + (*note -reductions-r::), ‘-reduce-r’ (*note -reduce-r::) + + (-reductions-from (lambda (a i) (format "(%s FN %d)" a i)) "INIT" '(1 2 3 4)) + ⇒ '("INIT" "(INIT FN 1)" "((INIT FN 1) FN 2)" "(((INIT FN 1) FN 2) FN 3)" "((((INIT FN 1) FN 2) FN 3) FN 4)") + (-reductions-from 'max 0 '(2 1 4 3)) + ⇒ '(0 2 2 4 4) + (-reductions-from '* 1 '(1 2 3 4)) + ⇒ '(1 1 2 6 24) + + -- Function: -reductions-r-from (fn init list) + Return a list of the intermediate values of the reduction. + + See ‘-reduce-r-from’ (*note -reduce-r-from::) for explanation of + the arguments. + + See also: ‘-reductions-r’ (*note -reductions-r::), ‘-reductions’ + (*note -reductions::), ‘-reduce’ (*note -reduce::) + + (-reductions-r-from (lambda (i a) (format "(%d FN %s)" i a)) "INIT" '(1 2 3 4)) + ⇒ '("(1 FN (2 FN (3 FN (4 FN INIT))))" "(2 FN (3 FN (4 FN INIT)))" "(3 FN (4 FN INIT))" "(4 FN INIT)" "INIT") + (-reductions-r-from 'max 0 '(2 1 4 3)) + ⇒ '(4 4 4 3 0) + (-reductions-r-from '* 1 '(1 2 3 4)) + ⇒ '(24 24 12 4 1) + + -- Function: -reductions (fn list) + Return a list of the intermediate values of the reduction. + + See ‘-reduce’ (*note -reduce::) for explanation of the arguments. + + See also: ‘-reductions-from’ (*note -reductions-from::), + ‘-reductions-r’ (*note -reductions-r::), ‘-reduce-r’ (*note + -reduce-r::) + + (-reductions (lambda (a i) (format "(%s FN %d)" a i)) '(1 2 3 4)) + ⇒ '(1 "(1 FN 2)" "((1 FN 2) FN 3)" "(((1 FN 2) FN 3) FN 4)") + (-reductions '+ '(1 2 3 4)) + ⇒ '(1 3 6 10) + (-reductions '* '(1 2 3 4)) + ⇒ '(1 2 6 24) + + -- Function: -reductions-r (fn list) + Return a list of the intermediate values of the reduction. + + See ‘-reduce-r’ (*note -reduce-r::) for explanation of the + arguments. + + See also: ‘-reductions-r-from’ (*note -reductions-r-from::), + ‘-reductions’ (*note -reductions::), ‘-reduce’ (*note -reduce::) + + (-reductions-r (lambda (i a) (format "(%d FN %s)" i a)) '(1 2 3 4)) + ⇒ '("(1 FN (2 FN (3 FN 4)))" "(2 FN (3 FN 4))" "(3 FN 4)" 4) + (-reductions-r '+ '(1 2 3 4)) + ⇒ '(10 9 7 4) + (-reductions-r '* '(1 2 3 4)) + ⇒ '(24 24 12 4) + + -- Function: -count (pred list) + Counts the number of items in LIST where (PRED item) is non-nil. + + (-count 'even? '(1 2 3 4 5)) + ⇒ 2 + (--count (< it 4) '(1 2 3 4)) + ⇒ 3 + + -- Function: -sum (list) + Return the sum of LIST. + + (-sum '()) + ⇒ 0 + (-sum '(1)) + ⇒ 1 + (-sum '(1 2 3 4)) + ⇒ 10 + + -- Function: -running-sum (list) + Return a list with running sums of items in LIST. + + LIST must be non-empty. + + (-running-sum '(1 2 3 4)) + ⇒ '(1 3 6 10) + (-running-sum '(1)) + ⇒ '(1) + (-running-sum '()) + ⇒ error + + -- Function: -product (list) + Return the product of LIST. + + (-product '()) + ⇒ 1 + (-product '(1)) + ⇒ 1 + (-product '(1 2 3 4)) + ⇒ 24 + + -- Function: -running-product (list) + Return a list with running products of items in LIST. + + LIST must be non-empty. + + (-running-product '(1 2 3 4)) + ⇒ '(1 2 6 24) + (-running-product '(1)) + ⇒ '(1) + (-running-product '()) + ⇒ error + + -- Function: -inits (list) + Return all prefixes of LIST. + + (-inits '(1 2 3 4)) + ⇒ '(nil (1) (1 2) (1 2 3) (1 2 3 4)) + (-inits nil) + ⇒ '(nil) + (-inits '(1)) + ⇒ '(nil (1)) + + -- Function: -tails (list) + Return all suffixes of LIST + + (-tails '(1 2 3 4)) + ⇒ '((1 2 3 4) (2 3 4) (3 4) (4) nil) + (-tails nil) + ⇒ '(nil) + (-tails '(1)) + ⇒ '((1) nil) + + -- Function: -common-prefix (&rest lists) + Return the longest common prefix of LISTS. + + (-common-prefix '(1)) + ⇒ '(1) + (-common-prefix '(1 2) '(3 4) '(1 2)) + ⇒ nil + (-common-prefix '(1 2) '(1 2 3) '(1 2 3 4)) + ⇒ '(1 2) + + -- Function: -common-suffix (&rest lists) + Return the longest common suffix of LISTS. + + (-common-suffix '(1)) + ⇒ '(1) + (-common-suffix '(1 2) '(3 4) '(1 2)) + ⇒ nil + (-common-suffix '(1 2 3 4) '(2 3 4) '(3 4)) + ⇒ '(3 4) + + -- Function: -min (list) + Return the smallest value from LIST of numbers or markers. + + (-min '(0)) + ⇒ 0 + (-min '(3 2 1)) + ⇒ 1 + (-min '(1 2 3)) + ⇒ 1 + + -- Function: -min-by (comparator list) + Take a comparison function COMPARATOR and a LIST and return the + least element of the list by the comparison function. + + See also combinator ‘-on’ (*note -on::) which can transform the + values before comparing them. + + (-min-by '> '(4 3 6 1)) + ⇒ 1 + (--min-by (> (car it) (car other)) '((1 2 3) (2) (3 2))) + ⇒ '(1 2 3) + (--min-by (> (length it) (length other)) '((1 2 3) (2) (3 2))) + ⇒ '(2) + + -- Function: -max (list) + Return the largest value from LIST of numbers or markers. + + (-max '(0)) + ⇒ 0 + (-max '(3 2 1)) + ⇒ 3 + (-max '(1 2 3)) + ⇒ 3 + + -- Function: -max-by (comparator list) + Take a comparison function COMPARATOR and a LIST and return the + greatest element of the list by the comparison function. + + See also combinator ‘-on’ (*note -on::) which can transform the + values before comparing them. + + (-max-by '> '(4 3 6 1)) + ⇒ 6 + (--max-by (> (car it) (car other)) '((1 2 3) (2) (3 2))) + ⇒ '(3 2) + (--max-by (> (length it) (length other)) '((1 2 3) (2) (3 2))) + ⇒ '(1 2 3) + + +File: dash.info, Node: Unfolding, Next: Predicates, Prev: Reductions, Up: Functions + +2.5 Unfolding +============= + +Operations dual to reductions, building lists from seed value rather +than consuming a list to produce a single value. + + -- Function: -iterate (fun init n) + Return a list of iterated applications of FUN to INIT. + + This means a list of form: + + (init (fun init) (fun (fun init)) ...) + + N is the length of the returned list. + + (-iterate '1+ 1 10) + ⇒ '(1 2 3 4 5 6 7 8 9 10) + (-iterate (lambda (x) (+ x x)) 2 5) + ⇒ '(2 4 8 16 32) + (--iterate (* it it) 2 5) + ⇒ '(2 4 16 256 65536) + + -- Function: -unfold (fun seed) + Build a list from SEED using FUN. + + This is "dual" operation to ‘-reduce-r’ (*note -reduce-r::): while + -reduce-r consumes a list to produce a single value, ‘-unfold’ + (*note -unfold::) takes a seed value and builds a (potentially + infinite!) list. + + FUN should return ‘nil’ to stop the generating process, or a cons + (A . B), where A will be prepended to the result and B is the new + seed. + + (-unfold (lambda (x) (unless (= x 0) (cons x (1- x)))) 10) + ⇒ '(10 9 8 7 6 5 4 3 2 1) + (--unfold (when it (cons it (cdr it))) '(1 2 3 4)) + ⇒ '((1 2 3 4) (2 3 4) (3 4) (4)) + (--unfold (when it (cons it (butlast it))) '(1 2 3 4)) + ⇒ '((1 2 3 4) (1 2 3) (1 2) (1)) + + +File: dash.info, Node: Predicates, Next: Partitioning, Prev: Unfolding, Up: Functions + +2.6 Predicates +============== + + -- Function: -any? (pred list) + Return t if (PRED x) is non-nil for any x in LIST, else nil. + + Alias: ‘-any-p’, ‘-some?’, ‘-some-p’ + + (-any? 'even? '(1 2 3)) + ⇒ t + (-any? 'even? '(1 3 5)) + ⇒ nil + (-any? 'null '(1 3 5)) + ⇒ nil + + -- Function: -all? (pred list) + Return t if (PRED x) is non-nil for all x in LIST, else nil. + + Alias: ‘-all-p’, ‘-every?’, ‘-every-p’ + + (-all? 'even? '(1 2 3)) + ⇒ nil + (-all? 'even? '(2 4 6)) + ⇒ t + (--all? (= 0 (% it 2)) '(2 4 6)) + ⇒ t + + -- Function: -none? (pred list) + Return t if (PRED x) is nil for all x in LIST, else nil. + + Alias: ‘-none-p’ + + (-none? 'even? '(1 2 3)) + ⇒ nil + (-none? 'even? '(1 3 5)) + ⇒ t + (--none? (= 0 (% it 2)) '(1 2 3)) + ⇒ nil + + -- Function: -only-some? (pred list) + Return ‘t‘ if at least one item of LIST matches PRED and at least + one item of LIST does not match PRED. Return ‘nil‘ both if all + items match the predicate or if none of the items match the + predicate. + + Alias: ‘-only-some-p’ + + (-only-some? 'even? '(1 2 3)) + ⇒ t + (-only-some? 'even? '(1 3 5)) + ⇒ nil + (-only-some? 'even? '(2 4 6)) + ⇒ nil + + -- Function: -contains? (list element) + Return non-nil if LIST contains ELEMENT. + + The test for equality is done with ‘equal’, or with ‘-compare-fn’ + if that’s non-nil. + + Alias: ‘-contains-p’ + + (-contains? '(1 2 3) 1) + ⇒ t + (-contains? '(1 2 3) 2) + ⇒ t + (-contains? '(1 2 3) 4) + ⇒ nil + + -- Function: -same-items? (list list2) + Return true if LIST and LIST2 has the same items. + + The order of the elements in the lists does not matter. + + Alias: ‘-same-items-p’ + + (-same-items? '(1 2 3) '(1 2 3)) + ⇒ t + (-same-items? '(1 2 3) '(3 2 1)) + ⇒ t + (-same-items? '(1 2 3) '(1 2 3 4)) + ⇒ nil + + -- Function: -is-prefix? (prefix list) + Return non-nil if PREFIX is prefix of LIST. + + Alias: ‘-is-prefix-p’ + + (-is-prefix? '(1 2 3) '(1 2 3 4 5)) + ⇒ t + (-is-prefix? '(1 2 3 4 5) '(1 2 3)) + ⇒ nil + (-is-prefix? '(1 3) '(1 2 3 4 5)) + ⇒ nil + + -- Function: -is-suffix? (suffix list) + Return non-nil if SUFFIX is suffix of LIST. + + Alias: ‘-is-suffix-p’ + + (-is-suffix? '(3 4 5) '(1 2 3 4 5)) + ⇒ t + (-is-suffix? '(1 2 3 4 5) '(3 4 5)) + ⇒ nil + (-is-suffix? '(3 5) '(1 2 3 4 5)) + ⇒ nil + + -- Function: -is-infix? (infix list) + Return non-nil if INFIX is infix of LIST. + + This operation runs in O(n^2) time + + Alias: ‘-is-infix-p’ + + (-is-infix? '(1 2 3) '(1 2 3 4 5)) + ⇒ t + (-is-infix? '(2 3 4) '(1 2 3 4 5)) + ⇒ t + (-is-infix? '(3 4 5) '(1 2 3 4 5)) + ⇒ t + + +File: dash.info, Node: Partitioning, Next: Indexing, Prev: Predicates, Up: Functions + +2.7 Partitioning +================ + +Functions partitioning the input list into a list of lists. + + -- Function: -split-at (n list) + Return a list of ((-take N LIST) (-drop N LIST)), in no more than + one pass through the list. + + (-split-at 3 '(1 2 3 4 5)) + ⇒ '((1 2 3) (4 5)) + (-split-at 17 '(1 2 3 4 5)) + ⇒ '((1 2 3 4 5) nil) + + -- Function: -split-with (pred list) + Return a list of ((-take-while PRED LIST) (-drop-while PRED LIST)), + in no more than one pass through the list. + + (-split-with 'even? '(1 2 3 4)) + ⇒ '(nil (1 2 3 4)) + (-split-with 'even? '(2 4 5 6)) + ⇒ '((2 4) (5 6)) + (--split-with (< it 4) '(1 2 3 4 3 2 1)) + ⇒ '((1 2 3) (4 3 2 1)) + + -- Macro: -split-on (item list) + Split the LIST each time ITEM is found. + + Unlike ‘-partition-by’ (*note -partition-by::), the ITEM is + discarded from the results. Empty lists are also removed from the + result. + + Comparison is done by ‘equal’. + + See also ‘-split-when’ (*note -split-when::) + + (-split-on '| '(Nil | Leaf a | Node [Tree a])) + ⇒ '((Nil) (Leaf a) (Node [Tree a])) + (-split-on ':endgroup '("a" "b" :endgroup "c" :endgroup "d" "e")) + ⇒ '(("a" "b") ("c") ("d" "e")) + (-split-on ':endgroup '("a" "b" :endgroup :endgroup "d" "e")) + ⇒ '(("a" "b") ("d" "e")) + + -- Function: -split-when (fn list) + Split the LIST on each element where FN returns non-nil. + + Unlike ‘-partition-by’ (*note -partition-by::), the "matched" + element is discarded from the results. Empty lists are also + removed from the result. + + This function can be thought of as a generalization of + ‘split-string’. + + (-split-when 'even? '(1 2 3 4 5 6)) + ⇒ '((1) (3) (5)) + (-split-when 'even? '(1 2 3 4 6 8 9)) + ⇒ '((1) (3) (9)) + (--split-when (memq it '(&optional &rest)) '(a b &optional c d &rest args)) + ⇒ '((a b) (c d) (args)) + + -- Function: -separate (pred list) + Return a list of ((-filter PRED LIST) (-remove PRED LIST)), in one + pass through the list. + + (-separate (lambda (num) (= 0 (% num 2))) '(1 2 3 4 5 6 7)) + ⇒ '((2 4 6) (1 3 5 7)) + (--separate (< it 5) '(3 7 5 9 3 2 1 4 6)) + ⇒ '((3 3 2 1 4) (7 5 9 6)) + (-separate 'cdr '((1 2) (1) (1 2 3) (4))) + ⇒ '(((1 2) (1 2 3)) ((1) (4))) + + -- Function: -partition (n list) + Return a new list with the items in LIST grouped into N-sized + sublists. If there are not enough items to make the last group + N-sized, those items are discarded. + + (-partition 2 '(1 2 3 4 5 6)) + ⇒ '((1 2) (3 4) (5 6)) + (-partition 2 '(1 2 3 4 5 6 7)) + ⇒ '((1 2) (3 4) (5 6)) + (-partition 3 '(1 2 3 4 5 6 7)) + ⇒ '((1 2 3) (4 5 6)) + + -- Function: -partition-all (n list) + Return a new list with the items in LIST grouped into N-sized + sublists. The last group may contain less than N items. + + (-partition-all 2 '(1 2 3 4 5 6)) + ⇒ '((1 2) (3 4) (5 6)) + (-partition-all 2 '(1 2 3 4 5 6 7)) + ⇒ '((1 2) (3 4) (5 6) (7)) + (-partition-all 3 '(1 2 3 4 5 6 7)) + ⇒ '((1 2 3) (4 5 6) (7)) + + -- Function: -partition-in-steps (n step list) + Return a new list with the items in LIST grouped into N-sized + sublists at offsets STEP apart. If there are not enough items to + make the last group N-sized, those items are discarded. + + (-partition-in-steps 2 1 '(1 2 3 4)) + ⇒ '((1 2) (2 3) (3 4)) + (-partition-in-steps 3 2 '(1 2 3 4)) + ⇒ '((1 2 3)) + (-partition-in-steps 3 2 '(1 2 3 4 5)) + ⇒ '((1 2 3) (3 4 5)) + + -- Function: -partition-all-in-steps (n step list) + Return a new list with the items in LIST grouped into N-sized + sublists at offsets STEP apart. The last groups may contain less + than N items. + + (-partition-all-in-steps 2 1 '(1 2 3 4)) + ⇒ '((1 2) (2 3) (3 4) (4)) + (-partition-all-in-steps 3 2 '(1 2 3 4)) + ⇒ '((1 2 3) (3 4)) + (-partition-all-in-steps 3 2 '(1 2 3 4 5)) + ⇒ '((1 2 3) (3 4 5) (5)) + + -- Function: -partition-by (fn list) + Apply FN to each item in LIST, splitting it each time FN returns a + new value. + + (-partition-by 'even? '()) + ⇒ '() + (-partition-by 'even? '(1 1 2 2 2 3 4 6 8)) + ⇒ '((1 1) (2 2 2) (3) (4 6 8)) + (--partition-by (< it 3) '(1 2 3 4 3 2 1)) + ⇒ '((1 2) (3 4 3) (2 1)) + + -- Function: -partition-by-header (fn list) + Apply FN to the first item in LIST. That is the header value. + Apply FN to each item in LIST, splitting it each time FN returns + the header value, but only after seeing at least one other value + (the body). + + (--partition-by-header (= it 1) '(1 2 3 1 2 1 2 3 4)) + ⇒ '((1 2 3) (1 2) (1 2 3 4)) + (--partition-by-header (> it 0) '(1 2 0 1 0 1 2 3 0)) + ⇒ '((1 2 0) (1 0) (1 2 3 0)) + (-partition-by-header 'even? '(2 1 1 1 4 1 3 5 6 6 1)) + ⇒ '((2 1 1 1) (4 1 3 5) (6 6 1)) + + -- Function: -partition-after-pred (pred list) + Partition directly after each time PRED is true on an element of + LIST. + + (-partition-after-pred #'odd? '()) + ⇒ '() + (-partition-after-pred #'odd? '(1)) + ⇒ '((1)) + (-partition-after-pred #'odd? '(0 1)) + ⇒ '((0 1)) + + -- Function: -partition-before-pred (pred list) + Partition directly before each time PRED is true on an element of + LIST. + + (-partition-before-pred #'odd? '()) + ⇒ '() + (-partition-before-pred #'odd? '(1)) + ⇒ '((1)) + (-partition-before-pred #'odd? '(0 1)) + ⇒ '((0) (1)) + + -- Function: -partition-before-item (item list) + Partition directly before each time ITEM appears in LIST. + + (-partition-before-item 3 '()) + ⇒ '() + (-partition-before-item 3 '(1)) + ⇒ '((1)) + (-partition-before-item 3 '(3)) + ⇒ '((3)) + + -- Function: -partition-after-item (item list) + Partition directly after each time ITEM appears in LIST. + + (-partition-after-item 3 '()) + ⇒ '() + (-partition-after-item 3 '(1)) + ⇒ '((1)) + (-partition-after-item 3 '(3)) + ⇒ '((3)) + + -- Function: -group-by (fn list) + Separate LIST into an alist whose keys are FN applied to the + elements of LIST. Keys are compared by ‘equal’. + + (-group-by 'even? '()) + ⇒ '() + (-group-by 'even? '(1 1 2 2 2 3 4 6 8)) + ⇒ '((nil 1 1 3) (t 2 2 2 4 6 8)) + (--group-by (car (split-string it "/")) '("a/b" "c/d" "a/e")) + ⇒ '(("a" "a/b" "a/e") ("c" "c/d")) + + +File: dash.info, Node: Indexing, Next: Set operations, Prev: Partitioning, Up: Functions + +2.8 Indexing +============ + +Return indices of elements based on predicates, sort elements by indices +etc. + + -- Function: -elem-index (elem list) + Return the index of the first element in the given LIST which is + equal to the query element ELEM, or nil if there is no such + element. + + (-elem-index 2 '(6 7 8 2 3 4)) + ⇒ 3 + (-elem-index "bar" '("foo" "bar" "baz")) + ⇒ 1 + (-elem-index '(1 2) '((3) (5 6) (1 2) nil)) + ⇒ 2 + + -- Function: -elem-indices (elem list) + Return the indices of all elements in LIST equal to the query + element ELEM, in ascending order. + + (-elem-indices 2 '(6 7 8 2 3 4 2 1)) + ⇒ '(3 6) + (-elem-indices "bar" '("foo" "bar" "baz")) + ⇒ '(1) + (-elem-indices '(1 2) '((3) (1 2) (5 6) (1 2) nil)) + ⇒ '(1 3) + + -- Function: -find-index (pred list) + Take a predicate PRED and a LIST and return the index of the first + element in the list satisfying the predicate, or nil if there is no + such element. + + See also ‘-first’ (*note -first::). + + (-find-index 'even? '(2 4 1 6 3 3 5 8)) + ⇒ 0 + (--find-index (< 5 it) '(2 4 1 6 3 3 5 8)) + ⇒ 3 + (-find-index (-partial 'string-lessp "baz") '("bar" "foo" "baz")) + ⇒ 1 + + -- Function: -find-last-index (pred list) + Take a predicate PRED and a LIST and return the index of the last + element in the list satisfying the predicate, or nil if there is no + such element. + + See also ‘-last’ (*note -last::). + + (-find-last-index 'even? '(2 4 1 6 3 3 5 8)) + ⇒ 7 + (--find-last-index (< 5 it) '(2 7 1 6 3 8 5 2)) + ⇒ 5 + (-find-last-index (-partial 'string-lessp "baz") '("q" "foo" "baz")) + ⇒ 1 + + -- Function: -find-indices (pred list) + Return the indices of all elements in LIST satisfying the predicate + PRED, in ascending order. + + (-find-indices 'even? '(2 4 1 6 3 3 5 8)) + ⇒ '(0 1 3 7) + (--find-indices (< 5 it) '(2 4 1 6 3 3 5 8)) + ⇒ '(3 7) + (-find-indices (-partial 'string-lessp "baz") '("bar" "foo" "baz")) + ⇒ '(1) + + -- Function: -grade-up (comparator list) + Grade elements of LIST using COMPARATOR relation, yielding a + permutation vector such that applying this permutation to LIST + sorts it in ascending order. + + (-grade-up '< '(3 1 4 2 1 3 3)) + ⇒ '(1 4 3 0 5 6 2) + (let ((l '(3 1 4 2 1 3 3))) (-select-by-indices (-grade-up '< l) l)) + ⇒ '(1 1 2 3 3 3 4) + + -- Function: -grade-down (comparator list) + Grade elements of LIST using COMPARATOR relation, yielding a + permutation vector such that applying this permutation to LIST + sorts it in descending order. + + (-grade-down '< '(3 1 4 2 1 3 3)) + ⇒ '(2 0 5 6 3 1 4) + (let ((l '(3 1 4 2 1 3 3))) (-select-by-indices (-grade-down '< l) l)) + ⇒ '(4 3 3 3 2 1 1) + + +File: dash.info, Node: Set operations, Next: Other list operations, Prev: Indexing, Up: Functions + +2.9 Set operations +================== + +Operations pretending lists are sets. + + -- Function: -union (list list2) + Return a new list containing the elements of LIST and elements of + LIST2 that are not in LIST. The test for equality is done with + ‘equal’, or with ‘-compare-fn’ if that’s non-nil. + + (-union '(1 2 3) '(3 4 5)) + ⇒ '(1 2 3 4 5) + (-union '(1 2 3 4) '()) + ⇒ '(1 2 3 4) + (-union '(1 1 2 2) '(3 2 1)) + ⇒ '(1 1 2 2 3) + + -- Function: -difference (list list2) + Return a new list with only the members of LIST that are not in + LIST2. The test for equality is done with ‘equal’, or with + ‘-compare-fn’ if that’s non-nil. + + (-difference '() '()) + ⇒ '() + (-difference '(1 2 3) '(4 5 6)) + ⇒ '(1 2 3) + (-difference '(1 2 3 4) '(3 4 5 6)) + ⇒ '(1 2) + + -- Function: -intersection (list list2) + Return a new list containing only the elements that are members of + both LIST and LIST2. The test for equality is done with ‘equal’, + or with ‘-compare-fn’ if that’s non-nil. + + (-intersection '() '()) + ⇒ '() + (-intersection '(1 2 3) '(4 5 6)) + ⇒ '() + (-intersection '(1 2 3 4) '(3 4 5 6)) + ⇒ '(3 4) + + -- Function: -powerset (list) + Return the power set of LIST. + + (-powerset '()) + ⇒ '(nil) + (-powerset '(x y z)) + ⇒ '((x y z) (x y) (x z) (x) (y z) (y) (z) nil) + + -- Function: -permutations (list) + Return the permutations of LIST. + + (-permutations '()) + ⇒ '(nil) + (-permutations '(1 2)) + ⇒ '((1 2) (2 1)) + (-permutations '(a b c)) + ⇒ '((a b c) (a c b) (b a c) (b c a) (c a b) (c b a)) + + -- Function: -distinct (list) + Return a new list with all duplicates removed. The test for + equality is done with ‘equal’, or with ‘-compare-fn’ if that’s + non-nil. + + Alias: ‘-uniq’ + + (-distinct '()) + ⇒ '() + (-distinct '(1 2 2 4)) + ⇒ '(1 2 4) + (-distinct '(t t t)) + ⇒ '(t) + + +File: dash.info, Node: Other list operations, Next: Tree operations, Prev: Set operations, Up: Functions + +2.10 Other list operations +========================== + +Other list functions not fit to be classified elsewhere. + + -- Function: -rotate (n list) + Rotate LIST N places to the right. With N negative, rotate to the + left. The time complexity is O(n). + + (-rotate 3 '(1 2 3 4 5 6 7)) + ⇒ '(5 6 7 1 2 3 4) + (-rotate -3 '(1 2 3 4 5 6 7)) + ⇒ '(4 5 6 7 1 2 3) + (-rotate 16 '(1 2 3 4 5 6 7)) + ⇒ '(6 7 1 2 3 4 5) + + -- Function: -repeat (n x) + Return a list with X repeated N times. Return nil if N is less + than 1. + + (-repeat 3 :a) + ⇒ '(:a :a :a) + (-repeat 1 :a) + ⇒ '(:a) + (-repeat 0 :a) + ⇒ nil + + -- Function: -cons* (&rest args) + Make a new list from the elements of ARGS. + + The last 2 members of ARGS are used as the final cons of the result + so if the final member of ARGS is not a list the result is a dotted + list. + + (-cons* 1 2) + ⇒ '(1 . 2) + (-cons* 1 2 3) + ⇒ '(1 2 . 3) + (-cons* 1) + ⇒ 1 + + -- Function: -snoc (list elem &rest elements) + Append ELEM to the end of the list. + + This is like ‘cons’, but operates on the end of list. + + If ELEMENTS is non nil, append these to the list as well. + + (-snoc '(1 2 3) 4) + ⇒ '(1 2 3 4) + (-snoc '(1 2 3) 4 5 6) + ⇒ '(1 2 3 4 5 6) + (-snoc '(1 2 3) '(4 5 6)) + ⇒ '(1 2 3 (4 5 6)) + + -- Function: -interpose (sep list) + Return a new list of all elements in LIST separated by SEP. + + (-interpose "-" '()) + ⇒ '() + (-interpose "-" '("a")) + ⇒ '("a") + (-interpose "-" '("a" "b" "c")) + ⇒ '("a" "-" "b" "-" "c") + + -- Function: -interleave (&rest lists) + Return a new list of the first item in each list, then the second + etc. + + (-interleave '(1 2) '("a" "b")) + ⇒ '(1 "a" 2 "b") + (-interleave '(1 2) '("a" "b") '("A" "B")) + ⇒ '(1 "a" "A" 2 "b" "B") + (-interleave '(1 2 3) '("a" "b")) + ⇒ '(1 "a" 2 "b") + + -- Function: -zip-with (fn list1 list2) + Zip the two lists LIST1 and LIST2 using a function FN. This + function is applied pairwise taking as first argument element of + LIST1 and as second argument element of LIST2 at corresponding + position. + + The anaphoric form ‘--zip-with’ binds the elements from LIST1 as + symbol ‘it’, and the elements from LIST2 as symbol ‘other’. + + (-zip-with '+ '(1 2 3) '(4 5 6)) + ⇒ '(5 7 9) + (-zip-with 'cons '(1 2 3) '(4 5 6)) + ⇒ '((1 . 4) (2 . 5) (3 . 6)) + (--zip-with (concat it " and " other) '("Batman" "Jekyll") '("Robin" "Hyde")) + ⇒ '("Batman and Robin" "Jekyll and Hyde") + + -- Function: -zip (&rest lists) + Zip LISTS together. Group the head of each list, followed by the + second elements of each list, and so on. The lengths of the + returned groupings are equal to the length of the shortest input + list. + + If two lists are provided as arguments, return the groupings as a + list of cons cells. Otherwise, return the groupings as a list of + lists. + + Use ‘-zip-lists’ (*note -zip-lists::) if you need the return value + to always be a list of lists. + + Alias: ‘-zip-pair’ + + See also: ‘-zip-lists’ (*note -zip-lists::) + + (-zip '(1 2 3) '(4 5 6)) + ⇒ '((1 . 4) (2 . 5) (3 . 6)) + (-zip '(1 2 3) '(4 5 6 7)) + ⇒ '((1 . 4) (2 . 5) (3 . 6)) + (-zip '(1 2) '(3 4 5) '(6)) + ⇒ '((1 3 6)) + + -- Function: -zip-lists (&rest lists) + Zip LISTS together. Group the head of each list, followed by the + second elements of each list, and so on. The lengths of the + returned groupings are equal to the length of the shortest input + list. + + The return value is always list of lists, which is a difference + from ‘-zip-pair’ which returns a cons-cell in case two input lists + are provided. + + See also: ‘-zip’ (*note -zip::) + + (-zip-lists '(1 2 3) '(4 5 6)) + ⇒ '((1 4) (2 5) (3 6)) + (-zip-lists '(1 2 3) '(4 5 6 7)) + ⇒ '((1 4) (2 5) (3 6)) + (-zip-lists '(1 2) '(3 4 5) '(6)) + ⇒ '((1 3 6)) + + -- Function: -zip-fill (fill-value &rest lists) + Zip LISTS, with FILL-VALUE padded onto the shorter lists. The + lengths of the returned groupings are equal to the length of the + longest input list. + + (-zip-fill 0 '(1 2 3 4 5) '(6 7 8 9)) + ⇒ '((1 . 6) (2 . 7) (3 . 8) (4 . 9) (5 . 0)) + + -- Function: -unzip (lists) + Unzip LISTS. + + This works just like ‘-zip’ (*note -zip::) but takes a list of + lists instead of a variable number of arguments, such that + + (-unzip (-zip L1 L2 L3 ...)) + + is identity (given that the lists are the same length). + + Note in particular that calling this on a list of two lists will + return a list of cons-cells such that the aboce identity works. + + See also: ‘-zip’ (*note -zip::) + + (-unzip (-zip '(1 2 3) '(a b c) '("e" "f" "g"))) + ⇒ '((1 2 3) (a b c) ("e" "f" "g")) + (-unzip '((1 2) (3 4) (5 6) (7 8) (9 10))) + ⇒ '((1 3 5 7 9) (2 4 6 8 10)) + (-unzip '((1 2) (3 4))) + ⇒ '((1 . 3) (2 . 4)) + + -- Function: -cycle (list) + Return an infinite copy of LIST that will cycle through the + elements and repeat from the beginning. + + (-take 5 (-cycle '(1 2 3))) + ⇒ '(1 2 3 1 2) + (-take 7 (-cycle '(1 "and" 3))) + ⇒ '(1 "and" 3 1 "and" 3 1) + (-zip (-cycle '(1 2 3)) '(1 2)) + ⇒ '((1 . 1) (2 . 2)) + + -- Function: -pad (fill-value &rest lists) + Appends FILL-VALUE to the end of each list in LISTS such that they + will all have the same length. + + (-pad 0 '()) + ⇒ '(nil) + (-pad 0 '(1)) + ⇒ '((1)) + (-pad 0 '(1 2 3) '(4 5)) + ⇒ '((1 2 3) (4 5 0)) + + -- Function: -table (fn &rest lists) + Compute outer product of LISTS using function FN. + + The function FN should have the same arity as the number of + supplied lists. + + The outer product is computed by applying fn to all possible + combinations created by taking one element from each list in order. + The dimension of the result is (length lists). + + See also: ‘-table-flat’ (*note -table-flat::) + + (-table '* '(1 2 3) '(1 2 3)) + ⇒ '((1 2 3) (2 4 6) (3 6 9)) + (-table (lambda (a b) (-sum (-zip-with '* a b))) '((1 2) (3 4)) '((1 3) (2 4))) + ⇒ '((7 15) (10 22)) + (apply '-table 'list (-repeat 3 '(1 2))) + ⇒ '((((1 1 1) (2 1 1)) ((1 2 1) (2 2 1))) (((1 1 2) (2 1 2)) ((1 2 2) (2 2 2)))) + + -- Function: -table-flat (fn &rest lists) + Compute flat outer product of LISTS using function FN. + + The function FN should have the same arity as the number of + supplied lists. + + The outer product is computed by applying fn to all possible + combinations created by taking one element from each list in order. + The results are flattened, ignoring the tensor structure of the + result. This is equivalent to calling: + + (-flatten-n (1- (length lists)) (apply ’-table fn lists)) + + but the implementation here is much more efficient. + + See also: ‘-flatten-n’ (*note -flatten-n::), ‘-table’ (*note + -table::) + + (-table-flat 'list '(1 2 3) '(a b c)) + ⇒ '((1 a) (2 a) (3 a) (1 b) (2 b) (3 b) (1 c) (2 c) (3 c)) + (-table-flat '* '(1 2 3) '(1 2 3)) + ⇒ '(1 2 3 2 4 6 3 6 9) + (apply '-table-flat 'list (-repeat 3 '(1 2))) + ⇒ '((1 1 1) (2 1 1) (1 2 1) (2 2 1) (1 1 2) (2 1 2) (1 2 2) (2 2 2)) + + -- Function: -first (pred list) + Return the first x in LIST where (PRED x) is non-nil, else nil. + + To get the first item in the list no questions asked, use ‘car’. + + Alias: ‘-find’ + + (-first 'even? '(1 2 3)) + ⇒ 2 + (-first 'even? '(1 3 5)) + ⇒ nil + (-first 'null '(1 3 5)) + ⇒ nil + + -- Function: -some (pred list) + Return (PRED x) for the first LIST item where (PRED x) is non-nil, + else nil. + + Alias: ‘-any’ + + (-some 'even? '(1 2 3)) + ⇒ t + (-some 'null '(1 2 3)) + ⇒ nil + (-some 'null '(1 2 nil)) + ⇒ t + + -- Function: -last (pred list) + Return the last x in LIST where (PRED x) is non-nil, else nil. + + (-last 'even? '(1 2 3 4 5 6 3 3 3)) + ⇒ 6 + (-last 'even? '(1 3 7 5 9)) + ⇒ nil + (--last (> (length it) 3) '("a" "looong" "word" "and" "short" "one")) + ⇒ "short" + + -- Function: -first-item (list) + Return the first item of LIST, or nil on an empty list. + + See also: ‘-second-item’ (*note -second-item::), ‘-last-item’ + (*note -last-item::). + + (fn LIST) + + (-first-item '(1 2 3)) + ⇒ 1 + (-first-item nil) + ⇒ nil + (let ((list (list 1 2 3))) (setf (-first-item list) 5) list) + ⇒ '(5 2 3) + + -- Function: -second-item (arg1) + Return the second item of LIST, or nil if LIST is too short. + + See also: ‘-third-item’ (*note -third-item::). + + (fn LIST) + + (-second-item '(1 2 3)) + ⇒ 2 + (-second-item nil) + ⇒ nil + + -- Function: -third-item (arg1) + Return the third item of LIST, or nil if LIST is too short. + + See also: ‘-fourth-item’ (*note -fourth-item::). + + (fn LIST) + + (-third-item '(1 2 3)) + ⇒ 3 + (-third-item nil) + ⇒ nil + + -- Function: -fourth-item (list) + Return the fourth item of LIST, or nil if LIST is too short. + + See also: ‘-fifth-item’ (*note -fifth-item::). + + (-fourth-item '(1 2 3 4)) + ⇒ 4 + (-fourth-item nil) + ⇒ nil + + -- Function: -fifth-item (list) + Return the fifth item of LIST, or nil if LIST is too short. + + See also: ‘-last-item’ (*note -last-item::). + + (-fifth-item '(1 2 3 4 5)) + ⇒ 5 + (-fifth-item nil) + ⇒ nil + + -- Function: -last-item (list) + Return the last item of LIST, or nil on an empty list. + + (-last-item '(1 2 3)) + ⇒ 3 + (-last-item nil) + ⇒ nil + (let ((list (list 1 2 3))) (setf (-last-item list) 5) list) + ⇒ '(1 2 5) + + -- Function: -butlast (list) + Return a list of all items in list except for the last. + + (-butlast '(1 2 3)) + ⇒ '(1 2) + (-butlast '(1 2)) + ⇒ '(1) + (-butlast '(1)) + ⇒ nil + + -- Function: -sort (comparator list) + Sort LIST, stably, comparing elements using COMPARATOR. Return the + sorted list. LIST is NOT modified by side effects. COMPARATOR is + called with two elements of LIST, and should return non-nil if the + first element should sort before the second. + + (-sort '< '(3 1 2)) + ⇒ '(1 2 3) + (-sort '> '(3 1 2)) + ⇒ '(3 2 1) + (--sort (< it other) '(3 1 2)) + ⇒ '(1 2 3) + + -- Function: -list (&rest args) + Return a list with ARGS. + + If first item of ARGS is already a list, simply return ARGS. If + not, return a list with ARGS as elements. + + (-list 1) + ⇒ '(1) + (-list 1 2 3) + ⇒ '(1 2 3) + (-list '(1 2 3)) + ⇒ '(1 2 3) + + -- Function: -fix (fn list) + Compute the (least) fixpoint of FN with initial input LIST. + + FN is called at least once, results are compared with ‘equal’. + + (-fix (lambda (l) (-non-nil (--mapcat (-split-at (/ (length it) 2) it) l))) '((1 2 3 4 5 6))) + ⇒ '((1) (2) (3) (4) (5) (6)) + (let ((data '(("starwars" "scifi") ("jedi" "starwars" "warrior")))) (--fix (-uniq (--mapcat (cons it (cdr (assoc it data))) it)) '("jedi" "book"))) + ⇒ '("jedi" "starwars" "warrior" "scifi" "book") + + +File: dash.info, Node: Tree operations, Next: Threading macros, Prev: Other list operations, Up: Functions + +2.11 Tree operations +==================== + +Functions pretending lists are trees. + + -- Function: -tree-seq (branch children tree) + Return a sequence of the nodes in TREE, in depth-first search + order. + + BRANCH is a predicate of one argument that returns non-nil if the + passed argument is a branch, that is, a node that can have + children. + + CHILDREN is a function of one argument that returns the children of + the passed branch node. + + Non-branch nodes are simply copied. + + (-tree-seq 'listp 'identity '(1 (2 3) 4 (5 (6 7)))) + ⇒ '((1 (2 3) 4 (5 (6 7))) 1 (2 3) 2 3 4 (5 (6 7)) 5 (6 7) 6 7) + (-tree-seq 'listp 'reverse '(1 (2 3) 4 (5 (6 7)))) + ⇒ '((1 (2 3) 4 (5 (6 7))) (5 (6 7)) (6 7) 7 6 5 4 (2 3) 3 2 1) + (--tree-seq (vectorp it) (append it nil) [1 [2 3] 4 [5 [6 7]]]) + ⇒ '([1 [2 3] 4 [5 [6 7]]] 1 [2 3] 2 3 4 [5 [6 7]] 5 [6 7] 6 7) + + -- Function: -tree-map (fn tree) + Apply FN to each element of TREE while preserving the tree + structure. + + (-tree-map '1+ '(1 (2 3) (4 (5 6) 7))) + ⇒ '(2 (3 4) (5 (6 7) 8)) + (-tree-map '(lambda (x) (cons x (expt 2 x))) '(1 (2 3) 4)) + ⇒ '((1 . 2) ((2 . 4) (3 . 8)) (4 . 16)) + (--tree-map (length it) '("" ("

" "text" "

") "")) + ⇒ '(6 (3 4 4) 7) + + -- Function: -tree-map-nodes (pred fun tree) + Call FUN on each node of TREE that satisfies PRED. + + If PRED returns nil, continue descending down this node. If PRED + returns non-nil, apply FUN to this node and do not descend further. + + (-tree-map-nodes 'vectorp (lambda (x) (-sum (append x nil))) '(1 [2 3] 4 (5 [6 7] 8))) + ⇒ '(1 5 4 (5 13 8)) + (-tree-map-nodes 'keywordp (lambda (x) (symbol-name x)) '(1 :foo 4 ((5 6 :bar) :baz 8))) + ⇒ '(1 ":foo" 4 ((5 6 ":bar") ":baz" 8)) + (--tree-map-nodes (eq (car-safe it) 'add-mode) (-concat it (list :mode 'emacs-lisp-mode)) '(with-mode emacs-lisp-mode (foo bar) (add-mode a b) (baz (add-mode c d)))) + ⇒ '(with-mode emacs-lisp-mode (foo bar) (add-mode a b :mode emacs-lisp-mode) (baz (add-mode c d :mode emacs-lisp-mode))) + + -- Function: -tree-reduce (fn tree) + Use FN to reduce elements of list TREE. If elements of TREE are + lists themselves, apply the reduction recursively. + + FN is first applied to first element of the list and second + element, then on this result and third element from the list etc. + + See ‘-reduce-r’ (*note -reduce-r::) for how exactly are lists of + zero or one element handled. + + (-tree-reduce '+ '(1 (2 3) (4 5))) + ⇒ 15 + (-tree-reduce 'concat '("strings" (" on" " various") ((" levels")))) + ⇒ "strings on various levels" + (--tree-reduce (cond ((stringp it) (concat it " " acc)) (t (let ((sn (symbol-name it))) (concat "<" sn ">" acc "")))) '(body (p "some words") (div "more" (b "bold") "words"))) + ⇒ "

some words

more bold words
" + + -- Function: -tree-reduce-from (fn init-value tree) + Use FN to reduce elements of list TREE. If elements of TREE are + lists themselves, apply the reduction recursively. + + FN is first applied to INIT-VALUE and first element of the list, + then on this result and second element from the list etc. + + The initial value is ignored on cons pairs as they always contain + two elements. + + (-tree-reduce-from '+ 1 '(1 (1 1) ((1)))) + ⇒ 8 + (--tree-reduce-from (-concat acc (list it)) nil '(1 (2 3 (4 5)) (6 7))) + ⇒ '((7 6) ((5 4) 3 2) 1) + + -- Function: -tree-mapreduce (fn folder tree) + Apply FN to each element of TREE, and make a list of the results. + If elements of TREE are lists themselves, apply FN recursively to + elements of these nested lists. + + Then reduce the resulting lists using FOLDER and initial value + INIT-VALUE. See ‘-reduce-r-from’ (*note -reduce-r-from::). + + This is the same as calling ‘-tree-reduce’ (*note -tree-reduce::) + after ‘-tree-map’ (*note -tree-map::) but is twice as fast as it + only traverse the structure once. + + (-tree-mapreduce 'list 'append '(1 (2 (3 4) (5 6)) (7 (8 9)))) + ⇒ '(1 2 3 4 5 6 7 8 9) + (--tree-mapreduce 1 (+ it acc) '(1 (2 (4 9) (2 1)) (7 (4 3)))) + ⇒ 9 + (--tree-mapreduce 0 (max acc (1+ it)) '(1 (2 (4 9) (2 1)) (7 (4 3)))) + ⇒ 3 + + -- Function: -tree-mapreduce-from (fn folder init-value tree) + Apply FN to each element of TREE, and make a list of the results. + If elements of TREE are lists themselves, apply FN recursively to + elements of these nested lists. + + Then reduce the resulting lists using FOLDER and initial value + INIT-VALUE. See ‘-reduce-r-from’ (*note -reduce-r-from::). + + This is the same as calling ‘-tree-reduce-from’ (*note + -tree-reduce-from::) after ‘-tree-map’ (*note -tree-map::) but is + twice as fast as it only traverse the structure once. + + (-tree-mapreduce-from 'identity '* 1 '(1 (2 (3 4) (5 6)) (7 (8 9)))) + ⇒ 362880 + (--tree-mapreduce-from (+ it it) (cons it acc) nil '(1 (2 (4 9) (2 1)) (7 (4 3)))) + ⇒ '(2 (4 (8 18) (4 2)) (14 (8 6))) + (concat "{" (--tree-mapreduce-from (cond ((-cons-pair? it) (concat (symbol-name (car it)) " -> " (symbol-name (cdr it)))) (t (concat (symbol-name it) " : {"))) (concat it (unless (or (equal acc "}") (equal (substring it (1- (length it))) "{")) ", ") acc) "}" '((elips-mode (foo (bar . booze)) (baz . qux)) (c-mode (foo . bla) (bum . bam))))) + ⇒ "{elips-mode : {foo : {bar -> booze{, baz -> qux{, c-mode : {foo -> bla, bum -> bam}}" + + -- Function: -clone (list) + Create a deep copy of LIST. The new list has the same elements and + structure but all cons are replaced with new ones. This is useful + when you need to clone a structure such as plist or alist. + + (let* ((a '(1 2 3)) (b (-clone a))) (nreverse a) b) + ⇒ '(1 2 3) + + +File: dash.info, Node: Threading macros, Next: Binding, Prev: Tree operations, Up: Functions + +2.12 Threading macros +===================== + + -- Macro: -> (x &optional form &rest more) + Thread the expr through the forms. Insert X as the second item in + the first form, making a list of it if it is not a list already. + If there are more forms, insert the first form as the second item + in second form, etc. + + (-> '(2 3 5)) + ⇒ '(2 3 5) + (-> '(2 3 5) (append '(8 13))) + ⇒ '(2 3 5 8 13) + (-> '(2 3 5) (append '(8 13)) (-slice 1 -1)) + ⇒ '(3 5 8) + + -- Macro: ->> (x &optional form &rest more) + Thread the expr through the forms. Insert X as the last item in + the first form, making a list of it if it is not a list already. + If there are more forms, insert the first form as the last item in + second form, etc. + + (->> '(1 2 3) (-map 'square)) + ⇒ '(1 4 9) + (->> '(1 2 3) (-map 'square) (-remove 'even?)) + ⇒ '(1 9) + (->> '(1 2 3) (-map 'square) (-reduce '+)) + ⇒ 14 + + -- Macro: --> (x &rest forms) + Starting with the value of X, thread each expression through FORMS. + + Insert X at the position signified by the symbol ‘it’ in the first + form. If there are more forms, insert the first form at the + position signified by ‘it’ in in second form, etc. + + (--> "def" (concat "abc" it "ghi")) + ⇒ "abcdefghi" + (--> "def" (concat "abc" it "ghi") (upcase it)) + ⇒ "ABCDEFGHI" + (--> "def" (concat "abc" it "ghi") upcase) + ⇒ "ABCDEFGHI" + + -- Macro: -as-> (value variable &rest forms) + Starting with VALUE, thread VARIABLE through FORMS. + + In the first form, bind VARIABLE to VALUE. In the second form, + bind VARIABLE to the result of the first form, and so forth. + + (-as-> 3 my-var (1+ my-var) (list my-var) (mapcar (lambda (ele) (* 2 ele)) my-var)) + ⇒ '(8) + (-as-> 3 my-var 1+) + ⇒ 4 + (-as-> 3 my-var) + ⇒ 3 + + -- Macro: -some-> (x &optional form &rest more) + When expr is non-nil, thread it through the first form (via ‘->’ + (*note ->::)), and when that result is non-nil, through the next + form, etc. + + (-some-> '(2 3 5)) + ⇒ '(2 3 5) + (-some-> 5 square) + ⇒ 25 + (-some-> 5 even? square) + ⇒ nil + + -- Macro: -some->> (x &optional form &rest more) + When expr is non-nil, thread it through the first form (via ‘->>’ + (*note ->>::)), and when that result is non-nil, through the next + form, etc. + + (-some->> '(1 2 3) (-map 'square)) + ⇒ '(1 4 9) + (-some->> '(1 3 5) (-last 'even?) (+ 100)) + ⇒ nil + (-some->> '(2 4 6) (-last 'even?) (+ 100)) + ⇒ 106 + + -- Macro: -some--> (x &optional form &rest more) + When expr in non-nil, thread it through the first form (via ‘-->’ + (*note -->::)), and when that result is non-nil, through the next + form, etc. + + (-some--> "def" (concat "abc" it "ghi")) + ⇒ "abcdefghi" + (-some--> nil (concat "abc" it "ghi")) + ⇒ nil + (-some--> '(1 3 5) (-filter 'even? it) (append it it) (-map 'square it)) + ⇒ nil + + +File: dash.info, Node: Binding, Next: Side-effects, Prev: Threading macros, Up: Functions + +2.13 Binding +============ + +Convenient versions of ‘let‘ and ‘let*‘ constructs combined with flow +control. + + -- Macro: -when-let (var-val &rest body) + If VAL evaluates to non-nil, bind it to VAR and execute body. + + Note: binding is done according to ‘-let’ (*note -let::). + + (fn (VAR VAL) &rest BODY) + + (-when-let (match-index (string-match "d" "abcd")) (+ match-index 2)) + ⇒ 5 + (-when-let ((&plist :foo foo) (list :foo "foo")) foo) + ⇒ "foo" + (-when-let ((&plist :foo foo) (list :bar "bar")) foo) + ⇒ nil + + -- Macro: -when-let* (vars-vals &rest body) + If all VALS evaluate to true, bind them to their corresponding VARS + and execute body. VARS-VALS should be a list of (VAR VAL) pairs. + + Note: binding is done according to ‘-let*’ (*note -let*::). VALS + are evaluated sequentially, and evaluation stops after the first + nil VAL is encountered. + + (-when-let* ((x 5) (y 3) (z (+ y 4))) (+ x y z)) + ⇒ 15 + (-when-let* ((x 5) (y nil) (z 7)) (+ x y z)) + ⇒ nil + + -- Macro: -if-let (var-val then &rest else) + If VAL evaluates to non-nil, bind it to VAR and do THEN, otherwise + do ELSE. + + Note: binding is done according to ‘-let’ (*note -let::). + + (fn (VAR VAL) THEN &rest ELSE) + + (-if-let (match-index (string-match "d" "abc")) (+ match-index 3) 7) + ⇒ 7 + (--if-let (even? 4) it nil) + ⇒ t + + -- Macro: -if-let* (vars-vals then &rest else) + If all VALS evaluate to true, bind them to their corresponding VARS + and do THEN, otherwise do ELSE. VARS-VALS should be a list of (VAR + VAL) pairs. + + Note: binding is done according to ‘-let*’ (*note -let*::). VALS + are evaluated sequentially, and evaluation stops after the first + nil VAL is encountered. + + (-if-let* ((x 5) (y 3) (z 7)) (+ x y z) "foo") + ⇒ 15 + (-if-let* ((x 5) (y nil) (z 7)) (+ x y z) "foo") + ⇒ "foo" + (-if-let* (((_ _ x) '(nil nil 7))) x) + ⇒ 7 + + -- Macro: -let (varlist &rest body) + Bind variables according to VARLIST then eval BODY. + + VARLIST is a list of lists of the form (PATTERN SOURCE). Each + PATTERN is matched against the SOURCE "structurally". SOURCE is + only evaluated once for each PATTERN. Each PATTERN is matched + recursively, and can therefore contain sub-patterns which are + matched against corresponding sub-expressions of SOURCE. + + All the SOURCEs are evalled before any symbols are bound (i.e. "in + parallel"). + + If VARLIST only contains one (PATTERN SOURCE) element, you can + optionally specify it using a vector and discarding the outer-most + parens. Thus + + (-let ((PATTERN SOURCE)) ..) + + becomes + + (-let [PATTERN SOURCE] ..). + + ‘-let’ (*note -let::) uses a convention of not binding places + (symbols) starting with _ whenever it’s possible. You can use this + to skip over entries you don’t care about. However, this is not + *always* possible (as a result of implementation) and these symbols + might get bound to undefined values. + + Following is the overview of supported patterns. Remember that + patterns can be matched recursively, so every a, b, aK in the + following can be a matching construct and not necessarily a + symbol/variable. + + Symbol: + + a - bind the SOURCE to A. This is just like regular ‘let’. + + Conses and lists: + + (a) - bind ‘car’ of cons/list to A + + (a . b) - bind car of cons to A and ‘cdr’ to B + + (a b) - bind car of list to A and ‘cadr’ to B + + (a1 a2 a3 ...) - bind 0th car of list to A1, 1st to A2, 2nd to A3 + ... + + (a1 a2 a3 ... aN . rest) - as above, but bind the Nth cdr to + REST. + + Vectors: + + [a] - bind 0th element of a non-list sequence to A (works with + vectors, strings, bit arrays...) + + [a1 a2 a3 ...] - bind 0th element of non-list sequence to A0, 1st + to A1, 2nd to A2, ... If the PATTERN is shorter than SOURCE, the + values at places not in PATTERN are ignored. If the PATTERN is + longer than SOURCE, an ‘error’ is thrown. + + [a1 a2 a3 ... &rest rest] - as above, but bind the rest of the + sequence to REST. This is conceptually the same as improper list + matching (a1 a2 ... aN . rest) + + Key/value stores: + + (&plist key0 a0 ... keyN aN) - bind value mapped by keyK in the + SOURCE plist to aK. If the value is not found, aK is nil. Uses + ‘plist-get’ to fetch values. + + (&alist key0 a0 ... keyN aN) - bind value mapped by keyK in the + SOURCE alist to aK. If the value is not found, aK is nil. Uses + ‘assoc’ to fetch values. + + (&hash key0 a0 ... keyN aN) - bind value mapped by keyK in the + SOURCE hash table to aK. If the value is not found, aK is nil. + Uses ‘gethash’ to fetch values. + + Further, special keyword &keys supports "inline" matching of + plist-like key-value pairs, similarly to &keys keyword of + ‘cl-defun’. + + (a1 a2 ... aN &keys key1 b1 ... keyN bK) + + This binds N values from the list to a1 ... aN, then interprets + the cdr as a plist (see key/value matching above). + + A shorthand notation for kv-destructuring exists which allows the + patterns be optionally left out and derived from the key name in + the following fashion: + + - a key :foo is converted into ‘foo’ pattern, - a key ’bar is + converted into ‘bar’ pattern, - a key "baz" is converted into ‘baz’ + pattern. + + That is, the entire value under the key is bound to the derived + variable without any further destructuring. + + This is possible only when the form following the key is not a + valid pattern (i.e. not a symbol, a cons cell or a vector). + Otherwise the matching proceeds as usual and in case of an invalid + spec fails with an error. + + Thus the patterns are normalized as follows: + + ;; derive all the missing patterns (&plist :foo ’bar "baz") => + (&plist :foo foo ’bar bar "baz" baz) + + ;; we can specify some but not others (&plist :foo ’bar + explicit-bar) => (&plist :foo foo ’bar explicit-bar) + + ;; nothing happens, we store :foo in x (&plist :foo x) => (&plist + :foo x) + + ;; nothing happens, we match recursively (&plist :foo (a b c)) => + (&plist :foo (a b c)) + + You can name the source using the syntax SYMBOL &as PATTERN. This + syntax works with lists (proper or improper), vectors and all types + of maps. + + (list &as a b c) (list 1 2 3) + + binds A to 1, B to 2, C to 3 and LIST to (1 2 3). + + Similarly: + + (bounds &as beg . end) (cons 1 2) + + binds BEG to 1, END to 2 and BOUNDS to (1 . 2). + + (items &as first . rest) (list 1 2 3) + + binds FIRST to 1, REST to (2 3) and ITEMS to (1 2 3) + + [vect &as _ b c] [1 2 3] + + binds B to 2, C to 3 and VECT to [1 2 3] (_ avoids binding as + usual). + + (plist &as &plist :b b) (list :a 1 :b 2 :c 3) + + binds B to 2 and PLIST to (:a 1 :b 2 :c 3). Same for &alist and + &hash. + + This is especially useful when we want to capture the result of a + computation and destructure at the same time. Consider the form + (function-returning-complex-structure) returning a list of two + vectors with two items each. We want to capture this entire result + and pass it to another computation, but at the same time we want to + get the second item from each vector. We can achieve it with + pattern + + (result &as [_ a] [_ b]) (function-returning-complex-structure) + + Note: Clojure programmers may know this feature as the ":as + binding". The difference is that we put the &as at the front + because we need to support improper list binding. + + (-let (([a (b c) d] [1 (2 3) 4])) (list a b c d)) + ⇒ '(1 2 3 4) + (-let [(a b c . d) (list 1 2 3 4 5 6)] (list a b c d)) + ⇒ '(1 2 3 (4 5 6)) + (-let [(&plist :foo foo :bar bar) (list :baz 3 :foo 1 :qux 4 :bar 2)] (list foo bar)) + ⇒ '(1 2) + + -- Macro: -let* (varlist &rest body) + Bind variables according to VARLIST then eval BODY. + + VARLIST is a list of lists of the form (PATTERN SOURCE). Each + PATTERN is matched against the SOURCE structurally. SOURCE is only + evaluated once for each PATTERN. + + Each SOURCE can refer to the symbols already bound by this VARLIST. + This is useful if you want to destructure SOURCE recursively but + also want to name the intermediate structures. + + See ‘-let’ (*note -let::) for the list of all possible patterns. + + (-let* (((a . b) (cons 1 2)) ((c . d) (cons 3 4))) (list a b c d)) + ⇒ '(1 2 3 4) + (-let* (((a . b) (cons 1 (cons 2 3))) ((c . d) b)) (list a b c d)) + ⇒ '(1 (2 . 3) 2 3) + (-let* (((&alist "foo" foo "bar" bar) (list (cons "foo" 1) (cons "bar" (list 'a 'b 'c)))) ((a b c) bar)) (list foo a b c bar)) + ⇒ '(1 a b c (a b c)) + + -- Macro: -lambda (match-form &rest body) + Return a lambda which destructures its input as MATCH-FORM and + executes BODY. + + Note that you have to enclose the MATCH-FORM in a pair of parens, + such that: + + (-lambda (x) body) (-lambda (x y ...) body) + + has the usual semantics of ‘lambda’. Furthermore, these get + translated into normal lambda, so there is no performance penalty. + + See ‘-let’ (*note -let::) for the description of destructuring + mechanism. + + (-map (-lambda ((x y)) (+ x y)) '((1 2) (3 4) (5 6))) + ⇒ '(3 7 11) + (-map (-lambda ([x y]) (+ x y)) '([1 2] [3 4] [5 6])) + ⇒ '(3 7 11) + (funcall (-lambda ((_ . a) (_ . b)) (-concat a b)) '(1 2 3) '(4 5 6)) + ⇒ '(2 3 5 6) + + -- Macro: -setq (&rest forms) + Bind each MATCH-FORM to the value of its VAL. + + MATCH-FORM destructuring is done according to the rules of ‘-let’ + (*note -let::). + + This macro allows you to bind multiple variables by destructuring + the value, so for example: + + (-setq (a b) x (&plist :c c) plist) + + expands roughly speaking to the following code + + (setq a (car x) b (cadr x) c (plist-get plist :c)) + + Care is taken to only evaluate each VAL once so that in case of + multiple assignments it does not cause unexpected side effects. + + (fn [MATCH-FORM VAL]...) + + (progn (-setq a 1) a) + ⇒ 1 + (progn (-setq (a b) (list 1 2)) (list a b)) + ⇒ '(1 2) + (progn (-setq (&plist :c c) (list :c "c")) c) + ⇒ "c" + + +File: dash.info, Node: Side-effects, Next: Destructive operations, Prev: Binding, Up: Functions + +2.14 Side-effects +================= + +Functions iterating over lists for side-effect only. + + -- Function: -each (list fn) + Call FN with every item in LIST. Return nil, used for side-effects + only. + + (let (s) (-each '(1 2 3) (lambda (item) (setq s (cons item s))))) + ⇒ nil + (let (s) (-each '(1 2 3) (lambda (item) (setq s (cons item s)))) s) + ⇒ '(3 2 1) + (let (s) (--each '(1 2 3) (setq s (cons it s))) s) + ⇒ '(3 2 1) + + -- Function: -each-while (list pred fn) + Call FN with every item in LIST while (PRED item) is non-nil. + Return nil, used for side-effects only. + + (let (s) (-each-while '(2 4 5 6) 'even? (lambda (item) (!cons item s))) s) + ⇒ '(4 2) + (let (s) (--each-while '(1 2 3 4) (< it 3) (!cons it s)) s) + ⇒ '(2 1) + + -- Function: -each-indexed (list fn) + Call (FN index item) for each item in LIST. + + In the anaphoric form ‘--each-indexed’, the index is exposed as + symbol ‘it-index’. + + See also: ‘-map-indexed’ (*note -map-indexed::). + + (let (s) (-each-indexed '(a b c) (lambda (index item) (setq s (cons (list item index) s)))) s) + ⇒ '((c 2) (b 1) (a 0)) + (let (s) (--each-indexed '(a b c) (setq s (cons (list it it-index) s))) s) + ⇒ '((c 2) (b 1) (a 0)) + + -- Function: -each-r (list fn) + Call FN with every item in LIST in reversed order. Return nil, + used for side-effects only. + + (let (s) (-each-r '(1 2 3) (lambda (item) (setq s (cons item s))))) + ⇒ nil + (let (s) (-each-r '(1 2 3) (lambda (item) (setq s (cons item s)))) s) + ⇒ '(1 2 3) + (let (s) (--each-r '(1 2 3) (setq s (cons it s))) s) + ⇒ '(1 2 3) + + -- Function: -each-r-while (list pred fn) + Call FN with every item in reversed LIST while (PRED item) is + non-nil. Return nil, used for side-effects only. + + (let (s) (-each-r-while '(2 4 5 6) 'even? (lambda (item) (!cons item s))) s) + ⇒ '(6) + (let (s) (--each-r-while '(1 2 3 4) (>= it 3) (!cons it s)) s) + ⇒ '(3 4) + + -- Function: -dotimes (num fn) + Repeatedly calls FN (presumably for side-effects) passing in + integers from 0 through NUM-1. + + (let (s) (-dotimes 3 (lambda (n) (!cons n s))) s) + ⇒ '(2 1 0) + (let (s) (--dotimes 5 (!cons it s)) s) + ⇒ '(4 3 2 1 0) + + -- Macro: -doto (eval-initial-value &rest forms) + Eval a form, then insert that form as the 2nd argument to other + forms. The EVAL-INITIAL-VALUE form is evaluated once. Its result + is passed to FORMS, which are then evaluated sequentially. Returns + the target form. + + (-doto '(1 2 3) (!cdr) (!cdr)) + ⇒ '(3) + (-doto '(1 . 2) (setcar 3) (setcdr 4)) + ⇒ '(3 . 4) + + -- Macro: --doto (eval-initial-value &rest forms) + Anaphoric form of ‘-doto’ (*note -doto::). Note: ‘it’ is not + required in each form. + + (gethash "key" (--doto (make-hash-table :test 'equal) (puthash "key" "value" it))) + ⇒ "value" + + +File: dash.info, Node: Destructive operations, Next: Function combinators, Prev: Side-effects, Up: Functions + +2.15 Destructive operations +=========================== + + -- Macro: !cons (car cdr) + Destructive: Set CDR to the cons of CAR and CDR. + + (let (l) (!cons 5 l) l) + ⇒ '(5) + (let ((l '(3))) (!cons 5 l) l) + ⇒ '(5 3) + + -- Macro: !cdr (list) + Destructive: Set LIST to the cdr of LIST. + + (let ((l '(3))) (!cdr l) l) + ⇒ '() + (let ((l '(3 5))) (!cdr l) l) + ⇒ '(5) + + +File: dash.info, Node: Function combinators, Prev: Destructive operations, Up: Functions + +2.16 Function combinators +========================= + +These combinators require Emacs 24 for its lexical scope. So they are +offered in a separate package: ‘dash-functional‘. + + -- Function: -partial (fn &rest args) + Takes a function FN and fewer than the normal arguments to FN, and + returns a fn that takes a variable number of additional ARGS. When + called, the returned function calls FN with ARGS first and then + additional args. + + (funcall (-partial '- 5) 3) + ⇒ 2 + (funcall (-partial '+ 5 2) 3) + ⇒ 10 + + -- Function: -rpartial (fn &rest args) + Takes a function FN and fewer than the normal arguments to FN, and + returns a fn that takes a variable number of additional ARGS. When + called, the returned function calls FN with the additional args + first and then ARGS. + + (funcall (-rpartial '- 5) 8) + ⇒ 3 + (funcall (-rpartial '- 5 2) 10) + ⇒ 3 + + -- Function: -juxt (&rest fns) + Takes a list of functions and returns a fn that is the + juxtaposition of those fns. The returned fn takes a variable + number of args, and returns a list containing the result of + applying each fn to the args (left-to-right). + + (funcall (-juxt '+ '-) 3 5) + ⇒ '(8 -2) + (-map (-juxt 'identity 'square) '(1 2 3)) + ⇒ '((1 1) (2 4) (3 9)) + + -- Function: -compose (&rest fns) + Takes a list of functions and returns a fn that is the composition + of those fns. The returned fn takes a variable number of + arguments, and returns the result of applying each fn to the result + of applying the previous fn to the arguments (right-to-left). + + (funcall (-compose 'square '+) 2 3) + ⇒ (square (+ 2 3)) + (funcall (-compose 'identity 'square) 3) + ⇒ (square 3) + (funcall (-compose 'square 'identity) 3) + ⇒ (square 3) + + -- Function: -applify (fn) + Changes an n-arity function FN to a 1-arity function that expects a + list with n items as arguments + + (-map (-applify '+) '((1 1 1) (1 2 3) (5 5 5))) + ⇒ '(3 6 15) + (-map (-applify (lambda (a b c) `(,a (,b (,c))))) '((1 1 1) (1 2 3) (5 5 5))) + ⇒ '((1 (1 (1))) (1 (2 (3))) (5 (5 (5)))) + (funcall (-applify '<) '(3 6)) + ⇒ t + + -- Function: -on (operator transformer) + Return a function of two arguments that first applies TRANSFORMER + to each of them and then applies OPERATOR on the results (in the + same order). + + In types: (b -> b -> c) -> (a -> b) -> a -> a -> c + + (-sort (-on '< 'length) '((1 2 3) (1) (1 2))) + ⇒ '((1) (1 2) (1 2 3)) + (-min-by (-on '> 'length) '((1 2 3) (4) (1 2))) + ⇒ '(4) + (-min-by (-on 'string-lessp 'number-to-string) '(2 100 22)) + ⇒ 22 + + -- Function: -flip (func) + Swap the order of arguments for binary function FUNC. + + In types: (a -> b -> c) -> b -> a -> c + + (funcall (-flip '<) 2 1) + ⇒ t + (funcall (-flip '-) 3 8) + ⇒ 5 + (-sort (-flip '<) '(4 3 6 1)) + ⇒ '(6 4 3 1) + + -- Function: -const (c) + Return a function that returns C ignoring any additional arguments. + + In types: a -> b -> a + + (funcall (-const 2) 1 3 "foo") + ⇒ 2 + (-map (-const 1) '("a" "b" "c" "d")) + ⇒ '(1 1 1 1) + (-sum (-map (-const 1) '("a" "b" "c" "d"))) + ⇒ 4 + + -- Macro: -cut (&rest params) + Take n-ary function and n arguments and specialize some of them. + Arguments denoted by <> will be left unspecialized. + + See SRFI-26 for detailed description. + + (funcall (-cut list 1 <> 3 <> 5) 2 4) + ⇒ '(1 2 3 4 5) + (-map (-cut funcall <> 5) '(1+ 1- (lambda (x) (/ 1.0 x)))) + ⇒ '(6 4 0.2) + (-map (-cut <> 1 2 3) (list 'list 'vector 'string)) + ⇒ '((1 2 3) [1 2 3] "") + + -- Function: -not (pred) + Take a unary predicate PRED and return a unary predicate that + returns t if PRED returns nil and nil if PRED returns non-nil. + + (funcall (-not 'even?) 5) + ⇒ t + (-filter (-not (-partial '< 4)) '(1 2 3 4 5 6 7 8)) + ⇒ '(1 2 3 4) + + -- Function: -orfn (&rest preds) + Take list of unary predicates PREDS and return a unary predicate + with argument x that returns non-nil if at least one of the PREDS + returns non-nil on x. + + In types: [a -> Bool] -> a -> Bool + + (-filter (-orfn 'even? (-partial (-flip '<) 5)) '(1 2 3 4 5 6 7 8 9 10)) + ⇒ '(1 2 3 4 6 8 10) + (funcall (-orfn 'stringp 'even?) "foo") + ⇒ t + + -- Function: -andfn (&rest preds) + Take list of unary predicates PREDS and return a unary predicate + with argument x that returns non-nil if all of the PREDS returns + non-nil on x. + + In types: [a -> Bool] -> a -> Bool + + (funcall (-andfn (-cut < <> 10) 'even?) 6) + ⇒ t + (funcall (-andfn (-cut < <> 10) 'even?) 12) + ⇒ nil + (-filter (-andfn (-not 'even?) (-cut >= 5 <>)) '(1 2 3 4 5 6 7 8 9 10)) + ⇒ '(1 3 5) + + -- Function: -iteratefn (fn n) + Return a function FN composed N times with itself. + + FN is a unary function. If you need to use a function of higher + arity, use ‘-applify’ (*note -applify::) first to turn it into a + unary function. + + With n = 0, this acts as identity function. + + In types: (a -> a) -> Int -> a -> a. + + This function satisfies the following law: + + (funcall (-iteratefn fn n) init) = (-last-item (-iterate fn init + (1+ n))). + + (funcall (-iteratefn (lambda (x) (* x x)) 3) 2) + ⇒ 256 + (funcall (-iteratefn '1+ 3) 1) + ⇒ 4 + (funcall (-iteratefn 'cdr 3) '(1 2 3 4 5)) + ⇒ '(4 5) + + -- Function: -fixfn (fn &optional equal-test halt-test) + Return a function that computes the (least) fixpoint of FN. + + FN must be a unary function. The returned lambda takes a single + argument, X, the initial value for the fixpoint iteration. The + iteration halts when either of the following conditions is + satisfied: + + 1. Iteration converges to the fixpoint, with equality being tested + using EQUAL-TEST. If EQUAL-TEST is not specified, ‘equal’ is used. + For functions over the floating point numbers, it may be necessary + to provide an appropriate appoximate comparison test. + + 2. HALT-TEST returns a non-nil value. HALT-TEST defaults to a + simple counter that returns t after ‘-fixfn-max-iterations’, to + guard against infinite iteration. Otherwise, HALT-TEST must be a + function that accepts a single argument, the current value of X, + and returns non-nil as long as iteration should continue. In this + way, a more sophisticated convergence test may be supplied by the + caller. + + The return value of the lambda is either the fixpoint or, if + iteration halted before converging, a cons with car ‘halted’ and + cdr the final output from HALT-TEST. + + In types: (a -> a) -> a -> a. + + (funcall (-fixfn 'cos 'approx-equal) 0.7) + ⇒ 0.7390851332151607 + (funcall (-fixfn (lambda (x) (expt (+ x 10) 0.25))) 2.0) + ⇒ 1.8555845286409378 + (funcall (-fixfn 'sin 'approx-equal) 0.1) + ⇒ '(halted . t) + + -- Function: -prodfn (&rest fns) + Take a list of n functions and return a function that takes a list + of length n, applying i-th function to i-th element of the input + list. Returns a list of length n. + + In types (for n=2): ((a -> b), (c -> d)) -> (a, c) -> (b, d) + + This function satisfies the following laws: + + (-compose (-prodfn f g ...) (-prodfn f’ g’ ...)) = (-prodfn + (-compose f f’) (-compose g g’) ...) (-prodfn f g ...) = (-juxt + (-compose f (-partial ’nth 0)) (-compose g (-partial ’nth 1)) ...) + (-compose (-prodfn f g ...) (-juxt f’ g’ ...)) = (-juxt (-compose + f f’) (-compose g g’) ...) (-compose (-partial ’nth n) (-prod f1 + f2 ...)) = (-compose fn (-partial ’nth n)) + + (funcall (-prodfn '1+ '1- 'number-to-string) '(1 2 3)) + ⇒ '(2 1 "3") + (-map (-prodfn '1+ '1-) '((1 2) (3 4) (5 6) (7 8))) + ⇒ '((2 1) (4 3) (6 5) (8 7)) + (apply '+ (funcall (-prodfn 'length 'string-to-number) '((1 2 3) "15"))) + ⇒ 18 + + +File: dash.info, Node: Development, Next: Index, Prev: Functions, Up: Top + +3 Development +************* + +The dash repository is hosted on GitHub: + + +* Menu: + +* Contribute:: How to contribute +* Changes:: List of significant changes by version +* Contributors:: List of contributors + + +File: dash.info, Node: Contribute, Next: Changes, Up: Development + +3.1 Contribute +============== + +Yes, please do. Pure functions in the list manipulation realm only, +please. There’s a suite of tests in dev/examples.el, so remember to add +tests for your function, or it might get broken later. + + Run the tests with ‘./run-tests.sh’. Create the docs with +‘./create-docs.sh’. I highly recommend that you install these as a +pre-commit hook, so that the tests are always running and the docs are +always in sync: + +cp pre-commit.sh .git/hooks/pre-commit + + Oh, and don’t edit ‘README.md’ directly, it is auto-generated. +Change ‘readme-template.md’ or ‘examples-to-docs.el’ instead. The same +goes for the info manual. + + +File: dash.info, Node: Changes, Next: Contributors, Prev: Contribute, Up: Development + +3.2 Changes +=========== + +Changes in 2.10: + + • Add ‘-let’ destructuring to ‘-if-let’ and ‘-when-let’ (Fredrik + Bergroth) + +Changes in 2.9: + + • Add ‘-let’, ‘-let*’ and ‘-lambda’ with destructuring + • Add ‘-tree-seq’ and ‘-tree-map-nodes’ + • Add ‘-non-nil’ + • Add ‘-fix’ + • Add ‘-fixfn’ (dash-functional 1.2) + • Add ‘-copy’ (Wilfred Hughes) + +Changes in 2.8: + + • Add ‘-butlast’ + +Changes in 2.7: + + • ‘-zip’ now supports more than two lists (Steve Lamb) + • Add ‘-cycle’, ‘-pad’, ‘-annotate’, ‘-zip-fill’ (Steve Lamb) + • Add ‘-table’, ‘-table-flat’ (finite cartesian product) + • Add ‘-flatten-n’ + • ‘-slice’ now supports "step" argument + • Add functional combinators ‘-iteratefn’, ‘-prodfn’ + • Add ‘-replace’, ‘-splice’, ‘-splice-list’ which generalize + ‘-replace-at’ and ‘-insert-at’ + • Add ‘-compose’, ‘-iteratefn’ and ‘-prodfn’ (dash-functional 1.1) + +Changes in 2.6: + + • Add ‘-is-prefix-p’, ‘-is-suffix-p’, ‘-is-infix-p’ (Matus Goljer) + • Add ‘-iterate’, ‘-unfold’ (Matus Goljer) + • Add ‘-split-on’, ‘-split-when’ (Matus Goljer) + • Add ‘-find-last-index’ (Matus Goljer) + • Add ‘-list’ (Johan Andersson) + +Changes in 2.5: + + • Add ‘-same-items?’ (Johan Andersson) + • A few bugfixes + +Changes in 2.4: + + • Add ‘-snoc’ (Matus Goljer) + • Add ‘-replace-at’, ‘-update-at’, ‘-remove-at’, and + ‘-remove-at-indices’ (Matus Goljer) + +Changes in 2.3: + + • Add tree operations (Matus Goljer) + • Make font-lock optional + +Changes in 2.2: + + • Add ‘-compose’ (Christina Whyte) + +Changes in 2.1: + + • Add indexing operations (Matus Goljer) + +Changes in 2.0: + + • Split out ‘dash-functional.el’ (Matus Goljer) + • Add ‘-andfn’, ‘-orfn’, ‘-not’, ‘-cut’, ‘-const’, ‘-flip’ and ‘-on’. + (Matus Goljer) + • Fix ‘-min’, ‘-max’, ‘-min-by’ and ‘-max-by’ (Matus Goljer) + +Changes in 1.8: + + • Add ‘-first-item’ and ‘-last-item’ (Wilfred Hughes) + +Changes in 1.7: + + • Add ‘-rotate’ (Matus Goljer) + +Changes in 1.6: + + • Add ‘-min’, ‘-max’, ‘-min-by’ and ‘-max-by’ (Johan Andersson) + +Changes in 1.5: + + • Add ‘-sum’ and ‘-product’ (Johan Andersson) + +Changes in 1.4: + + • Add ‘-sort’ + • Add ‘-reduce-r’ (Matus Goljer) + • Add ‘-reduce-r-from’ (Matus Goljer) + +Changes in 1.3: + + • Add ‘-partition-in-steps’ + • Add ‘-partition-all-in-steps’ + +Changes in 1.2: + + • Add ‘-last’ (Matus Goljer) + • Add ‘-insert-at’ (Emanuel Evans) + • Add ‘-when-let’ and ‘-if-let’ (Emanuel Evans) + • Add ‘-when-let*’ and ‘-if-let*’ (Emanuel Evans) + • Some bugfixes + + +File: dash.info, Node: Contributors, Prev: Changes, Up: Development + +3.3 Contributors +================ + + • Matus Goljer (https://github.com/Fuco1) contributed lots of + features and functions. + • Takafumi Arakaki (https://github.com/tkf) contributed ‘-group-by’. + • tali713 (https://github.com/tali713) is the author of ‘-applify’. + • Víctor M. Valenzuela (https://github.com/vemv) contributed + ‘-repeat’. + • Nic Ferrier (https://github.com/nicferrier) contributed ‘-cons*’. + • Wilfred Hughes (https://github.com/Wilfred) contributed ‘-slice’, + ‘-first-item’ and ‘-last-item’. + • Emanuel Evans (https://github.com/shosti) contributed ‘-if-let’, + ‘-when-let’ and ‘-insert-at’. + • Johan Andersson (https://github.com/rejeep) contributed ‘-sum’, + ‘-product’ and ‘-same-items?’ + • Christina Whyte (https://github.com/kurisuwhyte) contributed + ‘-compose’ + • Steve Lamb (https://github.com/steventlamb) contributed ‘-cycle’, + ‘-pad’, ‘-annotate’, ‘-zip-fill’ and an n-ary version of ‘-zip’. + • Fredrik Bergroth (https://github.com/fbergroth) made the ‘-if-let’ + family use ‘-let’ destructuring and improved script for generating + documentation. + • Mark Oteiza (https://github.com/holomorph) contributed the script + to create an info manual. + • Vasilij Schneidermann (https://github.com/wasamasa) contributed + ‘-some’. + • William West (https://github.com/occidens) made ‘-fixfn’ more + robust at handling floats. + + Thanks! + + +File: dash.info, Node: Index, Prev: Development, Up: Top + +Index +***** + +[index] +* Menu: + +* !cdr: Destructive operations. + (line 14) +* !cons: Destructive operations. + (line 6) +* -->: Threading macros. (line 32) +* --doto: Side-effects. (line 81) +* ->: Threading macros. (line 6) +* ->>: Threading macros. (line 19) +* -all?: Predicates. (line 18) +* -andfn: Function combinators. + (line 138) +* -annotate: Maps. (line 79) +* -any?: Predicates. (line 6) +* -applify: Function combinators. + (line 55) +* -as->: Threading macros. (line 46) +* -butlast: Other list operations. + (line 340) +* -clone: Tree operations. (line 122) +* -common-prefix: Reductions. (line 223) +* -common-suffix: Reductions. (line 233) +* -compose: Function combinators. + (line 42) +* -concat: List to list. (line 22) +* -cons*: Other list operations. + (line 30) +* -const: Function combinators. + (line 92) +* -contains?: Predicates. (line 57) +* -copy: Maps. (line 134) +* -count: Reductions. (line 151) +* -cut: Function combinators. + (line 104) +* -cycle: Other list operations. + (line 168) +* -difference: Set operations. (line 20) +* -distinct: Set operations. (line 62) +* -dotimes: Side-effects. (line 61) +* -doto: Side-effects. (line 70) +* -drop: Sublist selection. (line 124) +* -drop-last: Sublist selection. (line 136) +* -drop-while: Sublist selection. (line 157) +* -each: Side-effects. (line 8) +* -each-indexed: Side-effects. (line 28) +* -each-r: Side-effects. (line 41) +* -each-r-while: Side-effects. (line 52) +* -each-while: Side-effects. (line 19) +* -elem-index: Indexing. (line 9) +* -elem-indices: Indexing. (line 21) +* -fifth-item: Other list operations. + (line 320) +* -filter: Sublist selection. (line 8) +* -find-index: Indexing. (line 32) +* -find-indices: Indexing. (line 60) +* -find-last-index: Indexing. (line 46) +* -first: Other list operations. + (line 234) +* -first-item: Other list operations. + (line 271) +* -fix: Other list operations. + (line 376) +* -fixfn: Function combinators. + (line 175) +* -flatten: List to list. (line 33) +* -flatten-n: List to list. (line 55) +* -flip: Function combinators. + (line 80) +* -fourth-item: Other list operations. + (line 310) +* -grade-down: Indexing. (line 81) +* -grade-up: Indexing. (line 71) +* -group-by: Partitioning. (line 187) +* -if-let: Binding. (line 36) +* -if-let*: Binding. (line 49) +* -inits: Reductions. (line 203) +* -insert-at: List to list. (line 109) +* -interleave: Other list operations. + (line 68) +* -interpose: Other list operations. + (line 58) +* -intersection: Set operations. (line 32) +* -is-infix?: Predicates. (line 110) +* -is-prefix?: Predicates. (line 86) +* -is-suffix?: Predicates. (line 98) +* -iterate: Unfolding. (line 9) +* -iteratefn: Function combinators. + (line 152) +* -juxt: Function combinators. + (line 31) +* -keep: List to list. (line 8) +* -lambda: Binding. (line 252) +* -last: Other list operations. + (line 261) +* -last-item: Other list operations. + (line 330) +* -let: Binding. (line 65) +* -let*: Binding. (line 232) +* -list: Other list operations. + (line 363) +* -map: Maps. (line 10) +* -map-first: Maps. (line 37) +* -map-indexed: Maps. (line 65) +* -map-last: Maps. (line 51) +* -map-when: Maps. (line 21) +* -mapcat: Maps. (line 123) +* -max: Reductions. (line 267) +* -max-by: Reductions. (line 277) +* -min: Reductions. (line 243) +* -min-by: Reductions. (line 253) +* -non-nil: Sublist selection. (line 79) +* -none?: Predicates. (line 30) +* -not: Function combinators. + (line 117) +* -on: Function combinators. + (line 66) +* -only-some?: Predicates. (line 42) +* -orfn: Function combinators. + (line 126) +* -pad: Other list operations. + (line 179) +* -partial: Function combinators. + (line 9) +* -partition: Partitioning. (line 74) +* -partition-after-item: Partitioning. (line 177) +* -partition-after-pred: Partitioning. (line 145) +* -partition-all: Partitioning. (line 86) +* -partition-all-in-steps: Partitioning. (line 109) +* -partition-before-item: Partitioning. (line 167) +* -partition-before-pred: Partitioning. (line 156) +* -partition-by: Partitioning. (line 121) +* -partition-by-header: Partitioning. (line 132) +* -partition-in-steps: Partitioning. (line 97) +* -permutations: Set operations. (line 52) +* -powerset: Set operations. (line 44) +* -prodfn: Function combinators. + (line 209) +* -product: Reductions. (line 181) +* -reduce: Reductions. (line 46) +* -reduce-from: Reductions. (line 8) +* -reduce-r: Reductions. (line 65) +* -reduce-r-from: Reductions. (line 27) +* -reductions: Reductions. (line 119) +* -reductions-from: Reductions. (line 87) +* -reductions-r: Reductions. (line 135) +* -reductions-r-from: Reductions. (line 103) +* -remove: Sublist selection. (line 23) +* -remove-at: List to list. (line 145) +* -remove-at-indices: List to list. (line 158) +* -remove-first: Sublist selection. (line 37) +* -remove-item: Sublist selection. (line 67) +* -remove-last: Sublist selection. (line 52) +* -repeat: Other list operations. + (line 19) +* -replace: List to list. (line 67) +* -replace-at: List to list. (line 120) +* -replace-first: List to list. (line 81) +* -replace-last: List to list. (line 95) +* -rotate: Other list operations. + (line 8) +* -rpartial: Function combinators. + (line 20) +* -running-product: Reductions. (line 191) +* -running-sum: Reductions. (line 169) +* -same-items?: Predicates. (line 72) +* -second-item: Other list operations. + (line 286) +* -select-by-indices: Sublist selection. (line 168) +* -select-column: Sublist selection. (line 198) +* -select-columns: Sublist selection. (line 179) +* -separate: Partitioning. (line 63) +* -setq: Binding. (line 274) +* -slice: Sublist selection. (line 85) +* -snoc: Other list operations. + (line 44) +* -some: Other list operations. + (line 248) +* -some-->: Threading macros. (line 83) +* -some->: Threading macros. (line 59) +* -some->>: Threading macros. (line 71) +* -sort: Other list operations. + (line 350) +* -splice: Maps. (line 90) +* -splice-list: Maps. (line 110) +* -split-at: Partitioning. (line 8) +* -split-on: Partitioning. (line 28) +* -split-when: Partitioning. (line 46) +* -split-with: Partitioning. (line 17) +* -sum: Reductions. (line 159) +* -table: Other list operations. + (line 190) +* -table-flat: Other list operations. + (line 209) +* -tails: Reductions. (line 213) +* -take: Sublist selection. (line 101) +* -take-last: Sublist selection. (line 112) +* -take-while: Sublist selection. (line 146) +* -third-item: Other list operations. + (line 298) +* -tree-map: Tree operations. (line 28) +* -tree-map-nodes: Tree operations. (line 39) +* -tree-mapreduce: Tree operations. (line 84) +* -tree-mapreduce-from: Tree operations. (line 103) +* -tree-reduce: Tree operations. (line 52) +* -tree-reduce-from: Tree operations. (line 69) +* -tree-seq: Tree operations. (line 8) +* -unfold: Unfolding. (line 25) +* -union: Set operations. (line 8) +* -unzip: Other list operations. + (line 146) +* -update-at: List to list. (line 132) +* -when-let: Binding. (line 9) +* -when-let*: Binding. (line 23) +* -zip: Other list operations. + (line 95) +* -zip-fill: Other list operations. + (line 138) +* -zip-lists: Other list operations. + (line 119) +* -zip-with: Other list operations. + (line 79) + + + +Tag Table: +Node: Top946 +Node: Installation2425 +Node: Using in a package2958 +Node: Syntax highlighting of dash functions3322 +Node: Functions3705 +Node: Maps4916 +Ref: -map5211 +Ref: -map-when5552 +Ref: -map-first6130 +Ref: -map-last6608 +Ref: -map-indexed7081 +Ref: -annotate7561 +Ref: -splice8051 +Ref: -splice-list8832 +Ref: -mapcat9294 +Ref: -copy9670 +Node: Sublist selection9874 +Ref: -filter10067 +Ref: -remove10519 +Ref: -remove-first10925 +Ref: -remove-last11452 +Ref: -remove-item11973 +Ref: -non-nil12368 +Ref: -slice12527 +Ref: -take13059 +Ref: -take-last13367 +Ref: -drop13690 +Ref: -drop-last13963 +Ref: -take-while14223 +Ref: -drop-while14573 +Ref: -select-by-indices14929 +Ref: -select-columns15443 +Ref: -select-column16149 +Node: List to list16613 +Ref: -keep16805 +Ref: -concat17308 +Ref: -flatten17605 +Ref: -flatten-n18364 +Ref: -replace18751 +Ref: -replace-first19214 +Ref: -replace-last19711 +Ref: -insert-at20201 +Ref: -replace-at20528 +Ref: -update-at20918 +Ref: -remove-at21409 +Ref: -remove-at-indices21897 +Node: Reductions22479 +Ref: -reduce-from22648 +Ref: -reduce-r-from23414 +Ref: -reduce24181 +Ref: -reduce-r24910 +Ref: -reductions-from25781 +Ref: -reductions-r-from26496 +Ref: -reductions27221 +Ref: -reductions-r27846 +Ref: -count28481 +Ref: -sum28705 +Ref: -running-sum28894 +Ref: -product29187 +Ref: -running-product29396 +Ref: -inits29709 +Ref: -tails29957 +Ref: -common-prefix30204 +Ref: -common-suffix30501 +Ref: -min30798 +Ref: -min-by31024 +Ref: -max31547 +Ref: -max-by31772 +Node: Unfolding32300 +Ref: -iterate32539 +Ref: -unfold32984 +Node: Predicates33792 +Ref: -any?33916 +Ref: -all?34236 +Ref: -none?34566 +Ref: -only-some?34868 +Ref: -contains?35353 +Ref: -same-items?35742 +Ref: -is-prefix?36127 +Ref: -is-suffix?36450 +Ref: -is-infix?36773 +Node: Partitioning37127 +Ref: -split-at37315 +Ref: -split-with37600 +Ref: -split-on38003 +Ref: -split-when38679 +Ref: -separate39319 +Ref: -partition39761 +Ref: -partition-all40213 +Ref: -partition-in-steps40641 +Ref: -partition-all-in-steps41138 +Ref: -partition-by41623 +Ref: -partition-by-header42005 +Ref: -partition-after-pred42609 +Ref: -partition-before-pred42953 +Ref: -partition-before-item43304 +Ref: -partition-after-item43615 +Ref: -group-by43921 +Node: Indexing44358 +Ref: -elem-index44560 +Ref: -elem-indices44955 +Ref: -find-index45338 +Ref: -find-last-index45827 +Ref: -find-indices46331 +Ref: -grade-up46739 +Ref: -grade-down47142 +Node: Set operations47552 +Ref: -union47735 +Ref: -difference48177 +Ref: -intersection48594 +Ref: -powerset49031 +Ref: -permutations49244 +Ref: -distinct49544 +Node: Other list operations49922 +Ref: -rotate50147 +Ref: -repeat50517 +Ref: -cons*50780 +Ref: -snoc51167 +Ref: -interpose51580 +Ref: -interleave51878 +Ref: -zip-with52247 +Ref: -zip52964 +Ref: -zip-lists53796 +Ref: -zip-fill54497 +Ref: -unzip54820 +Ref: -cycle55565 +Ref: -pad55938 +Ref: -table56261 +Ref: -table-flat57050 +Ref: -first58058 +Ref: -some58430 +Ref: -last58739 +Ref: -first-item59073 +Ref: -second-item59489 +Ref: -third-item59769 +Ref: -fourth-item60047 +Ref: -fifth-item60313 +Ref: -last-item60575 +Ref: -butlast60867 +Ref: -sort61114 +Ref: -list61603 +Ref: -fix61934 +Node: Tree operations62474 +Ref: -tree-seq62670 +Ref: -tree-map63528 +Ref: -tree-map-nodes63971 +Ref: -tree-reduce64821 +Ref: -tree-reduce-from65703 +Ref: -tree-mapreduce66304 +Ref: -tree-mapreduce-from67164 +Ref: -clone68450 +Node: Threading macros68778 +Ref: ->68923 +Ref: ->>69414 +Ref: -->69919 +Ref: -as->70475 +Ref: -some->70930 +Ref: -some->>71304 +Ref: -some-->71740 +Node: Binding72211 +Ref: -when-let72423 +Ref: -when-let*72908 +Ref: -if-let73431 +Ref: -if-let*73826 +Ref: -let74443 +Ref: -let*80533 +Ref: -lambda81473 +Ref: -setq82270 +Node: Side-effects83086 +Ref: -each83280 +Ref: -each-while83687 +Ref: -each-indexed84047 +Ref: -each-r84565 +Ref: -each-r-while84998 +Ref: -dotimes85373 +Ref: -doto85676 +Ref: --doto86104 +Node: Destructive operations86379 +Ref: !cons86552 +Ref: !cdr86758 +Node: Function combinators86953 +Ref: -partial87227 +Ref: -rpartial87623 +Ref: -juxt88026 +Ref: -compose88458 +Ref: -applify89011 +Ref: -on89442 +Ref: -flip89968 +Ref: -const90280 +Ref: -cut90619 +Ref: -not91105 +Ref: -orfn91415 +Ref: -andfn91849 +Ref: -iteratefn92344 +Ref: -fixfn93047 +Ref: -prodfn94609 +Node: Development95677 +Node: Contribute96026 +Node: Changes96774 +Node: Contributors99772 +Node: Index101391 + +End Tag Table + + +Local Variables: +coding: utf-8 +End: diff --git a/elpa/dash-20200119.2310/dir b/elpa/dash-20200119.2310/dir new file mode 100644 index 00000000..49b1700d --- /dev/null +++ b/elpa/dash-20200119.2310/dir @@ -0,0 +1,18 @@ +This is the file .../info/dir, which contains the +topmost node of the Info hierarchy, called (dir)Top. +The first time you invoke Info you start off looking at this node. + +File: dir, Node: Top This is the top of the INFO tree + + This (the Directory node) gives a menu of major topics. + Typing "q" exits, "H" lists all Info commands, "d" returns here, + "h" gives a primer for first-timers, + "mEmacs" visits the Emacs manual, etc. + + In Emacs, you can click mouse button 2 on a menu item or cross reference + to select it. + +* Menu: + +Emacs +* Dash: (dash.info). A modern list library for GNU Emacs diff --git a/elpa/dashboard-20191210.1041/banners/1.txt b/elpa/dashboard-20200121.1429/banners/1.txt similarity index 100% rename from elpa/dashboard-20191210.1041/banners/1.txt rename to elpa/dashboard-20200121.1429/banners/1.txt diff --git a/elpa/dashboard-20191210.1041/banners/2.txt b/elpa/dashboard-20200121.1429/banners/2.txt similarity index 100% rename from elpa/dashboard-20191210.1041/banners/2.txt rename to elpa/dashboard-20200121.1429/banners/2.txt diff --git a/elpa/dashboard-20191210.1041/banners/3.txt b/elpa/dashboard-20200121.1429/banners/3.txt similarity index 100% rename from elpa/dashboard-20191210.1041/banners/3.txt rename to elpa/dashboard-20200121.1429/banners/3.txt diff --git a/elpa/dashboard-20191210.1041/banners/emacs.png b/elpa/dashboard-20200121.1429/banners/emacs.png similarity index 100% rename from elpa/dashboard-20191210.1041/banners/emacs.png rename to elpa/dashboard-20200121.1429/banners/emacs.png diff --git a/elpa/dashboard-20191210.1041/banners/logo.png b/elpa/dashboard-20200121.1429/banners/logo.png similarity index 100% rename from elpa/dashboard-20191210.1041/banners/logo.png rename to elpa/dashboard-20200121.1429/banners/logo.png diff --git a/elpa/dashboard-20191210.1041/dashboard-autoloads.el b/elpa/dashboard-20200121.1429/dashboard-autoloads.el similarity index 100% rename from elpa/dashboard-20191210.1041/dashboard-autoloads.el rename to elpa/dashboard-20200121.1429/dashboard-autoloads.el diff --git a/elpa/dashboard-20191210.1041/dashboard-pkg.el b/elpa/dashboard-20200121.1429/dashboard-pkg.el similarity index 83% rename from elpa/dashboard-20191210.1041/dashboard-pkg.el rename to elpa/dashboard-20200121.1429/dashboard-pkg.el index a6f14a62..37cc6036 100644 --- a/elpa/dashboard-20191210.1041/dashboard-pkg.el +++ b/elpa/dashboard-20200121.1429/dashboard-pkg.el @@ -1,4 +1,4 @@ -(define-package "dashboard" "20191210.1041" "A startup screen extracted from Spacemacs" +(define-package "dashboard" "20200121.1429" "A startup screen extracted from Spacemacs" '((emacs "25.3") (page-break-lines "0.11")) :keywords diff --git a/elpa/dashboard-20191210.1041/dashboard-widgets.el b/elpa/dashboard-20200121.1429/dashboard-widgets.el similarity index 89% rename from elpa/dashboard-20191210.1041/dashboard-widgets.el rename to elpa/dashboard-20200121.1429/dashboard-widgets.el index 016b743a..07a3c5d7 100644 --- a/elpa/dashboard-20191210.1041/dashboard-widgets.el +++ b/elpa/dashboard-20200121.1429/dashboard-widgets.el @@ -119,17 +119,21 @@ Example: (defconst dashboard-banner-length 75 "Width of a banner.") -(defvar dashboard-banner-logo-title "Welcome to Emacs!" - "Specify the startup banner.") +(defcustom dashboard-banner-logo-title "Welcome to Emacs!" + "Specify the startup banner." + :type 'string + :group 'dashboard) -(defvar dashboard-navigator-buttons nil +(defcustom dashboard-navigator-buttons nil "Specify the navigator buttons. The format is: 'icon title help action face prefix suffix'. Example: -'((\"☆\" \"Star\" \"Show stars\" (lambda (&rest _) (show-stars)) 'warning \"[\" \"]\"))") +'((\"☆\" \"Star\" \"Show stars\" (lambda (&rest _) (show-stars)) 'warning \"[\" \"]\"))" + :type '(repeat (repeat (list string string string function symbol string string))) + :group 'dashboard) -(defvar dashboard-init-info +(defcustom dashboard-init-info ;; Check if package.el was loaded and if package loading was enabled (if (bound-and-true-p package-alist) (format "%d packages loaded in %s" @@ -138,9 +142,11 @@ Example: (format "%d packages loaded in %s" (hash-table-size straight--profile-cache) (emacs-init-time)) (format "Emacs started in %s" (emacs-init-time)))) - "Init info with packages loaded and init time.") + "Init info with packages loaded and init time." + :type 'boolean + :group 'dashboard) -(defvar dashboard-footer +(defcustom dashboard-footer (let ((list '("The one true editor, Emacs!" "Who the hell uses VIM anyway? Go Evil!" "Free as free speech, free as free Beer" @@ -153,9 +159,11 @@ Example: "I showed you my source code, pls respond" ))) (nth (random (1- (1+ (length list)))) list)) - "A footer with some short message.") + "A footer with some short message." + :type 'string + :group 'dashboard) -(defvar dashboard-footer-icon +(defcustom dashboard-footer-icon (if (and (display-graphic-p) (or (fboundp 'all-the-icons-fileicon) (require 'all-the-icons nil 'noerror))) @@ -164,46 +172,66 @@ Example: :v-adjust -0.05 :face 'font-lock-keyword-face) (propertize ">" 'face 'dashboard-footer)) - "Footer's icon.") + "Footer's icon." + :type 'string + :group 'dashboard) -(defvar dashboard-startup-banner 'official +(defcustom dashboard-startup-banner 'official "Specify the startup banner. Default value is `official', it displays the Emacs logo. `logo' displays Emacs alternative logo. An integer value is the index of text banner. A string value must be a path to a .PNG file. -If the value is nil then no banner is displayed.") +If the value is nil then no banner is displayed." + :type '(choice (const :tag "offical" official) + (const :tag "logo" logo) + (string :tag "a png path")) + :group 'dashboard) -(defvar dashboard-buffer-last-width nil - "Previous width of dashboard-buffer.") +(defcustom dashboard-buffer-last-width nil + "Previous width of dashboard-buffer." + :type 'integer + :group 'dashboard) -(defvar dashboard-item-generators '((recents . dashboard-insert-recents) - (bookmarks . dashboard-insert-bookmarks) - (projects . dashboard-insert-projects) - (agenda . dashboard-insert-agenda) - (registers . dashboard-insert-registers))) +(defcustom dashboard-item-generators '((recents . dashboard-insert-recents) + (bookmarks . dashboard-insert-bookmarks) + (projects . dashboard-insert-projects) + (agenda . dashboard-insert-agenda) + (registers . dashboard-insert-registers)) + "Association list of items to how to generate in the startup buffer. +Will be of the form `(list-type . list-function)'. +Possible values for list-type are: `recents', `bookmarks', `projects', +`agenda' ,`registers'." + :type '(repeat (alist :key-type symbol :value-type function)) + :group 'dashboard) -(defvar dashboard-items '((recents . 5) - (bookmarks . 5) - (agenda . 5)) +(defcustom dashboard-items '((recents . 5) + (bookmarks . 5) + (agenda . 5)) "Association list of items to show in the startup buffer. -Will be of the form `(list-type . list-size)`. +Will be of the form `(list-type . list-size)'. If nil it is disabled. Possible values for list-type are: -`recents' `bookmarks' `projects' `agenda' `registers'") +`recents' `bookmarks' `projects' `agenda' `registers'." + :type '(repeat (alist :key-type symbol :value-type integer)) + :group 'dashboard) -(defvar dashboard-items-default-length 20 +(defcustom dashboard-items-default-length 20 "Length used for startup lists with otherwise unspecified bounds. -Set to nil for unbounded.") +Set to nil for unbounded." + :type 'integer + :group 'dashboard) -(defvar dashboard-heading-icons '((recents . "history") - (bookmarks . "bookmark") - (agenda . "calendar") - (projects . "rocket") - (registers . "database")) +(defcustom dashboard-heading-icons '((recents . "history") + (bookmarks . "bookmark") + (agenda . "calendar") + (projects . "rocket") + (registers . "database")) "Association list for the icons of the heading sections. Will be of the form `(list-type . icon-name-string)`. If nil it is disabled. Possible values for list-type are: -`recents' `bookmarks' `projects' `agenda' `registers'") +`recents' `bookmarks' `projects' `agenda' `registers'" + :type '(repeat (alist :key-type symbol :value-type string)) + :group 'dashboard) (defvar recentf-list nil) @@ -294,7 +322,8 @@ If MESSAGEBUF is not nil then MSG is also written in message buffer." (when (and (display-graphic-p) dashboard-set-heading-icons) ;; Try loading `all-the-icons' - (unless (require 'all-the-icons nil 'noerror) + (unless (or (fboundp 'all-the-icons-octicon) + (require 'all-the-icons nil 'noerror)) (error "Package `all-the-icons' isn't installed")) (insert (cond @@ -493,7 +522,8 @@ WIDGET-PARAMS are passed to the \"widget-create\" function." (when (and (display-graphic-p) dashboard-set-file-icons - (featurep 'all-the-icons)) + (or (fboundp 'all-the-icons-icon-for-dir) + (require 'all-the-icons nil 'noerror))) (let* ((path (car (last (split-string ,@rest " - ")))) (icon (if (and (not (file-remote-p path)) (file-directory-p path)) diff --git a/elpa/dashboard-20191210.1041/dashboard-widgets.elc b/elpa/dashboard-20200121.1429/dashboard-widgets.elc similarity index 54% rename from elpa/dashboard-20191210.1041/dashboard-widgets.elc rename to elpa/dashboard-20200121.1429/dashboard-widgets.elc index acf40eaf..8e7b1f12 100644 Binary files a/elpa/dashboard-20191210.1041/dashboard-widgets.elc and b/elpa/dashboard-20200121.1429/dashboard-widgets.elc differ diff --git a/elpa/dashboard-20191210.1041/dashboard.el b/elpa/dashboard-20200121.1429/dashboard.el similarity index 99% rename from elpa/dashboard-20191210.1041/dashboard.el rename to elpa/dashboard-20200121.1429/dashboard.el index b55f0ea2..2e769af8 100644 --- a/elpa/dashboard-20191210.1041/dashboard.el +++ b/elpa/dashboard-20200121.1429/dashboard.el @@ -53,6 +53,7 @@ :group 'dashboard :syntax-table nil :abbrev-table nil + (buffer-disable-undo) (whitespace-mode -1) (linum-mode -1) (page-break-lines-mode 1) diff --git a/elpa/dashboard-20191210.1041/dashboard.elc b/elpa/dashboard-20200121.1429/dashboard.elc similarity index 86% rename from elpa/dashboard-20191210.1041/dashboard.elc rename to elpa/dashboard-20200121.1429/dashboard.elc index 2e551e64..308686d4 100644 Binary files a/elpa/dashboard-20191210.1041/dashboard.elc and b/elpa/dashboard-20200121.1429/dashboard.elc differ diff --git a/elpa/dashboard-readme.txt b/elpa/dashboard-readme.txt deleted file mode 100644 index d6169aac..00000000 --- a/elpa/dashboard-readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -An extensible Emacs dashboard, with sections for -bookmarks, projectile projects, org-agenda and more. diff --git a/elpa/dockerfile-mode-20190505.1807/dockerfile-mode-autoloads.el b/elpa/dockerfile-mode-20200106.2126/dockerfile-mode-autoloads.el similarity index 90% rename from elpa/dockerfile-mode-20190505.1807/dockerfile-mode-autoloads.el rename to elpa/dockerfile-mode-20200106.2126/dockerfile-mode-autoloads.el index c8f27961..15510a84 100644 --- a/elpa/dockerfile-mode-20190505.1807/dockerfile-mode-autoloads.el +++ b/elpa/dockerfile-mode-20200106.2126/dockerfile-mode-autoloads.el @@ -12,7 +12,10 @@ (autoload 'dockerfile-build-buffer "dockerfile-mode" "\ Build an image called IMAGE-NAME based upon the buffer. + If prefix arg NO-CACHE is set, don't cache the image. +The build string will be of the format: +`sudo docker build --no-cache --tag IMAGE-NAME --build-args arg1.. -f filename directory` \(fn IMAGE-NAME &optional NO-CACHE)" t nil) diff --git a/elpa/dockerfile-mode-20190505.1807/dockerfile-mode-pkg.el b/elpa/dockerfile-mode-20200106.2126/dockerfile-mode-pkg.el similarity index 50% rename from elpa/dockerfile-mode-20190505.1807/dockerfile-mode-pkg.el rename to elpa/dockerfile-mode-20200106.2126/dockerfile-mode-pkg.el index 21034b73..6546768e 100644 --- a/elpa/dockerfile-mode-20190505.1807/dockerfile-mode-pkg.el +++ b/elpa/dockerfile-mode-20200106.2126/dockerfile-mode-pkg.el @@ -1,2 +1,2 @@ ;;; -*- no-byte-compile: t -*- -(define-package "dockerfile-mode" "20190505.1807" "Major mode for editing Docker's Dockerfiles" '((emacs "24") (s "1.12")) :commit "ed73e82dcc636dad00d1a8c3b32a49136d25ee60" :url "https://github.com/spotify/dockerfile-mode") +(define-package "dockerfile-mode" "20200106.2126" "Major mode for editing Docker's Dockerfiles" '((emacs "24") (s "1.12")) :commit "d31f7685ebc5832d957e25070a930aa42984327d" :url "https://github.com/spotify/dockerfile-mode") diff --git a/elpa/dockerfile-mode-20190505.1807/dockerfile-mode.el b/elpa/dockerfile-mode-20200106.2126/dockerfile-mode.el similarity index 86% rename from elpa/dockerfile-mode-20190505.1807/dockerfile-mode.el rename to elpa/dockerfile-mode-20200106.2126/dockerfile-mode.el index 036fc873..af6e6538 100644 --- a/elpa/dockerfile-mode-20190505.1807/dockerfile-mode.el +++ b/elpa/dockerfile-mode-20200106.2126/dockerfile-mode.el @@ -2,7 +2,7 @@ ;; Copyright (c) 2013 Spotify AB ;; Package-Requires: ((emacs "24") (s "1.12")) -;; Package-Version: 20190505.1807 +;; Package-Version: 20200106.2126 ;; Homepage: https://github.com/spotify/dockerfile-mode ;; ;; Licensed under the Apache License, Version 2.0 (the "License"); you may not @@ -90,10 +90,9 @@ Each element of the list will be passed as a separate (defvar dockerfile-mode-map (let ((map (make-sparse-keymap)) (menu-map (make-sparse-keymap))) - (define-key map "\C-c\C-b" 'dockerfile-build-buffer) - (define-key map "\C-c\M-b" 'dockerfile-build-no-cache-buffer) - (define-key map "\C-c\C-z" 'dockerfile-test-function) - (define-key map "\C-c\C-c" 'comment-region) + (define-key map "\C-c\C-b" #'dockerfile-build-buffer) + (define-key map "\C-c\M-b" #'dockerfile-build-no-cache-buffer) + (define-key map "\C-c\C-c" #'comment-region) (define-key map [menu-bar dockerfile-mode] (cons "Dockerfile" menu-map)) (define-key menu-map [dfc] '(menu-item "Comment Region" comment-region @@ -149,6 +148,10 @@ file name. Otherwise, uses Emacs' standard conversion function." (s-replace "\\" "\\\\" (cygwin-convert-file-name-to-windows file)) (convert-standard-filename file))) +(defun dockerfile-tag-string (image-name) + "Return a --tag shell-quoted IMAGE-NAME string or an empty string if image-name is blank." + (if (string= image-name "") "" (format "--tag %s " (shell-quote-argument image-name)))) + (defvar dockerfile-image-name nil "Name of the dockerfile currently being used. This can be set in file or directory-local variables.") @@ -165,23 +168,25 @@ This can be set in file or directory-local variables.") ;;;###autoload (defun dockerfile-build-buffer (image-name &optional no-cache) "Build an image called IMAGE-NAME based upon the buffer. -If prefix arg NO-CACHE is set, don't cache the image." + +If prefix arg NO-CACHE is set, don't cache the image. +The build string will be of the format: +`sudo docker build --no-cache --tag IMAGE-NAME --build-args arg1.. -f filename directory`" + (interactive (list (dockerfile-read-image-name) prefix-arg)) (save-buffer) - (if (stringp image-name) - (compilation-start - (format - "%s%s build %s -t %s %s -f %s %s" - (if dockerfile-use-sudo "sudo " "") - dockerfile-mode-command - (if no-cache "--no-cache" "") - (shell-quote-argument image-name) - (dockerfile-build-arg-string) - (shell-quote-argument (dockerfile-standard-filename (buffer-file-name))) - (shell-quote-argument (dockerfile-standard-filename default-directory))) - nil - (lambda (_) (format "*docker-build-output: %s *" image-name))) - (print "dockerfile-image-name must be a string, consider surrounding it with double quotes"))) + (compilation-start + (format + "%s%s build %s %s %s -f %s %s" + (if dockerfile-use-sudo "sudo " "") + dockerfile-mode-command + (if no-cache "--no-cache" "") + (dockerfile-tag-string image-name) + (dockerfile-build-arg-string) + (shell-quote-argument (dockerfile-standard-filename (buffer-file-name))) + (shell-quote-argument (dockerfile-standard-filename default-directory))) + nil + (lambda (_) (format "*docker-build-output: %s *" image-name)))) ;;;###autoload (defun dockerfile-build-no-cache-buffer (image-name) diff --git a/elpa/dockerfile-mode-20190505.1807/dockerfile-mode.elc b/elpa/dockerfile-mode-20200106.2126/dockerfile-mode.elc similarity index 78% rename from elpa/dockerfile-mode-20190505.1807/dockerfile-mode.elc rename to elpa/dockerfile-mode-20200106.2126/dockerfile-mode.elc index a66e700d..8a8609e1 100644 Binary files a/elpa/dockerfile-mode-20190505.1807/dockerfile-mode.elc and b/elpa/dockerfile-mode-20200106.2126/dockerfile-mode.elc differ diff --git a/elpa/ein-20191216.1849/ein-ac.el b/elpa/ein-20200127.249/ein-ac.el similarity index 100% rename from elpa/ein-20191216.1849/ein-ac.el rename to elpa/ein-20200127.249/ein-ac.el diff --git a/elpa/ein-20191216.1849/ein-ac.elc b/elpa/ein-20200127.249/ein-ac.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-ac.elc rename to elpa/ein-20200127.249/ein-ac.elc index 4e9b871f..680c9c37 100644 Binary files a/elpa/ein-20191216.1849/ein-ac.elc and b/elpa/ein-20200127.249/ein-ac.elc differ diff --git a/elpa/ein-20191216.1849/ein-autoloads.el b/elpa/ein-20200127.249/ein-autoloads.el similarity index 100% rename from elpa/ein-20191216.1849/ein-autoloads.el rename to elpa/ein-20200127.249/ein-autoloads.el diff --git a/elpa/ein-20191216.1849/ein-cell-edit.el b/elpa/ein-20200127.249/ein-cell-edit.el similarity index 98% rename from elpa/ein-20191216.1849/ein-cell-edit.el rename to elpa/ein-20200127.249/ein-cell-edit.el index 5a862547..7ca85540 100644 --- a/elpa/ein-20191216.1849/ein-cell-edit.el +++ b/elpa/ein-20200127.249/ein-cell-edit.el @@ -168,9 +168,10 @@ previous value." (defun ein:get-mode-for-kernel (kernelspec) (if (null kernelspec) 'python ;; FIXME - (ein:case-equal (ein:$kernelspec-language kernelspec) - (("julia" "python" "R") (intern (ein:$kernelspec-language kernelspec))) - (t 'python)))) + (intern (ein:$kernelspec-language kernelspec)))) + ;; (ein:case-equal (ein:$kernelspec-language kernelspec) + ;; (("julia" "python" "R") ) + ;; (t 'python)))) (defun ein:edit-src-continue (e) (interactive "e") diff --git a/elpa/ein-20191216.1849/ein-cell-edit.elc b/elpa/ein-20200127.249/ein-cell-edit.elc similarity index 79% rename from elpa/ein-20191216.1849/ein-cell-edit.elc rename to elpa/ein-20200127.249/ein-cell-edit.elc index 80e143dd..234384fe 100644 Binary files a/elpa/ein-20191216.1849/ein-cell-edit.elc and b/elpa/ein-20200127.249/ein-cell-edit.elc differ diff --git a/elpa/ein-20191216.1849/ein-cell-output.el b/elpa/ein-20200127.249/ein-cell-output.el similarity index 100% rename from elpa/ein-20191216.1849/ein-cell-output.el rename to elpa/ein-20200127.249/ein-cell-output.el diff --git a/elpa/ein-20191216.1849/ein-cell-output.elc b/elpa/ein-20200127.249/ein-cell-output.elc similarity index 98% rename from elpa/ein-20191216.1849/ein-cell-output.elc rename to elpa/ein-20200127.249/ein-cell-output.elc index 9836a18c..9fa8807c 100644 Binary files a/elpa/ein-20191216.1849/ein-cell-output.elc and b/elpa/ein-20200127.249/ein-cell-output.elc differ diff --git a/elpa/ein-20191216.1849/ein-cell.el b/elpa/ein-20200127.249/ein-cell.el similarity index 98% rename from elpa/ein-20191216.1849/ein-cell.el rename to elpa/ein-20200127.249/ein-cell.el index a3ab25ec..c5b1a0df 100644 --- a/elpa/ein-20191216.1849/ein-cell.el +++ b/elpa/ein-20200127.249/ein-cell.el @@ -203,6 +203,21 @@ a number will limit the number of lines in a cell output." (insert-image img "."))) (error (ein:log 'warn "Could not insert image: %s" err) nil))) +(defun ein:cell--markdown-heading-p (cell) + "Check if cell is behaving like a heading cell. + +Returns true if cell is a markdown cell, has at least one # character at the start of the line and is only one line long (i.e. does not contain any newline characters)." + (and (ein:markdowncell-p cell) + (string-match "^#+ " (ein:cell-get-text cell)) + (= 0 (seq-count #'(lambda (c) + (char-equal c ?\n)) + (ein:cell-get-text cell))))) + +(cl-defmethod ein:cell--markdown-heading-level ((cell ein:markdowncell)) + (progn + (string-match "^#+" (ein:cell-get-text cell)) + (match-end 0))) + ;;; Cell factory @@ -227,6 +242,7 @@ a number will limit the number of lines in a cell output." (defun ein:cell-from-type (type &rest args) (apply (ein:cell-class-from-type type) args)) + (defun ein:cell--determine-cell-type (json-data) (let ((base-type (plist-get json-data :cell_type)) (metadata (plist-get json-data :metadata))) @@ -999,7 +1015,7 @@ prettified text thus be used instead of HTML type." ((html text/html) (funcall (ein:output-area-get-html-renderer) (plist-get json type))) ((latex text/latex text text/plain) - (ein:insert-read-only (plist-get json type))) + (ein:insert-read-only (ansi-color-apply (plist-get json type)))) ((svg image/svg+xml) (ein:insert-image value (ein:fix-mime-type key) t)) ((png image/png jpeg image/jpeg) diff --git a/elpa/ein-20191216.1849/ein-cell.elc b/elpa/ein-20200127.249/ein-cell.elc similarity index 83% rename from elpa/ein-20191216.1849/ein-cell.elc rename to elpa/ein-20200127.249/ein-cell.elc index 56e4c238..90a24816 100644 Binary files a/elpa/ein-20191216.1849/ein-cell.elc and b/elpa/ein-20200127.249/ein-cell.elc differ diff --git a/elpa/ein-20191216.1849/ein-classes.el b/elpa/ein-20200127.249/ein-classes.el similarity index 100% rename from elpa/ein-20191216.1849/ein-classes.el rename to elpa/ein-20200127.249/ein-classes.el diff --git a/elpa/ein-20191216.1849/ein-classes.elc b/elpa/ein-20200127.249/ein-classes.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-classes.elc rename to elpa/ein-20200127.249/ein-classes.elc index 74cdd57d..b0854573 100644 Binary files a/elpa/ein-20191216.1849/ein-classes.elc and b/elpa/ein-20200127.249/ein-classes.elc differ diff --git a/elpa/ein-20191216.1849/ein-company.el b/elpa/ein-20200127.249/ein-company.el similarity index 100% rename from elpa/ein-20191216.1849/ein-company.el rename to elpa/ein-20200127.249/ein-company.el diff --git a/elpa/ein-20191216.1849/ein-company.elc b/elpa/ein-20200127.249/ein-company.elc similarity index 64% rename from elpa/ein-20191216.1849/ein-company.elc rename to elpa/ein-20200127.249/ein-company.elc index f3d0247e..08457a57 100644 Binary files a/elpa/ein-20191216.1849/ein-company.elc and b/elpa/ein-20200127.249/ein-company.elc differ diff --git a/elpa/ein-20191216.1849/ein-completer.el b/elpa/ein-20200127.249/ein-completer.el similarity index 94% rename from elpa/ein-20191216.1849/ein-completer.el rename to elpa/ein-20200127.249/ein-completer.el index ce0c0c14..c1945fd2 100644 --- a/elpa/ein-20191216.1849/ein-completer.el +++ b/elpa/ein-20200127.249/ein-completer.el @@ -115,13 +115,15 @@ (defun ein:completions--get-oinfo (objs) (let ((d (deferred:new #'identity)) (kernel (ein:get-kernel))) - (if (ein:kernel-live-p kernel) - (ein:kernel-execute - kernel - (format "__ein_generate_oinfo_data(%s, locals())" objs) - (list - :output `(,(lambda (d* &rest args) (deferred:callback-post d* args)) . ,d))) - (deferred:callback-post d "kernel not live")) + (ein:case-equal (ein:kernel-language kernel) + (("python") + (if (ein:kernel-live-p kernel) + (ein:kernel-execute + kernel + (format "__ein_generate_oinfo_data(%s, locals())" objs) + (list + :output `(,(lambda (d* &rest args) (deferred:callback-post d* args)) . ,d))) + (deferred:callback-post d "kernel not live")))) d)) (defvar ein:oinfo-chunk-size 50) diff --git a/elpa/ein-20191216.1849/ein-completer.elc b/elpa/ein-20200127.249/ein-completer.elc similarity index 78% rename from elpa/ein-20191216.1849/ein-completer.elc rename to elpa/ein-20200127.249/ein-completer.elc index cfb09a4d..17831733 100644 Binary files a/elpa/ein-20191216.1849/ein-completer.elc and b/elpa/ein-20200127.249/ein-completer.elc differ diff --git a/elpa/ein-20191216.1849/ein-connect.el b/elpa/ein-20200127.249/ein-connect.el similarity index 100% rename from elpa/ein-20191216.1849/ein-connect.el rename to elpa/ein-20200127.249/ein-connect.el diff --git a/elpa/ein-20191216.1849/ein-connect.elc b/elpa/ein-20200127.249/ein-connect.elc similarity index 89% rename from elpa/ein-20191216.1849/ein-connect.elc rename to elpa/ein-20200127.249/ein-connect.elc index c67de5ec..1cb96476 100644 Binary files a/elpa/ein-20191216.1849/ein-connect.elc and b/elpa/ein-20200127.249/ein-connect.elc differ diff --git a/elpa/ein-20191216.1849/ein-console.el b/elpa/ein-20200127.249/ein-console.el similarity index 100% rename from elpa/ein-20191216.1849/ein-console.el rename to elpa/ein-20200127.249/ein-console.el diff --git a/elpa/ein-20191216.1849/ein-console.elc b/elpa/ein-20200127.249/ein-console.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-console.elc rename to elpa/ein-20200127.249/ein-console.elc index ef9c16ba..7af263d1 100644 Binary files a/elpa/ein-20191216.1849/ein-console.elc and b/elpa/ein-20200127.249/ein-console.elc differ diff --git a/elpa/ein-20191216.1849/ein-contents-api.el b/elpa/ein-20200127.249/ein-contents-api.el similarity index 100% rename from elpa/ein-20191216.1849/ein-contents-api.el rename to elpa/ein-20200127.249/ein-contents-api.el diff --git a/elpa/ein-20191216.1849/ein-contents-api.elc b/elpa/ein-20200127.249/ein-contents-api.elc similarity index 90% rename from elpa/ein-20191216.1849/ein-contents-api.elc rename to elpa/ein-20200127.249/ein-contents-api.elc index c1cd73cd..484fa04f 100644 Binary files a/elpa/ein-20191216.1849/ein-contents-api.elc and b/elpa/ein-20200127.249/ein-contents-api.elc differ diff --git a/elpa/ein-20191216.1849/ein-core.el b/elpa/ein-20200127.249/ein-core.el similarity index 100% rename from elpa/ein-20191216.1849/ein-core.el rename to elpa/ein-20200127.249/ein-core.el diff --git a/elpa/ein-20191216.1849/ein-core.elc b/elpa/ein-20200127.249/ein-core.elc similarity index 91% rename from elpa/ein-20191216.1849/ein-core.elc rename to elpa/ein-20200127.249/ein-core.elc index a2a7e0b7..c7d2a23e 100644 Binary files a/elpa/ein-20191216.1849/ein-core.elc and b/elpa/ein-20200127.249/ein-core.elc differ diff --git a/elpa/ein-20191216.1849/ein-dev.el b/elpa/ein-20200127.249/ein-dev.el similarity index 100% rename from elpa/ein-20191216.1849/ein-dev.el rename to elpa/ein-20200127.249/ein-dev.el diff --git a/elpa/ein-20191216.1849/ein-dev.elc b/elpa/ein-20200127.249/ein-dev.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-dev.elc rename to elpa/ein-20200127.249/ein-dev.elc index d79f45bd..c8e556fb 100644 Binary files a/elpa/ein-20191216.1849/ein-dev.elc and b/elpa/ein-20200127.249/ein-dev.elc differ diff --git a/elpa/ein-20191216.1849/ein-events.el b/elpa/ein-20200127.249/ein-events.el similarity index 100% rename from elpa/ein-20191216.1849/ein-events.el rename to elpa/ein-20200127.249/ein-events.el diff --git a/elpa/ein-20191216.1849/ein-events.elc b/elpa/ein-20200127.249/ein-events.elc similarity index 98% rename from elpa/ein-20191216.1849/ein-events.elc rename to elpa/ein-20200127.249/ein-events.elc index de421cd3..20f0e579 100644 Binary files a/elpa/ein-20191216.1849/ein-events.elc and b/elpa/ein-20200127.249/ein-events.elc differ diff --git a/elpa/ein-20191216.1849/ein-file.el b/elpa/ein-20200127.249/ein-file.el similarity index 100% rename from elpa/ein-20191216.1849/ein-file.el rename to elpa/ein-20200127.249/ein-file.el diff --git a/elpa/ein-20191216.1849/ein-file.elc b/elpa/ein-20200127.249/ein-file.elc similarity index 74% rename from elpa/ein-20191216.1849/ein-file.elc rename to elpa/ein-20200127.249/ein-file.elc index a58e66d1..a38f5229 100644 Binary files a/elpa/ein-20191216.1849/ein-file.elc and b/elpa/ein-20200127.249/ein-file.elc differ diff --git a/elpa/ein-20191216.1849/ein-helm.el b/elpa/ein-20200127.249/ein-helm.el similarity index 100% rename from elpa/ein-20191216.1849/ein-helm.el rename to elpa/ein-20200127.249/ein-helm.el diff --git a/elpa/ein-20191216.1849/ein-helm.elc b/elpa/ein-20200127.249/ein-helm.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-helm.elc rename to elpa/ein-20200127.249/ein-helm.elc index 14a2cf6d..faea4cf9 100644 Binary files a/elpa/ein-20191216.1849/ein-helm.elc and b/elpa/ein-20200127.249/ein-helm.elc differ diff --git a/elpa/ein-20191216.1849/ein-hy.el b/elpa/ein-20200127.249/ein-hy.el similarity index 100% rename from elpa/ein-20191216.1849/ein-hy.el rename to elpa/ein-20200127.249/ein-hy.el diff --git a/elpa/ein-20191216.1849/ein-hy.elc b/elpa/ein-20200127.249/ein-hy.elc similarity index 98% rename from elpa/ein-20191216.1849/ein-hy.elc rename to elpa/ein-20200127.249/ein-hy.elc index 6f08fb42..e2971173 100644 Binary files a/elpa/ein-20191216.1849/ein-hy.elc and b/elpa/ein-20200127.249/ein-hy.elc differ diff --git a/elpa/ein-20191216.1849/ein-iexec.el b/elpa/ein-20200127.249/ein-iexec.el similarity index 100% rename from elpa/ein-20191216.1849/ein-iexec.el rename to elpa/ein-20200127.249/ein-iexec.el diff --git a/elpa/ein-20191216.1849/ein-iexec.elc b/elpa/ein-20200127.249/ein-iexec.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-iexec.elc rename to elpa/ein-20200127.249/ein-iexec.elc index 87b185e1..f3f03e0e 100644 Binary files a/elpa/ein-20191216.1849/ein-iexec.elc and b/elpa/ein-20200127.249/ein-iexec.elc differ diff --git a/elpa/ein-20191216.1849/ein-inspector.el b/elpa/ein-20200127.249/ein-inspector.el similarity index 100% rename from elpa/ein-20191216.1849/ein-inspector.el rename to elpa/ein-20200127.249/ein-inspector.el diff --git a/elpa/ein-20191216.1849/ein-inspector.elc b/elpa/ein-20200127.249/ein-inspector.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-inspector.elc rename to elpa/ein-20200127.249/ein-inspector.elc index 0677f451..f9a89c8d 100644 Binary files a/elpa/ein-20191216.1849/ein-inspector.elc and b/elpa/ein-20200127.249/ein-inspector.elc differ diff --git a/elpa/ein-20191216.1849/ein-ipdb.el b/elpa/ein-20200127.249/ein-ipdb.el similarity index 100% rename from elpa/ein-20191216.1849/ein-ipdb.el rename to elpa/ein-20200127.249/ein-ipdb.el diff --git a/elpa/ein-20191216.1849/ein-ipdb.elc b/elpa/ein-20200127.249/ein-ipdb.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-ipdb.elc rename to elpa/ein-20200127.249/ein-ipdb.elc index db63a2d6..95897551 100644 Binary files a/elpa/ein-20191216.1849/ein-ipdb.elc and b/elpa/ein-20200127.249/ein-ipdb.elc differ diff --git a/elpa/ein-20191216.1849/ein-ipynb-mode.el b/elpa/ein-20200127.249/ein-ipynb-mode.el similarity index 100% rename from elpa/ein-20191216.1849/ein-ipynb-mode.el rename to elpa/ein-20200127.249/ein-ipynb-mode.el diff --git a/elpa/ein-20191216.1849/ein-ipynb-mode.elc b/elpa/ein-20200127.249/ein-ipynb-mode.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-ipynb-mode.elc rename to elpa/ein-20200127.249/ein-ipynb-mode.elc index fea4086f..12fd4cd7 100644 Binary files a/elpa/ein-20191216.1849/ein-ipynb-mode.elc and b/elpa/ein-20200127.249/ein-ipynb-mode.elc differ diff --git a/elpa/ein-20191216.1849/ein-jupyter.el b/elpa/ein-20200127.249/ein-jupyter.el similarity index 100% rename from elpa/ein-20191216.1849/ein-jupyter.el rename to elpa/ein-20200127.249/ein-jupyter.el diff --git a/elpa/ein-20191216.1849/ein-jupyter.elc b/elpa/ein-20200127.249/ein-jupyter.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-jupyter.elc rename to elpa/ein-20200127.249/ein-jupyter.elc index 0d992d1c..ba019ab7 100644 Binary files a/elpa/ein-20191216.1849/ein-jupyter.elc and b/elpa/ein-20200127.249/ein-jupyter.elc differ diff --git a/elpa/ein-20191216.1849/ein-jupyterhub.el b/elpa/ein-20200127.249/ein-jupyterhub.el similarity index 100% rename from elpa/ein-20191216.1849/ein-jupyterhub.el rename to elpa/ein-20200127.249/ein-jupyterhub.el diff --git a/elpa/ein-20191216.1849/ein-jupyterhub.elc b/elpa/ein-20200127.249/ein-jupyterhub.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-jupyterhub.elc rename to elpa/ein-20200127.249/ein-jupyterhub.elc index 552ad451..f3c8f98b 100644 Binary files a/elpa/ein-20191216.1849/ein-jupyterhub.elc and b/elpa/ein-20200127.249/ein-jupyterhub.elc differ diff --git a/elpa/ein-20191216.1849/ein-kernel.el b/elpa/ein-20200127.249/ein-kernel.el similarity index 99% rename from elpa/ein-20191216.1849/ein-kernel.el rename to elpa/ein-20200127.249/ein-kernel.el index ec1ed188..9f5ef911 100644 --- a/elpa/ein-20191216.1849/ein-kernel.el +++ b/elpa/ein-20200127.249/ein-kernel.el @@ -85,6 +85,9 @@ "Destructor for `ein:$kernel'." (ein:kernel-disconnect kernel)) +(defun ein:kernel-language (kernel) + "Return a string naming the language used by kernel `kernel'. Typical return values might be 'python', or 'julia', or 'R' (among others)." + (ein:$kernelspec-language (ein:$kernel-kernelspec kernel))) (defun ein:kernel--get-msg (kernel msg-type content) (list diff --git a/elpa/ein-20191216.1849/ein-kernel.elc b/elpa/ein-20200127.249/ein-kernel.elc similarity index 93% rename from elpa/ein-20191216.1849/ein-kernel.elc rename to elpa/ein-20200127.249/ein-kernel.elc index c4f9cd48..d41702d5 100644 Binary files a/elpa/ein-20191216.1849/ein-kernel.elc and b/elpa/ein-20200127.249/ein-kernel.elc differ diff --git a/elpa/ein-20191216.1849/ein-kernelinfo.el b/elpa/ein-20200127.249/ein-kernelinfo.el similarity index 100% rename from elpa/ein-20191216.1849/ein-kernelinfo.el rename to elpa/ein-20200127.249/ein-kernelinfo.el diff --git a/elpa/ein-20191216.1849/ein-kernelinfo.elc b/elpa/ein-20200127.249/ein-kernelinfo.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-kernelinfo.elc rename to elpa/ein-20200127.249/ein-kernelinfo.elc index 9102c9fe..af215458 100644 Binary files a/elpa/ein-20191216.1849/ein-kernelinfo.elc and b/elpa/ein-20200127.249/ein-kernelinfo.elc differ diff --git a/elpa/ein-20191216.1849/ein-kill-ring.el b/elpa/ein-20200127.249/ein-kill-ring.el similarity index 100% rename from elpa/ein-20191216.1849/ein-kill-ring.el rename to elpa/ein-20200127.249/ein-kill-ring.el diff --git a/elpa/ein-20191216.1849/ein-kill-ring.elc b/elpa/ein-20200127.249/ein-kill-ring.elc similarity index 97% rename from elpa/ein-20191216.1849/ein-kill-ring.elc rename to elpa/ein-20200127.249/ein-kill-ring.elc index b1498cbf..ecb66f4e 100644 Binary files a/elpa/ein-20191216.1849/ein-kill-ring.elc and b/elpa/ein-20200127.249/ein-kill-ring.elc differ diff --git a/elpa/ein-20191216.1849/ein-log.el b/elpa/ein-20200127.249/ein-log.el similarity index 100% rename from elpa/ein-20191216.1849/ein-log.el rename to elpa/ein-20200127.249/ein-log.el diff --git a/elpa/ein-20191216.1849/ein-log.elc b/elpa/ein-20200127.249/ein-log.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-log.elc rename to elpa/ein-20200127.249/ein-log.elc index 608b3312..47510001 100644 Binary files a/elpa/ein-20191216.1849/ein-log.elc and b/elpa/ein-20200127.249/ein-log.elc differ diff --git a/elpa/ein-20191216.1849/ein-multilang-fontify.el b/elpa/ein-20200127.249/ein-multilang-fontify.el similarity index 100% rename from elpa/ein-20191216.1849/ein-multilang-fontify.el rename to elpa/ein-20200127.249/ein-multilang-fontify.el diff --git a/elpa/ein-20191216.1849/ein-multilang-fontify.elc b/elpa/ein-20200127.249/ein-multilang-fontify.elc similarity index 98% rename from elpa/ein-20191216.1849/ein-multilang-fontify.elc rename to elpa/ein-20200127.249/ein-multilang-fontify.elc index ebe8f35a..5fd6e3e7 100644 Binary files a/elpa/ein-20191216.1849/ein-multilang-fontify.elc and b/elpa/ein-20200127.249/ein-multilang-fontify.elc differ diff --git a/elpa/ein-20191216.1849/ein-multilang.el b/elpa/ein-20200127.249/ein-multilang.el similarity index 85% rename from elpa/ein-20191216.1849/ein-multilang.el rename to elpa/ein-20200127.249/ein-multilang.el index 22e79504..277e50e4 100644 --- a/elpa/ein-20191216.1849/ein-multilang.el +++ b/elpa/ein-20200127.249/ein-multilang.el @@ -35,10 +35,14 @@ (require 'ess-custom nil t) (require 'clojure-mode nil t) (require 'julia-mode nil t) +(require 'haskell-mode nil t) +(require 'hy-mode nil t) +(require 'cc-mode) (declare-function ess-indent-line "ess") (declare-function ess-r-eldoc-function "ess-r-completion") (declare-function ess-setq-vars-local "ess-utils") +(declare-function haskell-indentation-indent-line "haskell-indentation") (defun ein:ml-fontify (limit) "Fontify next input area comes after the current point then @@ -188,11 +192,69 @@ This function may raise an error." (when (boundp 'ess-r-mode-map) (set-keymap-parent ein:notebook-multilang-mode-map ess-r-mode-map)))) +(defun ein:ml-lang-setup-haskell () + (when (featurep 'haskell-mode) + (setq-local mode-name "EIN[haskell]") + (setq-local comment-start "-- ") + ;; (setq-local comment-start-skip "--\\s-*") + (when (boundp 'haskell-indentation-indent-line) + (setq-local indent-line-function + (apply-partially #'ein:ml-indent-line-function #'haskell-indentation-indent-line))) + (when (boundp 'haskell-mode-syntax-table) + (set-syntax-table haskell-mode-syntax-table)) + (when (boundp 'haskell-mode-map) + (set-keymap-parent ein:notebook-multilang-mode-map haskell-mode-map)))) + +(defun ein:ml-lang-setup-hy () + (when (featurep 'hy-mode) + (setq-local mode-name "EIN[hy]") + (hy-mode--setup-font-lock) + (hy-mode--setup-syntax) + (hy-mode--support-smartparens) + (set-keymap-parent ein:notebook-multilang-mode-map hy-mode-map))) + +(defun ein:ml-lang-setup-c++ () + (when (featurep 'c++-mode) + (setq-local mode-name "EIN[c++]") + (setq-local comment-start "// ") + (setq-local indent-line-function + (apply-partially #'ein:ml-indent-line-function #'c-indent-line)) + (set-syntax-table c++-mode-syntax-table) + (set-keymap-parent ein:notebook-multilang-mode-map c++-mode-map))) + +(defun ein:ml-lang-setup-c () + (when (featurep 'c-mode) + (setq-local mode-name "EIN[c]") + (setq-local comment-start "/* ") + (setq-local comment-end " */") + (setq-local indent-line-function + (apply-partially #'ein:ml-indent-line-function #'c-indent-line)) + (set-syntax-table c-mode-syntax-table) + (set-keymap-parent ein:notebook-multilang-mode-map c-mode-map))) + +(defun ein:ml-lang-setup-C++11 () + (ein:ml-lang-setup-c++)) + +(defun ein:ml-lang-setup-C++14 () + (ein:ml-lang-setup-c++)) + +(defun ein:ml-lang-setup-C++17 () + (ein:ml-lang-setup-c++)) + +(defun ein:ml-lang-setup-generic () + (setq-local mode-name "EIN[unknown]") + (setq-local indent-line-function + (apply-partially #'ein:ml-indent-line-function #'indent-relative)) + (set-syntax-table prog-mode-syntax-table) + (set-keymap-parent ein:notebook-multilang-mode-map prog-mode-map)) + (defun ein:ml-lang-setup (kernelspec) (let ((setup-func (intern (concat "ein:ml-lang-setup-" (ein:$kernelspec-language kernelspec))))) (if (fboundp setup-func) (funcall setup-func) - (error "ein:ml-lang-setup: kernelspec language '%s' unsupported" (ein:$kernelspec-language kernelspec))))) + (warn "ein:ml-lang-setup: unknown kernelspec language '%s', multilang support disabled." + (ein:$kernelspec-language kernelspec)) + (ein:ml-lang-setup-generic)))) ;; (defun ein:ml-lang-setup-markdown () ;; "Use `markdown-mode-map'. NOTE: This function is not used now." diff --git a/elpa/ein-20191216.1849/ein-multilang.elc b/elpa/ein-20200127.249/ein-multilang.elc similarity index 77% rename from elpa/ein-20191216.1849/ein-multilang.elc rename to elpa/ein-20200127.249/ein-multilang.elc index 839d24ff..e70f61df 100644 Binary files a/elpa/ein-20191216.1849/ein-multilang.elc and b/elpa/ein-20200127.249/ein-multilang.elc differ diff --git a/elpa/ein-20191216.1849/ein-node.el b/elpa/ein-20200127.249/ein-node.el similarity index 100% rename from elpa/ein-20191216.1849/ein-node.el rename to elpa/ein-20200127.249/ein-node.el diff --git a/elpa/ein-20191216.1849/ein-node.elc b/elpa/ein-20200127.249/ein-node.elc similarity index 91% rename from elpa/ein-20191216.1849/ein-node.elc rename to elpa/ein-20200127.249/ein-node.elc index 71fb449d..11008da2 100644 Binary files a/elpa/ein-20191216.1849/ein-node.elc and b/elpa/ein-20200127.249/ein-node.elc differ diff --git a/elpa/ein-20191216.1849/ein-notebook.el b/elpa/ein-20200127.249/ein-notebook.el similarity index 100% rename from elpa/ein-20191216.1849/ein-notebook.el rename to elpa/ein-20200127.249/ein-notebook.el diff --git a/elpa/ein-20191216.1849/ein-notebook.elc b/elpa/ein-20200127.249/ein-notebook.elc similarity index 92% rename from elpa/ein-20191216.1849/ein-notebook.elc rename to elpa/ein-20200127.249/ein-notebook.elc index 0c220ac9..31a5f3b3 100644 Binary files a/elpa/ein-20191216.1849/ein-notebook.elc and b/elpa/ein-20200127.249/ein-notebook.elc differ diff --git a/elpa/ein-20191216.1849/ein-notebooklist.el b/elpa/ein-20200127.249/ein-notebooklist.el similarity index 100% rename from elpa/ein-20191216.1849/ein-notebooklist.el rename to elpa/ein-20200127.249/ein-notebooklist.el diff --git a/elpa/ein-20191216.1849/ein-notebooklist.elc b/elpa/ein-20200127.249/ein-notebooklist.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-notebooklist.elc rename to elpa/ein-20200127.249/ein-notebooklist.elc index 73cdcdc4..5cd25d75 100644 Binary files a/elpa/ein-20191216.1849/ein-notebooklist.elc and b/elpa/ein-20200127.249/ein-notebooklist.elc differ diff --git a/elpa/ein-20191216.1849/ein-notification.el b/elpa/ein-20200127.249/ein-notification.el similarity index 100% rename from elpa/ein-20191216.1849/ein-notification.el rename to elpa/ein-20200127.249/ein-notification.el diff --git a/elpa/ein-20191216.1849/ein-notification.elc b/elpa/ein-20200127.249/ein-notification.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-notification.elc rename to elpa/ein-20200127.249/ein-notification.elc index 59563b42..c7a24ac1 100644 Binary files a/elpa/ein-20191216.1849/ein-notification.elc and b/elpa/ein-20200127.249/ein-notification.elc differ diff --git a/elpa/ein-20191216.1849/ein-org.el b/elpa/ein-20200127.249/ein-org.el similarity index 100% rename from elpa/ein-20191216.1849/ein-org.el rename to elpa/ein-20200127.249/ein-org.el diff --git a/elpa/ein-20191216.1849/ein-org.elc b/elpa/ein-20200127.249/ein-org.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-org.elc rename to elpa/ein-20200127.249/ein-org.elc index c20b56e6..ed7c7f1d 100644 Binary files a/elpa/ein-20191216.1849/ein-org.elc and b/elpa/ein-20200127.249/ein-org.elc differ diff --git a/elpa/ein-20191216.1849/ein-output-area.el b/elpa/ein-20200127.249/ein-output-area.el similarity index 100% rename from elpa/ein-20191216.1849/ein-output-area.el rename to elpa/ein-20200127.249/ein-output-area.el diff --git a/elpa/ein-20191216.1849/ein-output-area.elc b/elpa/ein-20200127.249/ein-output-area.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-output-area.elc rename to elpa/ein-20200127.249/ein-output-area.elc index f6cef646..af109465 100644 Binary files a/elpa/ein-20191216.1849/ein-output-area.elc and b/elpa/ein-20200127.249/ein-output-area.elc differ diff --git a/elpa/ein-20191216.1849/ein-pager.el b/elpa/ein-20200127.249/ein-pager.el similarity index 100% rename from elpa/ein-20191216.1849/ein-pager.el rename to elpa/ein-20200127.249/ein-pager.el diff --git a/elpa/ein-20191216.1849/ein-pager.elc b/elpa/ein-20200127.249/ein-pager.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-pager.elc rename to elpa/ein-20200127.249/ein-pager.elc index 3e54f9f0..df1596cc 100644 Binary files a/elpa/ein-20191216.1849/ein-pager.elc and b/elpa/ein-20200127.249/ein-pager.elc differ diff --git a/elpa/ein-20191216.1849/ein-pkg.el b/elpa/ein-20200127.249/ein-pkg.el similarity index 82% rename from elpa/ein-20191216.1849/ein-pkg.el rename to elpa/ein-20200127.249/ein-pkg.el index a2eacee8..2cf19959 100644 --- a/elpa/ein-20191216.1849/ein-pkg.el +++ b/elpa/ein-20200127.249/ein-pkg.el @@ -1,4 +1,4 @@ -(define-package "ein" "20191216.1849" "Emacs IPython Notebook" +(define-package "ein" "20200127.249" "Emacs IPython Notebook" '((emacs "25") (websocket "20191017.30") (auto-complete "1.4.0") diff --git a/elpa/ein-20191216.1849/ein-process.el b/elpa/ein-20200127.249/ein-process.el similarity index 100% rename from elpa/ein-20191216.1849/ein-process.el rename to elpa/ein-20200127.249/ein-process.el diff --git a/elpa/ein-20191216.1849/ein-process.elc b/elpa/ein-20200127.249/ein-process.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-process.elc rename to elpa/ein-20200127.249/ein-process.elc index fee2b923..4643538a 100644 Binary files a/elpa/ein-20191216.1849/ein-process.elc and b/elpa/ein-20200127.249/ein-process.elc differ diff --git a/elpa/ein-20191216.1849/ein-pseudo-console.el b/elpa/ein-20200127.249/ein-pseudo-console.el similarity index 100% rename from elpa/ein-20191216.1849/ein-pseudo-console.el rename to elpa/ein-20200127.249/ein-pseudo-console.el diff --git a/elpa/ein-20191216.1849/ein-pseudo-console.elc b/elpa/ein-20200127.249/ein-pseudo-console.elc similarity index 98% rename from elpa/ein-20191216.1849/ein-pseudo-console.elc rename to elpa/ein-20200127.249/ein-pseudo-console.elc index 90a5c005..4e03fde0 100644 Binary files a/elpa/ein-20191216.1849/ein-pseudo-console.elc and b/elpa/ein-20200127.249/ein-pseudo-console.elc differ diff --git a/elpa/ein-20191216.1849/ein-python.el b/elpa/ein-20200127.249/ein-python.el similarity index 100% rename from elpa/ein-20191216.1849/ein-python.el rename to elpa/ein-20200127.249/ein-python.el diff --git a/elpa/ein-20191216.1849/ein-python.elc b/elpa/ein-20200127.249/ein-python.elc similarity index 97% rename from elpa/ein-20191216.1849/ein-python.elc rename to elpa/ein-20200127.249/ein-python.elc index 0d669480..c36fa793 100644 Binary files a/elpa/ein-20191216.1849/ein-python.elc and b/elpa/ein-20200127.249/ein-python.elc differ diff --git a/elpa/ein-20191216.1849/ein-pytools.el b/elpa/ein-20200127.249/ein-pytools.el similarity index 100% rename from elpa/ein-20191216.1849/ein-pytools.el rename to elpa/ein-20200127.249/ein-pytools.el diff --git a/elpa/ein-20191216.1849/ein-pytools.elc b/elpa/ein-20200127.249/ein-pytools.elc similarity index 94% rename from elpa/ein-20191216.1849/ein-pytools.elc rename to elpa/ein-20200127.249/ein-pytools.elc index 1488c060..af9c4cbf 100644 Binary files a/elpa/ein-20191216.1849/ein-pytools.elc and b/elpa/ein-20200127.249/ein-pytools.elc differ diff --git a/elpa/ein-20191216.1849/ein-query.el b/elpa/ein-20200127.249/ein-query.el similarity index 100% rename from elpa/ein-20191216.1849/ein-query.el rename to elpa/ein-20200127.249/ein-query.el diff --git a/elpa/ein-20191216.1849/ein-query.elc b/elpa/ein-20200127.249/ein-query.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-query.elc rename to elpa/ein-20200127.249/ein-query.elc index d29be2ca..38313fd2 100644 Binary files a/elpa/ein-20191216.1849/ein-query.elc and b/elpa/ein-20200127.249/ein-query.elc differ diff --git a/elpa/ein-20191216.1849/ein-scratchsheet.el b/elpa/ein-20200127.249/ein-scratchsheet.el similarity index 100% rename from elpa/ein-20191216.1849/ein-scratchsheet.el rename to elpa/ein-20200127.249/ein-scratchsheet.el diff --git a/elpa/ein-20191216.1849/ein-scratchsheet.elc b/elpa/ein-20200127.249/ein-scratchsheet.elc similarity index 98% rename from elpa/ein-20191216.1849/ein-scratchsheet.elc rename to elpa/ein-20200127.249/ein-scratchsheet.elc index 0a3d4309..958ad99a 100644 Binary files a/elpa/ein-20191216.1849/ein-scratchsheet.elc and b/elpa/ein-20200127.249/ein-scratchsheet.elc differ diff --git a/elpa/ein-20191216.1849/ein-shared-output.el b/elpa/ein-20200127.249/ein-shared-output.el similarity index 100% rename from elpa/ein-20191216.1849/ein-shared-output.el rename to elpa/ein-20200127.249/ein-shared-output.el diff --git a/elpa/ein-20191216.1849/ein-shared-output.elc b/elpa/ein-20200127.249/ein-shared-output.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-shared-output.elc rename to elpa/ein-20200127.249/ein-shared-output.elc index 8a172aaa..cfd251dd 100644 Binary files a/elpa/ein-20191216.1849/ein-shared-output.elc and b/elpa/ein-20200127.249/ein-shared-output.elc differ diff --git a/elpa/ein-20191216.1849/ein-skewer.el b/elpa/ein-20200127.249/ein-skewer.el similarity index 100% rename from elpa/ein-20191216.1849/ein-skewer.el rename to elpa/ein-20200127.249/ein-skewer.el diff --git a/elpa/ein-20191216.1849/ein-skewer.elc b/elpa/ein-20200127.249/ein-skewer.elc similarity index 94% rename from elpa/ein-20191216.1849/ein-skewer.elc rename to elpa/ein-20200127.249/ein-skewer.elc index 8d9d4a8c..dacb8ee1 100644 Binary files a/elpa/ein-20191216.1849/ein-skewer.elc and b/elpa/ein-20200127.249/ein-skewer.elc differ diff --git a/elpa/ein-20191216.1849/ein-smartrep.el b/elpa/ein-20200127.249/ein-smartrep.el similarity index 100% rename from elpa/ein-20191216.1849/ein-smartrep.el rename to elpa/ein-20200127.249/ein-smartrep.el diff --git a/elpa/ein-20191216.1849/ein-smartrep.elc b/elpa/ein-20200127.249/ein-smartrep.elc similarity index 98% rename from elpa/ein-20191216.1849/ein-smartrep.elc rename to elpa/ein-20200127.249/ein-smartrep.elc index d2041f1e..d65bf0b9 100644 Binary files a/elpa/ein-20191216.1849/ein-smartrep.elc and b/elpa/ein-20200127.249/ein-smartrep.elc differ diff --git a/elpa/ein-20191216.1849/ein-subpackages.el b/elpa/ein-20200127.249/ein-subpackages.el similarity index 100% rename from elpa/ein-20191216.1849/ein-subpackages.el rename to elpa/ein-20200127.249/ein-subpackages.el diff --git a/elpa/ein-20191216.1849/ein-subpackages.elc b/elpa/ein-20200127.249/ein-subpackages.elc similarity index 97% rename from elpa/ein-20191216.1849/ein-subpackages.elc rename to elpa/ein-20200127.249/ein-subpackages.elc index e0dc1b2f..acf3f01e 100644 Binary files a/elpa/ein-20191216.1849/ein-subpackages.elc and b/elpa/ein-20200127.249/ein-subpackages.elc differ diff --git a/elpa/ein-20191216.1849/ein-timestamp.el b/elpa/ein-20200127.249/ein-timestamp.el similarity index 100% rename from elpa/ein-20191216.1849/ein-timestamp.el rename to elpa/ein-20200127.249/ein-timestamp.el diff --git a/elpa/ein-20191216.1849/ein-timestamp.elc b/elpa/ein-20200127.249/ein-timestamp.elc similarity index 98% rename from elpa/ein-20191216.1849/ein-timestamp.elc rename to elpa/ein-20200127.249/ein-timestamp.elc index 3f0bd508..c2eb8f11 100644 Binary files a/elpa/ein-20191216.1849/ein-timestamp.elc and b/elpa/ein-20200127.249/ein-timestamp.elc differ diff --git a/elpa/ein-20191216.1849/ein-traceback.el b/elpa/ein-20200127.249/ein-traceback.el similarity index 100% rename from elpa/ein-20191216.1849/ein-traceback.el rename to elpa/ein-20200127.249/ein-traceback.el diff --git a/elpa/ein-20191216.1849/ein-traceback.elc b/elpa/ein-20200127.249/ein-traceback.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-traceback.elc rename to elpa/ein-20200127.249/ein-traceback.elc index 9015672c..61a79c5e 100644 Binary files a/elpa/ein-20191216.1849/ein-traceback.elc and b/elpa/ein-20200127.249/ein-traceback.elc differ diff --git a/elpa/ein-20191216.1849/ein-utils.el b/elpa/ein-20200127.249/ein-utils.el similarity index 100% rename from elpa/ein-20191216.1849/ein-utils.el rename to elpa/ein-20200127.249/ein-utils.el diff --git a/elpa/ein-20191216.1849/ein-utils.elc b/elpa/ein-20200127.249/ein-utils.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-utils.elc rename to elpa/ein-20200127.249/ein-utils.elc index c8010d9d..abc483b2 100644 Binary files a/elpa/ein-20191216.1849/ein-utils.elc and b/elpa/ein-20200127.249/ein-utils.elc differ diff --git a/elpa/ein-20191216.1849/ein-websocket.el b/elpa/ein-20200127.249/ein-websocket.el similarity index 100% rename from elpa/ein-20191216.1849/ein-websocket.el rename to elpa/ein-20200127.249/ein-websocket.el diff --git a/elpa/ein-20191216.1849/ein-websocket.elc b/elpa/ein-20200127.249/ein-websocket.elc similarity index 99% rename from elpa/ein-20191216.1849/ein-websocket.elc rename to elpa/ein-20200127.249/ein-websocket.elc index b2cd3d4e..c9063eaf 100644 Binary files a/elpa/ein-20191216.1849/ein-websocket.elc and b/elpa/ein-20200127.249/ein-websocket.elc differ diff --git a/elpa/ein-20191216.1849/ein-worksheet.el b/elpa/ein-20200127.249/ein-worksheet.el similarity index 98% rename from elpa/ein-20191216.1849/ein-worksheet.el rename to elpa/ein-20200127.249/ein-worksheet.el index a51e4827..ce60cfa2 100644 --- a/elpa/ein-20191216.1849/ein-worksheet.el +++ b/elpa/ein-20200127.249/ein-worksheet.el @@ -187,7 +187,8 @@ Normalize `buffer-undo-list' by removing extraneous details, and update the ein: (when (buffer-live-p b) (poly-ein-copy-state (ein:worksheet--get-buffer ein:%worksheet%) b)))) (ein:display-warning msg :error) - (error "ein:worksheet--jigger-undo-list: aborting"))) + (when ein:debug + (error "ein:worksheet--jigger-undo-list: aborting")))) (if (< fill 0) (setq ein:%which-cell% (nthcdr (- fill) ein:%which-cell%)) (if (> fill 0) @@ -1326,12 +1327,20 @@ function." ;; As Imenu does not provide the way to represent level *and* ;; position, use #'s to do that. (cl-loop for cell in (when (ein:worksheet-p ein:%worksheet%) - (seq-filter #'ein:headingcell-p + (seq-filter #'(lambda (cell) (or (ein:headingcell-p cell) + (ein:cell--markdown-heading-p cell))) (ein:worksheet-get-cells ein:%worksheet%))) - for sharps = (cl-loop repeat (slot-value cell 'level) collect "#") - for text = (ein:cell-get-text cell) - for name = (ein:join-str "" (append sharps (list " " text))) - collect (cons name (ein:cell-input-pos-min cell)))) + for sharps = (if (ein:headingcell-p cell) + (cl-loop repeat (slot-value cell 'level) collect "#") + (cl-loop repeat(progn + (string-match "^#+" (ein:cell-get-text cell)) + (match-end 0)) + collect "#")) + for text = (ein:cell-get-text cell) + for name = (if (ein:headingcell-p cell) + (ein:join-str "" (append sharps (list " " text))) + text) + collect (cons name (ein:cell-input-pos-min cell)))) (defun ein:worksheet-imenu-setup () "Called via notebook mode hooks." diff --git a/elpa/ein-20191216.1849/ein-worksheet.elc b/elpa/ein-20200127.249/ein-worksheet.elc similarity index 91% rename from elpa/ein-20191216.1849/ein-worksheet.elc rename to elpa/ein-20200127.249/ein-worksheet.elc index 50c95fdf..46a23915 100644 Binary files a/elpa/ein-20191216.1849/ein-worksheet.elc and b/elpa/ein-20200127.249/ein-worksheet.elc differ diff --git a/elpa/ein-20191216.1849/ein.el b/elpa/ein-20200127.249/ein.el similarity index 100% rename from elpa/ein-20191216.1849/ein.el rename to elpa/ein-20200127.249/ein.el diff --git a/elpa/ein-20191216.1849/ein.elc b/elpa/ein-20200127.249/ein.elc similarity index 95% rename from elpa/ein-20191216.1849/ein.elc rename to elpa/ein-20200127.249/ein.elc index 9f2bf2b4..bbb38b4b 100644 Binary files a/elpa/ein-20191216.1849/ein.elc and b/elpa/ein-20200127.249/ein.elc differ diff --git a/elpa/ein-20191216.1849/ein_inspector.py b/elpa/ein-20200127.249/ein_inspector.py similarity index 100% rename from elpa/ein-20191216.1849/ein_inspector.py rename to elpa/ein-20200127.249/ein_inspector.py diff --git a/elpa/ein-20191216.1849/ein_remote_safe.py b/elpa/ein-20200127.249/ein_remote_safe.py similarity index 100% rename from elpa/ein-20191216.1849/ein_remote_safe.py rename to elpa/ein-20200127.249/ein_remote_safe.py diff --git a/elpa/ein-20191216.1849/ob-ein.el b/elpa/ein-20200127.249/ob-ein.el similarity index 99% rename from elpa/ein-20191216.1849/ob-ein.el rename to elpa/ein-20200127.249/ob-ein.el index e3f51a8e..9a1a00fc 100644 --- a/elpa/ein-20191216.1849/ob-ein.el +++ b/elpa/ein-20200127.249/ob-ein.el @@ -71,7 +71,11 @@ ("ein-R" . R) ("ein-r" . R) ("ein-julia" . julia) - ("ein-hy" . hy)) + ("ein-hy" . hy) + ("ein-c" . c) + ("ein-C++11" . c++) + ("ein-C++14" . c++) + ("ein-C++17" . c++)) "ob-ein has knowledge of these (ein-LANG . LANG-MODE) pairs." :type '(repeat (cons string symbol)) :group 'ein) diff --git a/elpa/ein-20191216.1849/ob-ein.elc b/elpa/ein-20200127.249/ob-ein.elc similarity index 93% rename from elpa/ein-20191216.1849/ob-ein.elc rename to elpa/ein-20200127.249/ob-ein.elc index a6d59d9a..8128bd31 100644 Binary files a/elpa/ein-20191216.1849/ob-ein.elc and b/elpa/ein-20200127.249/ob-ein.elc differ diff --git a/elpa/ein-20191216.1849/poly-ein.el b/elpa/ein-20200127.249/poly-ein.el similarity index 100% rename from elpa/ein-20191216.1849/poly-ein.el rename to elpa/ein-20200127.249/poly-ein.el diff --git a/elpa/ein-20191216.1849/poly-ein.elc b/elpa/ein-20200127.249/poly-ein.elc similarity index 99% rename from elpa/ein-20191216.1849/poly-ein.elc rename to elpa/ein-20200127.249/poly-ein.elc index e0097c21..47273f44 100644 Binary files a/elpa/ein-20191216.1849/poly-ein.elc and b/elpa/ein-20200127.249/poly-ein.elc differ diff --git a/elpa/elm-mode-20191228.2356/elm-imenu.el b/elpa/elm-mode-20191228.2356/elm-imenu.el deleted file mode 100644 index 8a0d98ee..00000000 --- a/elpa/elm-mode-20191228.2356/elm-imenu.el +++ /dev/null @@ -1,17 +0,0 @@ -;;; elm-imenu.el --- imenu support for elm -;;; Commentary: -;;; Code: -(require 'imenu) - -(defun elm-imenu-create-index () - "Create an imenu index for the current buffer." - (save-excursion - (imenu--generic-function - '(("Type" "^type \\([A-Z][^ \n]+\\)" 1) - ("Type Alias" "^type alias \\([A-Z][^ \n]+\\)" 1) - ("Port" "^port \\([^ ]+\\)" 1) - ("Function" "^\\([^ ]+\\) :" 1))))) - - -(provide 'elm-imenu) -;;; elm-imenu.el ends here diff --git a/elpa/elm-mode-20191228.2356/elm-imenu.elc b/elpa/elm-mode-20191228.2356/elm-imenu.elc deleted file mode 100644 index 19a37308..00000000 Binary files a/elpa/elm-mode-20191228.2356/elm-imenu.elc and /dev/null differ diff --git a/elpa/elm-mode-20191228.2356/elm-font-lock.el b/elpa/elm-mode-20200126.2223/elm-font-lock.el similarity index 100% rename from elpa/elm-mode-20191228.2356/elm-font-lock.el rename to elpa/elm-mode-20200126.2223/elm-font-lock.el diff --git a/elpa/elm-mode-20191228.2356/elm-font-lock.elc b/elpa/elm-mode-20200126.2223/elm-font-lock.elc similarity index 99% rename from elpa/elm-mode-20191228.2356/elm-font-lock.elc rename to elpa/elm-mode-20200126.2223/elm-font-lock.elc index 2fe0abfe..7f91d172 100644 Binary files a/elpa/elm-mode-20191228.2356/elm-font-lock.elc and b/elpa/elm-mode-20200126.2223/elm-font-lock.elc differ diff --git a/elpa/elm-mode-20191228.2356/elm-format.el b/elpa/elm-mode-20200126.2223/elm-format.el similarity index 100% rename from elpa/elm-mode-20191228.2356/elm-format.el rename to elpa/elm-mode-20200126.2223/elm-format.el diff --git a/elpa/elm-mode-20191228.2356/elm-format.elc b/elpa/elm-mode-20200126.2223/elm-format.elc similarity index 99% rename from elpa/elm-mode-20191228.2356/elm-format.elc rename to elpa/elm-mode-20200126.2223/elm-format.elc index fec62486..2238b6de 100644 Binary files a/elpa/elm-mode-20191228.2356/elm-format.elc and b/elpa/elm-mode-20200126.2223/elm-format.elc differ diff --git a/elpa/elm-mode-20200126.2223/elm-imenu.el b/elpa/elm-mode-20200126.2223/elm-imenu.el new file mode 100644 index 00000000..715f2618 --- /dev/null +++ b/elpa/elm-mode-20200126.2223/elm-imenu.el @@ -0,0 +1,22 @@ +;;; elm-imenu.el --- imenu support for elm +;;; Commentary: +;;; Code: +(require 'imenu) + +(defcustom elm-imenu-use-categories t + "Group imenu entries by their type, e.g. functions, type aliases." + :group 'elm + :type 'boolean + :safe 'booleanp) + +(defun elm-imenu-create-index () + "Create an imenu index for the current buffer." + (save-excursion + (imenu--generic-function + `((,(and elm-imenu-use-categories "Type") "^type\\s-+\\([A-Z]\\(?:\\s_\\|\\sw\\)*\\)" 1) + (,(and elm-imenu-use-categories "Type Alias") "^type\\s-+alias\\s-+\\([A-Z]\\(?:\\s_\\|\\sw\\)*\\)" 1) + (,(and elm-imenu-use-categories "Port") "^port\\s-+\\(\\(?:\\s_\\|\\sw\\)+\\)" 1) + (,(and elm-imenu-use-categories "Function") "^\\(\\(?:\\s_\\|\\sw\\)+\\)\\s-+:" 1))))) + +(provide 'elm-imenu) +;;; elm-imenu.el ends here diff --git a/elpa/elm-mode-20200126.2223/elm-imenu.elc b/elpa/elm-mode-20200126.2223/elm-imenu.elc new file mode 100644 index 00000000..4c9d8193 Binary files /dev/null and b/elpa/elm-mode-20200126.2223/elm-imenu.elc differ diff --git a/elpa/elm-mode-20191228.2356/elm-indent.el b/elpa/elm-mode-20200126.2223/elm-indent.el similarity index 100% rename from elpa/elm-mode-20191228.2356/elm-indent.el rename to elpa/elm-mode-20200126.2223/elm-indent.el diff --git a/elpa/elm-mode-20191228.2356/elm-indent.elc b/elpa/elm-mode-20200126.2223/elm-indent.elc similarity index 77% rename from elpa/elm-mode-20191228.2356/elm-indent.elc rename to elpa/elm-mode-20200126.2223/elm-indent.elc index af533ced..d464a28d 100644 Binary files a/elpa/elm-mode-20191228.2356/elm-indent.elc and b/elpa/elm-mode-20200126.2223/elm-indent.elc differ diff --git a/elpa/elm-mode-20191228.2356/elm-interactive.el b/elpa/elm-mode-20200126.2223/elm-interactive.el similarity index 99% rename from elpa/elm-mode-20191228.2356/elm-interactive.el rename to elpa/elm-mode-20200126.2223/elm-interactive.el index f89a8de6..c48c1bfb 100644 --- a/elpa/elm-mode-20191228.2356/elm-interactive.el +++ b/elpa/elm-mode-20200126.2223/elm-interactive.el @@ -132,9 +132,9 @@ For Elm 0.18 and earlier, set this to '(\"--yes\" \"--warn\" \"--output=elm.js\" (defvar elm-package-buffer-name "*elm-package*") -(defcustom elm-package-command '("elm-package") +(defcustom elm-package-command '("elm" "package") "The Elm package command. -For Elm 0.19 and greater, set this to '(\"elm\" \"package\")." +For Elm 0.18 and earler, set this to '(\"elm-package\")." :type '(repeat string) :group 'elm) diff --git a/elpa/elm-mode-20191228.2356/elm-interactive.elc b/elpa/elm-mode-20200126.2223/elm-interactive.elc similarity index 89% rename from elpa/elm-mode-20191228.2356/elm-interactive.elc rename to elpa/elm-mode-20200126.2223/elm-interactive.elc index 32849d43..e790ba1f 100644 Binary files a/elpa/elm-mode-20191228.2356/elm-interactive.elc and b/elpa/elm-mode-20200126.2223/elm-interactive.elc differ diff --git a/elpa/elm-mode-20191228.2356/elm-mode-autoloads.el b/elpa/elm-mode-20200126.2223/elm-mode-autoloads.el similarity index 99% rename from elpa/elm-mode-20191228.2356/elm-mode-autoloads.el rename to elpa/elm-mode-20200126.2223/elm-mode-autoloads.el index fdf13eb3..cc0c7523 100644 --- a/elpa/elm-mode-20191228.2356/elm-mode-autoloads.el +++ b/elpa/elm-mode-20200126.2223/elm-mode-autoloads.el @@ -27,7 +27,7 @@ ;;;### (autoloads nil "elm-imenu" "elm-imenu.el" (0 0 0 0)) ;;; Generated autoloads from elm-imenu.el -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "elm-imenu" '("elm-imenu-create-index"))) +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "elm-imenu" '("elm-imenu-"))) ;;;*** diff --git a/elpa/elm-mode-20191228.2356/elm-mode-pkg.el b/elpa/elm-mode-20200126.2223/elm-mode-pkg.el similarity index 80% rename from elpa/elm-mode-20191228.2356/elm-mode-pkg.el rename to elpa/elm-mode-20200126.2223/elm-mode-pkg.el index a84d9998..0492d8da 100644 --- a/elpa/elm-mode-20191228.2356/elm-mode-pkg.el +++ b/elpa/elm-mode-20200126.2223/elm-mode-pkg.el @@ -1,4 +1,4 @@ -(define-package "elm-mode" "20191228.2356" "Major mode for Elm" +(define-package "elm-mode" "20200126.2223" "Major mode for Elm" '((f "0.17") (s "1.7.0") (emacs "25.1") diff --git a/elpa/elm-mode-20191228.2356/elm-mode.el b/elpa/elm-mode-20200126.2223/elm-mode.el similarity index 100% rename from elpa/elm-mode-20191228.2356/elm-mode.el rename to elpa/elm-mode-20200126.2223/elm-mode.el diff --git a/elpa/elm-mode-20191228.2356/elm-mode.elc b/elpa/elm-mode-20200126.2223/elm-mode.elc similarity index 99% rename from elpa/elm-mode-20191228.2356/elm-mode.elc rename to elpa/elm-mode-20200126.2223/elm-mode.elc index 3f8d5a3e..ca12c7d7 100644 Binary files a/elpa/elm-mode-20191228.2356/elm-mode.elc and b/elpa/elm-mode-20200126.2223/elm-mode.elc differ diff --git a/elpa/elm-mode-20191228.2356/elm-tags.el b/elpa/elm-mode-20200126.2223/elm-tags.el similarity index 100% rename from elpa/elm-mode-20191228.2356/elm-tags.el rename to elpa/elm-mode-20200126.2223/elm-tags.el diff --git a/elpa/elm-mode-20191228.2356/elm-tags.elc b/elpa/elm-mode-20200126.2223/elm-tags.elc similarity index 98% rename from elpa/elm-mode-20191228.2356/elm-tags.elc rename to elpa/elm-mode-20200126.2223/elm-tags.elc index 1fdb3b79..ab70d43c 100644 Binary files a/elpa/elm-mode-20191228.2356/elm-tags.elc and b/elpa/elm-mode-20200126.2223/elm-tags.elc differ diff --git a/elpa/elm-mode-20191228.2356/elm-util.el b/elpa/elm-mode-20200126.2223/elm-util.el similarity index 98% rename from elpa/elm-mode-20191228.2356/elm-util.el rename to elpa/elm-mode-20200126.2223/elm-util.el index 992af602..13c41f9a 100644 --- a/elpa/elm-mode-20191228.2356/elm-util.el +++ b/elpa/elm-mode-20200126.2223/elm-util.el @@ -43,9 +43,9 @@ :group 'elm-util) (defcustom elm-package-json - "elm-package.json" + "elm.json" "The name of the package JSON configuration file. -Set to \"elm.json\" for use with Elm 0.19." +Set to \"elm-package.json\" for use with Elm 0.18 and earlier." :type 'string :group 'elm-util) diff --git a/elpa/elm-mode-20191228.2356/elm-util.elc b/elpa/elm-mode-20200126.2223/elm-util.elc similarity index 89% rename from elpa/elm-mode-20191228.2356/elm-util.elc rename to elpa/elm-mode-20200126.2223/elm-util.elc index 28a3a3a0..35146cd3 100644 Binary files a/elpa/elm-mode-20191228.2356/elm-util.elc and b/elpa/elm-mode-20200126.2223/elm-util.elc differ diff --git a/elpa/elm-mode-20191228.2356/elm.tags b/elpa/elm-mode-20200126.2223/elm.tags similarity index 100% rename from elpa/elm-mode-20191228.2356/elm.tags rename to elpa/elm-mode-20200126.2223/elm.tags diff --git a/elpa/elpy-20191222.2227/elpy-autoloads.el b/elpa/elpy-20200112.1819/elpy-autoloads.el similarity index 100% rename from elpa/elpy-20191222.2227/elpy-autoloads.el rename to elpa/elpy-20200112.1819/elpy-autoloads.el diff --git a/elpa/elpy-20191222.2227/elpy-django.el b/elpa/elpy-20200112.1819/elpy-django.el similarity index 100% rename from elpa/elpy-20191222.2227/elpy-django.el rename to elpa/elpy-20200112.1819/elpy-django.el diff --git a/elpa/elpy-20191222.2227/elpy-django.elc b/elpa/elpy-20200112.1819/elpy-django.elc similarity index 99% rename from elpa/elpy-20191222.2227/elpy-django.elc rename to elpa/elpy-20200112.1819/elpy-django.elc index 95212ada..600a7d2f 100644 Binary files a/elpa/elpy-20191222.2227/elpy-django.elc and b/elpa/elpy-20200112.1819/elpy-django.elc differ diff --git a/elpa/elpy-20191222.2227/elpy-pkg.el b/elpa/elpy-20200112.1819/elpy-pkg.el similarity index 76% rename from elpa/elpy-20191222.2227/elpy-pkg.el rename to elpa/elpy-20200112.1819/elpy-pkg.el index f2c98abc..b0aaf643 100644 --- a/elpa/elpy-20191222.2227/elpy-pkg.el +++ b/elpa/elpy-20200112.1819/elpy-pkg.el @@ -1,4 +1,4 @@ -(define-package "elpy" "20191222.2227" "Emacs Python Development Environment" +(define-package "elpy" "20200112.1819" "Emacs Python Development Environment" '((company "0.9.2") (emacs "24.4") (highlight-indentation "0.5.0") diff --git a/elpa/elpy-20191222.2227/elpy-profile.el b/elpa/elpy-20200112.1819/elpy-profile.el similarity index 100% rename from elpa/elpy-20191222.2227/elpy-profile.el rename to elpa/elpy-20200112.1819/elpy-profile.el diff --git a/elpa/elpy-20191222.2227/elpy-profile.elc b/elpa/elpy-20200112.1819/elpy-profile.elc similarity index 99% rename from elpa/elpy-20191222.2227/elpy-profile.elc rename to elpa/elpy-20200112.1819/elpy-profile.elc index 38a24828..65b51f04 100644 Binary files a/elpa/elpy-20191222.2227/elpy-profile.elc and b/elpa/elpy-20200112.1819/elpy-profile.elc differ diff --git a/elpa/elpy-20191222.2227/elpy-refactor.el b/elpa/elpy-20200112.1819/elpy-refactor.el similarity index 100% rename from elpa/elpy-20191222.2227/elpy-refactor.el rename to elpa/elpy-20200112.1819/elpy-refactor.el diff --git a/elpa/elpy-20191222.2227/elpy-refactor.elc b/elpa/elpy-20200112.1819/elpy-refactor.elc similarity index 73% rename from elpa/elpy-20191222.2227/elpy-refactor.elc rename to elpa/elpy-20200112.1819/elpy-refactor.elc index b9358083..d1b996a8 100644 Binary files a/elpa/elpy-20191222.2227/elpy-refactor.elc and b/elpa/elpy-20200112.1819/elpy-refactor.elc differ diff --git a/elpa/elpy-20191222.2227/elpy-rpc.el b/elpa/elpy-20200112.1819/elpy-rpc.el similarity index 100% rename from elpa/elpy-20191222.2227/elpy-rpc.el rename to elpa/elpy-20200112.1819/elpy-rpc.el diff --git a/elpa/elpy-20191222.2227/elpy-rpc.elc b/elpa/elpy-20200112.1819/elpy-rpc.elc similarity index 99% rename from elpa/elpy-20191222.2227/elpy-rpc.elc rename to elpa/elpy-20200112.1819/elpy-rpc.elc index 99a9475f..1f025d9b 100644 Binary files a/elpa/elpy-20191222.2227/elpy-rpc.elc and b/elpa/elpy-20200112.1819/elpy-rpc.elc differ diff --git a/elpa/elpy-20191222.2227/elpy-shell.el b/elpa/elpy-20200112.1819/elpy-shell.el similarity index 99% rename from elpa/elpy-20191222.2227/elpy-shell.el rename to elpa/elpy-20200112.1819/elpy-shell.el index 4f5286f9..b8e03828 100644 --- a/elpa/elpy-20191222.2227/elpy-shell.el +++ b/elpa/elpy-20200112.1819/elpy-shell.el @@ -570,8 +570,13 @@ Prepends a continuation promt if PREPEND-CONT-PROMPT is set." (save-excursion (goto-char mark-point) (if prepend-cont-prompt - (let* ((column (+ (- (point) (progn (forward-line -1) (end-of-line) (point))) 1)) - (prompt (concat (make-string (max 0 (- column 7)) ? ) "...: ")) + (let* ((column (+ (- (point) + (let ((inhibit-field-text-motion t)) + (forward-line -1) + (end-of-line) + (point))) + 1)) + (prompt (concat (make-string (max 0 (- column 6)) ? ) "... ")) (lines (split-string string "\n"))) (goto-char mark-point) (elpy-shell--insert-and-font-lock diff --git a/elpa/elpy-20191222.2227/elpy-shell.elc b/elpa/elpy-20200112.1819/elpy-shell.elc similarity index 93% rename from elpa/elpy-20191222.2227/elpy-shell.elc rename to elpa/elpy-20200112.1819/elpy-shell.elc index c0558f07..008b24bb 100644 Binary files a/elpa/elpy-20191222.2227/elpy-shell.elc and b/elpa/elpy-20200112.1819/elpy-shell.elc differ diff --git a/elpa/elpy-20191222.2227/elpy.el b/elpa/elpy-20200112.1819/elpy.el similarity index 98% rename from elpa/elpy-20191222.2227/elpy.el rename to elpa/elpy-20200112.1819/elpy.el index dde789dd..e8c072b0 100644 --- a/elpa/elpy-20191222.2227/elpy.el +++ b/elpa/elpy-20200112.1819/elpy.el @@ -856,7 +856,7 @@ item in another window.\n\n") "\n") (insert "\n") (widget-create 'elpy-insert--pip-button - :package python-shell-interpreter) + :package python-shell-interpreter :norpc t) (insert "\n\n")) ;; Pip not available in the rpc virtualenv @@ -970,7 +970,7 @@ item in another window.\n\n") "program to provide syntax checks of your programs, so you might " "want to install one. Elpy by default uses flake8.\n") (insert "\n") - (widget-create 'elpy-insert--pip-button :package "flake8") + (widget-create 'elpy-insert--pip-button :package "flake8" :norpc t) (insert "\n\n")) )) @@ -1285,8 +1285,12 @@ PyPI, or nil if that's VERSION." (defun elpy-insert--pip-button-action (widget &optional _event) "The :action option for the pip button widget." - (with-elpy-rpc-virtualenv-activated - (async-shell-command (widget-get widget :command)))) + (let ((command (widget-get widget :command)) + (norpc (widget-get widget :norpc))) + (if norpc + (async-shell-command command) + (with-elpy-rpc-virtualenv-activated + (async-shell-command command))))) ;;;;;;;;;;;; ;;; Projects @@ -2512,7 +2516,7 @@ Also, switch to that buffer." (defvar elpy-xref--format-references (let ((str "%s:\t%s")) - (put-text-property 0 4 'face 'font-lock-comment-face str) + (put-text-property 0 4 'face 'compilation-line-number str) str) "String used to format references in xref buffers.") @@ -3208,7 +3212,9 @@ display the current class and method instead." :set (lambda (var val) ; (set-default var val) (dolist (buffer (buffer-list)) - (when (with-current-buffer buffer elpy-mode) + (when (and (with-current-buffer buffer elpy-mode) + (member 'elpy-folding--mark-foldable-lines + after-change-functions)) (elpy-folding--mark-foldable-lines))))) (defvar elpy-folding-docstring-regex "[uU]?[rR]?\"\"\"" @@ -3269,26 +3275,31 @@ Meant to be used as a hook to `after-change-functions'." (when elpy-folding-fringe-indicators (save-excursion (save-restriction - (when (and beg end) - (narrow-to-region (progn (goto-char beg) (line-beginning-position)) - (progn (goto-char end) (line-end-position)))) - (remove-overlays (point-min) (point-max) 'elpy-hs-foldable t) - (goto-char (point-min)) - (while (re-search-forward python-nav-beginning-of-defun-regexp nil t) - (let* ((beg (line-beginning-position)) - (end (line-end-position)) - (ov (make-overlay beg end)) - (marker-string "*fringe-dummy*") - (marker-length (length marker-string))) - (when (version<= "25.2" emacs-version) - (put-text-property 0 marker-length - 'display - (list 'left-fringe - 'elpy-folding-fringe-foldable-marker - 'elpy-folding-fringe-face) - marker-string) - (overlay-put ov 'before-string marker-string)) - (overlay-put ov 'elpy-hs-foldable t))))))) + (save-match-data + (when (and beg end) + (narrow-to-region (progn (goto-char beg) + (line-beginning-position)) + (progn (goto-char end) + (line-end-position)))) + (remove-overlays (point-min) (point-max) 'elpy-hs-foldable t) + (goto-char (point-min)) + (while (re-search-forward + python-nav-beginning-of-defun-regexp nil t) + (let* ((beg (line-beginning-position)) + (end (line-end-position)) + (ov (make-overlay beg end)) + (marker-string "*fringe-dummy*") + (marker-length (length marker-string))) + (when (version<= "25.2" emacs-version) + (put-text-property 0 marker-length + 'display + (list + 'left-fringe + 'elpy-folding-fringe-foldable-marker + 'elpy-folding-fringe-face) + marker-string) + (overlay-put ov 'before-string marker-string)) + (overlay-put ov 'elpy-hs-foldable t)))))))) ;; Mouse interaction (defun elpy-folding--click-fringe (event) diff --git a/elpa/elpy-20191222.2227/elpy.elc b/elpa/elpy-20200112.1819/elpy.elc similarity index 78% rename from elpa/elpy-20191222.2227/elpy.elc rename to elpa/elpy-20200112.1819/elpy.elc index f3d474e0..b8070c09 100644 Binary files a/elpa/elpy-20191222.2227/elpy.elc and b/elpa/elpy-20200112.1819/elpy.elc differ diff --git a/elpa/elpy-20191222.2227/elpy/__init__.py b/elpa/elpy-20200112.1819/elpy/__init__.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/__init__.py rename to elpa/elpy-20200112.1819/elpy/__init__.py diff --git a/elpa/elpy-20191222.2227/elpy/__main__.py b/elpa/elpy-20200112.1819/elpy/__main__.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/__main__.py rename to elpa/elpy-20200112.1819/elpy/__main__.py diff --git a/elpa/elpy-20191222.2227/elpy/auto_pep8.py b/elpa/elpy-20200112.1819/elpy/auto_pep8.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/auto_pep8.py rename to elpa/elpy-20200112.1819/elpy/auto_pep8.py diff --git a/elpa/elpy-20191222.2227/elpy/blackutil.py b/elpa/elpy-20200112.1819/elpy/blackutil.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/blackutil.py rename to elpa/elpy-20200112.1819/elpy/blackutil.py diff --git a/elpa/elpy-20191222.2227/elpy/compat.py b/elpa/elpy-20200112.1819/elpy/compat.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/compat.py rename to elpa/elpy-20200112.1819/elpy/compat.py diff --git a/elpa/elpy-20191222.2227/elpy/jedibackend.py b/elpa/elpy-20200112.1819/elpy/jedibackend.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/jedibackend.py rename to elpa/elpy-20200112.1819/elpy/jedibackend.py diff --git a/elpa/elpy-20191222.2227/elpy/pydocutils.py b/elpa/elpy-20200112.1819/elpy/pydocutils.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/pydocutils.py rename to elpa/elpy-20200112.1819/elpy/pydocutils.py diff --git a/elpa/elpy-20191222.2227/elpy/refactor.py b/elpa/elpy-20200112.1819/elpy/refactor.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/refactor.py rename to elpa/elpy-20200112.1819/elpy/refactor.py diff --git a/elpa/elpy-20191222.2227/elpy/rpc.py b/elpa/elpy-20200112.1819/elpy/rpc.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/rpc.py rename to elpa/elpy-20200112.1819/elpy/rpc.py diff --git a/elpa/elpy-20191222.2227/elpy/server.py b/elpa/elpy-20200112.1819/elpy/server.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/server.py rename to elpa/elpy-20200112.1819/elpy/server.py diff --git a/elpa/elpy-20191222.2227/elpy/tests/__init__.py b/elpa/elpy-20200112.1819/elpy/tests/__init__.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/tests/__init__.py rename to elpa/elpy-20200112.1819/elpy/tests/__init__.py diff --git a/elpa/elpy-20191222.2227/elpy/tests/compat.py b/elpa/elpy-20200112.1819/elpy/tests/compat.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/tests/compat.py rename to elpa/elpy-20200112.1819/elpy/tests/compat.py diff --git a/elpa/elpy-20191222.2227/elpy/tests/support.py b/elpa/elpy-20200112.1819/elpy/tests/support.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/tests/support.py rename to elpa/elpy-20200112.1819/elpy/tests/support.py diff --git a/elpa/elpy-20191222.2227/elpy/tests/test_auto_pep8.py b/elpa/elpy-20200112.1819/elpy/tests/test_auto_pep8.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/tests/test_auto_pep8.py rename to elpa/elpy-20200112.1819/elpy/tests/test_auto_pep8.py diff --git a/elpa/elpy-20191222.2227/elpy/tests/test_black.py b/elpa/elpy-20200112.1819/elpy/tests/test_black.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/tests/test_black.py rename to elpa/elpy-20200112.1819/elpy/tests/test_black.py diff --git a/elpa/elpy-20191222.2227/elpy/tests/test_jedibackend.py b/elpa/elpy-20200112.1819/elpy/tests/test_jedibackend.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/tests/test_jedibackend.py rename to elpa/elpy-20200112.1819/elpy/tests/test_jedibackend.py diff --git a/elpa/elpy-20191222.2227/elpy/tests/test_pydocutils.py b/elpa/elpy-20200112.1819/elpy/tests/test_pydocutils.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/tests/test_pydocutils.py rename to elpa/elpy-20200112.1819/elpy/tests/test_pydocutils.py diff --git a/elpa/elpy-20191222.2227/elpy/tests/test_refactor.py b/elpa/elpy-20200112.1819/elpy/tests/test_refactor.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/tests/test_refactor.py rename to elpa/elpy-20200112.1819/elpy/tests/test_refactor.py diff --git a/elpa/elpy-20191222.2227/elpy/tests/test_rpc.py b/elpa/elpy-20200112.1819/elpy/tests/test_rpc.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/tests/test_rpc.py rename to elpa/elpy-20200112.1819/elpy/tests/test_rpc.py diff --git a/elpa/elpy-20191222.2227/elpy/tests/test_server.py b/elpa/elpy-20200112.1819/elpy/tests/test_server.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/tests/test_server.py rename to elpa/elpy-20200112.1819/elpy/tests/test_server.py diff --git a/elpa/elpy-20191222.2227/elpy/tests/test_support.py b/elpa/elpy-20200112.1819/elpy/tests/test_support.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/tests/test_support.py rename to elpa/elpy-20200112.1819/elpy/tests/test_support.py diff --git a/elpa/elpy-20191222.2227/elpy/tests/test_yapf.py b/elpa/elpy-20200112.1819/elpy/tests/test_yapf.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/tests/test_yapf.py rename to elpa/elpy-20200112.1819/elpy/tests/test_yapf.py diff --git a/elpa/elpy-20191222.2227/elpy/yapfutil.py b/elpa/elpy-20200112.1819/elpy/yapfutil.py similarity index 100% rename from elpa/elpy-20191222.2227/elpy/yapfutil.py rename to elpa/elpy-20200112.1819/elpy/yapfutil.py diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/.yas-setup.el b/elpa/elpy-20200112.1819/snippets/python-mode/.yas-setup.el similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/.yas-setup.el rename to elpa/elpy-20200112.1819/snippets/python-mode/.yas-setup.el diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/.yas-setup.elc b/elpa/elpy-20200112.1819/snippets/python-mode/.yas-setup.elc similarity index 98% rename from elpa/elpy-20191222.2227/snippets/python-mode/.yas-setup.elc rename to elpa/elpy-20200112.1819/snippets/python-mode/.yas-setup.elc index dd0d8185..946d6d67 100644 Binary files a/elpa/elpy-20191222.2227/snippets/python-mode/.yas-setup.elc and b/elpa/elpy-20200112.1819/snippets/python-mode/.yas-setup.elc differ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__abs__ b/elpa/elpy-20200112.1819/snippets/python-mode/__abs__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__abs__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__abs__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__add__ b/elpa/elpy-20200112.1819/snippets/python-mode/__add__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__add__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__add__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__and__ b/elpa/elpy-20200112.1819/snippets/python-mode/__and__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__and__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__and__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__bool__ b/elpa/elpy-20200112.1819/snippets/python-mode/__bool__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__bool__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__bool__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__call__ b/elpa/elpy-20200112.1819/snippets/python-mode/__call__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__call__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__call__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__cmp__ b/elpa/elpy-20200112.1819/snippets/python-mode/__cmp__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__cmp__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__cmp__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__coerce__ b/elpa/elpy-20200112.1819/snippets/python-mode/__coerce__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__coerce__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__coerce__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__complex__ b/elpa/elpy-20200112.1819/snippets/python-mode/__complex__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__complex__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__complex__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__contains__ b/elpa/elpy-20200112.1819/snippets/python-mode/__contains__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__contains__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__contains__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__del__ b/elpa/elpy-20200112.1819/snippets/python-mode/__del__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__del__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__del__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__delattr__ b/elpa/elpy-20200112.1819/snippets/python-mode/__delattr__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__delattr__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__delattr__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__delete__ b/elpa/elpy-20200112.1819/snippets/python-mode/__delete__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__delete__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__delete__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__delitem__ b/elpa/elpy-20200112.1819/snippets/python-mode/__delitem__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__delitem__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__delitem__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__div__ b/elpa/elpy-20200112.1819/snippets/python-mode/__div__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__div__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__div__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__divmod__ b/elpa/elpy-20200112.1819/snippets/python-mode/__divmod__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__divmod__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__divmod__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__enter__ b/elpa/elpy-20200112.1819/snippets/python-mode/__enter__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__enter__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__enter__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__eq__ b/elpa/elpy-20200112.1819/snippets/python-mode/__eq__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__eq__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__eq__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__exit__ b/elpa/elpy-20200112.1819/snippets/python-mode/__exit__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__exit__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__exit__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__float__ b/elpa/elpy-20200112.1819/snippets/python-mode/__float__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__float__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__float__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__floordiv__ b/elpa/elpy-20200112.1819/snippets/python-mode/__floordiv__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__floordiv__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__floordiv__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__ge__ b/elpa/elpy-20200112.1819/snippets/python-mode/__ge__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__ge__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__ge__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__get__ b/elpa/elpy-20200112.1819/snippets/python-mode/__get__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__get__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__get__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__getattr__ b/elpa/elpy-20200112.1819/snippets/python-mode/__getattr__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__getattr__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__getattr__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__getattribute__ b/elpa/elpy-20200112.1819/snippets/python-mode/__getattribute__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__getattribute__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__getattribute__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__getitem__ b/elpa/elpy-20200112.1819/snippets/python-mode/__getitem__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__getitem__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__getitem__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__gt__ b/elpa/elpy-20200112.1819/snippets/python-mode/__gt__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__gt__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__gt__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__hash__ b/elpa/elpy-20200112.1819/snippets/python-mode/__hash__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__hash__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__hash__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__hex__ b/elpa/elpy-20200112.1819/snippets/python-mode/__hex__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__hex__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__hex__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__iadd__ b/elpa/elpy-20200112.1819/snippets/python-mode/__iadd__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__iadd__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__iadd__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__iand__ b/elpa/elpy-20200112.1819/snippets/python-mode/__iand__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__iand__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__iand__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__idiv__ b/elpa/elpy-20200112.1819/snippets/python-mode/__idiv__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__idiv__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__idiv__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__ifloordiv__ b/elpa/elpy-20200112.1819/snippets/python-mode/__ifloordiv__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__ifloordiv__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__ifloordiv__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__ilshift__ b/elpa/elpy-20200112.1819/snippets/python-mode/__ilshift__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__ilshift__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__ilshift__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__imod__ b/elpa/elpy-20200112.1819/snippets/python-mode/__imod__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__imod__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__imod__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__imul__ b/elpa/elpy-20200112.1819/snippets/python-mode/__imul__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__imul__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__imul__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__index__ b/elpa/elpy-20200112.1819/snippets/python-mode/__index__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__index__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__index__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__init__ b/elpa/elpy-20200112.1819/snippets/python-mode/__init__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__init__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__init__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__instancecheck__ b/elpa/elpy-20200112.1819/snippets/python-mode/__instancecheck__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__instancecheck__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__instancecheck__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__int__ b/elpa/elpy-20200112.1819/snippets/python-mode/__int__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__int__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__int__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__invert__ b/elpa/elpy-20200112.1819/snippets/python-mode/__invert__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__invert__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__invert__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__ior__ b/elpa/elpy-20200112.1819/snippets/python-mode/__ior__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__ior__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__ior__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__ipow__ b/elpa/elpy-20200112.1819/snippets/python-mode/__ipow__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__ipow__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__ipow__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__irshift__ b/elpa/elpy-20200112.1819/snippets/python-mode/__irshift__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__irshift__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__irshift__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__isub__ b/elpa/elpy-20200112.1819/snippets/python-mode/__isub__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__isub__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__isub__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__iter__ b/elpa/elpy-20200112.1819/snippets/python-mode/__iter__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__iter__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__iter__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__itruediv__ b/elpa/elpy-20200112.1819/snippets/python-mode/__itruediv__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__itruediv__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__itruediv__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__ixor__ b/elpa/elpy-20200112.1819/snippets/python-mode/__ixor__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__ixor__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__ixor__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__le__ b/elpa/elpy-20200112.1819/snippets/python-mode/__le__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__le__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__le__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__len__ b/elpa/elpy-20200112.1819/snippets/python-mode/__len__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__len__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__len__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__long__ b/elpa/elpy-20200112.1819/snippets/python-mode/__long__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__long__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__long__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__lshift__ b/elpa/elpy-20200112.1819/snippets/python-mode/__lshift__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__lshift__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__lshift__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__lt__ b/elpa/elpy-20200112.1819/snippets/python-mode/__lt__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__lt__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__lt__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__mod__ b/elpa/elpy-20200112.1819/snippets/python-mode/__mod__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__mod__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__mod__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__mul__ b/elpa/elpy-20200112.1819/snippets/python-mode/__mul__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__mul__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__mul__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__ne__ b/elpa/elpy-20200112.1819/snippets/python-mode/__ne__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__ne__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__ne__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__neg__ b/elpa/elpy-20200112.1819/snippets/python-mode/__neg__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__neg__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__neg__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__new__ b/elpa/elpy-20200112.1819/snippets/python-mode/__new__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__new__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__new__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__nonzero__ b/elpa/elpy-20200112.1819/snippets/python-mode/__nonzero__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__nonzero__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__nonzero__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__oct__ b/elpa/elpy-20200112.1819/snippets/python-mode/__oct__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__oct__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__oct__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__or__ b/elpa/elpy-20200112.1819/snippets/python-mode/__or__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__or__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__or__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__pos__ b/elpa/elpy-20200112.1819/snippets/python-mode/__pos__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__pos__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__pos__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__pow__ b/elpa/elpy-20200112.1819/snippets/python-mode/__pow__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__pow__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__pow__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__radd__ b/elpa/elpy-20200112.1819/snippets/python-mode/__radd__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__radd__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__radd__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__rand__ b/elpa/elpy-20200112.1819/snippets/python-mode/__rand__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__rand__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__rand__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__rdivmod__ b/elpa/elpy-20200112.1819/snippets/python-mode/__rdivmod__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__rdivmod__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__rdivmod__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__repr__ b/elpa/elpy-20200112.1819/snippets/python-mode/__repr__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__repr__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__repr__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__reversed__ b/elpa/elpy-20200112.1819/snippets/python-mode/__reversed__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__reversed__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__reversed__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__rfloordiv__ b/elpa/elpy-20200112.1819/snippets/python-mode/__rfloordiv__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__rfloordiv__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__rfloordiv__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__rlshift__ b/elpa/elpy-20200112.1819/snippets/python-mode/__rlshift__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__rlshift__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__rlshift__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__rmod__ b/elpa/elpy-20200112.1819/snippets/python-mode/__rmod__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__rmod__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__rmod__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__rmul__ b/elpa/elpy-20200112.1819/snippets/python-mode/__rmul__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__rmul__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__rmul__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__ror__ b/elpa/elpy-20200112.1819/snippets/python-mode/__ror__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__ror__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__ror__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__rpow__ b/elpa/elpy-20200112.1819/snippets/python-mode/__rpow__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__rpow__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__rpow__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__rrshift__ b/elpa/elpy-20200112.1819/snippets/python-mode/__rrshift__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__rrshift__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__rrshift__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__rshift__ b/elpa/elpy-20200112.1819/snippets/python-mode/__rshift__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__rshift__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__rshift__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__rsub__ b/elpa/elpy-20200112.1819/snippets/python-mode/__rsub__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__rsub__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__rsub__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__rtruediv__ b/elpa/elpy-20200112.1819/snippets/python-mode/__rtruediv__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__rtruediv__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__rtruediv__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__rxor__ b/elpa/elpy-20200112.1819/snippets/python-mode/__rxor__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__rxor__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__rxor__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__set__ b/elpa/elpy-20200112.1819/snippets/python-mode/__set__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__set__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__set__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__setattr__ b/elpa/elpy-20200112.1819/snippets/python-mode/__setattr__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__setattr__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__setattr__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__setitem__ b/elpa/elpy-20200112.1819/snippets/python-mode/__setitem__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__setitem__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__setitem__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__slots__ b/elpa/elpy-20200112.1819/snippets/python-mode/__slots__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__slots__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__slots__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__str__ b/elpa/elpy-20200112.1819/snippets/python-mode/__str__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__str__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__str__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__sub__ b/elpa/elpy-20200112.1819/snippets/python-mode/__sub__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__sub__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__sub__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__subclasscheck__ b/elpa/elpy-20200112.1819/snippets/python-mode/__subclasscheck__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__subclasscheck__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__subclasscheck__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__truediv__ b/elpa/elpy-20200112.1819/snippets/python-mode/__truediv__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__truediv__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__truediv__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__unicode__ b/elpa/elpy-20200112.1819/snippets/python-mode/__unicode__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__unicode__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__unicode__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/__xor__ b/elpa/elpy-20200112.1819/snippets/python-mode/__xor__ similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/__xor__ rename to elpa/elpy-20200112.1819/snippets/python-mode/__xor__ diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_abs b/elpa/elpy-20200112.1819/snippets/python-mode/_abs similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_abs rename to elpa/elpy-20200112.1819/snippets/python-mode/_abs diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_add b/elpa/elpy-20200112.1819/snippets/python-mode/_add similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_add rename to elpa/elpy-20200112.1819/snippets/python-mode/_add diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_and b/elpa/elpy-20200112.1819/snippets/python-mode/_and similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_and rename to elpa/elpy-20200112.1819/snippets/python-mode/_and diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_bool b/elpa/elpy-20200112.1819/snippets/python-mode/_bool similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_bool rename to elpa/elpy-20200112.1819/snippets/python-mode/_bool diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_call b/elpa/elpy-20200112.1819/snippets/python-mode/_call similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_call rename to elpa/elpy-20200112.1819/snippets/python-mode/_call diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_cmp b/elpa/elpy-20200112.1819/snippets/python-mode/_cmp similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_cmp rename to elpa/elpy-20200112.1819/snippets/python-mode/_cmp diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_coerce b/elpa/elpy-20200112.1819/snippets/python-mode/_coerce similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_coerce rename to elpa/elpy-20200112.1819/snippets/python-mode/_coerce diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_complex b/elpa/elpy-20200112.1819/snippets/python-mode/_complex similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_complex rename to elpa/elpy-20200112.1819/snippets/python-mode/_complex diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_contains b/elpa/elpy-20200112.1819/snippets/python-mode/_contains similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_contains rename to elpa/elpy-20200112.1819/snippets/python-mode/_contains diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_del b/elpa/elpy-20200112.1819/snippets/python-mode/_del similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_del rename to elpa/elpy-20200112.1819/snippets/python-mode/_del diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_delattr b/elpa/elpy-20200112.1819/snippets/python-mode/_delattr similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_delattr rename to elpa/elpy-20200112.1819/snippets/python-mode/_delattr diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_delete b/elpa/elpy-20200112.1819/snippets/python-mode/_delete similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_delete rename to elpa/elpy-20200112.1819/snippets/python-mode/_delete diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_delitem b/elpa/elpy-20200112.1819/snippets/python-mode/_delitem similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_delitem rename to elpa/elpy-20200112.1819/snippets/python-mode/_delitem diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_div b/elpa/elpy-20200112.1819/snippets/python-mode/_div similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_div rename to elpa/elpy-20200112.1819/snippets/python-mode/_div diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_divmod b/elpa/elpy-20200112.1819/snippets/python-mode/_divmod similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_divmod rename to elpa/elpy-20200112.1819/snippets/python-mode/_divmod diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_enter b/elpa/elpy-20200112.1819/snippets/python-mode/_enter similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_enter rename to elpa/elpy-20200112.1819/snippets/python-mode/_enter diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_eq b/elpa/elpy-20200112.1819/snippets/python-mode/_eq similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_eq rename to elpa/elpy-20200112.1819/snippets/python-mode/_eq diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_exit b/elpa/elpy-20200112.1819/snippets/python-mode/_exit similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_exit rename to elpa/elpy-20200112.1819/snippets/python-mode/_exit diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_float b/elpa/elpy-20200112.1819/snippets/python-mode/_float similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_float rename to elpa/elpy-20200112.1819/snippets/python-mode/_float diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_floordiv b/elpa/elpy-20200112.1819/snippets/python-mode/_floordiv similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_floordiv rename to elpa/elpy-20200112.1819/snippets/python-mode/_floordiv diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_ge b/elpa/elpy-20200112.1819/snippets/python-mode/_ge similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_ge rename to elpa/elpy-20200112.1819/snippets/python-mode/_ge diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_get b/elpa/elpy-20200112.1819/snippets/python-mode/_get similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_get rename to elpa/elpy-20200112.1819/snippets/python-mode/_get diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_getattr b/elpa/elpy-20200112.1819/snippets/python-mode/_getattr similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_getattr rename to elpa/elpy-20200112.1819/snippets/python-mode/_getattr diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_getattribute b/elpa/elpy-20200112.1819/snippets/python-mode/_getattribute similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_getattribute rename to elpa/elpy-20200112.1819/snippets/python-mode/_getattribute diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_getitem b/elpa/elpy-20200112.1819/snippets/python-mode/_getitem similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_getitem rename to elpa/elpy-20200112.1819/snippets/python-mode/_getitem diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_gt b/elpa/elpy-20200112.1819/snippets/python-mode/_gt similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_gt rename to elpa/elpy-20200112.1819/snippets/python-mode/_gt diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_hash b/elpa/elpy-20200112.1819/snippets/python-mode/_hash similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_hash rename to elpa/elpy-20200112.1819/snippets/python-mode/_hash diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_hex b/elpa/elpy-20200112.1819/snippets/python-mode/_hex similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_hex rename to elpa/elpy-20200112.1819/snippets/python-mode/_hex diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_iadd b/elpa/elpy-20200112.1819/snippets/python-mode/_iadd similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_iadd rename to elpa/elpy-20200112.1819/snippets/python-mode/_iadd diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_iand b/elpa/elpy-20200112.1819/snippets/python-mode/_iand similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_iand rename to elpa/elpy-20200112.1819/snippets/python-mode/_iand diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_idiv b/elpa/elpy-20200112.1819/snippets/python-mode/_idiv similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_idiv rename to elpa/elpy-20200112.1819/snippets/python-mode/_idiv diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_ifloordiv b/elpa/elpy-20200112.1819/snippets/python-mode/_ifloordiv similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_ifloordiv rename to elpa/elpy-20200112.1819/snippets/python-mode/_ifloordiv diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_ilshift b/elpa/elpy-20200112.1819/snippets/python-mode/_ilshift similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_ilshift rename to elpa/elpy-20200112.1819/snippets/python-mode/_ilshift diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_imod b/elpa/elpy-20200112.1819/snippets/python-mode/_imod similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_imod rename to elpa/elpy-20200112.1819/snippets/python-mode/_imod diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_imul b/elpa/elpy-20200112.1819/snippets/python-mode/_imul similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_imul rename to elpa/elpy-20200112.1819/snippets/python-mode/_imul diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_index b/elpa/elpy-20200112.1819/snippets/python-mode/_index similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_index rename to elpa/elpy-20200112.1819/snippets/python-mode/_index diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_init b/elpa/elpy-20200112.1819/snippets/python-mode/_init similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_init rename to elpa/elpy-20200112.1819/snippets/python-mode/_init diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_instancecheck b/elpa/elpy-20200112.1819/snippets/python-mode/_instancecheck similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_instancecheck rename to elpa/elpy-20200112.1819/snippets/python-mode/_instancecheck diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_int b/elpa/elpy-20200112.1819/snippets/python-mode/_int similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_int rename to elpa/elpy-20200112.1819/snippets/python-mode/_int diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_invert b/elpa/elpy-20200112.1819/snippets/python-mode/_invert similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_invert rename to elpa/elpy-20200112.1819/snippets/python-mode/_invert diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_ior b/elpa/elpy-20200112.1819/snippets/python-mode/_ior similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_ior rename to elpa/elpy-20200112.1819/snippets/python-mode/_ior diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_ipow b/elpa/elpy-20200112.1819/snippets/python-mode/_ipow similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_ipow rename to elpa/elpy-20200112.1819/snippets/python-mode/_ipow diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_irshift b/elpa/elpy-20200112.1819/snippets/python-mode/_irshift similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_irshift rename to elpa/elpy-20200112.1819/snippets/python-mode/_irshift diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_isub b/elpa/elpy-20200112.1819/snippets/python-mode/_isub similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_isub rename to elpa/elpy-20200112.1819/snippets/python-mode/_isub diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_iter b/elpa/elpy-20200112.1819/snippets/python-mode/_iter similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_iter rename to elpa/elpy-20200112.1819/snippets/python-mode/_iter diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_itruediv b/elpa/elpy-20200112.1819/snippets/python-mode/_itruediv similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_itruediv rename to elpa/elpy-20200112.1819/snippets/python-mode/_itruediv diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_ixor b/elpa/elpy-20200112.1819/snippets/python-mode/_ixor similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_ixor rename to elpa/elpy-20200112.1819/snippets/python-mode/_ixor diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_le b/elpa/elpy-20200112.1819/snippets/python-mode/_le similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_le rename to elpa/elpy-20200112.1819/snippets/python-mode/_le diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_len b/elpa/elpy-20200112.1819/snippets/python-mode/_len similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_len rename to elpa/elpy-20200112.1819/snippets/python-mode/_len diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_long b/elpa/elpy-20200112.1819/snippets/python-mode/_long similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_long rename to elpa/elpy-20200112.1819/snippets/python-mode/_long diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_lshift b/elpa/elpy-20200112.1819/snippets/python-mode/_lshift similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_lshift rename to elpa/elpy-20200112.1819/snippets/python-mode/_lshift diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_lt b/elpa/elpy-20200112.1819/snippets/python-mode/_lt similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_lt rename to elpa/elpy-20200112.1819/snippets/python-mode/_lt diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_mod b/elpa/elpy-20200112.1819/snippets/python-mode/_mod similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_mod rename to elpa/elpy-20200112.1819/snippets/python-mode/_mod diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_mul b/elpa/elpy-20200112.1819/snippets/python-mode/_mul similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_mul rename to elpa/elpy-20200112.1819/snippets/python-mode/_mul diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_ne b/elpa/elpy-20200112.1819/snippets/python-mode/_ne similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_ne rename to elpa/elpy-20200112.1819/snippets/python-mode/_ne diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_neg b/elpa/elpy-20200112.1819/snippets/python-mode/_neg similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_neg rename to elpa/elpy-20200112.1819/snippets/python-mode/_neg diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_new b/elpa/elpy-20200112.1819/snippets/python-mode/_new similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_new rename to elpa/elpy-20200112.1819/snippets/python-mode/_new diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_nonzero b/elpa/elpy-20200112.1819/snippets/python-mode/_nonzero similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_nonzero rename to elpa/elpy-20200112.1819/snippets/python-mode/_nonzero diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_oct b/elpa/elpy-20200112.1819/snippets/python-mode/_oct similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_oct rename to elpa/elpy-20200112.1819/snippets/python-mode/_oct diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_or b/elpa/elpy-20200112.1819/snippets/python-mode/_or similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_or rename to elpa/elpy-20200112.1819/snippets/python-mode/_or diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_pos b/elpa/elpy-20200112.1819/snippets/python-mode/_pos similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_pos rename to elpa/elpy-20200112.1819/snippets/python-mode/_pos diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_pow b/elpa/elpy-20200112.1819/snippets/python-mode/_pow similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_pow rename to elpa/elpy-20200112.1819/snippets/python-mode/_pow diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_radd b/elpa/elpy-20200112.1819/snippets/python-mode/_radd similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_radd rename to elpa/elpy-20200112.1819/snippets/python-mode/_radd diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_rand b/elpa/elpy-20200112.1819/snippets/python-mode/_rand similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_rand rename to elpa/elpy-20200112.1819/snippets/python-mode/_rand diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_rdivmod b/elpa/elpy-20200112.1819/snippets/python-mode/_rdivmod similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_rdivmod rename to elpa/elpy-20200112.1819/snippets/python-mode/_rdivmod diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_repr b/elpa/elpy-20200112.1819/snippets/python-mode/_repr similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_repr rename to elpa/elpy-20200112.1819/snippets/python-mode/_repr diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_reversed b/elpa/elpy-20200112.1819/snippets/python-mode/_reversed similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_reversed rename to elpa/elpy-20200112.1819/snippets/python-mode/_reversed diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_rfloordiv b/elpa/elpy-20200112.1819/snippets/python-mode/_rfloordiv similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_rfloordiv rename to elpa/elpy-20200112.1819/snippets/python-mode/_rfloordiv diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_rlshift b/elpa/elpy-20200112.1819/snippets/python-mode/_rlshift similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_rlshift rename to elpa/elpy-20200112.1819/snippets/python-mode/_rlshift diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_rmod b/elpa/elpy-20200112.1819/snippets/python-mode/_rmod similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_rmod rename to elpa/elpy-20200112.1819/snippets/python-mode/_rmod diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_rmul b/elpa/elpy-20200112.1819/snippets/python-mode/_rmul similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_rmul rename to elpa/elpy-20200112.1819/snippets/python-mode/_rmul diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_ror b/elpa/elpy-20200112.1819/snippets/python-mode/_ror similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_ror rename to elpa/elpy-20200112.1819/snippets/python-mode/_ror diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_rpow b/elpa/elpy-20200112.1819/snippets/python-mode/_rpow similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_rpow rename to elpa/elpy-20200112.1819/snippets/python-mode/_rpow diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_rrshift b/elpa/elpy-20200112.1819/snippets/python-mode/_rrshift similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_rrshift rename to elpa/elpy-20200112.1819/snippets/python-mode/_rrshift diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_rshift b/elpa/elpy-20200112.1819/snippets/python-mode/_rshift similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_rshift rename to elpa/elpy-20200112.1819/snippets/python-mode/_rshift diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_rsub b/elpa/elpy-20200112.1819/snippets/python-mode/_rsub similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_rsub rename to elpa/elpy-20200112.1819/snippets/python-mode/_rsub diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_rtruediv b/elpa/elpy-20200112.1819/snippets/python-mode/_rtruediv similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_rtruediv rename to elpa/elpy-20200112.1819/snippets/python-mode/_rtruediv diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_rxor b/elpa/elpy-20200112.1819/snippets/python-mode/_rxor similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_rxor rename to elpa/elpy-20200112.1819/snippets/python-mode/_rxor diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_set b/elpa/elpy-20200112.1819/snippets/python-mode/_set similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_set rename to elpa/elpy-20200112.1819/snippets/python-mode/_set diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_setattr b/elpa/elpy-20200112.1819/snippets/python-mode/_setattr similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_setattr rename to elpa/elpy-20200112.1819/snippets/python-mode/_setattr diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_setitem b/elpa/elpy-20200112.1819/snippets/python-mode/_setitem similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_setitem rename to elpa/elpy-20200112.1819/snippets/python-mode/_setitem diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_slots b/elpa/elpy-20200112.1819/snippets/python-mode/_slots similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_slots rename to elpa/elpy-20200112.1819/snippets/python-mode/_slots diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_str b/elpa/elpy-20200112.1819/snippets/python-mode/_str similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_str rename to elpa/elpy-20200112.1819/snippets/python-mode/_str diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_sub b/elpa/elpy-20200112.1819/snippets/python-mode/_sub similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_sub rename to elpa/elpy-20200112.1819/snippets/python-mode/_sub diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_subclasscheck b/elpa/elpy-20200112.1819/snippets/python-mode/_subclasscheck similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_subclasscheck rename to elpa/elpy-20200112.1819/snippets/python-mode/_subclasscheck diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_truediv b/elpa/elpy-20200112.1819/snippets/python-mode/_truediv similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_truediv rename to elpa/elpy-20200112.1819/snippets/python-mode/_truediv diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_unicode b/elpa/elpy-20200112.1819/snippets/python-mode/_unicode similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_unicode rename to elpa/elpy-20200112.1819/snippets/python-mode/_unicode diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/_xor b/elpa/elpy-20200112.1819/snippets/python-mode/_xor similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/_xor rename to elpa/elpy-20200112.1819/snippets/python-mode/_xor diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/ase b/elpa/elpy-20200112.1819/snippets/python-mode/ase similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/ase rename to elpa/elpy-20200112.1819/snippets/python-mode/ase diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/asne b/elpa/elpy-20200112.1819/snippets/python-mode/asne similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/asne rename to elpa/elpy-20200112.1819/snippets/python-mode/asne diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/asr b/elpa/elpy-20200112.1819/snippets/python-mode/asr similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/asr rename to elpa/elpy-20200112.1819/snippets/python-mode/asr diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/class b/elpa/elpy-20200112.1819/snippets/python-mode/class similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/class rename to elpa/elpy-20200112.1819/snippets/python-mode/class diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/def b/elpa/elpy-20200112.1819/snippets/python-mode/def similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/def rename to elpa/elpy-20200112.1819/snippets/python-mode/def diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/defs b/elpa/elpy-20200112.1819/snippets/python-mode/defs similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/defs rename to elpa/elpy-20200112.1819/snippets/python-mode/defs diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/enc b/elpa/elpy-20200112.1819/snippets/python-mode/enc similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/enc rename to elpa/elpy-20200112.1819/snippets/python-mode/enc diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/env b/elpa/elpy-20200112.1819/snippets/python-mode/env similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/env rename to elpa/elpy-20200112.1819/snippets/python-mode/env diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/from b/elpa/elpy-20200112.1819/snippets/python-mode/from similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/from rename to elpa/elpy-20200112.1819/snippets/python-mode/from diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/pdb b/elpa/elpy-20200112.1819/snippets/python-mode/pdb similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/pdb rename to elpa/elpy-20200112.1819/snippets/python-mode/pdb diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/py3 b/elpa/elpy-20200112.1819/snippets/python-mode/py3 similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/py3 rename to elpa/elpy-20200112.1819/snippets/python-mode/py3 diff --git a/elpa/elpy-20191222.2227/snippets/python-mode/super b/elpa/elpy-20200112.1819/snippets/python-mode/super similarity index 100% rename from elpa/elpy-20191222.2227/snippets/python-mode/super rename to elpa/elpy-20200112.1819/snippets/python-mode/super diff --git a/elpa/git-commit-20191227.1317/git-commit-pkg.el b/elpa/git-commit-20191227.1317/git-commit-pkg.el deleted file mode 100644 index ee383c0c..00000000 --- a/elpa/git-commit-20191227.1317/git-commit-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "git-commit" "20191227.1317" "Edit Git commit messages" '((emacs "25.1") (dash "20180910") (transient "20190812") (with-editor "20181103")) :commit "49dfbdbe46acbf29c28e87f12dd6f722071ef0f9" :keywords '("git" "tools" "vc") :maintainer '("Jonas Bernoulli" . "jonas@bernoul.li") :url "https://github.com/magit/magit") diff --git a/elpa/git-commit-20191227.1317/git-commit-autoloads.el b/elpa/git-commit-20200123.1706/git-commit-autoloads.el similarity index 100% rename from elpa/git-commit-20191227.1317/git-commit-autoloads.el rename to elpa/git-commit-20200123.1706/git-commit-autoloads.el diff --git a/elpa/git-commit-20200123.1706/git-commit-pkg.el b/elpa/git-commit-20200123.1706/git-commit-pkg.el new file mode 100644 index 00000000..adcb126c --- /dev/null +++ b/elpa/git-commit-20200123.1706/git-commit-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "git-commit" "20200123.1706" "Edit Git commit messages" '((emacs "25.1") (dash "20180910") (transient "20190812") (with-editor "20181103")) :commit "e5e475c61ce568a7e20ed8f795fa343a93632871" :keywords '("git" "tools" "vc") :maintainer '("Jonas Bernoulli" . "jonas@bernoul.li") :url "https://github.com/magit/magit") diff --git a/elpa/git-commit-20191227.1317/git-commit.el b/elpa/git-commit-20200123.1706/git-commit.el similarity index 98% rename from elpa/git-commit-20191227.1317/git-commit.el rename to elpa/git-commit-20200123.1706/git-commit.el index f680e929..0a17bf84 100644 --- a/elpa/git-commit-20191227.1317/git-commit.el +++ b/elpa/git-commit-20200123.1706/git-commit.el @@ -1,6 +1,6 @@ ;;; git-commit.el --- Edit Git commit messages -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -12,7 +12,7 @@ ;; Maintainer: Jonas Bernoulli ;; Package-Requires: ((emacs "25.1") (dash "20180910") (transient "20190812") (with-editor "20181103")) -;; Package-Version: 20191227.1317 +;; Package-Version: 20200123.1706 ;; Keywords: git tools vc ;; Homepage: https://github.com/magit/magit @@ -314,7 +314,7 @@ In this context a \"keyword\" is text surrounded be brackets." :group 'git-commit-faces) (define-obsolete-face-alias 'git-commit-note - 'git-commit-keyword "Git-Commit 2.91.0") + 'git-commit-keyword "Git-Commit 3.0.0") (defface git-commit-pseudo-header '((t :inherit font-lock-string-face)) @@ -368,12 +368,8 @@ This is only used if Magit is available." (defvar git-commit-mode-map (let ((map (make-sparse-keymap))) - (cond ((featurep 'jkl) - (define-key map (kbd "C-M-i") 'git-commit-prev-message) - (define-key map (kbd "C-M-k") 'git-commit-next-message)) - (t - (define-key map (kbd "M-p") 'git-commit-prev-message) - (define-key map (kbd "M-n") 'git-commit-next-message))) + (define-key map (kbd "M-p") 'git-commit-prev-message) + (define-key map (kbd "M-n") 'git-commit-next-message) (define-key map (kbd "C-c C-i") 'git-commit-insert-pseudo-header) (define-key map (kbd "C-c C-a") 'git-commit-ack) (define-key map (kbd "C-c M-i") 'git-commit-suggested) @@ -782,7 +778,7 @@ With a numeric prefix ARG, go forward ARG comments." nil nil nil 'git-commit-read-ident-history))) (save-match-data (if (string-match "\\`\\([^<]+\\) *<\\([^>]+\\)>\\'" str) - (list (string-trim (match-string 1 str)) + (list (save-match-data (string-trim (match-string 1 str))) (string-trim (match-string 2 str))) (user-error "Invalid input")))) (list (read-string "Name: ") diff --git a/elpa/git-commit-20191227.1317/git-commit.elc b/elpa/git-commit-20200123.1706/git-commit.elc similarity index 87% rename from elpa/git-commit-20191227.1317/git-commit.elc rename to elpa/git-commit-20200123.1706/git-commit.elc index dcb6d702..6bb4b1f5 100644 Binary files a/elpa/git-commit-20191227.1317/git-commit.elc and b/elpa/git-commit-20200123.1706/git-commit.elc differ diff --git a/elpa/leuven-theme-20191211.1608/leuven-dark-theme.el b/elpa/leuven-theme-20191211.1608/leuven-dark-theme.el deleted file mode 100644 index e87a3049..00000000 --- a/elpa/leuven-theme-20191211.1608/leuven-dark-theme.el +++ /dev/null @@ -1,990 +0,0 @@ -;;; leuven-theme.el --- Awesome Emacs color theme on dark background - -;; Copyright (C) 2003-2017 Free Software Foundation, Inc. - -;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")> -;; URL: https://github.com/fniessen/emacs-leuven-theme -;; Version: 20170101.1105 -;; Keywords: color theme - -;; This file is part of GNU Emacs. - -;; GNU Emacs 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. - -;; GNU Emacs 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 elegant Org-enhancing color theme "leuven" ROCKS! -;; ... and not just for Org mode. -;; -;; To use it, put the following in your Emacs configuration file: -;; -;; (load-theme 'leuven t) -;; -;; Requirements: Emacs 24. -;; -;; NOTE -- Would you like implement a version of this for dark backgrounds, -;; please do so! I'm willing to integrate it... - -;;; Code: - -;;; Options. - -(defgroup leuven nil - "Leuven theme options. -The theme has to be reloaded after changing anything in this group." - :group 'faces) - -(defcustom leuven-scale-outline-headlines t - "Scale `outline' (and `org') level-1 headlines." - :type 'boolean - :group 'leuven) - -;;; Theme Faces. - -(deftheme leuven-dark - "Face colors with a light background. -Basic, Font Lock, Isearch, Gnus, Message, Org mode, Diff, Ediff, -Flyspell, Semantic, and Ansi-Color faces are included -- and much -more...") - -(let ((class '((class color) (min-colors 89))) - - ;; Leuven generic colors. - (cancel '(:slant italic :strike-through t :foreground "#292929")) - (clock-line '(:box (:line-width 1 :color "#436ab7") :foreground "#fffefe" :background "#161100")) - (code-block '(:foreground "#af8b124" :background "#000000")) - (code-inline '(:foreground "#388e2e" :background "#000000")) - (column '(:height 1.0 :weight normal :slant normal :underline nil :strike-through nil :foreground "#2c1200" :background "#030100")) - (completion-selected-candidate '(:weight bold :foreground "#000000" :background "#4a77d1")) - (completion-other-candidates '(:weight bold :foreground "#fffefe" :background "#000307")) - (completion-inline '(:weight normal :foreground "#1a1a1a" :inherit hl-line)) ; Like Google. - (diff-added '(:background "#000300")) - (diff-changed '(:foreground "#6845138" :background "#000919")) - (diff-header '(:foreground "#c15138" :background "#000100")) - (diff-hunk-header '(:foreground "#9d159c" :background "#050005")) - (diff-none '(:foreground "#737373")) - (diff-refine-added '(:background "#001300")) - (diff-refine-removed '(:background "#270007")) - (diff-removed '(:background "#080002")) - (directory '(:weight bold :foreground "#6845138" :background "#000000")) - (file '(:foreground "#fffefe")) - (highlight-blue '(:background "#000508")) - (highlight-gray '(:background "#080807")) - (highlight-green '(:background "#000900")) - (highlight-red '(:background "#1b0004")) - (highlight-yellow '(:underline "#000200" :background "#000100")) - (link '(:weight normal :underline t :foreground "#006aab")) - (link-no-underline '(:weight normal :foreground "#006aab")) - (mail-header-name '(:family "Sans Serif" :weight normal :foreground "#2d2d2c")) - (mail-header-other '(:family "Sans Serif" :slant normal :foreground "#606060")) - (mail-read '(:foreground "#292929")) - (mail-read-high '(:foreground "#484848")) - (mail-ticked '(:foreground "#8b0000")) - (mail-to '(:family "Sans Serif" :underline nil :foreground "#006aab")) - (mail-unread '(:foreground "#0b67be")) - (mail-unread-high '(:foreground "#457eae")) - (marked-line '(:foreground "#ad130a" :background "#300005")) - (match '(:weight bold :background "#060900")) ; occur patterns - (ol1 `(,@(when leuven-scale-outline-headlines (list :height 1.3)) :weight bold :overline "#2a2a2a" :foreground "#8f8f8f" :background "#030303")) - (ol2 '(:height 1.0 :weight bold :overline "#84a1cb" :foreground "#84a1cb" :background "#000407")) - (ol3 '(:height 1.0 :weight bold :foreground "#4c9a5a" :background "#000100")) - (ol4 '(:height 1.0 :weight bold :slant normal :foreground "#690000")) - (ol5 '(:height 1.0 :weight bold :slant normal :foreground "#870042")) - (ol6 '(:height 1.0 :weight bold :slant italic :foreground "#005eae")) - (ol7 '(:height 1.0 :weight bold :slant italic :foreground "#004e00")) - (ol8 '(:height 1.0 :weight bold :slant italic :foreground "#4f0000")) - (paren-matched '(:background "#001000")) ; Or take that green for region? - (paren-unmatched '(:weight bold :underline "#850000" :foreground "#fffefe" :background "#0e0002")) - (region '(:background "#001e3a")) - (shadow '(:foreground "#494949")) - (string '(:foreground "#007600")) ; or #8d0000 - (subject '(:family "Sans Serif" :weight bold :foreground "#fffefe")) - (symlink '(:foreground "#005291")) - (tab '(:foreground "#060606" :background "#000000")) - (volatile-highlight '(:underline nil :foreground "#fffefe" :background "#2a1100")) ; flash-region - (vc-branch '(:box (:line-width 1 :color "#003a00") :foreground "#fffefe" :background "#000b00")) - (xml-attribute '(:foreground "#670000")) - (xml-tag '(:foreground "#950082")) - (highlight-current-tag '(:background "#00050e")) ; #010304 or #020700 - ) - - (custom-theme-set-faces - 'leuven - `(default ((,class (:foreground "#9b9b9b" :background "#000000")))) - `(bold ((,class (:weight bold :foreground "#fffefe")))) - `(bold-italic ((,class (:weight bold :slant italic :foreground "#fffefe")))) - `(italic ((,class (:slant italic :foreground "#c0c0c0")))) - `(underline ((,class (:underline t)))) - `(cursor ((,class (:background "#003668")))) - - ;; Highlighting faces. - `(fringe ((,class (:foreground "#0a0900" :background "#000000")))) - `(highlight ((,class ,highlight-blue))) - `(region ((,class ,region))) - `(secondary-selection ((,class ,match))) ; Used by Org-mode for highlighting matched entries and keywords. - `(isearch ((,class (:weight bold :underline "#3e0000" :foreground nil :background "#200600")))) - `(isearch-fail ((,class (:weight bold :foreground "#fffefe" :background "#3d0004")))) - `(lazy-highlight ((,class (:underline "#3e0000" :background "#000200")))) ; isearch others - `(trailing-whitespace ((,class (:foreground "#222222" :background "#000100")))) - `(query-replace ((,class (:inherit isearch)))) - `(whitespace-hspace ((,class (:foreground "#101010")))) ; see also `nobreak-space' - `(whitespace-indentation ((,class ,tab))) - `(whitespace-line ((,class (:foreground "#9d0000" :background "#000100")))) - `(whitespace-tab ((,class ,tab))) - `(whitespace-trailing ((,class (:foreground "#222222" :background "#000100")))) - - ;; Mode line faces. - `(mode-line ((,class (:box (:line-width 1 :color "#91a1d3") :foreground "#002237" :background "#436ab7")))) - `(mode-line-inactive ((,class (:box (:line-width 1 :color "#7a7a78") :foreground "#030303" :background "#32332f")))) - `(mode-line-buffer-id ((,class (:weight bold :foreground "#000000")))) - `(mode-line-emphasis ((,class (:weight bold :foreground "#000000")))) - `(mode-line-highlight ((,class (:foreground "#000200")))) - - ;; Escape and prompt faces. - `(minibuffer-prompt ((,class (:weight bold :foreground "#fffefe" :background "#0e0a00")))) - `(minibuffer-noticeable-prompt ((,class (:weight bold :foreground "#fffefe" :background "#0e0a00")))) - `(escape-glyph ((,class (:foreground "#00538f")))) - `(error ((,class (:foreground "#850000")))) - `(warning ((,class (:weight bold :foreground "#320000")))) - `(success ((,class (:foreground "#001800")))) - - ;; Font lock faces. - `(font-lock-builtin-face ((,class (:foreground "#005ac6")))) - `(font-lock-comment-delimiter-face ((,class (:foreground "#3f3f37")))) ; #5d5d5d - `(font-lock-comment-face ((,class (:slant italic :foreground "#3f3f37")))) ; #5d5d5d - `(font-lock-constant-face ((,class (:foreground "#8d0000")))) - `(font-lock-doc-face ((,class (:foreground "#2f8926")))) - ;; `(font-lock-doc-string-face ((,class (:foreground "#007600")))) ; XEmacs only, but is used for HTML exports from org2html (and not interactively) - `(font-lock-function-name-face ((,class (:weight normal :foreground "#2773a8")))) - `(font-lock-keyword-face ((,class (:bold nil :foreground "#6845138")))) ; #3e59e2 - `(font-lock-preprocessor-face ((,class (:foreground "#484848")))) - `(font-lock-regexp-grouping-backslash ((,class (:weight bold :inherit nil)))) - `(font-lock-regexp-grouping-construct ((,class (:weight bold :inherit nil)))) - `(font-lock-string-face ((,class ,string))) - `(font-lock-type-face ((,class (:weight normal :foreground "#8855ca")))) - `(font-lock-variable-name-face ((,class (:weight normal :foreground "#860074")))) ; #a942a8 - `(font-lock-warning-face ((,class (:weight bold :foreground "#850000")))) - - ;; Button and link faces. - `(link ((,class ,link))) - `(link-visited ((,class (:underline t :foreground "#590006")))) - `(button ((,class (:underline t :foreground "#006aab")))) - `(header-line ((,class (:weight bold :underline "#320068" :overline "#320068" :foreground "#fffefe" :background "#00050e")))) - - ;; Gnus faces. - `(gnus-button ((,class (:weight normal)))) - `(gnus-cite-attribution-face ((,class (:foreground "#615fc2")))) - `(gnus-cite-face-1 ((,class (:foreground "#615fc2" :background "#010101")))) - `(gnus-cite-face-2 ((,class (:foreground "#b662b5" :background "#010101")))) - `(gnus-cite-face-3 ((,class (:foreground "#007272" :background "#010101")))) - `(gnus-cite-face-4 ((,class (:foreground "#b53320" :background "#010101")))) - `(gnus-cite-face-5 ((,class (:foreground "#a680128" :background "#010101")))) - `(gnus-cite-face-6 ((,class (:foreground "#6e2700" :background "#010101")))) - `(gnus-cite-face-7 ((,class (:foreground "#615fc2" :background "#010101")))) - `(gnus-cite-face-8 ((,class (:foreground "#b662b5" :background "#010101")))) - `(gnus-cite-face-9 ((,class (:foreground "#007272" :background "#010101")))) - `(gnus-cite-face-10 ((,class (:foreground "#b53320" :background "#010101")))) - `(gnus-emphasis-bold ((,class (:weight bold)))) - `(gnus-emphasis-highlight-words ((,class (:foreground "#000200" :background "#fffefe")))) - `(gnus-group-mail-1 ((,class (:weight bold :foreground "#6b0035")))) - `(gnus-group-mail-1-empty ((,class (:foreground "#615fc2")))) - `(gnus-group-mail-2 ((,class (:weight bold :foreground "#840014")))) - `(gnus-group-mail-2-empty ((,class (:foreground "#b662b5")))) - `(gnus-group-mail-3 ((,class ,mail-unread))) - `(gnus-group-mail-3-empty ((,class ,mail-read))) - `(gnus-group-mail-low ((,class ,cancel))) - `(gnus-group-mail-low-empty ((,class ,cancel))) - `(gnus-group-news-1 ((,class (:weight bold :foreground "#6b0035")))) - `(gnus-group-news-1-empty ((,class (:foreground "#615fc2")))) - `(gnus-group-news-2 ((,class (:weight bold :foreground "#840014")))) - `(gnus-group-news-2-empty ((,class (:foreground "#b662b5")))) - `(gnus-group-news-3 ((,class ,mail-unread))) - `(gnus-group-news-3-empty ((,class ,mail-read))) - `(gnus-group-news-4 ((,class (:weight bold :foreground "#850000")))) - `(gnus-group-news-4-empty ((,class (:foreground "#b53320")))) - `(gnus-group-news-5 ((,class (:weight bold :foreground "#810036")))) - `(gnus-group-news-5-empty ((,class (:foreground "#a680128")))) - `(gnus-group-news-6 ((,class (:weight bold :foreground "#494949")))) - `(gnus-group-news-6-empty ((,class (:foreground "#484848")))) - `(gnus-header-content ((,class ,mail-header-other))) - `(gnus-header-from ((,class (:family "Sans Serif" :foreground "#fffefe")))) - `(gnus-header-name ((,class ,mail-header-name))) - `(gnus-header-newsgroups ((,class (:family "Sans Serif" :foreground "#004c78")))) - `(gnus-header-subject ((,class ,subject))) - `(gnus-picon ((,class (:foreground "#000200" :background "#000000")))) - `(gnus-picon-xbm ((,class (:foreground "#000200" :background "#000000")))) - `(gnus-server-closed ((,class (:slant italic :foreground "#6845138" :background "#000000")))) - `(gnus-server-denied ((,class (:weight bold :foreground "#850000" :background "#000000")))) - `(gnus-server-opened ((,class (:family "Sans Serif" :foreground "#000000" :foreground "#2154ba")))) - `(gnus-signature ((,class (:slant italic :foreground "#3d3e3f")))) - `(gnus-splash ((,class (:foreground "#460000")))) - `(gnus-summary-cancelled ((,class ,cancel))) - `(gnus-summary-high-ancient ((,class ,mail-unread-high))) - `(gnus-summary-high-read ((,class ,mail-read-high))) - `(gnus-summary-high-ticked ((,class ,mail-ticked))) - `(gnus-summary-high-unread ((,class ,mail-unread-high))) - `(gnus-summary-low-ancient ((,class (:slant italic :foreground "#fffefe")))) - `(gnus-summary-low-read ((,class (:slant italic :foreground "#343434" :background "#0a0a0a")))) - `(gnus-summary-low-ticked ((,class ,mail-ticked))) - `(gnus-summary-low-unread ((,class (:slant italic :foreground "#fffefe")))) - `(gnus-summary-normal-ancient ((,class (:slant italic :foreground "#0061b2")))) - `(gnus-summary-normal-read ((,class ,mail-read))) - `(gnus-summary-normal-ticked ((,class ,mail-ticked))) - `(gnus-summary-normal-unread ((,class ,mail-unread))) - `(gnus-summary-selected ((,class (:foreground "#000000" :background "#005395")))) - `(gnus-x-face ((,class (:foreground "#fffefe" :background "#000000")))) - - ;; Message faces. - `(message-header-name ((,class ,mail-header-name))) - `(message-header-cc ((,class ,mail-to))) - `(message-header-other ((,class ,mail-header-other))) - `(message-header-subject ((,class ,subject))) - `(message-header-to ((,class ,mail-to))) - `(message-cited-text ((,class (:foreground "#615fc2" :background "#010101")))) - `(message-separator ((,class (:family "Sans Serif" :weight normal :foreground "#171a1d")))) - `(message-header-newsgroups ((,class (:family "Sans Serif" :foreground "#004c78")))) - `(message-header-xheader ((,class ,mail-header-other))) - `(message-mml ((,class (:foreground "#006a00")))) - - ;; Diff. - `(diff-added ((,class ,diff-added))) - `(diff-changed ((,class ,diff-changed))) - `(diff-context ((,class ,diff-none))) - `(diff-file-header ((,class ,diff-header))) - `(diff-file1-hunk-header ((,class (:foreground "#a332a3" :background "#000405")))) - `(diff-file2-hunk-header ((,class (:foreground "#1f7221" :background "#000405")))) - `(diff-function ((,class (:foreground "darkgray")))) - `(diff-header ((,class ,diff-header))) - `(diff-hunk-header ((,class ,diff-hunk-header))) - `(diff-index ((,class ,diff-header))) - `(diff-indicator-added ((,class (:foreground "#005b00" :background "#000400")))) - `(diff-indicator-changed ((,class (:background "#10319a")))) - `(diff-indicator-removed ((,class (:foreground "#900004" :background "#0e0002")))) - `(diff-refine-added ((,class ,diff-refine-added))) - `(diff-refine-change ((,class (:background "#000919")))) - `(diff-refine-removed ((,class ,diff-refine-removed))) - `(diff-removed ((,class ,diff-removed))) - - ;; SMerge. - `(smerge-refined-change ((,class (:background "#001e58")))) - - ;; Ediff. - `(ediff-current-diff-A ((,class (:background "#0e0002")))) - `(ediff-current-diff-B ((,class (:background "#000300")))) - `(ediff-current-diff-C ((,class (:background "#001220")))) - `(ediff-even-diff-A ((,class (:background "#101010")))) - `(ediff-even-diff-B ((,class (:background "#101010")))) - `(ediff-fine-diff-A ((,class (:background "#300005")))) - `(ediff-fine-diff-B ((,class (:background "#001500")))) - `(ediff-odd-diff-A ((,class (:background "#101010")))) - `(ediff-odd-diff-B ((,class (:background "#101010")))) - - ;; Flyspell. - (if (version< emacs-version "24.4") - `(flyspell-duplicate ((,class (:underline "#007600" :inherit nil)))) - `(flyspell-duplicate ((,class (:underline (:style wave :color "#007600") :inherit nil))))) - (if (version< emacs-version "24.4") - `(flyspell-incorrect ((,class (:underline "#850000" :inherit nil)))) - `(flyspell-incorrect ((,class (:underline (:style wave :color "#850000") :inherit nil))))) - - ;; ;; Semantic faces. - ;; `(semantic-decoration-on-includes ((,class (:underline ,cham-4)))) - ;; `(semantic-decoration-on-private-members-face ((,class (:background ,alum-2)))) - ;; `(semantic-decoration-on-protected-members-face ((,class (:background ,alum-2)))) - ;; `(semantic-decoration-on-unknown-includes ((,class (:background ,choc-3)))) - ;; `(semantic-decoration-on-unparsed-includes ((,class (:underline ,orange-3)))) - `(semantic-highlight-func-current-tag-face ((,class ,highlight-current-tag))) - `(semantic-tag-boundary-face ((,class (:overline "#320068")))) - ;; `(semantic-unmatched-syntax-face ((,class (:underline ,red-1)))) - - `(Info-title-1-face ((,class ,ol1))) - `(Info-title-2-face ((,class ,ol2))) - `(Info-title-3-face ((,class ,ol3))) - `(Info-title-4-face ((,class ,ol4))) - `(ace-jump-face-foreground ((,class (:weight bold :foreground "#fffefe" :background "#320000")))) - `(ahs-face ((,class (:background "#070902")))) ; #002141 (blue). - `(ahs-definition-face ((,class (:background "#09000a")))) - `(ahs-plugin-defalt-face ((,class (:background "#070902")))) ; #27000c (rose) = current. - `(anzu-match-1 ((,class (:foreground "#fffefe" :background "#000e06")))) - `(anzu-match-2 ((,class (:foreground "#fffefe" :background "springgreen")))) - `(anzu-match-3 ((,class (:foreground "#fffefe" :background "#850000")))) - `(anzu-mode-line ((,class (:foreground "#fffefe" :background "#001000")))) - `(anzu-replace-highlight ((,class (:inherit query-replace)))) - `(anzu-replace-to ((,class (:weight bold :foreground "#6d00a9" :background "#200600")))) - `(auto-dim-other-buffers-face ((,class (:background "#010101")))) - `(avy-background-face ((,class (:background "#292929")))) - `(avy-lead-face ((,class (:weight bold :foreground "#fffefe" :background "#320000")))) - `(bbdb-company ((,class (:slant italic :foreground "#005683")))) - `(bbdb-field-name ((,class (:weight bold :foreground "#005683")))) - `(bbdb-field-value ((,class (:foreground "#005683")))) - `(bbdb-name ((,class (:underline t :foreground "#620000")))) - `(bmkp-light-fringe-autonamed ((,class (:foreground "#6d6d6d" :background "#0f0f0f")))) - `(bmkp-light-autonamed ((,class (:background "#030303")))) - `(bmkp-light-fringe-non-autonamed ((,class (:foreground "#000000" :background "#00121f")))) ; default - `(bmkp-light-non-autonamed ((,class (:background "#00060a")))) - `(browse-kill-ring-separator-face ((,class (:foreground "#850000")))) - `(calendar-month-header ((,class (:weight bold :foreground "#837d6e" :background "#000000")))) - `(calendar-today ((,class (:weight bold :foreground "#837d6e" :background "#000000")))) - `(calendar-weekday-header ((,class (:weight bold :foreground "#2c6dbc")))) - `(calendar-weekend-header ((,class (:weight bold :foreground "#7a7a7a")))) - `(cfw:face-annotation ((,class (:foreground "#001800" :background "#850000")))) - `(cfw:face-day-title ((,class (:foreground "#151515")))) - `(cfw:face-default-content ((,class (:foreground "#5272ca")))) - `(cfw:face-default-day ((,class (:weight bold)))) - `(cfw:face-disable ((,class (:foreground "#292929")))) - `(cfw:face-grid ((,class (:foreground "#0b0b0b")))) - `(cfw:face-header ((,class (:foreground "#2c6dbc" :background "#000000" :weight bold)))) - `(cfw:face-holiday ((,class (:foreground "#505050" :background "#00060d")))) - `(cfw:face-periods ((,class (:foreground "#000000" :background "#004282" :slant italic)))) - `(cfw:face-saturday ((,class (:foreground "#7a7a7a" :background "#000000" :weight bold)))) - `(cfw:face-select ((,class (:foreground "#00448b" :background "#000306")))) - `(cfw:face-sunday ((,class (:foreground "#7a7a7a" :background "#000000" :weight bold)))) - `(cfw:face-title ((,class (:height 2.0 :foreground "#5f5f5f" :weight bold :inherit variable-pitch)))) - `(cfw:face-today ((,class (:foreground "#837d6e" :background "#000000")))) - `(cfw:face-today-title ((,class (:foreground "#000000" :background "#226bb7")))) - `(cfw:face-toolbar ((,class (:background "#000000")))) - `(cfw:face-toolbar-button-off ((,class (:foreground "#121212" :background "#000000")))) - `(cfw:face-toolbar-button-on ((,class (:foreground "#686868" :background "#010101")))) - `(change-log-date ((,class (:foreground "#7800c5")))) - `(change-log-file ((,class (:weight bold :foreground "#00548e")))) - `(change-log-list ((,class (:box (:line-width 1) :foreground "#00323a")))) - `(change-log-name ((,class (:foreground "#007600")))) - `(circe-highlight-all-nicks-face ((,class (:foreground "#6845138" :background "#030303")))) ; other nick names - `(circe-highlight-nick-face ((,class (:foreground "#006700" :background "#030303")))) ; messages with my nick cited - `(circe-my-message-face ((,class (:foreground "#3f3f3f" :background "#030303")))) - `(circe-originator-face ((,class (:foreground "#6845138")))) - `(circe-prompt-face ((,class (:foreground "#850000")))) - `(circe-server-face ((,class (:foreground "#002032")))) - `(comint-highlight-input ((,class (:weight bold :foreground "#6845138" :inherit nil)))) - ;; `(comint-highlight-prompt ((,class (:weight bold :foreground "#fffefe" :background "#0e0a00")))) - `(comint-highlight-prompt ((,class (:weight bold :foreground "#6845138" :inherit nil)))) - - ;; `(ac-selection-face ((,class ,completion-selected-candidate))) - `(ac-selection-face ((,class (:weight bold :foreground "#000000" :background "#320000")))) ; TEMP For diff'ing AC from Comp. - `(ac-candidate-face ((,class ,completion-other-candidates))) - `(ac-completion-face ((,class ,completion-inline))) - `(ac-candidate-mouse-face ((,class (:inherit highlight)))) - `(popup-scroll-bar-background-face ((,class (:background "#000307")))) - `(popup-scroll-bar-foreground-face ((,class (:background "#080e13")))) ; Scrollbar (visible). - - `(company-tooltip-common-selection ((,class (:weight normal :foreground "#050400" :inherit company-tooltip-selection)))) ; Prefix + common part in tooltip (for selection). - `(company-tooltip-selection ((,class ,completion-selected-candidate))) ; Suffix in tooltip (for selection). - `(company-tooltip-annotation-selection ((,class (:weight normal :foreground "#050400")))) ; Annotation (for selection). - - `(company-tooltip-common ((,class (:weight normal :foreground "#920092" :inherit company-tooltip)))) ; Prefix + common part in tooltip. - `(company-tooltip ((,class ,completion-other-candidates))) ; Suffix in tooltip. - `(company-tooltip-annotation ((,class (:weight normal :foreground "#654312f")))) ; Annotation. - - `(company-preview-common ((,class ,completion-inline))) - - `(company-scrollbar-bg ((,class (:background "#000307")))) - `(company-scrollbar-fg ((,class (:background "#080e13")))) ; Scrollbar (visible). - - `(compare-windows ((,class (:background "#000200")))) - ;; `(completions-common-part ((,class (:foreground "#850000" :weight bold)))) - ;; `(completions-first-difference ((,class (:foreground "#001800" :weight bold)))) - `(compilation-error ((,class (:weight bold :foreground "#850000")))) ; Used for grep error messages. - `(compilation-info ((,class (:weight bold :foreground "#6376d6")))) ; Used for grep hits. - `(compilation-line-number ((,class (:weight bold :foreground "#86008f")))) - `(compilation-warning ((,class (:weight bold :foreground "#320000")))) - `(compilation-mode-line-exit ((,class (:weight bold :foreground "#001800")))) ; :exit[matched] - `(compilation-mode-line-fail ((,class (:weight bold :foreground "#470049")))) ; :exit[no match] - `(compilation-mode-line-run ((,class (:weight bold :foreground "#320000")))) ; :run - `(css-property ((,class (:foreground "#005400")))) - `(css-selector ((,class (:weight bold :foreground "#6845138")))) - `(custom-button ((,class (:box (:line-width 2 :style released-button) :foreground "#fffefe" :background "lightgrey")))) - `(custom-button-mouse ((,class (:box (:line-width 2 :style released-button) :foreground "#fffefe" :background "#070707")))) - `(custom-button-pressed ((,class (:box (:line-width 2 :style pressed-button) :foreground "#fffefe" :background "#101010")))) - `(custom-button-pressed-unraised ((,class (:underline t :foreground "#a332a3")))) - `(custom-button-unraised ((,class (:underline t)))) - `(custom-changed ((,class (:foreground "#000000" :background "#6845138")))) - `(custom-comment ((,class (:background "#0d0d0d")))) - `(custom-comment-tag ((,class (:foreground "#ad89125")))) - `(custom-documentation ((,class (nil)))) - `(custom-face-tag ((,class (:family "Sans Serif" :height 1.2 :weight bold)))) - `(custom-group-tag ((,class (:height 1.2 :weight bold :foreground "#6845138")))) - `(custom-group-tag-1 ((,class (:family "Sans Serif" :height 1.2 :weight bold :foreground "#850000")))) - `(custom-invalid ((,class (:foreground "#000200" :background "#850000")))) - `(custom-link ((,class (:underline t :foreground "#6845138")))) - `(custom-modified ((,class (:foreground "#000000" :background "#6845138")))) - `(custom-rogue ((,class (:foreground "#200009" :background "#fffefe")))) - `(custom-saved ((,class (:underline t)))) - `(custom-set ((,class (:foreground "#6845138" :background "#000000")))) - `(custom-state ((,class (:foreground "#006d00")))) - `(custom-themed ((,class (:foreground "#000000" :background "#6845138")))) - `(custom-variable-button ((,class (:weight bold :underline t)))) - `(custom-variable-tag ((,class (:family "Sans Serif" :height 1.2 :weight bold :foreground "#6845138")))) - `(custom-visibility ((,class ,link))) - `(diff-hl-change ((,class (:foreground "#8962130" :inherit diff-changed)))) - `(diff-hl-delete ((,class (:foreground "#9d0000" :inherit diff-removed)))) - `(diff-hl-dired-change ((,class (:weight bold :foreground "#fffefe" :background "#340000")))) - `(diff-hl-dired-delete ((,class (:weight bold :foreground "#8a0000")))) - `(diff-hl-dired-ignored ((,class (:weight bold :foreground "#000000" :background "#1f1d13")))) - `(diff-hl-dired-insert ((,class (:weight bold :foreground "#1e1e1f")))) - `(diff-hl-dired-unknown ((,class (:foreground "#000000" :background "#7365ea")))) - `(diff-hl-insert ((,class (:foreground "#006d00" :inherit diff-added)))) - `(diff-hl-unknown ((,class (:foreground "#000000" :background "#7365ea")))) - `(diary-face ((,class (:foreground "#002344")))) - `(dircolors-face-asm ((,class (:foreground "#fffefe")))) - `(dircolors-face-backup ((,class (:foreground "#fffefe")))) - `(dircolors-face-compress ((,class (:foreground "#850000")))) - `(dircolors-face-dir ((,class ,directory))) - `(dircolors-face-doc ((,class (:foreground "#fffefe")))) - `(dircolors-face-dos ((,class (:foreground "#006a00")))) - `(dircolors-face-emacs ((,class (:foreground "#fffefe")))) - `(dircolors-face-exec ((,class (:foreground "#006a00")))) - `(dircolors-face-html ((,class (:foreground "#fffefe")))) - `(dircolors-face-img ((,class (:foreground "#840086")))) - `(dircolors-face-lang ((,class (:foreground "#fffefe")))) - `(dircolors-face-lang-interface ((,class (:foreground "#fffefe")))) - `(dircolors-face-make ((,class (:foreground "#fffefe")))) - `(dircolors-face-objet ((,class (:foreground "#fffefe")))) - `(dircolors-face-package ((,class (:foreground "#fffefe")))) - `(dircolors-face-paddb ((,class (:foreground "#fffefe")))) - `(dircolors-face-ps ((,class (:foreground "#fffefe")))) - `(dircolors-face-sound ((,class (:foreground "#003567")))) - `(dircolors-face-tar ((,class (:foreground "#850000")))) - `(dircolors-face-text ((,class (:foreground "#fffefe")))) - `(dircolors-face-yacc ((,class (:foreground "#fffefe")))) - `(dired-directory ((,class ,directory))) - `(dired-header ((,class ,directory))) - `(dired-ignored ((,class (:strike-through t :foreground "#850000")))) - `(dired-mark ((,class ,marked-line))) - `(dired-marked ((,class ,marked-line))) - `(dired-symlink ((,class ,symlink))) - `(diredp-compressed-file-suffix ((,class (:foreground "#850000")))) - `(diredp-date-time ((,class (:foreground "#7800c5")))) - `(diredp-dir-heading ((,class ,directory))) - `(diredp-dir-name ((,class ,directory))) - `(diredp-dir-priv ((,class ,directory))) - `(diredp-exec-priv ((,class (:background "#004200")))) - `(diredp-executable-tag ((,class (:foreground "#006a00" :background "#000000")))) - `(diredp-file-name ((,class ,file))) - `(diredp-file-suffix ((,class (:foreground "#1a1a1a")))) - `(diredp-flag-mark-line ((,class ,marked-line))) - `(diredp-ignored-file-name ((,class ,shadow))) - `(diredp-read-priv ((,class (:background "#00469a")))) - `(diredp-write-priv ((,class (:foreground "#000000" :background "#770000")))) - `(elfeed-search-filter-face ((,class (:foreground "#1b1b1b")))) - ;; `(eww-form-checkbox ((,class ()))) - ;; `(eww-form-select ((,class ()))) - ;; `(eww-form-submit ((,class ()))) - `(eww-form-text ((,class (:weight bold :foreground "#5f7890" :background "#001b31")))) - ;; `(eww-form-textarea ((,class ()))) - `(file-name-shadow ((,class ,shadow))) - `(font-latex-bold-face ((,class (:weight bold :foreground "#fffefe")))) - `(fancy-narrow-blocked-face ((,class (:foreground "#34333c")))) - `(flycheck-color-mode-line-error-face ((, class (:background "#780000")))) - `(flycheck-color-mode-line-warning-face ((, class (:background "#320000")))) - `(flycheck-color-mode-line-info-face ((, class (:background "#000200")))) - `(font-latex-italic-face ((,class (:slant italic :foreground "#c0c0c0")))) - `(font-latex-math-face ((,class (:foreground "#6845138")))) - `(font-latex-sectioning-1-face ((,class (:family "Sans Serif" :height 2.7 :weight bold :foreground "#003d83")))) - `(font-latex-sectioning-2-face ((,class ,ol1))) - `(font-latex-sectioning-3-face ((,class ,ol2))) - `(font-latex-sectioning-4-face ((,class ,ol3))) - `(font-latex-sectioning-5-face ((,class ,ol4))) - `(font-latex-sedate-face ((,class (:foreground "#6d0000")))) - `(font-latex-string-face ((,class (:weight bold :foreground "#0051e2")))) - `(font-latex-verbatim-face ((,class (:foreground "#af8b124" :background "#000000" :inherit nil)))) - `(git-commit-summary-face ((,class (:foreground "#fffefe")))) - `(git-commit-comment-face ((,class (:slant italic :foreground "#5d5d5d")))) - `(google-translate-text-face ((,class (:foreground "#505050" :background "#020202")))) - `(google-translate-phonetic-face ((,class (:inherit shadow)))) - `(google-translate-translation-face ((,class (:weight normal :foreground "#0050b9" :background "#02070a")))) - `(google-translate-suggestion-label-face ((,class (:foreground "#850000")))) - `(google-translate-suggestion-face ((,class (:slant italic :underline t)))) - `(google-translate-listen-button-face ((,class (:height 0.8)))) - `(helm-action ((,class (:foreground "#fffefe")))) - `(helm-bookmark-file ((,class ,file))) - `(helm-bookmarks-su-face ((,class (:foreground "#850000")))) - `(helm-buffer-directory ((,class ,directory))) - `(helm-buffer-process ((,class (:foreground "#007400")))) - `(helm-candidate-number ((,class (:foreground "#fffefe" :background "#000200")))) - `(helm-dir-heading ((,class (:foreground "#6845138" :background "#200009")))) - `(helm-dir-priv ((,class (:foreground "#bc442d" :background "#101010")))) - `(helm-ff-directory ((,class ,directory))) - `(helm-ff-dotted-directory ((,class ,directory))) - `(helm-ff-executable ((,class (:foreground "#003900" :background "#000000")))) - `(helm-ff-file ((,class (:foreground "#fffefe")))) - `(helm-ff-invalid-symlink ((,class (:foreground "#000200" :background "#850000")))) - `(helm-ff-symlink ((,class ,symlink))) - `(helm-file-name ((,class (:foreground "#6845138")))) - `(helm-gentoo-match-face ((,class (:foreground "#850000")))) - `(helm-grep-lineno ((,class ,shadow))) - `(helm-grep-match ((,class ,match))) - `(helm-grep-running ((,class (:weight bold :foreground "#000000")))) - `(helm-isearch-match ((,class (:background "#000600")))) - `(helm-lisp-show-completion ((,class ,volatile-highlight))) ; See `helm-dabbrev'. - ;; `(helm-ls-git-added-copied-face ((,class (:foreground "")))) - ;; `(helm-ls-git-added-modified-face ((,class (:foreground "")))) - ;; `(helm-ls-git-conflict-face ((,class (:foreground "")))) - ;; `(helm-ls-git-deleted-and-staged-face ((,class (:foreground "")))) - ;; `(helm-ls-git-deleted-not-staged-face ((,class (:foreground "")))) - ;; `(helm-ls-git-modified-and-staged-face ((,class (:foreground "")))) - `(helm-ls-git-modified-not-staged-face ((,class (:foreground "#860074")))) - ;; `(helm-ls-git-renamed-modified-face ((,class (:foreground "")))) - ;; `(helm-ls-git-untracked-face ((,class (:foreground "")))) - `(helm-match ((,class ,match))) - `(helm-moccur-buffer ((,class (:foreground "#0063c8")))) - `(helm-selection ((,class ,highlight-blue))) - `(helm-selection-line ((,class ,highlight-gray))) - `(helm-separator ((,class (:foreground "#850000")))) - `(helm-source-header ((,class ,ol1))) - `(helm-swoop-target-line-block-face ((,class (:background "#0e1b00" :foreground "#b3b3b3")))) - `(helm-swoop-target-line-face ((,class ,volatile-highlight))) - `(helm-swoop-target-word-face ((,class (:weight bold :foreground nil :background "#200600")))) - `(helm-visible-mark ((,class ,marked-line))) - `(helm-w3m-bookmarks-face ((,class (:underline t :foreground "#001220")))) - `(highlight-changes ((,class (:foreground nil)))) ;; blue "#966811d" - `(highlight-changes-delete ((,class (:strike-through nil :foreground nil)))) ;; red "#a60024" - `(highlight-symbol-face ((,class (:background "#000100")))) - `(hl-line ((,class ,highlight-green))) ; Highlight current line. - `(hl-tags-face ((,class ,highlight-current-tag))) ; ~ Pair highlighting (matching tags). - `(holiday-face ((,class (:foreground "#505050" :background "#00060d")))) - `(html-helper-bold-face ((,class (:weight bold :foreground "#fffefe")))) - `(html-helper-italic-face ((,class (:slant italic :foreground "#fffefe")))) - `(html-helper-underline-face ((,class (:underline t :foreground "#fffefe")))) - `(html-tag-face ((,class (:foreground "#6845138")))) - `(ilog-non-change-face ((,class (:height 2.0 :foreground "#8855ca")))) - `(ilog-change-face ((,class (:height 2.0 :foreground "#007400")))) - `(ilog-echo-face ((,class (:height 2.0 :foreground "#005ac6")))) - `(ilog-load-face ((,class (:foreground "#860074")))) - `(ilog-message-face ((,class (:foreground "#484848")))) - `(indent-guide-face ((,class (:foreground "#101010")))) - `(info-file ((,class (:family "Sans Serif" :height 1.8 :weight bold :box (:line-width 1 :color "#8a63130") :foreground "#003d83" :background "#000d1c")))) - `(info-header-node ((,class (:underline t :foreground "#320000")))) ; nodes in header - `(info-header-xref ((,class (:underline t :foreground "#0048a5")))) ; cross references in header - `(info-index-match ((,class (:weight bold :foreground nil :background "#200600")))) ; when using `i' - `(info-menu-header ((,class ,ol2))) ; menu titles (headers) -- major topics - `(info-menu-star ((,class (:foreground "#fffefe")))) ; every 3rd menu item - `(info-node ((,class (:underline t :foreground "#6845138")))) ; node names - `(info-quoted-name ((,class ,code-inline))) - `(info-string ((,class ,string))) - `(info-title-1 ((,class ,ol1))) - `(info-xref ((,class (:underline t :foreground "#006aab")))) ; unvisited cross-references - `(info-xref-visited ((,class (:underline t :foreground "#a332a3")))) ; previously visited cross-references - ;; js2-highlight-vars-face (~ auto-highlight-symbol) - `(js2-function-param ((,class (:foreground "#0a0c00")))) - `(js2-error ((,class (:box (:line-width 1 :color "#7b0000") :background "#0c0002")))) ; DONE. - `(js2-external-variable ((,class (:foreground "#850000")))) ; DONE. - `(js2-function-param ((,class (:foreground "#006537")))) - `(js2-instance-member ((,class (:foreground "#7f00b0")))) - `(js2-jsdoc-html-tag-delimiter ((,class (:foreground "#001800")))) - `(js2-jsdoc-html-tag-name ((,class (:foreground "#000200")))) - `(js2-jsdoc-tag ((,class (:foreground "#3f4e5c")))) - `(js2-jsdoc-type ((,class (:foreground "#005683")))) - `(js2-jsdoc-value ((,class (:foreground "#2b1a0a")))) - `(js2-magic-paren ((,class (:underline t)))) - `(js2-private-function-call ((,class (:foreground "#321b00")))) - `(js2-private-member ((,class (:foreground "#2b1a0a")))) - `(js2-warning ((,class (:underline "#320000")))) - - ;; Org non-standard faces. - `(leuven-org-deadline-overdue ((,class (:foreground "#850011")))) - `(leuven-org-deadline-today ((,class (:weight bold :foreground "#837d6e" :background "#000000")))) - `(leuven-org-deadline-tomorrow ((,class (:foreground "#005100")))) - `(leuven-org-deadline-future ((,class (:foreground "#005100")))) - `(leuven-gnus-unseen ((,class (:weight bold :foreground "#5a0000")))) - `(leuven-gnus-date ((,class (:foreground "#4d0026")))) - `(leuven-gnus-size ((,class (:foreground "#003000")))) - - `(light-symbol-face ((,class (:background "#000100")))) - `(linum ((,class (:foreground "#333333" :background "#040404")))) - `(log-view-file ((,class (:foreground "#8a63130" :background "#000405")))) - `(log-view-message ((,class (:foreground "#0e1b00")))) - `(lui-button-face ((,class ,link))) - `(lui-highlight-face ((,class (:box '(:line-width 1 :color "#9d0000") :foreground "#9d0000" :background "#000100")))) ; my nickname - `(lui-time-stamp-face ((,class (:foreground "#7800c5")))) - `(magit-blame-header ((,class (:inherit magit-diff-file-header)))) - `(magit-blame-heading ((,class (:overline "#2a2a2a" :foreground "#850000" :background "#070707")))) - `(magit-blame-hash ((,class (:overline "#2a2a2a" :foreground "#850000" :background "#070707")))) - `(magit-blame-name ((,class (:overline "#2a2a2a" :foreground "#2f8926" :background "#070707")))) - `(magit-blame-date ((,class (:overline "#2a2a2a" :foreground "#6845138" :background "#070707")))) - `(magit-blame-summary ((,class (:overline "#2a2a2a" :weight bold :foreground "#575757" :background "#070707")))) - `(magit-branch ((,class ,vc-branch))) - `(magit-diff-add ((,class ,diff-added))) - `(magit-diff-del ((,class ,diff-removed))) - `(magit-diff-file-header ((,class (:height 1.1 :weight bold :foreground "#00548e")))) - `(magit-diff-hunk-header ((,class ,diff-hunk-header))) - `(magit-diff-none ((,class ,diff-none))) - `(magit-header ((,class (:foreground "#000000" :background "#770000")))) - `(magit-item-highlight ((,class (:background "#000405")))) - `(magit-item-mark ((,class ,marked-line))) - `(magit-log-head-label ((,class (:box (:line-width 1 :color "#6845138" :style nil))))) - `(magit-log-tag-label ((,class (:box (:line-width 1 :color "#003a00" :style nil))))) - `(magit-section-title ((,class (:family "Sans Serif" :height 1.8 :weight bold :foreground "#003d83" :inherit nil)))) - `(makefile-space-face ((,class (:background "#5d002c")))) - `(makefile-targets ((,class (:weight bold :foreground "#6845138")))) - ;; `(markdown-blockquote-face ((,class ()))) - `(markdown-bold-face ((,class (:inherit bold)))) - ;; `(markdown-comment-face ((,class ()))) - ;; `(markdown-footnote-face ((,class ()))) - ;; `(markdown-header-delimiter-face ((,class ()))) - ;; `(markdown-header-face ((,class ()))) - `(markdown-header-face-1 ((,class ,ol1))) - `(markdown-header-face-2 ((,class ,ol2))) - `(markdown-header-face-3 ((,class ,ol3))) - `(markdown-header-face-4 ((,class ,ol4))) - `(markdown-header-face-5 ((,class ,ol5))) - `(markdown-header-face-6 ((,class ,ol6))) - ;; `(markdown-header-rule-face ((,class ()))) - `(markdown-inline-code-face ((,class ,code-inline))) - `(markdown-italic-face ((,class (:inherit italic)))) - ;; `(markdown-language-keyword-face ((,class ()))) - ;; `(markdown-line-break-face ((,class ()))) - `(markdown-link-face ((,class ,link-no-underline))) - ;; `(markdown-link-title-face ((,class ()))) - ;; `(markdown-list-face ((,class ()))) - ;; `(markdown-math-face ((,class ()))) - ;; `(markdown-metadata-key-face ((,class ()))) - ;; `(markdown-metadata-value-face ((,class ()))) - ;; `(markdown-missing-link-face ((,class ()))) - ;; `(markdown-pre-face ((,class ()))) - ;; `(markdown-reference-face ((,class ()))) - ;; `(markdown-strike-through-face ((,class ()))) - `(markdown-url-face ((,class ,link))) - `(match ((,class ,match))) ; Used for grep matches. - `(mc/cursor-bar-face ((,class (:height 1.0 :foreground "#000000" :background "#1b65c6")))) - `(mc/cursor-face ((,class (:inverse-video t)))) - `(mc/region-face ((,class (:inherit region)))) - `(mm-uu-extract ((,class ,code-block))) - `(moccur-current-line-face ((,class (:foreground "#fffefe" :background "#000000")))) - `(moccur-face ((,class (:foreground "#fffefe" :background "#000100")))) - `(next-error ((,class ,volatile-highlight))) - `(nobreak-space ((,class (:background "#000b12")))) - `(nxml-attribute-local-name-face ((,class ,xml-attribute))) - `(nxml-attribute-value-delimiter-face ((,class (:foreground "#006d00")))) - `(nxml-attribute-value-face ((,class (:foreground "#006d00")))) - `(nxml-comment-content-face ((,class (:slant italic :foreground "#850000")))) - `(nxml-comment-delimiter-face ((,class (:foreground "#850000")))) - `(nxml-element-local-name ((,class ,xml-tag))) - `(nxml-element-local-name-face ((,class (:foreground "#6845138")))) - `(nxml-processing-instruction-target-face ((,class (:foreground "#6b00cb")))) - `(nxml-tag-delimiter-face ((,class (:foreground "#6845138")))) - `(nxml-tag-slash-face ((,class (:foreground "#6845138")))) - `(org-agenda-block-count ((,class (:weight bold :foreground "#2b2b2c")))) - `(org-agenda-calendar-event ((,class (:weight bold :foreground "#0059ab" :background "#00060d")))) - `(org-agenda-calendar-sexp ((,class (:foreground "#0058a4" :background "#000203")))) - `(org-agenda-clocking ((,class (:foreground "#fffefe" :background "#161100")))) - `(org-agenda-column-dateline ((,class ,column))) - `(org-agenda-current-time ((,class (:underline t :foreground "#2c6dbc")))) - `(org-agenda-date ((,class (:height 1.6 :weight bold :foreground "#2c6dbc")))) - `(org-agenda-date-today ((,class (:height 1.6 :weight bold :foreground "#837d6e" :background "#000000")))) - `(org-agenda-date-weekend ((,class (:height 1.6 :weight bold :foreground "#7a7a7a")))) - `(org-agenda-diary ((,class (:weight bold :foreground "#006d00" :background "#001720")))) - `(org-agenda-dimmed-todo-face ((,class (:foreground "#161100")))) - `(org-agenda-done ((,class (:foreground "#727272")))) - `(org-agenda-filter-category ((,class (:weight bold :foreground "#320000")))) - `(org-agenda-filter-tags ((,class (:weight bold :foreground "#320000")))) - `(org-agenda-restriction-lock ((,class (:background "#550000")))) - `(org-agenda-structure ((,class (:height 1.6 :weight bold :foreground "#005291")))) - `(org-archived ((,class (:foreground "#222222")))) - `(org-beamer-tag ((,class (:box (:line-width 1 :color "#210a00") :foreground "#a4a4a4" :background "#000100")))) - `(org-block ((,class ,code-block))) - `(org-block-background ((,class (:background "#000000")))) ;; :inherit fixed-pitch)))) - `(org-block-begin-line ((,class (:underline "#2b2a2d" :foreground "#727272" :background "#0a0a04")))) - `(org-block-end-line ((,class (:overline "#2b2a2d" :foreground "#727272" :background "#0a0a04")))) - `(org-checkbox ((,class (:weight bold :box (:line-width 1 :style pressed-button) :foreground "#868686" :background "#2d2d2d")))) - `(org-clock-overlay ((,class (:foreground "#000000" :background "#3e647e")))) - `(org-code ((,class ,code-inline))) - `(org-column ((,class ,column))) - `(org-column-title ((,class ,column))) - `(org-date ((,class (:underline t :foreground "#607ce3")))) - `(org-default ((,class (:foreground "#9b9b9b" :background "#000000")))) - `(org-dim ((,class (:foreground "#282828")))) - `(org-document-info ((,class (:foreground "#818181")))) - `(org-document-info-keyword ((,class (:foreground "#00538f" :background "#00040d")))) - `(org-document-title ((,class (:family "Sans Serif" :height 1.8 :weight bold :foreground "#fffefe")))) - `(org-done ((,class (:weight bold :box (:line-width 1 :color "#1d1d1d") :foreground "#1d1d1d" :background "#030303")))) - `(org-drawer ((,class (:foreground "#00213e")))) - `(org-ellipsis ((,class (:underline nil :box (:line-width 1 :color "#343434") :foreground "#343434" :background "#000200")))) ; #010600 - `(org-example ((,class (:foreground "#6845138" :background "#000200")))) - `(org-footnote ((,class (:underline t :foreground "#00538f")))) - `(org-formula ((,class (:foreground "#500000")))) - `(org-headline-done ((,class (:height 1.0 :weight normal :strike-through t :foreground "#262626")))) - `(org-hide ((,class (:foreground "#090909")))) - `(org-inlinetask ((,class (:box (:line-width 1 :color "#050505") :foreground "#505050" :background "#000000")))) - `(org-latex-and-related ((,class (:foreground "#3a6ca0" :background "#000000")))) - `(org-level-1 ((,class ,ol1))) - `(org-level-2 ((,class ,ol2))) - `(org-level-3 ((,class ,ol3))) - `(org-level-4 ((,class ,ol4))) - `(org-level-5 ((,class ,ol5))) - `(org-level-6 ((,class ,ol6))) - `(org-level-7 ((,class ,ol7))) - `(org-level-8 ((,class ,ol8))) - `(org-link ((,class ,link))) - `(org-list-dt ((,class (:weight bold :foreground "#436ab7")))) - `(org-macro ((,class (:weight bold :foreground "#231100")))) - `(org-meta-line ((,class (:slant normal :foreground "#00538f" :background "#00040d")))) - `(org-mode-line-clock ((,class (:box (:line-width 1 :color "#436ab7") :foreground "#fffefe" :background "#340000")))) - `(org-mode-line-clock-overrun ((,class (:weight bold :box (:line-width 1 :color "#436ab7") :foreground "#000000" :background "#770000")))) - `(org-number-of-items ((,class (:weight bold :foreground "#000000" :background "#00360a")))) - `(org-property-value ((,class (:foreground "#005c00")))) - `(org-quote ((,class (:slant italic :foreground "#5d5d5d" :background "#000000")))) - `(org-scheduled ((,class (:foreground "#9b9b9b")))) - `(org-scheduled-previously ((,class (:foreground "#0d64c4")))) - `(org-scheduled-today ((,class (:weight bold :foreground "#837d6e" :background "#000000")))) - `(org-sexp-date ((,class (:foreground "#0059ab")))) - `(org-special-keyword ((,class (:weight bold :foreground "#004700" :background "#000200")))) - `(org-table ((,class (:foreground "#388e2e" :background "#000200")))) ;; :inherit fixed-pitch)))) - `(org-tag ((,class (:weight normal :slant italic :foreground "#2e3135" :background "#000000")))) - `(org-target ((,class (:foreground "#5b0027")))) - `(org-time-grid ((,class (:foreground "#121212")))) - `(org-todo ((,class (:weight bold :box (:line-width 1 :color "#2f1113") :foreground "#2f1113" :background "#090001")))) - `(org-upcoming-deadline ((,class (:foreground "#6c0000")))) - `(org-verbatim ((,class (:foreground "#0063c8" :background "#000001")))) - `(org-verse ((,class (:slant italic :foreground "#5d5d5d" :background "#040404")))) - `(org-warning ((,class (:weight bold :foreground "#fffefe" :background "#000b17")))) - `(outline-1 ((,class ,ol1))) - `(outline-2 ((,class ,ol2))) - `(outline-3 ((,class ,ol3))) - `(outline-4 ((,class ,ol4))) - `(outline-5 ((,class ,ol5))) - `(outline-6 ((,class ,ol6))) - `(outline-7 ((,class ,ol7))) - `(outline-8 ((,class ,ol8))) - `(pabbrev-debug-display-label-face ((,class (:background "#001200")))) - `(pabbrev-suggestions-face ((,class (:weight bold :foreground "#000000" :background "#850000")))) - `(pabbrev-suggestions-label-face ((,class (:weight bold :foreground "#000000" :background "#7800c5")))) - `(paren-face-match ((,class ,paren-matched))) - `(paren-face-mismatch ((,class ,paren-unmatched))) - `(paren-face-no-match ((,class ,paren-unmatched))) - `(persp-selected-face ((,class (:weight bold :foreground "#000306")))) - `(powerline-active1 ((,class (:foreground "#002237" :background "#949494" :inherit mode-line)))) - `(powerline-active2 ((,class (:foreground "#002237" :background "#285ea0" :inherit mode-line)))) - `(powerline-inactive1 ((,class (:foreground "#030303" :background "#5e5e5e" :inherit mode-line-inactive)))) - `(powerline-inactive2 ((,class (:foreground "#030303" :background "#292929" :inherit mode-line-inactive)))) - `(rainbow-delimiters-depth-1-face ((,class (:foreground "#535464")))) - `(rainbow-delimiters-depth-2-face ((,class (:foreground "#1d3f7f")))) - `(rainbow-delimiters-depth-3-face ((,class (:foreground "#3b3c31")))) - `(rainbow-delimiters-depth-4-face ((,class (:foreground "#29492a")))) - `(rainbow-delimiters-depth-5-face ((,class (:foreground "#5c4343")))) - `(rainbow-delimiters-depth-6-face ((,class (:foreground "#374f8c")))) - `(rainbow-delimiters-depth-7-face ((,class (:foreground "#454541")))) - `(rainbow-delimiters-depth-8-face ((,class (:foreground "#1e3c1f")))) - `(rainbow-delimiters-depth-9-face ((,class (:foreground "#5e4849")))) - `(rainbow-delimiters-mismatched-face ((,class ,paren-unmatched))) - `(rainbow-delimiters-unmatched-face ((,class ,paren-unmatched))) - `(recover-this-file ((,class (:weight bold :background "#780000")))) - `(rng-error ((,class (:weight bold :foreground "#850000" :background "#0a0003")))) - `(sh-heredoc ((,class (:foreground "#6845138" :background "#000306")))) - `(sh-quoted-exec ((,class (:foreground "#800031")))) - `(shadow ((,class ,shadow))) ; Used for grep context lines. - `(shell-option-face ((,class (:foreground "#006a00")))) - `(shell-output-2-face ((,class (:foreground "#6845138")))) - `(shell-output-3-face ((,class (:foreground "#7800c5")))) - `(shell-output-face ((,class (:foreground "#fffefe")))) - ;; `(shell-prompt-face ((,class (:weight bold :foreground "#000200")))) - `(shm-current-face ((,class (:background "#070600")))) - `(shm-quarantine-face ((,class (:background "lemonchiffon")))) - `(show-paren-match ((,class ,paren-matched))) - `(show-paren-mismatch ((,class ,paren-unmatched))) - `(sml-modeline-end-face ((,class (:background "#003369")))) ; #436ab7 - `(sml-modeline-vis-face ((,class (:background "#005da8")))) - - ;; `(sp-pair-overlay-face - ;; `(sp-show-pair-enclosing - ;; `(sp-show-pair-match-face ; ~ Pair highlighting (matching tags). - ;; `(sp-show-pair-mismatch-face - ;; `(sp-wrap-overlay-closing-pair - ;; `(sp-wrap-overlay-face - ;; `(sp-wrap-overlay-opening-pair - ;; `(sp-wrap-tag-overlay-face - - `(speedbar-button-face ((,class (:foreground "#006d00")))) - `(speedbar-directory-face ((,class (:foreground "#ad89125")))) - `(speedbar-file-face ((,class (:foreground "#006264")))) - `(speedbar-highlight-face ((,class ,volatile-highlight))) - `(speedbar-selected-face ((,class (:underline t :foreground "#850000")))) - `(speedbar-tag-face ((,class (:foreground "#a32829")))) - `(svn-status-directory-face ((,class ,directory))) - `(svn-status-filename-face ((,class (:weight bold :foreground "#00548e")))) - `(svn-status-locked-face ((,class (:weight bold :foreground "#850000")))) - `(svn-status-marked-face ((,class ,marked-line))) - `(svn-status-marked-popup-face ((,class (:weight bold :foreground "#003900")))) - `(svn-status-switched-face ((,class (:slant italic :foreground "#3e3e3e")))) - `(svn-status-symlink-face ((,class ,symlink))) - `(svn-status-update-available-face ((,class (:foreground "#320000")))) - `(tex-verbatim ((,class (:foreground "#6845138")))) - `(tool-bar ((,class (:box (:line-width 1 :style released-button) :foreground "#fffefe" :background "#1b1b1b")))) - `(tooltip ((,class (:foreground "#fffefe" :background "#000000")))) - `(trailing-whitespace ((,class (:background "#050009")))) - `(traverse-match-face ((,class (:weight bold :foreground "#790dcf")))) - `(vc-annotate-face-3F3FFF ((,class (:foreground "#4844106" :background "#fffefe")))) - `(vc-annotate-face-3F6CFF ((,class (:foreground "#4844106" :background "#fffefe")))) - `(vc-annotate-face-3F99FF ((,class (:foreground "#004193" :background "#fffefe")))) - `(vc-annotate-face-3FC6FF ((,class (:foreground "#004193" :background "#fffefe")))) - `(vc-annotate-face-3FF3FF ((,class (:foreground "#001729" :background "#fffefe")))) - `(vc-annotate-face-3FFF56 ((,class (:foreground "#001600" :background "#fffefe")))) - `(vc-annotate-face-3FFF83 ((,class (:foreground "#001400" :background "#fffefe")))) - `(vc-annotate-face-3FFFB0 ((,class (:foreground "#001400" :background "#fffefe")))) - `(vc-annotate-face-3FFFDD ((,class (:foreground "#001729" :background "#fffefe")))) - `(vc-annotate-face-56FF3F ((,class (:foreground "#001600" :background "#fffefe")))) - `(vc-annotate-face-83FF3F ((,class (:foreground "#000c00" :background "#fffefe")))) - `(vc-annotate-face-B0FF3F ((,class (:foreground "#000c00" :background "#fffefe")))) - `(vc-annotate-face-DDFF3F ((,class (:foreground "#000500" :background "#fffefe")))) - `(vc-annotate-face-F6FFCC ((,class (:foreground "#fffefe" :background "#000100")))) - `(vc-annotate-face-FF3F3F ((,class (:foreground "#780000" :background "#fffefe")))) - `(vc-annotate-face-FF6C3F ((,class (:foreground "#780000" :background "#fffefe")))) - `(vc-annotate-face-FF993F ((,class (:foreground "#3c0000" :background "#fffefe")))) - `(vc-annotate-face-FFC63F ((,class (:foreground "#3c0000" :background "#fffefe")))) - `(vc-annotate-face-FFF33F ((,class (:foreground "#000500" :background "#fffefe")))) - `(vhl/default-face ((,class ,volatile-highlight))) ; `volatile-highlights.el'. - `(w3m-anchor ((,class ,link))) - `(w3m-arrived-anchor ((,class (:foreground "#6b00cb")))) - `(w3m-bitmap-image-face ((,class (:foreground "#e0e0df" :background "#001800")))) - `(w3m-bold ((,class (:weight bold :foreground "#fffefe")))) - `(w3m-current-anchor ((,class (:weight bold :underline t :foreground "#6845138")))) - `(w3m-form ((,class (:underline t :foreground "#330000")))) - `(w3m-form-button-face ((,class (:weight bold :underline t :foreground "#e0e0df" :background "#101010")))) - `(w3m-form-button-mouse-face ((,class (:underline t :foreground "#101010" :background "#1f7221")))) - `(w3m-form-button-pressed-face ((,class (:weight bold :underline t :foreground "#e0e0df" :background "#101010")))) - `(w3m-header-line-location-content-face ((,class (:foreground "#494949":background "#010101")))) - `(w3m-header-line-location-title-face ((,class (:foreground "#4b6bcd" :background "#010101")))) - `(w3m-history-current-url-face ((,class (:foreground "#000100")))) - `(w3m-image-face ((,class (:weight bold :foreground "#001000")))) - `(w3m-link-numbering ((,class (:foreground "#00192e")))) ; mouseless browsing - `(w3m-strike-through-face ((,class (:strike-through t)))) - `(w3m-underline-face ((,class (:underline t)))) - - ;; `(web-mode-block-attr-name-face ((,class ()))) - ;; `(web-mode-block-attr-value-face ((,class ()))) - ;; `(web-mode-block-comment-face ((,class ()))) - ;; `(web-mode-block-control-face ((,class ()))) - ;; `(web-mode-block-delimiter-face ((,class ()))) - ;; `(web-mode-block-face ((,class ()))) - ;; `(web-mode-block-string-face ((,class ()))) - ;; `(web-mode-bold-face ((,class ()))) - ;; `(web-mode-builtin-face ((,class ()))) - ;; `(web-mode-comment-face ((,class ()))) - ;; `(web-mode-comment-keyword-face ((,class ()))) - ;; `(web-mode-constant-face ((,class ()))) - ;; `(web-mode-css-at-rule-face ((,class ()))) - ;; `(web-mode-css-color-face ((,class ()))) - ;; `(web-mode-css-comment-face ((,class ()))) - ;; `(web-mode-css-function-face ((,class ()))) - ;; `(web-mode-css-priority-face ((,class ()))) - ;; `(web-mode-css-property-name-face ((,class ()))) - ;; `(web-mode-css-pseudo-class-face ((,class ()))) - ;; `(web-mode-css-selector-face ((,class ()))) - ;; `(web-mode-css-string-face ((,class ()))) - ;; `(web-mode-css-variable-face ((,class ()))) - ;; `(web-mode-current-column-highlight-face ((,class ()))) - `(web-mode-current-element-highlight-face ((,class (:background "#320068")))) ; #020500 - ;; `(web-mode-doctype-face ((,class ()))) - ;; `(web-mode-error-face ((,class ()))) - ;; `(web-mode-filter-face ((,class ()))) - ;; `(web-mode-folded-face ((,class ()))) - ;; `(web-mode-function-call-face ((,class ()))) - ;; `(web-mode-function-name-face ((,class ()))) - ;; `(web-mode-html-attr-custom-face ((,class ()))) - ;; `(web-mode-html-attr-engine-face ((,class ()))) - ;; `(web-mode-html-attr-equal-face ((,class ()))) - `(web-mode-html-attr-name-face ((,class ,xml-attribute))) - ;; `(web-mode-html-attr-value-face ((,class ()))) - ;; `(web-mode-html-entity-face ((,class ()))) - `(web-mode-html-tag-bracket-face ((,class ,xml-tag))) - ;; `(web-mode-html-tag-custom-face ((,class ()))) - `(web-mode-html-tag-face ((,class ,xml-tag))) - ;; `(web-mode-html-tag-namespaced-face ((,class ()))) - ;; `(web-mode-inlay-face ((,class ()))) - ;; `(web-mode-italic-face ((,class ()))) - ;; `(web-mode-javascript-comment-face ((,class ()))) - ;; `(web-mode-javascript-string-face ((,class ()))) - ;; `(web-mode-json-comment-face ((,class ()))) - ;; `(web-mode-json-context-face ((,class ()))) - ;; `(web-mode-json-key-face ((,class ()))) - ;; `(web-mode-json-string-face ((,class ()))) - ;; `(web-mode-jsx-depth-1-face ((,class ()))) - ;; `(web-mode-jsx-depth-2-face ((,class ()))) - ;; `(web-mode-jsx-depth-3-face ((,class ()))) - ;; `(web-mode-jsx-depth-4-face ((,class ()))) - ;; `(web-mode-keyword-face ((,class ()))) - ;; `(web-mode-param-name-face ((,class ()))) - ;; `(web-mode-part-comment-face ((,class ()))) - `(web-mode-part-face ((,class (:background "#000000")))) - ;; `(web-mode-part-string-face ((,class ()))) - ;; `(web-mode-preprocessor-face ((,class ()))) - `(web-mode-script-face ((,class (:background "#030304")))) - ;; `(web-mode-sql-keyword-face ((,class ()))) - ;; `(web-mode-string-face ((,class ()))) - ;; `(web-mode-style-face ((,class ()))) - ;; `(web-mode-symbol-face ((,class ()))) - ;; `(web-mode-type-face ((,class ()))) - ;; `(web-mode-underline-face ((,class ()))) - ;; `(web-mode-variable-name-face ((,class ()))) - ;; `(web-mode-warning-face ((,class ()))) - ;; `(web-mode-whitespace-face ((,class ()))) - - `(which-func ((,class (:weight bold :foreground "#000000")))) - ;; `(which-key-command-description-face) - ;; `(which-key-group-description-face) - ;; `(which-key-highlighted-command-face) - ;; `(which-key-key-face) - `(which-key-local-map-description-face ((,class (:weight bold :background "#000203" :inherit which-key-command-description-face)))) - ;; `(which-key-note-face) - ;; `(which-key-separator-face) - ;; `(which-key-special-key-face) - `(widget-button ((,class ,link))) - `(widget-button-pressed ((,class (:foreground "#850000")))) - `(widget-documentation ((,class (:foreground "#006d00")))) - `(widget-field ((,class (:background "#0d0d0d")))) - `(widget-inactive ((,class (:foreground "#5d5d5d")))) - `(widget-single-line-field ((,class (:background "#0d0d0d")))) - `(woman-bold ((,class (:weight bold :foreground "#7e0000")))) - `(woman-italic ((,class (:weight bold :slant italic :foreground "#004000")))) - `(woman-symbol ((,class (:weight bold :foreground "#7800c5")))) - `(yas-field-debug-face ((,class (:background "#850000")))) - `(yas-field-highlight-face ((,class (:box (:line-width 1 :color "#464646") :foreground "#fffefe" :background "#0a0e0c")))) - )) - -(custom-theme-set-variables 'leuven - - ;; highlight-sexp-mode. - '(hl-sexp-background-color "#060404") - - '(ansi-color-faces-vector - [default default default italic underline success warning error]) - - ;; Colors used in Shell mode. - '(ansi-color-names-vector - ["#fffefe" "#9d0000" "#006a00" "#0e1b00" "#6845138" "#840086" "#003567" "#494949"]) - ) - -;;;###autoload -(when (and (boundp 'custom-theme-load-path) - load-file-name) - ;; Add theme folder to `custom-theme-load-path' when installing over MELPA. - (add-to-list 'custom-theme-load-path - (file-name-as-directory (file-name-directory load-file-name)))) - -;;;###autoload -(when (string-match "/etc/themes/$" - (file-name-directory (or load-file-name (buffer-file-name)))) - (message "To stay up-to-date, you should better install and use leuven-theme from MELPA.") - (sit-for 2)) - -(provide-theme 'leuven-dark) - -;; This is for the sake of Emacs. -;; Local Variables: -;; no-byte-compile: t -;; time-stamp-end: "$" -;; time-stamp-format: "%:y%02m%02d.%02H%02M" -;; time-stamp-start: "Version: " -;; End: - -;;; leuven-theme.el ends here diff --git a/elpa/leuven-theme-20200122.1934/leuven-dark-theme.el b/elpa/leuven-theme-20200122.1934/leuven-dark-theme.el new file mode 100644 index 00000000..3bf8883b --- /dev/null +++ b/elpa/leuven-theme-20200122.1934/leuven-dark-theme.el @@ -0,0 +1,1067 @@ +;;; leuven-dark-theme.el --- Awesome Emacs color theme on dark background + +;; Copyright (C) 2003-2020 Free Software Foundation, Inc. + +;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")> +;; URL: https://github.com/fniessen/emacs-leuven-dark-theme +;; Version: 20200102.2050 +;; Keywords: color theme + +;; This file is part of GNU Emacs. + +;; GNU Emacs 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. + +;; GNU Emacs 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 elegant Org-enhancing color theme "leuven-dark" ROCKS! +;; ... and not just for Org mode. +;; +;; To use it, put the following in your Emacs configuration file: +;; +;; (load-theme 'leuven-dark t) +;; +;; Requirements: Emacs 24+. +;; +;; NOTE -- Would you like implement a version of this for dark backgrounds, +;; please do so! I'm willing to integrate it... + +;;; Code: + +;;; Options. + +(defgroup leuven-dark nil + "Leuven theme options. +The theme has to be reloaded after changing anything in this group." + :group 'faces) + +(defcustom leuven-dark-scale-outline-headlines t + "Scale `outline' (and `org') level-1 headlines. +This can be nil for unscaled, t for using the theme default, or a scaling number." + :type '(choice + (const :tag "Unscaled" nil) + (const :tag "Default provided by theme" t) + (number :tag "Set scaling")) + :group 'leuven-dark) + +(defcustom leuven-dark-scale-org-agenda-structure t + "Scale Org agenda structure lines, like dates. +This can be nil for unscaled, t for using the theme default, or a scaling number." + :type '(choice + (const :tag "Unscaled" nil) + (const :tag "Default provided by theme" t) + (number :tag "Set scaling")) + :group 'leuven-dark) + +(defun leuven-dark-scale-font (control default-height) + "Function for splicing optional font heights into face descriptions. +CONTROL can be a number, nil, or t. When t, use DEFAULT-HEIGHT." + (cond + ((numberp control) (list :height control)) + ((eq t control) (list :height default-height)) + (t nil))) + +;;; Theme Faces. + +(deftheme leuven-dark + "Face colors with a light background. +Basic, Font Lock, Isearch, Gnus, Message, Org mode, Diff, Ediff, +Flyspell, Semantic, and Ansi-Color faces are included -- and much +more...") + +(let ((class '((class color) (min-colors 89))) + + ;; Leuven generic colors. + (cancel '(:slant italic :strike-through t :foreground "#5b5660")) + (clock-line '(:box (:line-width 1 :color "#cfa161") :foreground "#ffffff" :background "#1636ff")) + (code-block '(:foreground "#ffff7f" :background "#252046" :extend t)) + (code-inline '(:foreground "#ff9bff" :background "#262031" :extend t)) + (column '(:height 1.0 :weight normal :slant normal :underline nil :strike-through nil :foreground "#1e52b8" :background "#252c48")) + (completion-inline '(:weight normal :foreground "#443f49" :inherit hl-line)) ; Like Google. + (completion-other-candidates '(:weight bold :foreground "#ffffff" :background "#372a2a")) + (completion-selected-candidate '(:weight bold :foreground "#25202a" :background "#ffad65")) + (diff-added '(:background "#442049")) + (diff-changed '(:foreground "#ffff0b" :background "#443f2a")) + (diff-header '(:weight bold :foreground "#83ffff" :background "#252073")) + (diff-hunk-header '(:foreground "#6bff6f" :background "#252f2a")) + (diff-none '(:foreground "#7b777f")) + (diff-refine-added '(:background "#6d0d73")) + (diff-refine-removed '(:background "#06494f")) + (diff-removed '(:background "#25353e")) + (directory '(:weight bold :foreground "#ffff0b" :background "#252053")) + (file '(:foreground "#ffffff")) + (function-param '(:foreground "#de8d83")) + (grep-file-name '(:weight bold :foreground "#d8b76b")) ; Used for grep hits. + (grep-line-number '(:weight bold :foreground "#5fca5b")) + (highlight-blue '(:background "#3c312a" :extend t)) + (highlight-blue2 '(:background "#3e2d2f" :extend t)) + (highlight-gray '(:background "#3e3944" :extend t)) + (highlight-green '(:background "#2f0e3a" :extend t)) + (highlight-red '(:background "#063741" :extend t)) + (highlight-yellow '(:background "#2d2058" :extend t)) + (link '(:weight normal :underline t :foreground "#ff925a")) + (link-no-underline '(:weight normal :foreground "#ff925a")) + (mail-header-name '(:family "Sans Serif" :weight normal :foreground "#615c67")) + (mail-header-other '(:family "Sans Serif" :slant normal :foreground "#9d99a1")) + (mail-read '(:foreground "#77737b")) + (mail-read-high '(:foreground "#837f87")) + (mail-ticked '(:foreground "#06ccff")) + (mail-to '(:family "Sans Serif" :underline nil :foreground "#ff925a")) + (mail-unread '(:weight bold :foreground "#ffffff")) + (mail-unread-high '(:weight bold :foreground "#eea682")) + (marked-line '(:foreground "#5affff" :background "#06555f")) + (match '(:weight bold :background "#0601ff")) ; occur patterns + match in helm for files + match in Org files. + (ol1 `(,@(leuven-dark-scale-font leuven-dark-scale-outline-headlines 1.3) :weight bold :overline "#5d5862" :foreground "#c7c3cb" :background "#322d37" :extend t)) + (ol2 '(:height 1.0 :weight bold :overline "#efcab2" :foreground "#efcab2" :background "#3d2a2d" :extend t)) + (ol3 '(:height 1.0 :weight bold :foreground "#ffaae3" :background "#332038" :extend t)) + (ol4 '(:height 1.0 :weight bold :slant normal :foreground "#1a9cff" :extend t)) + (ol5 '(:height 1.0 :weight bold :slant normal :foreground "#21da7a" :extend t)) + (ol6 '(:height 1.0 :weight bold :slant italic :foreground "#ff883d" :extend t)) + (ol7 '(:height 1.0 :weight bold :slant italic :foreground "#d451d9" :extend t)) + (ol8 '(:height 1.0 :weight bold :slant italic :foreground "#077ffa" :extend t)) + (paren-matched '(:background "#441746")) ; Or take that green for region? + (paren-unmatched '(:weight bold :underline "#06ffff" :foreground "#ffffff" :background "#065a64")) + (region '(:background "#752c0b" :extend t)) + (shadow '(:foreground "#848088")) + (string '(:foreground "#ff7fff")) ; or #34c8d8 + (subject '(:family "Sans Serif" :weight bold :foreground "#ffffff")) + (symlink '(:foreground "#e37233")) + (tab '(:foreground "#3a353f" :background "#25202a")) + (trailing '(:foreground "#3a353f" :background "#252076")) + (volatile-highlight '(:underline nil :foreground "#25202a" :background "#66c96f")) + (volatile-highlight-supersize '(:height 1.1 :underline nil :foreground "#25202a" :background "#66c96f")) ; flash-region + (vc-branch '(:box (:line-width 1 :color "#ff33d2") :foreground "#ffffff" :background "#5a015f")) + (xml-attribute '(:foreground "#119cd0")) + (xml-tag '(:foreground "#56e46f")) + (highlight-current-tag '(:background "#3a352a")) ; #342b32 or #0614df + ) + + (custom-theme-set-faces + 'leuven-dark + `(default ((,class (:foreground "#cfccd2" :background "#25202a")))) + `(bold ((,class (:weight bold :foreground "#ffffff")))) + `(bold-italic ((,class (:weight bold :slant italic :foreground "#ffffff")))) + `(italic ((,class (:slant italic :foreground "#e8e5eb")))) + `(underline ((,class (:underline t)))) + `(cursor ((,class (:background "#e1420b")))) + + ;; Lucid toolkit emacs menus. + `(menu ((,class (:foreground "#25202a" :background "#cfccd2")))) + + ;; Highlighting faces. + `(fringe ((,class (:foreground "#b76130" :background "#25202a")))) + `(highlight ((,class ,highlight-blue))) + `(region ((,class ,region))) + `(secondary-selection ((,class ,match))) ; Used by Org-mode for highlighting matched entries and keywords. + `(isearch ((,class (:underline "#ffffff" :foreground "#25202a" :background "#aa8b5e")))) + `(isearch-fail ((,class (:weight bold :foreground "#ffffff" :background "#06333d")))) + `(lazy-highlight ((,class (:foreground "#ffffff" :background "#0601ff")))) ; Isearch others (see `match'). + `(trailing-whitespace ((,class ,trailing))) + `(query-replace ((,class (:inherit isearch)))) + `(whitespace-hspace ((,class (:foreground "#322d37")))) ; see also `nobreak-space' + `(whitespace-indentation ((,class ,tab))) + `(whitespace-line ((,class (:foreground "#38ffff" :background "#06017f")))) + `(whitespace-tab ((,class ,tab))) + `(whitespace-trailing ((,class ,trailing))) + + ;; Mode line faces. + `(mode-line ((,class (:box (:line-width 1 :color "#e8d0b3") :foreground "#7e311e" :background "#cfa161")))) + `(mode-line-inactive ((,class (:box (:line-width 1 :color "#b5b1bb") :foreground "#322d38" :background "#696371")))) + `(mode-line-buffer-id ((,class (:weight bold :foreground "#25202a")))) + `(mode-line-emphasis ((,class (:weight bold :foreground "#25202a")))) + `(mode-line-highlight ((,class (:foreground "#0601ff")))) + + ;; Escape and prompt faces. + `(minibuffer-prompt ((,class (:weight bold :foreground "#ffffff" :background "#0628ff")))) + `(minibuffer-noticeable-prompt ((,class (:weight bold :foreground "#ffffff" :background "#0628ff")))) + `(escape-glyph ((,class (:foreground "#ff7138")))) + `(error ((,class (:foreground "#06ffff")))) + `(warning ((,class (:weight bold :foreground "#065aff")))) + `(success ((,class (:foreground "#ff01ff")))) + + ;; Font lock faces. + `(font-lock-builtin-face ((,class (:foreground "#ff9029")))) + `(font-lock-comment-delimiter-face ((,class (:foreground "#767283")))) ; #9a969e + `(font-lock-comment-face ((,class (:slant italic :foreground "#767283")))) ; #9a969e + `(font-lock-constant-face ((,class (:foreground "#34c8d8")))) + `(font-lock-doc-face ((,class (:foreground "#fd95fa")))) + ;; `(font-lock-doc-string-face ((,class (:foreground "#ff7fff")))) ; XEmacs only, but is used for HTML exports from org2html (and not interactively) + `(font-lock-function-name-face ((,class (:weight normal :foreground "#ff996f")))) + `(font-lock-keyword-face ((,class (:bold nil :foreground "#ffff0b")))) ; #ccab2d + `(font-lock-preprocessor-face ((,class (:foreground "#837f87")))) + `(font-lock-regexp-grouping-backslash ((,class (:weight bold :inherit nil)))) + `(font-lock-regexp-grouping-construct ((,class (:weight bold :inherit nil)))) + `(font-lock-string-face ((,class ,string))) + `(font-lock-type-face ((,class (:weight normal :foreground "#9fcb66")))) + `(font-lock-variable-name-face ((,class (:weight normal :foreground "#4ac964")))) ; #83ff87 + `(font-lock-warning-face ((,class (:weight bold :foreground "#06ffff")))) + + ;; Button and link faces. + `(link ((,class ,link))) + `(link-visited ((,class (:underline t :foreground "#1f879a")))) + `(button ((,class (:underline t :foreground "#ff925a")))) + `(header-line ((,class (:box (:line-width 1 :color "#ffffff") :foreground "#ffffff" :background "#322d37")))) + + ;; Gnus faces. + `(gnus-button ((,class (:weight normal)))) + `(gnus-cite-attribution-face ((,class (:foreground "#b3af59")))) + `(gnus-cite-1 ((,class (:foreground "#b3af59" :background "#2d2832")))) + `(gnus-cite-2 ((,class (:foreground "#9dffa1" :background "#2d2832")))) + `(gnus-cite-3 ((,class (:foreground "#ff8890" :background "#2d2832")))) + `(gnus-cite-4 ((,class (:foreground "#6bffff" :background "#2d2832")))) + `(gnus-cite-5 ((,class (:foreground "#ffff6f" :background "#2d2832")))) + `(gnus-cite-6 ((,class (:foreground "#4999ff" :background "#2d2832")))) + `(gnus-cite-7 ((,class (:foreground "#b3af59" :background "#2d2832")))) + `(gnus-cite-8 ((,class (:foreground "#9dffa1" :background "#2d2832")))) + `(gnus-cite-9 ((,class (:foreground "#ff8890" :background "#2d2832")))) + `(gnus-cite-10 ((,class (:foreground "#6bffff" :background "#2d2832")))) + `(gnus-emphasis-bold ((,class (:weight bold)))) + `(gnus-emphasis-highlight-words ((,class (:foreground "#0601ff" :background "#ffffff")))) + `(gnus-group-mail-1 ((,class (:weight bold :foreground "#06af59")))) + `(gnus-group-mail-1-empty ((,class (:foreground "#b3af59")))) + `(gnus-group-mail-2 ((,class (:weight bold :foreground "#06ffa1")))) + `(gnus-group-mail-2-empty ((,class (:foreground "#9dffa1")))) + `(gnus-group-mail-3 ((,class ,mail-unread))) + `(gnus-group-mail-3-empty ((,class ,mail-read))) + `(gnus-group-mail-low ((,class ,cancel))) + `(gnus-group-mail-low-empty ((,class ,cancel))) + `(gnus-group-news-1 ((,class (:weight bold :foreground "#06af59")))) + `(gnus-group-news-1-empty ((,class (:foreground "#b3af59")))) + `(gnus-group-news-2 ((,class (:weight bold :foreground "#06ffa1")))) + `(gnus-group-news-2-empty ((,class (:foreground "#9dffa1")))) + `(gnus-group-news-3 ((,class ,mail-unread))) + `(gnus-group-news-3-empty ((,class ,mail-read))) + `(gnus-group-news-4 ((,class (:weight bold :foreground "#06ffff")))) + `(gnus-group-news-4-empty ((,class (:foreground "#6bffff")))) + `(gnus-group-news-5 ((,class (:weight bold :foreground "#06ff6f")))) + `(gnus-group-news-5-empty ((,class (:foreground "#ffff6f")))) + `(gnus-group-news-6 ((,class (:weight bold :foreground "#848088")))) + `(gnus-group-news-6-empty ((,class (:foreground "#837f87")))) + `(gnus-header-content ((,class ,mail-header-other))) + `(gnus-header-from ((,class (:family "Sans Serif" :foreground "#ffffff")))) + `(gnus-header-name ((,class ,mail-header-name))) + `(gnus-header-newsgroups ((,class (:family "Sans Serif" :foreground "#cf663d")))) + `(gnus-header-subject ((,class ,subject))) + `(gnus-picon ((,class (:foreground "#0601ff" :background "#25202a")))) + `(gnus-picon-xbm ((,class (:foreground "#0601ff" :background "#25202a")))) + `(gnus-server-closed ((,class (:slant italic :foreground "#ffff0b" :background "#25202a")))) + `(gnus-server-denied ((,class (:weight bold :foreground "#06ffff" :background "#25202a")))) + `(gnus-server-opened ((,class (:family "Sans Serif" :foreground "#25202a" :foreground "#bd9432")))) + `(gnus-signature ((,class (:slant italic :foreground "#787279")))) + `(gnus-splash ((,class (:foreground "#0673ff")))) + `(gnus-summary-cancelled ((,class ,cancel))) + `(gnus-summary-high-ancient ((,class ,mail-unread-high))) + `(gnus-summary-high-read ((,class ,mail-read-high))) + `(gnus-summary-high-ticked ((,class ,mail-ticked))) + `(gnus-summary-high-unread ((,class ,mail-unread-high))) + `(gnus-summary-low-ancient ((,class (:slant italic :foreground "#ffffff")))) + `(gnus-summary-low-read ((,class (:slant italic :foreground "#6b666f" :background "#413c46")))) + `(gnus-summary-low-ticked ((,class ,mail-ticked))) + `(gnus-summary-low-unread ((,class (:slant italic :foreground "#ffffff")))) + `(gnus-summary-normal-ancient ((,class ,mail-read))) + `(gnus-summary-normal-read ((,class ,mail-read))) + `(gnus-summary-normal-ticked ((,class ,mail-ticked))) + `(gnus-summary-normal-unread ((,class ,mail-unread))) + `(gnus-summary-selected ((,class (:foreground "#25202a" :background "#ff7332")))) + `(gnus-x-face ((,class (:foreground "#ffffff" :background "#25202a")))) + + ;; Message faces. + `(message-header-name ((,class ,mail-header-name))) + `(message-header-cc ((,class ,mail-to))) + `(message-header-other ((,class ,mail-header-other))) + `(message-header-subject ((,class ,subject))) + `(message-header-to ((,class ,mail-to))) + `(message-cited-text ((,class (:foreground "#b3af59" :background "#2d2832")))) + `(message-separator ((,class (:family "Sans Serif" :weight normal :foreground "#473d43")))) + `(message-header-newsgroups ((,class (:family "Sans Serif" :foreground "#cf663d")))) + `(message-header-xheader ((,class ,mail-header-other))) + `(message-mml ((,class (:foreground "#e074e3")))) + + ;; Diff. + `(diff-added ((,class ,diff-added))) + `(diff-changed ((,class ,diff-changed))) + `(diff-context ((,class ,diff-none))) + `(diff-file-header ((,class ,diff-header))) + `(diff-file1-hunk-header ((,class (:foreground "#78ff7c" :background "#382c33")))) + `(diff-file2-hunk-header ((,class (:foreground "#d781db" :background "#382c33")))) + `(diff-function ((,class (:foreground "#38663d")))) + `(diff-header ((,class ,diff-header))) + `(diff-hunk-header ((,class ,diff-hunk-header))) + `(diff-index ((,class ,diff-header))) + `(diff-indicator-added ((,class (:foreground "#c966cc" :background "#53204e")))) + `(diff-indicator-changed ((,class (:background "#46302a")))) + `(diff-indicator-removed ((,class (:foreground "#38ccd2" :background "#254046")))) + `(diff-refine-added ((,class ,diff-refine-added))) + `(diff-refine-change ((,class (:background "#443f2a")))) + `(diff-refine-removed ((,class ,diff-refine-removed))) + `(diff-removed ((,class ,diff-removed))) + + ;; SMerge. + `(smerge-mine ((,class ,diff-changed))) + `(smerge-other ((,class ,diff-added))) + `(smerge-base ((,class ,diff-removed))) + `(smerge-markers ((,class (:background "#253859")))) + `(smerge-refined-change ((,class (:background "#5a550b")))) + + ;; Ediff. + `(ediff-current-diff-A ((,class (:background "#253f49" :extend t)))) + `(ediff-current-diff-B ((,class (:background "#442049" :extend t)))) + `(ediff-current-diff-C ((,class (:background "#ff010b" :extend t)))) + `(ediff-even-diff-A ((,class (:background "#312c36" :extend t)))) + `(ediff-even-diff-B ((,class (:background "#312c36" :extend t)))) + `(ediff-fine-diff-A ((,class (:background "#06555f" :extend t)))) + `(ediff-fine-diff-B ((,class (:background "#ae01b2" :extend t)))) + `(ediff-odd-diff-A ((,class (:background "#312c36" :extend t)))) + `(ediff-odd-diff-B ((,class (:background "#312c36" :extend t)))) + + ;; Flyspell. + (if (version< emacs-version "24.4") + `(flyspell-duplicate ((,class (:underline "#101487" :inherit nil)))) + `(flyspell-duplicate ((,class (:underline (:style wave :color "#101487") :background "#292759" :inherit nil))))) + (if (version< emacs-version "24.4") + `(flyspell-incorrect ((,class (:underline "#0a5864" :inherit nil)))) + `(flyspell-incorrect ((,class (:underline (:style wave :color "#0a5864") :background "#2f454c":inherit nil))))) + + ;; ;; Semantic faces. + ;; `(semantic-decoration-on-includes ((,class (:underline ,cham-4)))) + ;; `(semantic-decoration-on-private-members-face ((,class (:background ,alum-2)))) + ;; `(semantic-decoration-on-protected-members-face ((,class (:background ,alum-2)))) + `(semantic-decoration-on-unknown-includes ((,class (:background "#252630")))) + ;; `(semantic-decoration-on-unparsed-includes ((,class (:underline ,orange-3)))) + `(semantic-highlight-func-current-tag-face ((,class ,highlight-current-tag))) + `(semantic-tag-boundary-face ((,class (:overline "#8c8890")))) ; Method separator. + ;; `(semantic-unmatched-syntax-face ((,class (:underline ,red-1)))) + + `(Info-title-1-face ((,class ,ol1))) + `(Info-title-2-face ((,class ,ol2))) + `(Info-title-3-face ((,class ,ol3))) + `(Info-title-4-face ((,class ,ol4))) + `(ace-jump-face-foreground ((,class (:weight bold :foreground "#ffffff" :background "#065aff")))) + `(ahs-face ((,class (:background "#3e392a")))) + `(ahs-definition-face ((,class (:background "#064943")))) + `(ahs-plugin-defalt-face ((,class (:background "#25392a")))) ; Current. + `(anzu-match-1 ((,class (:foreground "#ffffff" :background "#840135")))) + `(anzu-match-2 ((,class (:foreground "#ffffff" :background "springgreen")))) + `(anzu-match-3 ((,class (:foreground "#ffffff" :background "#06ffff")))) + `(anzu-mode-line ((,class (:foreground "#ffffff" :background "#830187")))) + `(anzu-mode-line-no-match ((,class (:foreground "#ffffff" :background "#067f87")))) + `(anzu-replace-highlight ((,class (:inherit query-replace)))) + `(anzu-replace-to ((,class (:weight bold :foreground "#47cc0c" :background "#0742d2")))) + `(auto-dim-other-buffers-face ((,class (:background "#2c2731")))) + `(avy-background-face ((,class (:background "#5b5660")))) + `(avy-lead-face ((,class (:weight bold :foreground "#ffffff" :background "#065aff")))) + `(bbdb-company ((,class (:slant italic :foreground "#bd7d55")))) + `(bbdb-field-name ((,class (:weight bold :foreground "#bd7d55")))) + `(bbdb-field-value ((,class (:foreground "#bd7d55")))) + `(bbdb-name ((,class (:underline t :foreground "#0699d2")))) + `(bmkp-light-autonamed ((,class (:background "#322d37")))) + `(bmkp-light-fringe-autonamed ((,class (:foreground "#a9a5ad" :background "#302b35")))) + `(bmkp-light-fringe-non-autonamed ((,class (:foreground "#252059" :background "#fe010e")))) ; default + `(bmkp-light-non-autonamed ((,class (:background "#60202a")))) + `(bmkp-no-local ((,class (:background "#063f3e")))) + `(browse-kill-ring-separator-face ((,class (:foreground "#06ffff")))) + `(calendar-month-header ((,class (:weight bold :foreground "#b4b5ca" :background "#252059")))) + `(calendar-today ((,class (:weight bold :foreground "#b4b5ca" :background "#252059")))) + `(calendar-weekday-header ((,class (:weight bold :foreground "#ec9d5a")))) + `(calendar-weekend-header ((,class (:weight bold :foreground "#b5b1b9")))) + `(cfw:face-annotation ((,class (:foreground "#ff01ff" :background "#06ffff")))) + `(cfw:face-day-title ((,class (:foreground "#3b3640")))) + `(cfw:face-default-content ((,class (:foreground "#d9ad66")))) + `(cfw:face-default-day ((,class (:weight bold)))) + `(cfw:face-disable ((,class (:foreground "#5b5660")))) + `(cfw:face-grid ((,class (:foreground "#27222c")))) + `(cfw:face-header ((,class (:foreground "#ec9d5a" :background "#25202a" :weight bold)))) + `(cfw:face-holiday ((,class (:foreground "#8c8890" :background "#3e322a")))) + `(cfw:face-periods ((,class (:foreground "#25202a" :background "#9d7330" :slant italic)))) + `(cfw:face-saturday ((,class (:foreground "#b5b1b9" :background "#25202a" :weight bold)))) + `(cfw:face-select ((,class (:foreground "#b96a1e" :background "#352d2e")))) + `(cfw:face-sunday ((,class (:foreground "#b5b1b9" :background "#25202a" :weight bold)))) + `(cfw:face-title ((,class (:height 2.0 :foreground "#9c98a0" :weight bold :inherit variable-pitch)))) + `(cfw:face-today ((,class (:foreground "#b4b5ca" :background "#252059")))) + `(cfw:face-today-title ((,class (:foreground "#25202a" :background "#eb9958")))) + `(cfw:face-toolbar ((,class (:background "#25202a")))) + `(cfw:face-toolbar-button-off ((,class (:foreground "#35303a" :background "#25202a")))) + `(cfw:face-toolbar-button-on ((,class (:foreground "#a5a1a9" :background "#2d2832")))) + `(change-log-date ((,class (:foreground "#64df19")))) + `(change-log-file ((,class (:weight bold :foreground "#c27c45")))) + `(change-log-list ((,class (:foreground "#ffffff" :background "#8e1142")))) + `(change-log-name ((,class (:foreground "#ff7fff")))) + `(circe-highlight-all-nicks-face ((,class (:foreground "#ffff0b" :background "#322d37")))) ; other nick names + `(circe-highlight-nick-face ((,class (:foreground "#ff6cff" :background "#322d37")))) ; messages with my nick cited + `(circe-my-message-face ((,class (:foreground "#78747c" :background "#322d37")))) + `(circe-originator-face ((,class (:foreground "#ffff0b")))) + `(circe-prompt-face ((,class (:foreground "#06ffff")))) + `(circe-server-face ((,class (:foreground "#6b3524")))) + `(comint-highlight-input ((,class (:weight bold :foreground "#ffff0b" :inherit nil)))) + ;; `(comint-highlight-prompt ((,class (:weight bold :foreground "#ffffff" :background "#0628ff")))) + `(comint-highlight-prompt ((,class (:weight bold :foreground "#ffff0b" :inherit nil)))) + + ;; `(ac-selection-face ((,class ,completion-selected-candidate))) + `(ac-selection-face ((,class (:weight bold :foreground "#25202a" :background "#065aff")))) ; TEMP For diff'ing AC from Comp. + `(ac-candidate-face ((,class ,completion-other-candidates))) + `(ac-completion-face ((,class ,completion-inline))) + `(ac-candidate-mouse-face ((,class (:inherit highlight)))) + `(popup-scroll-bar-background-face ((,class (:background "#372a2a")))) + `(popup-scroll-bar-foreground-face ((,class (:background "#332525")))) ; Scrollbar (visible). + + `(company-tooltip-common-selection ((,class (:weight normal :foreground "#2a3159" :inherit company-tooltip-selection)))) ; Prefix + common part in tooltip (for selection). + `(company-tooltip-selection ((,class ,completion-selected-candidate))) ; Suffix in tooltip (for selection). + `(company-tooltip-annotation-selection ((,class (:weight normal :foreground "#2a3159")))) ; Annotation (for selection). + + `(company-tooltip-common ((,class (:weight normal :foreground "#54ff59" :inherit company-tooltip)))) ; Prefix + common part in tooltip. + `(company-tooltip ((,class ,completion-other-candidates))) ; Suffix in tooltip. + `(company-tooltip-annotation ((,class (:weight normal :foreground "#deea0b")))) ; Annotation. + + `(company-preview-common ((,class ,completion-inline))) + + `(company-scrollbar-bg ((,class (:background "#372a2a")))) + `(company-scrollbar-fg ((,class (:background "#332525")))) ; Scrollbar (visible). + + `(compare-windows ((,class (:background "#0601ff")))) + ;; `(completions-common-part ((,class (:foreground "#06ffff" :weight bold)))) + ;; `(completions-first-difference ((,class (:foreground "#ff01ff" :weight bold)))) + `(compilation-error ((,class (:weight bold :foreground "#06ffff")))) ; Used for grep error messages. + `(compilation-info ((,class ,grep-file-name))) + `(compilation-line-number ((,class ,grep-line-number))) + `(compilation-warning ((,class (:weight bold :foreground "#065aff")))) + `(compilation-mode-line-exit ((,class (:weight bold :foreground "#ff01ff")))) ; :exit[matched] + `(compilation-mode-line-fail ((,class (:weight bold :foreground "#167d1b")))) ; :exit[no match] + `(compilation-mode-line-run ((,class (:weight bold :foreground "#065aff")))) ; :run + `(css-property ((,class (:foreground "#ff55ff")))) + `(css-selector ((,class (:weight bold :foreground "#ffff0b")))) + `(custom-button ((,class (:box (:line-width 2 :style released-button) :foreground "#ffffff" :background "lightgrey")))) + `(custom-button-mouse ((,class (:box (:line-width 2 :style released-button) :foreground "#ffffff" :background "#3d3842")))) + `(custom-button-pressed ((,class (:box (:line-width 2 :style pressed-button) :foreground "#ffffff" :background "#312c36")))) + `(custom-button-pressed-unraised ((,class (:underline t :foreground "#78ff7c")))) + `(custom-button-unraised ((,class (:underline t)))) + `(custom-changed ((,class (:foreground "#25202a" :background "#ffff0b")))) + `(custom-comment ((,class (:background "#2b2630")))) + `(custom-comment-tag ((,class (:foreground "#ffff7c")))) + `(custom-documentation ((,class (nil)))) + `(custom-face-tag ((,class (:family "Sans Serif" :height 1.2 :weight bold)))) + `(custom-group-tag ((,class (:height 1.2 :weight bold :foreground "#ffff0b")))) + `(custom-group-tag-1 ((,class (:family "Sans Serif" :height 1.2 :weight bold :foreground "#06ffff")))) + `(custom-invalid ((,class (:foreground "#0601ff" :background "#06ffff")))) + `(custom-link ((,class (:underline t :foreground "#ffff0b")))) + `(custom-modified ((,class (:foreground "#25202a" :background "#ffff0b")))) + `(custom-rogue ((,class (:foreground "#063f3e" :background "#ffffff")))) + `(custom-saved ((,class (:underline t)))) + `(custom-set ((,class (:foreground "#ffff0b" :background "#25202a")))) + `(custom-state ((,class (:foreground "#ff74ff")))) + `(custom-themed ((,class (:foreground "#25202a" :background "#ffff0b")))) + `(custom-variable-button ((,class (:weight bold :underline t)))) + `(custom-variable-tag ((,class (:family "Sans Serif" :height 1.2 :weight bold :foreground "#ffff0b")))) + `(custom-visibility ((,class ,link))) + `(diff-hl-change ((,class (:foreground "#ffff3c" :background "#46302a")))) + `(diff-hl-delete ((,class (:foreground "#37ffff" :background "#254046")))) + `(diff-hl-dired-change ((,class (:weight bold :foreground "#ffffff" :background "#065cd0")))) + `(diff-hl-dired-delete ((,class (:weight bold :foreground "#2dc6ef")))) + `(diff-hl-dired-ignored ((,class (:weight bold :foreground "#25202a" :background "#44445e")))) + `(diff-hl-dired-insert ((,class (:weight bold :foreground "#4b464f")))) + `(diff-hl-dired-unknown ((,class (:foreground "#25202a" :background "#c4c455")))) + `(diff-hl-insert ((,class (:foreground "#ff74ff" :background "#53204e")))) + `(diff-hl-unknown ((,class (:foreground "#25202a" :background "#c4c455")))) + `(diary-face ((,class (:foreground "#7c360d")))) + `(dircolors-face-asm ((,class (:foreground "#ffffff")))) + `(dircolors-face-backup ((,class (:foreground "#ffffff")))) + `(dircolors-face-compress ((,class (:foreground "#06ffff")))) + `(dircolors-face-dir ((,class ,directory))) + `(dircolors-face-doc ((,class (:foreground "#ffffff")))) + `(dircolors-face-dos ((,class (:foreground "#e074e3")))) + `(dircolors-face-emacs ((,class (:foreground "#ffffff")))) + `(dircolors-face-exec ((,class (:foreground "#e074e3")))) + `(dircolors-face-html ((,class (:foreground "#ffffff")))) + `(dircolors-face-img ((,class (:foreground "#37ff3c")))) + `(dircolors-face-lang ((,class (:foreground "#ffffff")))) + `(dircolors-face-lang-interface ((,class (:foreground "#ffffff")))) + `(dircolors-face-make ((,class (:foreground "#ffffff")))) + `(dircolors-face-objet ((,class (:foreground "#ffffff")))) + `(dircolors-face-package ((,class (:foreground "#ffffff")))) + `(dircolors-face-paddb ((,class (:foreground "#ffffff")))) + `(dircolors-face-ps ((,class (:foreground "#ffffff")))) + `(dircolors-face-sound ((,class (:foreground "#ff400b")))) + `(dircolors-face-tar ((,class (:foreground "#06ffff")))) + `(dircolors-face-text ((,class (:foreground "#ffffff")))) + `(dircolors-face-yacc ((,class (:foreground "#ffffff")))) + `(dired-directory ((,class ,directory))) + `(dired-header ((,class ,directory))) + `(dired-ignored ((,class (:strike-through t :foreground "#06ffff")))) + `(dired-mark ((,class ,marked-line))) + `(dired-marked ((,class ,marked-line))) + `(dired-symlink ((,class ,symlink))) + `(diredp-compressed-file-suffix ((,class (:foreground "#06ffff")))) + `(diredp-date-time ((,class (:foreground "#64df19")))) + `(diredp-dir-heading ((,class ,directory))) + `(diredp-dir-name ((,class ,directory))) + `(diredp-dir-priv ((,class ,directory))) + `(diredp-exec-priv ((,class (:background "#fd3fcb")))) + `(diredp-executable-tag ((,class (:foreground "#e074e3" :background "#25202a")))) + `(diredp-file-name ((,class ,file))) + `(diredp-file-suffix ((,class (:foreground "#443f49")))) + `(diredp-flag-mark-line ((,class ,marked-line))) + `(diredp-ignored-file-name ((,class ,shadow))) + `(diredp-read-priv ((,class (:background "#f7660b")))) + `(diredp-write-priv ((,class (:foreground "#25202a" :background "#06bfc7")))) + `(eldoc-highlight-function-argument ((,class (:weight bold :foreground "#06ffff" :background "#25392a")))) + `(elfeed-search-filter-face ((,class (:foreground "#46414b")))) + ;; `(eww-form-checkbox ((,class ()))) + ;; `(eww-form-select ((,class ()))) + ;; `(eww-form-submit ((,class ()))) + `(eww-form-text ((,class (:weight bold :foreground "#c3a798" :background "#5d3218")))) + ;; `(eww-form-textarea ((,class ()))) + `(file-name-shadow ((,class ,shadow))) + `(flycheck-error ((,class (:underline (:color "#06dae7" :style wave) :weight bold :background "#253c46")))) + `(flycheck-error-list-line-number ((,class (:foreground "#5fca5b")))) + `(flycheck-fringe-error ((,class (:foreground "#06dae7")))) + `(flycheck-fringe-info ((,class (:foreground "#ed75ef")))) + `(flycheck-fringe-warning ((,class (:foreground "#1056cd")))) + `(flycheck-info ((,class (:underline (:color "#ed75ef" :style wave) :weight bold)))) + `(flycheck-warning ((,class (:underline (:color "#1056cd" :style wave) :weight bold :background "#252066")))) + `(font-latex-bold-face ((,class (:weight bold :foreground "#ffffff")))) + `(fancy-narrow-blocked-face ((,class (:foreground "#6b6765")))) + `(flycheck-color-mode-line-error-face ((, class (:background "#35a4b1")))) + `(flycheck-color-mode-line-warning-face ((, class (:background "#1938ff")))) + `(flycheck-color-mode-line-info-face ((, class (:background "#0601ff")))) + `(font-latex-italic-face ((,class (:slant italic :foreground "#e8e5eb")))) + `(font-latex-math-face ((,class (:foreground "#ffff0b")))) + `(font-latex-sectioning-1-face ((,class (:family "Sans Serif" :height 2.7 :weight bold :foreground "#9f6a1c")))) + `(font-latex-sectioning-2-face ((,class ,ol1))) + `(font-latex-sectioning-3-face ((,class ,ol2))) + `(font-latex-sectioning-4-face ((,class ,ol3))) + `(font-latex-sectioning-5-face ((,class ,ol4))) + `(font-latex-sedate-face ((,class (:foreground "#06aaff")))) + `(font-latex-string-face ((,class (:weight bold :foreground "#ff990b")))) + `(font-latex-verbatim-face ((,class (:foreground "#ffff7f" :background "#252046" :inherit nil)))) + `(git-commit-summary-face ((,class (:foreground "#ffffff")))) + `(git-commit-comment-face ((,class (:slant italic :foreground "#9a969e")))) + `(git-timemachine-commit ((,class ,diff-removed))) + `(git-timemachine-minibuffer-author-face ((,class ,diff-added))) + `(git-timemachine-minibuffer-detail-face ((,class ,diff-header))) + `(google-translate-text-face ((,class (:foreground "#8c8890" :background "#2e2933")))) + `(google-translate-phonetic-face ((,class (:inherit shadow)))) + `(google-translate-translation-face ((,class (:weight normal :foreground "#d2861c" :background "#3f3336")))) + `(google-translate-suggestion-label-face ((,class (:foreground "#06ffff")))) + `(google-translate-suggestion-face ((,class (:slant italic :underline t)))) + `(google-translate-listen-button-face ((,class (:height 0.8)))) + `(helm-action ((,class (:foreground "#ffffff")))) + `(helm-bookmark-file ((,class ,file))) + `(helm-bookmarks-su-face ((,class (:foreground "#06ffff")))) + `(helm-buffer-directory ((,class ,directory))) + ;; `(helm-non-file-buffer ((,class (:slant italic :foreground "#ffff0b")))) + ;; `(helm-buffer-file ((,class (:foreground "#cfccd2")))) + `(helm-buffer-modified ((,class (:slant italic :foreground "#4ac964")))) + `(helm-buffer-process ((,class (:foreground "#ff7dff")))) + `(helm-candidate-number ((,class (:foreground "#ffffff" :background "#0601a1")))) + `(helm-dir-heading ((,class (:foreground "#ffff0b" :background "#063f3e")))) + `(helm-dir-priv ((,class (:foreground "#78ffff" :background "#312c36")))) + `(helm-ff-directory ((,class ,directory))) + `(helm-ff-dotted-directory ((,class ,directory))) + `(helm-ff-executable ((,class (:foreground "#ff32ff" :background "#25202a")))) + `(helm-ff-file ((,class (:foreground "#ffffff")))) + `(helm-ff-invalid-symlink ((,class (:foreground "#0601ff" :background "#06ffff")))) + `(helm-ff-symlink ((,class ,symlink))) + `(helm-file-name ((,class (:foreground "#ffff0b")))) + `(helm-gentoo-match-face ((,class (:foreground "#06ffff")))) + `(helm-grep-file ((,class ,grep-file-name))) + `(helm-grep-lineno ((,class ,grep-line-number))) + `(helm-grep-match ((,class ,match))) + `(helm-grep-running ((,class (:weight bold :foreground "#25202a")))) + `(helm-isearch-match ((,class (:background "#38013d")))) + `(helm-lisp-show-completion ((,class ,volatile-highlight-supersize))) ; See `helm-dabbrev'. + ;; `(helm-ls-git-added-copied-face ((,class (:foreground "")))) + ;; `(helm-ls-git-added-modified-face ((,class (:foreground "")))) + ;; `(helm-ls-git-conflict-face ((,class (:foreground "")))) + ;; `(helm-ls-git-deleted-and-staged-face ((,class (:foreground "")))) + ;; `(helm-ls-git-deleted-not-staged-face ((,class (:foreground "")))) + ;; `(helm-ls-git-modified-and-staged-face ((,class (:foreground "")))) + `(helm-ls-git-modified-not-staged-face ((,class (:foreground "#4ac964")))) + ;; `(helm-ls-git-renamed-modified-face ((,class (:foreground "")))) + ;; `(helm-ls-git-untracked-face ((,class (:foreground "")))) + `(helm-match ((,class ,match))) + `(helm-moccur-buffer ((,class (:foreground "#ff993d")))) + `(helm-selection ((,class (:background "#cb8a33" :foreground "#25202a")))) + `(helm-selection-line ((,class ,highlight-gray))) ; ??? + `(helm-separator ((,class (:foreground "#06ffff")))) + `(helm-source-header ((,class (:weight bold :box (:line-width 1 :color "#3d3842") :background "#433e48" :foreground "#ffffff")))) + `(helm-swoop-target-line-block-face ((,class (:background "#3833ff" :foreground "#e0dde3")))) + `(helm-swoop-target-line-face ((,class (:background "#38330b")))) + `(helm-swoop-target-word-face ((,class (:weight bold :foreground nil :background "#0742d2")))) + `(helm-visible-mark ((,class ,marked-line))) + `(helm-w3m-bookmarks-face ((,class (:underline t :foreground "#ff010b")))) + `(highlight-changes ((,class (:foreground nil)))) ;; blue "#d4f754" + `(highlight-changes-delete ((,class (:strike-through nil :foreground nil)))) ;; red "#4ff7d7" + `(highlight-symbol-face ((,class (:background "#252080")))) + `(hl-line ((,class ,highlight-yellow))) ; Highlight current line. + `(hl-tags-face ((,class ,highlight-current-tag))) ; ~ Pair highlighting (matching tags). + `(holiday-face ((,class (:foreground "#8c8890" :background "#3e322a")))) + `(html-helper-bold-face ((,class (:weight bold :foreground "#ffffff")))) + `(html-helper-italic-face ((,class (:slant italic :foreground "#ffffff")))) + `(html-helper-underline-face ((,class (:underline t :foreground "#ffffff")))) + `(html-tag-face ((,class (:foreground "#ffff0b")))) + `(ilog-non-change-face ((,class (:height 2.0 :foreground "#9fcb66")))) + `(ilog-change-face ((,class (:height 2.0 :foreground "#ff7dff")))) + `(ilog-echo-face ((,class (:height 2.0 :foreground "#ff9029")))) + `(ilog-load-face ((,class (:foreground "#4ac964")))) + `(ilog-message-face ((,class (:foreground "#837f87")))) + `(indent-guide-face ((,class (:foreground "#312c36")))) + `(info-file ((,class (:family "Sans Serif" :height 1.8 :weight bold :box (:line-width 1 :color "#ffff3d") :foreground "#9f6a1c" :background "#563c2a")))) + `(info-header-node ((,class (:underline t :foreground "#065aff")))) ; nodes in header + `(info-header-xref ((,class (:underline t :foreground "#e46f0b")))) ; cross references in header + `(info-index-match ((,class (:weight bold :foreground nil :background "#0742d2")))) ; when using `i' + `(info-menu-header ((,class ,ol2))) ; menu titles (headers) -- major topics + `(info-menu-star ((,class (:foreground "#ffffff")))) ; every 3rd menu item + `(info-node ((,class (:underline t :foreground "#ffff0b")))) ; node names + `(info-quoted-name ((,class ,code-inline))) + `(info-string ((,class ,string))) + `(info-title-1 ((,class ,ol1))) + `(info-xref ((,class (:underline t :foreground "#ff925a")))) ; unvisited cross-references + `(info-xref-visited ((,class (:underline t :foreground "#78ff7c")))) ; previously visited cross-references + ;; js2-highlight-vars-face (~ auto-highlight-symbol) + `(js2-error ((,class (:box (:line-width 1 :color "#06c8cf") :background "#063741")))) ; DONE. + `(js2-external-variable ((,class (:foreground "#06ffff" :background "#252630")))) ; DONE. + `(js2-function-param ((,class ,function-param))) + `(js2-instance-member ((,class (:foreground "#6bcd3d")))) + `(js2-jsdoc-html-tag-delimiter ((,class (:foreground "#34c8d8")))) + `(js2-jsdoc-html-tag-name ((,class (:foreground "#34c8d8")))) + `(js2-jsdoc-tag ((,class (:weight normal :foreground "#9fcb66")))) + `(js2-jsdoc-type ((,class (:foreground "#bd7d55")))) + `(js2-jsdoc-value ((,class (:weight normal :foreground "#4ac964")))) ; #83ff87 + `(js2-magic-paren ((,class (:underline t)))) + `(js2-private-function-call ((,class (:foreground "#2a5ae5")))) + `(js2-private-member ((,class (:foreground "#375073")))) + `(js2-warning ((,class (:underline "#065aff")))) + + ;; Org non-standard faces. + `(leuven-dark-org-deadline-overdue ((,class (:foreground "#12d9ae")))) + `(leuven-dark-org-deadline-today ((,class (:weight bold :foreground "#b4b5ca" :background "#252059")))) + `(leuven-dark-org-deadline-tomorrow ((,class (:foreground "#c357f8")))) + `(leuven-dark-org-deadline-future ((,class (:foreground "#c357f8")))) + `(leuven-dark-gnus-unseen ((,class (:weight bold :foreground "#088dfd")))) + `(leuven-dark-gnus-date ((,class (:foreground "#067f4a")))) + `(leuven-dark-gnus-size ((,class (:foreground "#7440a7")))) + `(leuven-dark-todo-items-face ((,class (:weight bold :foreground "#06cee0" :background "#06017f")))) + + `(light-symbol-face ((,class (:background "#252080")))) + `(linum ((,class (:foreground "#6a656f" :background "#35303a")))) + `(log-view-file ((,class (:foreground "#ffff3d" :background "#382c33")))) + `(log-view-message ((,class (:foreground "#ffffff" :background "#171593")))) + `(lui-button-face ((,class ,link))) + `(lui-highlight-face ((,class (:box '(:line-width 1 :color "#38ffff") :foreground "#38ffff" :background "#06017f")))) ; my nickname + `(lui-time-stamp-face ((,class (:foreground "#64df19")))) + `(magit-blame-header ((,class (:inherit magit-diff-file-header)))) + `(magit-blame-heading ((,class (:overline "#5d5862" :foreground "#06ffff" :background "#3c3741")))) + `(magit-blame-hash ((,class (:overline "#5d5862" :foreground "#06ffff" :background "#3c3741")))) + `(magit-blame-name ((,class (:overline "#5d5862" :foreground "#fd95fa" :background "#3c3741")))) + `(magit-blame-date ((,class (:overline "#5d5862" :foreground "#ffff0b" :background "#3c3741")))) + `(magit-blame-summary ((,class (:overline "#5d5862" :weight bold :foreground "#938f97" :background "#3c3741")))) + `(magit-branch ((,class ,vc-branch))) + `(magit-diff-add ((,class ,diff-added))) + `(magit-diff-del ((,class ,diff-removed))) + `(magit-diff-file-header ((,class (:height 1.1 :weight bold :foreground "#c27c45")))) + `(magit-diff-hunk-header ((,class ,diff-hunk-header))) + `(magit-diff-none ((,class ,diff-none))) + `(magit-header ((,class (:foreground "#25202a" :background "#06bfc7")))) + `(magit-item-highlight ((,class (:background "#382c33")))) + `(magit-item-mark ((,class ,marked-line))) + `(magit-log-head-label ((,class (:box (:line-width 1 :color "#ffff0b" :style nil))))) + `(magit-log-tag-label ((,class (:box (:line-width 1 :color "#ff33ff" :style nil))))) + `(magit-section-title ((,class (:family "Sans Serif" :height 1.8 :weight bold :foreground "#9f6a1c" :inherit nil)))) + `(makefile-space-face ((,class (:background "#069655")))) + `(makefile-targets ((,class (:weight bold :foreground "#ffff0b")))) + ;; `(markdown-blockquote-face ((,class ()))) + `(markdown-bold-face ((,class (:inherit bold)))) + ;; `(markdown-comment-face ((,class ()))) + ;; `(markdown-footnote-face ((,class ()))) + ;; `(markdown-header-delimiter-face ((,class ()))) + ;; `(markdown-header-face ((,class ()))) + `(markdown-header-face-1 ((,class ,ol1))) + `(markdown-header-face-2 ((,class ,ol2))) + `(markdown-header-face-3 ((,class ,ol3))) + `(markdown-header-face-4 ((,class ,ol4))) + `(markdown-header-face-5 ((,class ,ol5))) + `(markdown-header-face-6 ((,class ,ol6))) + ;; `(markdown-header-rule-face ((,class ()))) + `(markdown-inline-code-face ((,class ,code-inline))) + `(markdown-italic-face ((,class (:inherit italic)))) + `(markdown-language-keyword-face ((,class (:inherit org-block-begin-line)))) + ;; `(markdown-line-break-face ((,class ()))) + `(markdown-link-face ((,class ,link-no-underline))) + ;; `(markdown-link-title-face ((,class ()))) + ;; `(markdown-list-face ((,class ()))) + ;; `(markdown-math-face ((,class ()))) + ;; `(markdown-metadata-key-face ((,class ()))) + ;; `(markdown-metadata-value-face ((,class ()))) + ;; `(markdown-missing-link-face ((,class ()))) + `(markdown-pre-face ((,class (:inherit org-block-background)))) + ;; `(markdown-reference-face ((,class ()))) + ;; `(markdown-strike-through-face ((,class ()))) + `(markdown-url-face ((,class ,link))) + `(match ((,class ,match))) ; Used for grep matches. + `(mc/cursor-bar-face ((,class (:height 1.0 :foreground "#ec9b45" :background "#ec9b45")))) + `(mc/cursor-face ((,class (:inverse-video t)))) + `(mc/region-face ((,class (:inherit region)))) + `(mm-uu-extract ((,class ,code-block))) + `(moccur-current-line-face ((,class (:foreground "#ffffff" :background "#252059")))) + `(moccur-face ((,class (:foreground "#ffffff" :background "#06016f")))) + `(next-error ((,class ,volatile-highlight-supersize))) + `(nobreak-space ((,class (:background "#543532")))) + `(nxml-attribute-local-name-face ((,class ,xml-attribute))) + `(nxml-attribute-value-delimiter-face ((,class (:foreground "#ff74ff")))) + `(nxml-attribute-value-face ((,class (:foreground "#ff74ff")))) + `(nxml-comment-content-face ((,class (:slant italic :foreground "#06ffff")))) + `(nxml-comment-delimiter-face ((,class (:foreground "#06ffff")))) + `(nxml-element-local-name ((,class ,xml-tag))) + `(nxml-element-local-name-face ((,class (:foreground "#ffff0b")))) + `(nxml-processing-instruction-target-face ((,class (:foreground "#69cf0b")))) + `(nxml-tag-delimiter-face ((,class (:foreground "#ffff0b")))) + `(nxml-tag-slash-face ((,class (:foreground "#ffff0b")))) + `(org-agenda-block-count ((,class (:weight bold :foreground "#5f5a64")))) + `(org-agenda-calendar-event ((,class (:weight bold :foreground "#cc8b3d" :background "#3e322a")))) + `(org-agenda-calendar-sexp ((,class (:foreground "#d0853c" :background "#30272c")))) + `(org-agenda-clocking ((,class (:foreground "#ffffff" :background "#1636ff")))) + `(org-agenda-column-dateline ((,class ,column))) + `(org-agenda-current-time ((,class (:underline t :foreground "#ec9d5a")))) + `(org-agenda-date ((,class (,@(leuven-dark-scale-font leuven-dark-scale-org-agenda-structure 1.6) :weight bold :foreground "#ec9d5a")))) + `(org-agenda-date-today ((,class (,@(leuven-dark-scale-font leuven-dark-scale-org-agenda-structure 1.6) :weight bold :foreground "#b4b5ca" :background "#252059")))) + `(org-agenda-date-weekend ((,class (,@(leuven-dark-scale-font leuven-dark-scale-org-agenda-structure 1.6) :weight bold :foreground "#b5b1b9")))) + `(org-agenda-diary ((,class (:weight bold :foreground "#ff74ff" :background "#572723")))) + `(org-agenda-dimmed-todo-face ((,class (:foreground "#1636ff")))) + `(org-agenda-done ((,class (:foreground "#aeaab2")))) + `(org-agenda-filter-category ((,class (:weight bold :foreground "#065aff")))) + `(org-agenda-filter-effort ((,class (:weight bold :foreground "#065aff")))) + `(org-agenda-filter-regexp ((,class (:weight bold :foreground "#065aff")))) + `(org-agenda-filter-tags ((,class (:weight bold :foreground "#065aff")))) + `(org-agenda-restriction-lock ((,class (:background "#1d82a4")))) + `(org-agenda-structure ((,class (,@(leuven-dark-scale-font leuven-dark-scale-org-agenda-structure 1.6) :weight bold :foreground "#e37233")))) + `(org-archived ((,class (:foreground "#514c56")))) + `(org-beamer-tag ((,class (:box (:line-width 1 :color "#0a43ed") :foreground "#d6d3d9" :background "#252655")))) + `(org-block ((,class ,code-block))) + `(org-block-background ((,class (:background "#252046" :extend t)))) ;; :inherit fixed-pitch)))) + `(org-block-begin-line ((,class (:underline "#5d595f" :foreground "#aeaab2" :background "#221e34" :extend t)))) + `(org-block-end-line ((,class (:overline "#5d595f" :foreground "#aeaab2" :background "#221e34" :extend t)))) + `(org-checkbox ((,class (:weight bold :box (:line-width 1 :style pressed-button) :foreground "#efcab2" :background "#615c66")))) + `(org-clock-overlay ((,class (:foreground "#25202a" :background "#b98f7c")))) + `(org-code ((,class ,code-inline))) + `(org-column ((,class ,column))) + `(org-column-title ((,class ,column))) + `(org-date ((,class (:underline t :foreground "#ffba6b")))) + `(org-default ((,class (:foreground "#cfccd2" :background "#25202a")))) + `(org-dim ((,class (:foreground "#5a555f")))) + `(org-document-info ((,class (:foreground "#bbb7bf")))) + `(org-document-info-keyword ((,class (:foreground "#ff7138" :background "#38332a")))) + `(org-document-title ((,class (:height 1.8 :weight bold :foreground "#ffffff")))) + `(org-done ((,class (:weight bold :box (:line-width 1 :color "#49444e") :foreground "#49444e" :background "#322d37")))) + `(org-drawer ((,class (:foreground "#7c310f")))) + `(org-ellipsis ((,class (:underline nil :foreground "#6b666f")))) ; #0611a5 + `(org-example ((,class (:foreground "#ffff0b" :background "#38203d")))) + `(org-footnote ((,class (:underline t :foreground "#ff7138")))) + `(org-formula ((,class (:foreground "#0680e1")))) + `(org-headline-done ((,class (:height 1.0 :weight normal :strike-through t :foreground "#57525c")))) + `(org-hide ((,class (:foreground "#403b45")))) + `(org-inlinetask ((,class (:box (:line-width 1 :color "#37323c") :foreground "#8c8890" :background "#252050")))) + `(org-latex-and-related ((,class (:foreground "#cf996f" :background "#25202a")))) + `(org-level-1 ((,class ,ol1))) + `(org-level-2 ((,class ,ol2))) + `(org-level-3 ((,class ,ol3))) + `(org-level-4 ((,class ,ol4))) + `(org-level-5 ((,class ,ol5))) + `(org-level-6 ((,class ,ol6))) + `(org-level-7 ((,class ,ol7))) + `(org-level-8 ((,class ,ol8))) + `(org-link ((,class ,link))) + `(org-list-dt ((,class (:weight bold :foreground "#cfa161")))) + `(org-macro ((,class (:weight bold :foreground "#1747fd")))) + `(org-meta-line ((,class (:slant normal :foreground "#ff7138" :background "#38332a")))) + `(org-mode-line-clock ((,class (:box (:line-width 1 :color "#cfa161") :foreground "#ffffff" :background "#065cd0")))) + `(org-mode-line-clock-overrun ((,class (:weight bold :box (:line-width 1 :color "#cfa161") :foreground "#25202a" :background "#06bfc7")))) + `(org-number-of-items ((,class (:weight bold :foreground "#25202a" :background "#8a458e")))) + `(org-property-value ((,class (:foreground "#ff5fff")))) + `(org-quote ((,class (:slant italic :foreground "#9a969e" :background "#252046")))) + `(org-scheduled ((,class (:foreground "#cfccd2")))) + `(org-scheduled-previously ((,class (:foreground "#ed9943")))) + `(org-scheduled-today ((,class (:weight bold :foreground "#b4b5ca" :background "#252059")))) + `(org-sexp-date ((,class (:foreground "#cc8b3d")))) + `(org-special-keyword ((,class (:weight bold :foreground "#ff44ff" :background "#38203d")))) + `(org-table ((,class (:foreground "#ff9bff" :background "#38203d")))) ;; :inherit fixed-pitch)))) + `(org-tag ((,class (:weight normal :slant italic :foreground "#6a6065" :background "#25202a")))) + `(org-target ((,class (:foreground "#06925a")))) + `(org-time-grid ((,class (:foreground "#35303a")))) + `(org-todo ((,class (:weight bold :box (:line-width 1 :color "#2c5462") :foreground "#2c5462" :background "#253743")))) + `(org-upcoming-deadline ((,class (:foreground "#06aab2")))) + `(org-verbatim ((,class (:foreground "#ff993d" :background "#2c212a")))) + `(org-verse ((,class (:slant italic :foreground "#9a969e" :background "#342f39")))) + `(org-warning ((,class (:weight bold :foreground "#ffffff" :background "#54362a")))) + `(outline-1 ((,class ,ol1))) + `(outline-2 ((,class ,ol2))) + `(outline-3 ((,class ,ol3))) + `(outline-4 ((,class ,ol4))) + `(outline-5 ((,class ,ol5))) + `(outline-6 ((,class ,ol6))) + `(outline-7 ((,class ,ol7))) + `(outline-8 ((,class ,ol8))) + `(pabbrev-debug-display-label-face ((,class (:foreground "#25202a" :background "#5edeb3")))) + `(pabbrev-suggestions-face ((,class (:weight bold :foreground "#25202a" :background "#06ffff")))) + `(pabbrev-suggestions-label-face ((,class (:weight bold :foreground "#25202a" :background "#64df19")))) + `(paren-face-match ((,class ,paren-matched))) + `(paren-face-mismatch ((,class ,paren-unmatched))) + `(paren-face-no-match ((,class ,paren-unmatched))) + `(persp-selected-face ((,class (:weight bold :foreground "#34292a")))) + `(powerline-active1 ((,class (:foreground "#7e311e" :background "#cbc7ce" :inherit mode-line)))) + `(powerline-active2 ((,class (:foreground "#7e311e" :background "#c38f53" :inherit mode-line)))) + `(powerline-inactive1 ((,class (:foreground "#322d38" :background "#9b979f" :inherit mode-line-inactive)))) + `(powerline-inactive2 ((,class (:foreground "#322d38" :background "#5b5660" :inherit mode-line-inactive)))) + `(rainbow-delimiters-depth-1-face ((,class (:foreground "#938e84")))) + `(rainbow-delimiters-depth-2-face ((,class (:foreground "#907733")))) + `(rainbow-delimiters-depth-3-face ((,class (:foreground "#736e84")))) + `(rainbow-delimiters-depth-4-face ((,class (:foreground "#936797")))) + `(rainbow-delimiters-depth-5-face ((,class (:foreground "#738c94")))) + `(rainbow-delimiters-depth-6-face ((,class (:foreground "#a1894f")))) + `(rainbow-delimiters-depth-7-face ((,class (:foreground "#7e7a87")))) + `(rainbow-delimiters-depth-8-face ((,class (:foreground "#835787")))) + `(rainbow-delimiters-depth-9-face ((,class (:foreground "#7b8f97")))) + `(rainbow-delimiters-mismatched-face ((,class ,paren-unmatched))) + `(rainbow-delimiters-unmatched-face ((,class ,paren-unmatched))) + `(recover-this-file ((,class (:weight bold :background "#06c0c8")))) + `(rng-error ((,class (:weight bold :foreground "#06ffff" :background "#283a43")))) + `(sh-heredoc ((,class (:foreground "#ffff0b" :background "#34292a")))) + `(sh-quoted-exec ((,class (:foreground "#06eb74")))) + `(shadow ((,class ,shadow))) ; Used for grep context lines. + `(shell-option-face ((,class (:foreground "#e074e3")))) + `(shell-output-2-face ((,class (:foreground "#ffff0b")))) + `(shell-output-3-face ((,class (:foreground "#64df19")))) + `(shell-output-face ((,class (:foreground "#ffffff")))) + ;; `(shell-prompt-face ((,class (:weight bold :foreground "#0601ff")))) + `(shm-current-face ((,class (:background "#343551")))) + `(shm-quarantine-face ((,class (:background "lemonchiffon")))) + `(show-paren-match ((,class ,paren-matched))) + `(show-paren-mismatch ((,class ,paren-unmatched))) + `(sml-modeline-end-face ((,class (:background "#985213")))) ; #cfa161 + `(sml-modeline-vis-face ((,class (:background "#e9863f")))) + `(term ((,class (:foreground "#cfccd2" :background "#25202a")))) + + ;; `(sp-pair-overlay-face ((,class ()))) + ;; `(sp-show-pair-enclosing ((,class ()))) + ;; `(sp-show-pair-match-face ((,class ()))) ; ~ Pair highlighting (matching tags). + ;; `(sp-show-pair-mismatch-face ((,class ()))) + ;; `(sp-wrap-overlay-closing-pair ((,class ()))) + ;; `(sp-wrap-overlay-face ((,class ()))) + ;; `(sp-wrap-overlay-opening-pair ((,class ()))) + ;; `(sp-wrap-tag-overlay-face ((,class ()))) + + `(speedbar-button-face ((,class (:foreground "#ff74ff")))) + `(speedbar-directory-face ((,class (:foreground "#ffff7c")))) + `(speedbar-file-face ((,class (:foreground "#ff747c")))) + `(speedbar-highlight-face ((,class ,volatile-highlight))) + `(speedbar-selected-face ((,class (:underline t :foreground "#06ffff")))) + `(speedbar-tag-face ((,class (:foreground "#5fd5db")))) + `(svn-status-directory-face ((,class ,directory))) + `(svn-status-filename-face ((,class (:weight bold :foreground "#c27c45")))) + `(svn-status-locked-face ((,class (:weight bold :foreground "#06ffff")))) + `(svn-status-marked-face ((,class ,marked-line))) + `(svn-status-marked-popup-face ((,class (:weight bold :foreground "#ff32ff")))) + `(svn-status-switched-face ((,class (:slant italic :foreground "#77737b")))) + `(svn-status-symlink-face ((,class ,symlink))) + `(svn-status-update-available-face ((,class (:foreground "#065aff")))) + `(tex-verbatim ((,class (:foreground "#ffff0b")))) + `(tool-bar ((,class (:box (:line-width 1 :style released-button) :foreground "#ffffff" :background "#45404a")))) + `(tooltip ((,class (:foreground "#ffffff" :background "#252046")))) + `(traverse-match-face ((,class (:weight bold :foreground "#79d427")))) + `(vc-annotate-face-3F3FFF ((,class (:foreground "#c4c00b" :background "#ffffff")))) + `(vc-annotate-face-3F6CFF ((,class (:foreground "#c4c00b" :background "#ffffff")))) + `(vc-annotate-face-3F99FF ((,class (:foreground "#c4660b" :background "#ffffff")))) + `(vc-annotate-face-3FC6FF ((,class (:foreground "#c4660b" :background "#ffffff")))) + `(vc-annotate-face-3FF3FF ((,class (:foreground "#c40c0b" :background "#ffffff")))) + `(vc-annotate-face-3FFF56 ((,class (:foreground "#b801bc" :background "#ffffff")))) + `(vc-annotate-face-3FFF83 ((,class (:foreground "#c40159" :background "#ffffff")))) + `(vc-annotate-face-3FFFB0 ((,class (:foreground "#c40159" :background "#ffffff")))) + `(vc-annotate-face-3FFFDD ((,class (:foreground "#c40c0b" :background "#ffffff")))) + `(vc-annotate-face-56FF3F ((,class (:foreground "#b801bc" :background "#ffffff")))) + `(vc-annotate-face-83FF3F ((,class (:foreground "#5401c8" :background "#ffffff")))) + `(vc-annotate-face-B0FF3F ((,class (:foreground "#5401c8" :background "#ffffff")))) + `(vc-annotate-face-DDFF3F ((,class (:foreground "#060cc8" :background "#ffffff")))) + `(vc-annotate-face-F6FFCC ((,class (:foreground "#ffffff" :background "#252064")))) + `(vc-annotate-face-FF3F3F ((,class (:foreground "#06c0c8" :background "#ffffff")))) + `(vc-annotate-face-FF6C3F ((,class (:foreground "#06c0c8" :background "#ffffff")))) + `(vc-annotate-face-FF993F ((,class (:foreground "#0666c8" :background "#ffffff")))) + `(vc-annotate-face-FFC63F ((,class (:foreground "#0666c8" :background "#ffffff")))) + `(vc-annotate-face-FFF33F ((,class (:foreground "#060cc8" :background "#ffffff")))) + + ;; ;; vc + ;; (vc-up-to-date-state ((,c :foreground ,(gc 'green-1)))) + ;; (vc-edited-state ((,c :foreground ,(gc 'yellow+1)))) + ;; (vc-missing-state ((,c :foreground ,(gc 'red)))) + ;; (vc-conflict-state ((,c :foreground ,(gc 'red+2) :weight bold))) + ;; (vc-locked-state ((,c :foreground ,(gc 'cyan-1)))) + ;; (vc-locally-added-state ((,c :foreground ,(gc 'blue)))) + ;; (vc-needs-update-state ((,c :foreground ,(gc 'magenta)))) + ;; (vc-removed-state ((,c :foreground ,(gc 'red-1)))) + + `(vhl/default-face ((,class ,volatile-highlight))) ; `volatile-highlights.el' (for undo, yank). + `(w3m-anchor ((,class ,link))) + `(w3m-arrived-anchor ((,class (:foreground "#69cf0b")))) + `(w3m-bitmap-image-face ((,class (:foreground "#f7f5f9" :background "#ff01ff")))) + `(w3m-bold ((,class (:weight bold :foreground "#ffffff")))) + `(w3m-current-anchor ((,class (:weight bold :underline t :foreground "#ffff0b")))) + `(w3m-form ((,class (:underline t :foreground "#065ab8")))) + `(w3m-form-button-face ((,class (:weight bold :underline t :foreground "#f7f5f9" :background "#312c36")))) + `(w3m-form-button-mouse-face ((,class (:underline t :foreground "#312c36" :background "#d781db")))) + `(w3m-form-button-pressed-face ((,class (:weight bold :underline t :foreground "#f7f5f9" :background "#312c36")))) + `(w3m-header-line-location-content-face ((,class (:foreground "#848088":background "#2c2731")))) + `(w3m-header-line-location-title-face ((,class (:foreground "#d6aa58" :background "#2c2731")))) + `(w3m-history-current-url-face ((,class (:foreground "#252458")))) + `(w3m-image-face ((,class (:weight bold :foreground "#501155")))) + `(w3m-link-numbering ((,class (:foreground "#50381e")))) ; mouseless browsing + `(w3m-strike-through-face ((,class (:strike-through t)))) + `(w3m-underline-face ((,class (:underline t)))) + + ;; `(web-mode-block-attr-name-face ((,class ()))) + ;; `(web-mode-block-attr-value-face ((,class ()))) + ;; `(web-mode-block-comment-face ((,class ()))) + ;; `(web-mode-block-control-face ((,class ()))) + ;; `(web-mode-block-delimiter-face ((,class ()))) + ;; `(web-mode-block-face ((,class ()))) + ;; `(web-mode-block-string-face ((,class ()))) + ;; `(web-mode-bold-face ((,class ()))) + ;; `(web-mode-builtin-face ((,class ()))) + ;; `(web-mode-comment-face ((,class ()))) + ;; `(web-mode-comment-keyword-face ((,class ()))) + ;; `(web-mode-constant-face ((,class ()))) + ;; `(web-mode-css-at-rule-face ((,class ()))) + ;; `(web-mode-css-color-face ((,class ()))) + ;; `(web-mode-css-comment-face ((,class ()))) + ;; `(web-mode-css-function-face ((,class ()))) + ;; `(web-mode-css-priority-face ((,class ()))) + ;; `(web-mode-css-property-name-face ((,class ()))) + ;; `(web-mode-css-pseudo-class-face ((,class ()))) + ;; `(web-mode-css-selector-face ((,class ()))) + ;; `(web-mode-css-string-face ((,class ()))) + ;; `(web-mode-css-variable-face ((,class ()))) + ;; `(web-mode-current-column-highlight-face ((,class ()))) + `(web-mode-current-element-highlight-face ((,class (:background "#6b330b")))) ; #061187 + ;; `(web-mode-doctype-face ((,class ()))) + ;; `(web-mode-error-face ((,class ()))) + ;; `(web-mode-filter-face ((,class ()))) + `(web-mode-folded-face ((,class (:box (:line-width 1 :color "#8c8890") :foreground "#6a659d" :background "#110cbe")))) + ;; `(web-mode-function-call-face ((,class ()))) + ;; `(web-mode-function-name-face ((,class ()))) + ;; `(web-mode-html-attr-custom-face ((,class ()))) + ;; `(web-mode-html-attr-engine-face ((,class ()))) + ;; `(web-mode-html-attr-equal-face ((,class ()))) + `(web-mode-html-attr-name-face ((,class ,xml-attribute))) + ;; `(web-mode-html-attr-value-face ((,class ()))) + ;; `(web-mode-html-entity-face ((,class ()))) + `(web-mode-html-tag-bracket-face ((,class ,xml-tag))) + ;; `(web-mode-html-tag-custom-face ((,class ()))) + `(web-mode-html-tag-face ((,class ,xml-tag))) + ;; `(web-mode-html-tag-namespaced-face ((,class ()))) + ;; `(web-mode-inlay-face ((,class ()))) + ;; `(web-mode-italic-face ((,class ()))) + ;; `(web-mode-javascript-comment-face ((,class ()))) + ;; `(web-mode-javascript-string-face ((,class ()))) + ;; `(web-mode-json-comment-face ((,class ()))) + ;; `(web-mode-json-context-face ((,class ()))) + ;; `(web-mode-json-key-face ((,class ()))) + ;; `(web-mode-json-string-face ((,class ()))) + ;; `(web-mode-jsx-depth-1-face ((,class ()))) + ;; `(web-mode-jsx-depth-2-face ((,class ()))) + ;; `(web-mode-jsx-depth-3-face ((,class ()))) + ;; `(web-mode-jsx-depth-4-face ((,class ()))) + ;; `(web-mode-keyword-face ((,class ()))) + ;; `(web-mode-param-name-face ((,class ()))) + ;; `(web-mode-part-comment-face ((,class ()))) + `(web-mode-part-face ((,class (:background "#252046")))) + ;; `(web-mode-part-string-face ((,class ()))) + ;; `(web-mode-preprocessor-face ((,class ()))) + `(web-mode-script-face ((,class (:background "#332d37")))) + ;; `(web-mode-sql-keyword-face ((,class ()))) + ;; `(web-mode-string-face ((,class ()))) + ;; `(web-mode-style-face ((,class ()))) + ;; `(web-mode-symbol-face ((,class ()))) + ;; `(web-mode-type-face ((,class ()))) + ;; `(web-mode-underline-face ((,class ()))) + ;; `(web-mode-variable-name-face ((,class ()))) + ;; `(web-mode-warning-face ((,class ()))) + ;; `(web-mode-whitespace-face ((,class ()))) + + `(which-func ((,class (:weight bold :slant italic :foreground "#25202a")))) + ;; `(which-key-command-description-face) + ;; `(which-key-group-description-face) + ;; `(which-key-highlighted-command-face) + ;; `(which-key-key-face) + `(which-key-local-map-description-face ((,class (:weight bold :background "#30272c" :inherit which-key-command-description-face)))) + ;; `(which-key-note-face) + ;; `(which-key-separator-face) + ;; `(which-key-special-key-face) + `(widget-button ((,class ,link))) + `(widget-button-pressed ((,class (:foreground "#06ffff")))) + `(widget-documentation ((,class (:foreground "#ff74ff")))) + `(widget-field ((,class (:background "#2b2630")))) + `(widget-inactive ((,class (:foreground "#9a969e")))) + `(widget-single-line-field ((,class (:background "#2b2630")))) + `(woman-bold ((,class (:weight bold :foreground "#13c2ca")))) + `(woman-italic ((,class (:weight bold :slant italic :foreground "#bd41ea")))) + `(woman-symbol ((,class (:weight bold :foreground "#64df19")))) + `(yas-field-debug-face ((,class (:foreground "#25202a" :background "#5edeb3")))) + `(yas-field-highlight-face ((,class (:box (:line-width 1 :color "#807c84") :foreground "#ffffff" :background "#302331")))) + + ;; `(ztreep-arrow-face ((,class ()))) + ;; `(ztreep-diff-header-face ((,class ()))) + ;; `(ztreep-diff-header-small-face ((,class ()))) + `(ztreep-diff-model-add-face ((,class (:weight bold :foreground "#ff77ff")))) + `(ztreep-diff-model-diff-face ((,class (:weight bold :foreground "#ffbb2c")))) + `(ztreep-diff-model-ignored-face ((,class (:strike-through t :foreground "#66616b")))) + `(ztreep-diff-model-normal-face ((,class (:foreground "#ffffff")))) + ;; `(ztreep-expand-sign-face ((,class ()))) + ;; `(ztreep-header-face ((,class ()))) + ;; `(ztreep-leaf-face ((,class ()))) + ;; `(ztreep-node-face ((,class ()))) + + )) + +(custom-theme-set-variables 'leuven-dark + + ;; highlight-sexp-mode. + '(hl-sexp-background-color "#33323e") + + '(ansi-color-faces-vector + [default default default italic underline success warning error]) + + ;; Colors used in Shell mode. + '(ansi-color-names-vector + ["#ffffff" "#37ffff" "#e074e3" "#3732ff" "#ffff0b" "#37ff3c" "#ff400b" "#848088"]) + ) + +;;;######autoload +(when (and (boundp 'custom-theme-load-path) + load-file-name) + ;; Add theme folder to `custom-theme-load-path' when installing over MELPA. + (add-to-list 'custom-theme-load-path + (file-name-as-directory (file-name-directory load-file-name)))) + +;;;######autoload +(when (string-match "/etc/themes/$" + (file-name-directory (or load-file-name (buffer-file-name)))) + (message "To stay up-to-date, you should better install and use leuven-dark-theme from MELPA.") + (sit-for 2)) + +(provide-theme 'leuven-dark) + +;; This is for the sake of Emacs. +;; Local Variables: +;; no-byte-compile: t +;; time-stamp-end: "$" +;; time-stamp-format: "%:y%02m%02d.%02H%02M" +;; time-stamp-start: "Version: " +;; End: + +;;; leuven-dark-theme.el ends here diff --git a/elpa/leuven-theme-20191211.1608/leuven-theme-autoloads.el b/elpa/leuven-theme-20200122.1934/leuven-theme-autoloads.el similarity index 75% rename from elpa/leuven-theme-20191211.1608/leuven-theme-autoloads.el rename to elpa/leuven-theme-20200122.1934/leuven-theme-autoloads.el index 035da5c5..80eca07e 100644 --- a/elpa/leuven-theme-20191211.1608/leuven-theme-autoloads.el +++ b/elpa/leuven-theme-20200122.1934/leuven-theme-autoloads.el @@ -10,11 +10,7 @@ ;;;;;; (0 0 0 0)) ;;; Generated autoloads from leuven-dark-theme.el -(when (and (boundp 'custom-theme-load-path) load-file-name) (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name)))) - -(when (string-match "/etc/themes/$" (file-name-directory (or load-file-name (buffer-file-name)))) (message "To stay up-to-date, you should better install and use leuven-theme from MELPA.") (sit-for 2)) - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "leuven-dark-theme" '("leuven-"))) +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "leuven-dark-theme" '("leuven-dark"))) ;;;*** diff --git a/elpa/leuven-theme-20191211.1608/leuven-theme-pkg.el b/elpa/leuven-theme-20200122.1934/leuven-theme-pkg.el similarity index 84% rename from elpa/leuven-theme-20191211.1608/leuven-theme-pkg.el rename to elpa/leuven-theme-20200122.1934/leuven-theme-pkg.el index aa9e1798..52bfac52 100644 --- a/elpa/leuven-theme-20191211.1608/leuven-theme-pkg.el +++ b/elpa/leuven-theme-20200122.1934/leuven-theme-pkg.el @@ -1,4 +1,4 @@ -(define-package "leuven-theme" "20191211.1608" "Awesome Emacs color theme on white background" 'nil :keywords +(define-package "leuven-theme" "20200122.1934" "Awesome Emacs color theme on white background" 'nil :keywords '("color" "theme") :authors '(("Fabrice Niessen <(concat \"fniessen\" at-sign \"pirilampo.org\")>")) diff --git a/elpa/leuven-theme-20191211.1608/leuven-theme.el b/elpa/leuven-theme-20200122.1934/leuven-theme.el similarity index 97% rename from elpa/leuven-theme-20191211.1608/leuven-theme.el rename to elpa/leuven-theme-20200122.1934/leuven-theme.el index be04efef..4ec5b676 100644 --- a/elpa/leuven-theme-20191211.1608/leuven-theme.el +++ b/elpa/leuven-theme-20200122.1934/leuven-theme.el @@ -1,10 +1,10 @@ ;;; leuven-theme.el --- Awesome Emacs color theme on white background -;; Copyright (C) 2003-2019 Free Software Foundation, Inc. +;; Copyright (C) 2003-2020 Free Software Foundation, Inc. ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")> ;; URL: https://github.com/fniessen/emacs-leuven-theme -;; Version: 20191211.1707 +;; Version: 20200102.2050 ;; Keywords: color theme ;; This file is part of GNU Emacs. @@ -84,8 +84,8 @@ more...") ;; Leuven generic colors. (cancel '(:slant italic :strike-through t :foreground "#A9A9A9")) (clock-line '(:box (:line-width 1 :color "#335EA8") :foreground "black" :background "#EEC900")) - (code-block '(:foreground "#000088" :background "#FFFFE0")) - (code-inline '(:foreground "#006400" :background "#FDFFF7")) + (code-block '(:foreground "#000088" :background "#FFFFE0" :extend t)) + (code-inline '(:foreground "#006400" :background "#FDFFF7" :extend t)) (column '(:height 1.0 :weight normal :slant normal :underline nil :strike-through nil :foreground "#E6AD4F" :background "#FFF2DE")) (completion-inline '(:weight normal :foreground "#C0C0C0" :inherit hl-line)) ; Like Google. (completion-other-candidates '(:weight bold :foreground "black" :background "#EBF4FE")) @@ -103,12 +103,12 @@ more...") (function-param '(:foreground "#247284")) (grep-file-name '(:weight bold :foreground "#2A489E")) ; Used for grep hits. (grep-line-number '(:weight bold :foreground "#A535AE")) - (highlight-blue '(:background "#E6ECFF")) - (highlight-blue2 '(:background "#E4F1F9")) - (highlight-gray '(:background "#E4E4E3")) - (highlight-green '(:background "#D5F1CF")) - (highlight-red '(:background "#FFC8C8")) - (highlight-yellow '(:background "#F6FECD")) + (highlight-blue '(:background "#E6ECFF" :extend t)) + (highlight-blue2 '(:background "#E4F1F9" :extend t)) + (highlight-gray '(:background "#E4E4E3" :extend t)) + (highlight-green '(:background "#D5F1CF" :extend t)) + (highlight-red '(:background "#FFC8C8" :extend t)) + (highlight-yellow '(:background "#F6FECD" :extend t)) (link '(:weight normal :underline t :foreground "#006DAF")) (link-no-underline '(:weight normal :foreground "#006DAF")) (mail-header-name '(:family "Sans Serif" :weight normal :foreground "#A3A3A2")) @@ -121,17 +121,17 @@ more...") (mail-unread-high '(:weight bold :foreground "#135985")) (marked-line '(:foreground "#AA0000" :background "#FFAAAA")) (match '(:weight bold :background "#FFFF00")) ; occur patterns + match in helm for files + match in Org files. - (ol1 `(,@(leuven-scale-font leuven-scale-outline-headlines 1.3) :weight bold :overline "#A7A7A7" :foreground "#3C3C3C" :background "#F0F0F0")) - (ol2 '(:height 1.0 :weight bold :overline "#123555" :foreground "#123555" :background "#E5F4FB")) - (ol3 '(:height 1.0 :weight bold :foreground "#005522" :background "#EFFFEF")) - (ol4 '(:height 1.0 :weight bold :slant normal :foreground "#EA6300")) - (ol5 '(:height 1.0 :weight bold :slant normal :foreground "#E3258D")) - (ol6 '(:height 1.0 :weight bold :slant italic :foreground "#0077CC")) - (ol7 '(:height 1.0 :weight bold :slant italic :foreground "#2EAE2C")) - (ol8 '(:height 1.0 :weight bold :slant italic :foreground "#FD8008")) + (ol1 `(,@(leuven-scale-font leuven-scale-outline-headlines 1.3) :weight bold :overline "#A7A7A7" :foreground "#3C3C3C" :background "#F0F0F0" :extend t)) + (ol2 '(:height 1.0 :weight bold :overline "#123555" :foreground "#123555" :background "#E5F4FB" :extend t)) + (ol3 '(:height 1.0 :weight bold :foreground "#005522" :background "#EFFFEF" :extend t)) + (ol4 '(:height 1.0 :weight bold :slant normal :foreground "#EA6300" :extend t)) + (ol5 '(:height 1.0 :weight bold :slant normal :foreground "#E3258D" :extend t)) + (ol6 '(:height 1.0 :weight bold :slant italic :foreground "#0077CC" :extend t)) + (ol7 '(:height 1.0 :weight bold :slant italic :foreground "#2EAE2C" :extend t)) + (ol8 '(:height 1.0 :weight bold :slant italic :foreground "#FD8008" :extend t)) (paren-matched '(:background "#C0E8C3")) ; Or take that green for region? (paren-unmatched '(:weight bold :underline "red" :foreground "black" :background "#FFA5A5")) - (region '(:background "#8ED3FF")) + (region '(:background "#8ED3FF" :extend t)) (shadow '(:foreground "#7F7F7F")) (string '(:foreground "#008000")) ; or #D0372D (subject '(:family "Sans Serif" :weight bold :foreground "black")) @@ -314,15 +314,15 @@ more...") `(smerge-refined-change ((,class (:background "#AAAAFF")))) ;; Ediff. - `(ediff-current-diff-A ((,class (:background "#FFDDDD")))) - `(ediff-current-diff-B ((,class (:background "#DDFFDD")))) - `(ediff-current-diff-C ((,class (:background "cyan")))) - `(ediff-even-diff-A ((,class (:background "light grey")))) - `(ediff-even-diff-B ((,class (:background "light grey")))) - `(ediff-fine-diff-A ((,class (:background "#FFAAAA")))) - `(ediff-fine-diff-B ((,class (:background "#55FF55")))) - `(ediff-odd-diff-A ((,class (:background "light grey")))) - `(ediff-odd-diff-B ((,class (:background "light grey")))) + `(ediff-current-diff-A ((,class (:background "#FFDDDD" :extend t)))) + `(ediff-current-diff-B ((,class (:background "#DDFFDD" :extend t)))) + `(ediff-current-diff-C ((,class (:background "cyan" :extend t)))) + `(ediff-even-diff-A ((,class (:background "light grey" :extend t)))) + `(ediff-even-diff-B ((,class (:background "light grey" :extend t)))) + `(ediff-fine-diff-A ((,class (:background "#FFAAAA" :extend t)))) + `(ediff-fine-diff-B ((,class (:background "#55FF55" :extend t)))) + `(ediff-odd-diff-A ((,class (:background "light grey" :extend t)))) + `(ediff-odd-diff-B ((,class (:background "light grey" :extend t)))) ;; Flyspell. (if (version< emacs-version "24.4") @@ -746,9 +746,9 @@ more...") `(org-archived ((,class (:foreground "gray70")))) `(org-beamer-tag ((,class (:box (:line-width 1 :color "#FABC18") :foreground "#2C2C2C" :background "#FFF8D0")))) `(org-block ((,class ,code-block))) - `(org-block-background ((,class (:background "#FFFFE0")))) ;; :inherit fixed-pitch)))) - `(org-block-begin-line ((,class (:underline "#A7A6AA" :foreground "#555555" :background "#E2E1D5")))) - `(org-block-end-line ((,class (:overline "#A7A6AA" :foreground "#555555" :background "#E2E1D5")))) + `(org-block-background ((,class (:background "#FFFFE0" :extend t)))) ;; :inherit fixed-pitch)))) + `(org-block-begin-line ((,class (:underline "#A7A6AA" :foreground "#555555" :background "#E2E1D5" :extend t)))) + `(org-block-end-line ((,class (:overline "#A7A6AA" :foreground "#555555" :background "#E2E1D5" :extend t)))) `(org-checkbox ((,class (:weight bold :box (:line-width 1 :style pressed-button) :foreground "#123555" :background "#A3A3A3")))) `(org-clock-overlay ((,class (:foreground "white" :background "SkyBlue4")))) `(org-code ((,class ,code-inline))) @@ -809,7 +809,7 @@ more...") `(outline-6 ((,class ,ol6))) `(outline-7 ((,class ,ol7))) `(outline-8 ((,class ,ol8))) - `(pabbrev-debug-display-label-face ((,class (:background "chartreuse")))) + `(pabbrev-debug-display-label-face ((,class (:foreground "white" :background "#A62154")))) `(pabbrev-suggestions-face ((,class (:weight bold :foreground "white" :background "red")))) `(pabbrev-suggestions-label-face ((,class (:weight bold :foreground "white" :background "purple")))) `(paren-face-match ((,class ,paren-matched))) @@ -1011,7 +1011,7 @@ more...") `(woman-bold ((,class (:weight bold :foreground "#F13D3D")))) `(woman-italic ((,class (:weight bold :slant italic :foreground "#46BE1B")))) `(woman-symbol ((,class (:weight bold :foreground "purple")))) - `(yas-field-debug-face ((,class (:background "red")))) + `(yas-field-debug-face ((,class (:foreground "white" :background "#A62154")))) `(yas-field-highlight-face ((,class (:box (:line-width 1 :color "#838383") :foreground "black" :background "#D4DCD8")))) ;; `(ztreep-arrow-face ((,class ()))) diff --git a/elpa/magit-20191227.1438/magit-core.elc b/elpa/magit-20191227.1438/magit-core.elc deleted file mode 100644 index 68430c74..00000000 Binary files a/elpa/magit-20191227.1438/magit-core.elc and /dev/null differ diff --git a/elpa/magit-20191227.1438/magit.info b/elpa/magit-20191227.1438/magit.info deleted file mode 100644 index b0711e50..00000000 --- a/elpa/magit-20191227.1438/magit.info +++ /dev/null @@ -1,193 +0,0 @@ -This is magit.info, produced by makeinfo version 6.5 from magit.texi. - - Copyright (C) 2015-2019 Jonas Bernoulli - - You can redistribute this document 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 document 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. - -INFO-DIR-SECTION Emacs -START-INFO-DIR-ENTRY -* Magit: (magit). Using Git from Emacs with Magit. -END-INFO-DIR-ENTRY - - -Indirect: -magit.info-1: 754 -magit.info-2: 301056 - -Tag Table: -(Indirect) -Node: Top754 -Node: Introduction6475 -Node: Installation11198 -Node: Installing from Melpa11528 -Node: Installing from the Git Repository12601 -Node: Post-Installation Tasks14949 -Node: Getting Started16234 -Node: Interface Concepts21683 -Node: Modes and Buffers22044 -Node: Switching Buffers23793 -Node: Naming Buffers28563 -Node: Quitting Windows31870 -Node: Automatic Refreshing of Magit Buffers33616 -Node: Automatic Saving of File-Visiting Buffers36468 -Node: Automatic Reverting of File-Visiting Buffers37653 -Node: Risk of Reverting Automatically42648 -Node: Sections45030 -Node: Section Movement45956 -Node: Section Visibility50517 -Node: Section Hooks56594 -Node: Section Types and Values59001 -Node: Section Options60304 -Node: Transient Commands60776 -Node: Transient Arguments and Buffer Variables62013 -Node: Completion Confirmation and the Selection69031 -Node: Action Confirmation69475 -Node: Completion and Confirmation76825 -Node: The Selection80011 -Node: The hunk-internal region82910 -Node: Support for Completion Frameworks83999 -Node: Additional Completion Options88906 -Node: Running Git89505 -Node: Viewing Git Output89778 -Node: Git Process Status90911 -Node: Running Git Manually91876 -Node: Git Executable94346 -Node: Global Git Arguments96628 -Node: Inspecting97434 -Node: Status Buffer98591 -Node: Status Sections102581 -Node: Status Header Sections108133 -Node: Status Module Sections110763 -Node: Status Options113268 -Node: Repository List115143 -Node: Logging118181 -Node: Refreshing Logs120744 -Node: Log Buffer122190 -Node: Log Margin126046 -Node: Select from Log129225 -Node: Reflog131450 -Node: Cherries133107 -Node: Diffing134955 -Node: Refreshing Diffs138036 -Node: Commands Available in Diffs141615 -Node: Diff Options144151 -Node: Revision Buffer149189 -Node: Ediffing152519 -Node: References Buffer156167 -Node: References Sections166687 -Node: Bisecting167548 -Node: Visiting Files and Blobs169361 -Node: General-Purpose Visit Commands169831 -Node: Visiting Files and Blobs from a Diff170787 -Node: Blaming174246 -Node: Manipulating180809 -Node: Creating Repository181151 -Node: Cloning Repository181706 -Node: Staging and Unstaging186949 -Node: Staging from File-Visiting Buffers191032 -Node: Applying192200 -Node: Committing194093 -Node: Initiating a Commit194676 -Node: Editing Commit Messages198061 -Node: Using the Revision Stack200864 -Node: Commit Pseudo Headers203915 -Node: Commit Mode and Hooks205251 -Node: Commit Message Conventions208189 -Node: Branching210317 -Node: The Two Remotes210543 -Node: Branch Commands213196 -Node: Branch Git Variables225579 -Node: Auxiliary Branch Commands230970 -Node: Merging232088 -Node: Resolving Conflicts236096 -Node: Rebasing241097 -Node: Editing Rebase Sequences246107 -Node: Information About In-Progress Rebase250435 -Ref: Information About In-Progress Rebase-Footnote-1259317 -Node: Cherry Picking259913 -Node: Reverting264244 -Node: Resetting265693 -Node: Stashing267347 -Node: Transferring272048 -Node: Remotes272270 -Node: Remote Commands272422 -Node: Remote Git Variables276503 -Node: Fetching278882 -Node: Pulling281236 -Node: Pushing282429 -Node: Plain Patches286037 -Node: Maildir Patches287528 -Node: Miscellaneous289042 -Node: Tagging289358 -Node: Notes291286 -Node: Submodules293658 -Node: Listing Submodules293876 -Node: Submodule Transient295804 -Node: Subtree298326 -Node: Worktree301056 -Node: Common Commands302161 -Node: Wip Modes304208 -Node: Wip Graph309141 -Node: Legacy Wip Modes311455 -Node: Minor Mode for Buffers Visiting Files314350 -Node: Minor Mode for Buffers Visiting Blobs321451 -Node: Customizing322264 -Node: Per-Repository Configuration323860 -Node: Essential Settings326115 -Node: Safety326439 -Node: Performance328200 -Node: Microsoft Windows Performance335261 -Node: MacOS Performance336452 -Ref: MacOS Performance-Footnote-1337157 -Node: Plumbing337239 -Node: Calling Git338068 -Node: Getting a Value from Git339593 -Node: Calling Git for Effect342679 -Node: Section Plumbing349199 -Node: Creating Sections349427 -Node: Section Selection353327 -Node: Matching Sections355126 -Node: Refreshing Buffers361099 -Node: Conventions364247 -Node: Theming Faces364439 -Node: FAQ372554 -Node: FAQ - How to ...?372996 -Node: How to show git's output?373356 -Node: How to install the gitman info manual?374110 -Node: How to show diffs for gpg-encrypted files?375080 -Node: How does branching and pushing work?375676 -Node: Can Magit be used as ediff-version-control-package?376039 -Node: FAQ - Issues and Errors378028 -Node: Magit is slow378960 -Node: I changed several thousand files at once and now Magit is unusable379174 -Node: I am having problems committing379903 -Node: I am using MS Windows and cannot push with Magit380384 -Node: I am using OS X and SOMETHING works in shell but not in Magit381001 -Node: Diffs contain control sequences381807 -Node: Expanding a file to show the diff causes it to disappear382920 -Node: Point is wrong in the COMMIT_EDITMSG buffer383471 -Node: The mode-line information isn't always up-to-date384517 -Node: A branch and tag sharing the same name breaks SOMETHING385599 -Node: My Git hooks work on the command-line but not inside Magit386487 -Node: git-commit-mode isn't used when committing from the command-line387333 -Node: Point ends up inside invisible text when jumping to a file-visiting buffer389600 -Node: Debugging Tools390398 -Node: Keystroke Index392577 -Node: Command Index426561 -Node: Function Index463586 -Node: Variable Index479938 - -End Tag Table - - -Local Variables: -coding: utf-8 -End: diff --git a/elpa/magit-20191227.1438/AUTHORS.md b/elpa/magit-20200126.1750/AUTHORS.md similarity index 97% rename from elpa/magit-20191227.1438/AUTHORS.md rename to elpa/magit-20200126.1750/AUTHORS.md index 52a4e4da..84141597 100644 --- a/elpa/magit-20191227.1438/AUTHORS.md +++ b/elpa/magit-20200126.1750/AUTHORS.md @@ -42,6 +42,7 @@ Contributors - Aaron Madlon-Kay - Abdo Roig-Maranges - Adam Benanti <0entropy@protonmail.com> +- Adam Kruszewski - Adam Porter - Adam Spiers - Adeodato Simó @@ -70,6 +71,7 @@ Contributors - Andy Sawyer - Aria Edmonds - Arialdo Martini +- Arnau Roig Ninerola - Barak A. Pearlmutter - Bar Magal - Bart Bakker @@ -96,6 +98,7 @@ Contributors - Christian Kluge - Christophe Junke - Christopher Monsanto +- Clément Pit-Claudel - Cornelius Mika - Craig Andera - Dale Hagglund @@ -202,6 +205,7 @@ Contributors - Louis Roché - Luís Oliveira - Luke Amdor +- Magnus Malm - Mak Kolybabi - Manuel Vázquez Acosta - Marcel Wolf @@ -273,6 +277,7 @@ Contributors - Richard Kim - Robert Boone - Robin Green +- Roey Darwish Dror - Roger Crew - Romain Francoise - Ron Parker @@ -320,6 +325,7 @@ Contributors - Tom Feist - Topi Miettinen - Troy Hinckley +- Tsuyoshi Kitamoto - Tunc Uzlu - Vineet Naik - Vitaly Ostashov diff --git a/elpa/magit-20191227.1438/LICENSE b/elpa/magit-20200126.1750/LICENSE similarity index 100% rename from elpa/magit-20191227.1438/LICENSE rename to elpa/magit-20200126.1750/LICENSE diff --git a/elpa/magit-20191227.1438/dir b/elpa/magit-20200126.1750/dir similarity index 100% rename from elpa/magit-20191227.1438/dir rename to elpa/magit-20200126.1750/dir diff --git a/elpa/magit-20191227.1438/git-rebase.el b/elpa/magit-20200126.1750/git-rebase.el similarity index 95% rename from elpa/magit-20191227.1438/git-rebase.el rename to elpa/magit-20200126.1750/git-rebase.el index af3824e3..4ca8e9b5 100644 --- a/elpa/magit-20191227.1438/git-rebase.el +++ b/elpa/magit-20200126.1750/git-rebase.el @@ -1,6 +1,6 @@ ;;; git-rebase.el --- Edit Git rebase files -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -152,23 +152,14 @@ (defvar git-rebase-mode-map (let ((map (make-sparse-keymap))) (set-keymap-parent map special-mode-map) - (cond ((featurep 'jkl) - (define-key map [return] 'git-rebase-show-commit) - (define-key map (kbd "i") 'git-rebase-backward-line) - (define-key map (kbd "k") 'forward-line) - (define-key map (kbd "M-i") 'git-rebase-move-line-up) - (define-key map (kbd "M-k") 'git-rebase-move-line-down) - (define-key map (kbd "p") 'git-rebase-pick) - (define-key map (kbd ",") 'git-rebase-kill-line)) - (t - (define-key map (kbd "C-m") 'git-rebase-show-commit) - (define-key map (kbd "p") 'git-rebase-backward-line) - (define-key map (kbd "n") 'forward-line) - (define-key map (kbd "M-p") 'git-rebase-move-line-up) - (define-key map (kbd "M-n") 'git-rebase-move-line-down) - (define-key map (kbd "c") 'git-rebase-pick) - (define-key map (kbd "k") 'git-rebase-kill-line) - (define-key map (kbd "C-k") 'git-rebase-kill-line))) + (define-key map (kbd "C-m") 'git-rebase-show-commit) + (define-key map (kbd "p") 'git-rebase-backward-line) + (define-key map (kbd "n") 'forward-line) + (define-key map (kbd "M-p") 'git-rebase-move-line-up) + (define-key map (kbd "M-n") 'git-rebase-move-line-down) + (define-key map (kbd "c") 'git-rebase-pick) + (define-key map (kbd "k") 'git-rebase-kill-line) + (define-key map (kbd "C-k") 'git-rebase-kill-line) (define-key map (kbd "b") 'git-rebase-break) (define-key map (kbd "e") 'git-rebase-edit) (define-key map (kbd "l") 'git-rebase-label) @@ -193,14 +184,9 @@ map) "Keymap for Git-Rebase mode.") -(cond ((featurep 'jkl) - (put 'git-rebase-reword :advertised-binding "r") - (put 'git-rebase-move-line-up :advertised-binding (kbd "M-i")) - (put 'git-rebase-kill-line :advertised-binding ",")) - (t - (put 'git-rebase-reword :advertised-binding "r") - (put 'git-rebase-move-line-up :advertised-binding (kbd "M-p")) - (put 'git-rebase-kill-line :advertised-binding "k"))) +(put 'git-rebase-reword :advertised-binding (kbd "r")) +(put 'git-rebase-move-line-up :advertised-binding (kbd "M-p")) +(put 'git-rebase-kill-line :advertised-binding (kbd "k")) (easy-menu-define git-rebase-mode-menu git-rebase-mode-map "Git-Rebase mode menu" diff --git a/elpa/magit-20191227.1438/git-rebase.elc b/elpa/magit-20200126.1750/git-rebase.elc similarity index 86% rename from elpa/magit-20191227.1438/git-rebase.elc rename to elpa/magit-20200126.1750/git-rebase.elc index 5051e4d2..de6f1586 100644 Binary files a/elpa/magit-20191227.1438/git-rebase.elc and b/elpa/magit-20200126.1750/git-rebase.elc differ diff --git a/elpa/magit-20191227.1438/magit-apply.el b/elpa/magit-20200126.1750/magit-apply.el similarity index 99% rename from elpa/magit-20191227.1438/magit-apply.el rename to elpa/magit-20200126.1750/magit-apply.el index 1a7ca97d..766a3ccc 100644 --- a/elpa/magit-20191227.1438/magit-apply.el +++ b/elpa/magit-20200126.1750/magit-apply.el @@ -1,6 +1,6 @@ ;;; magit-apply.el --- apply Git diffs -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-apply.elc b/elpa/magit-20200126.1750/magit-apply.elc similarity index 55% rename from elpa/magit-20191227.1438/magit-apply.elc rename to elpa/magit-20200126.1750/magit-apply.elc index 40e1d2c2..8b68625c 100644 Binary files a/elpa/magit-20191227.1438/magit-apply.elc and b/elpa/magit-20200126.1750/magit-apply.elc differ diff --git a/elpa/magit-20191227.1438/magit-autoloads.el b/elpa/magit-20200126.1750/magit-autoloads.el similarity index 99% rename from elpa/magit-20191227.1438/magit-autoloads.el rename to elpa/magit-20200126.1750/magit-autoloads.el index 51f2afa3..4689dfa2 100644 --- a/elpa/magit-20191227.1438/magit-autoloads.el +++ b/elpa/magit-20200126.1750/magit-autoloads.el @@ -1606,6 +1606,11 @@ Push a tag to another repository. \(fn TAG REMOTE &optional ARGS)" t nil) +(autoload 'magit-push-notes-ref "magit-push" "\ +Push a notes ref to another repository. + +\(fn REF REMOTE &optional ARGS)" t nil) + (autoload 'magit-push-implicitly "magit-push" "\ Push somewhere without using an explicit refspec. diff --git a/elpa/magit-20191227.1438/magit-autorevert.el b/elpa/magit-20200126.1750/magit-autorevert.el similarity index 99% rename from elpa/magit-20191227.1438/magit-autorevert.el rename to elpa/magit-20200126.1750/magit-autorevert.el index c47ae0c0..41ccbfea 100644 --- a/elpa/magit-20191227.1438/magit-autorevert.el +++ b/elpa/magit-20200126.1750/magit-autorevert.el @@ -1,6 +1,6 @@ ;;; magit-autorevert.el --- revert buffers when files in repository change -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-autorevert.elc b/elpa/magit-20200126.1750/magit-autorevert.elc similarity index 99% rename from elpa/magit-20191227.1438/magit-autorevert.elc rename to elpa/magit-20200126.1750/magit-autorevert.elc index 8e9f479a..af423ffe 100644 Binary files a/elpa/magit-20191227.1438/magit-autorevert.elc and b/elpa/magit-20200126.1750/magit-autorevert.elc differ diff --git a/elpa/magit-20191227.1438/magit-bisect.el b/elpa/magit-20200126.1750/magit-bisect.el similarity index 99% rename from elpa/magit-20191227.1438/magit-bisect.el rename to elpa/magit-20200126.1750/magit-bisect.el index 3e54c1c2..451914e0 100644 --- a/elpa/magit-20191227.1438/magit-bisect.el +++ b/elpa/magit-20200126.1750/magit-bisect.el @@ -1,6 +1,6 @@ ;;; magit-bisect.el --- bisect support for Magit -*- lexical-binding: t -*- -;; Copyright (C) 2011-2019 The Magit Project Contributors +;; Copyright (C) 2011-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-bisect.elc b/elpa/magit-20200126.1750/magit-bisect.elc similarity index 99% rename from elpa/magit-20191227.1438/magit-bisect.elc rename to elpa/magit-20200126.1750/magit-bisect.elc index f8283177..cd55c53a 100644 Binary files a/elpa/magit-20191227.1438/magit-bisect.elc and b/elpa/magit-20200126.1750/magit-bisect.elc differ diff --git a/elpa/magit-20191227.1438/magit-blame.el b/elpa/magit-20200126.1750/magit-blame.el similarity index 96% rename from elpa/magit-20191227.1438/magit-blame.el rename to elpa/magit-20200126.1750/magit-blame.el index f9401564..50657034 100644 --- a/elpa/magit-20191227.1438/magit-blame.el +++ b/elpa/magit-20200126.1750/magit-blame.el @@ -1,6 +1,6 @@ ;;; magit-blame.el --- blame support for Magit -*- lexical-binding: t -*- -;; Copyright (C) 2012-2019 The Magit Project Contributors +;; Copyright (C) 2012-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -271,26 +271,15 @@ in `magit-blame-read-only-mode-map' instead.") (defvar magit-blame-read-only-mode-map (let ((map (make-sparse-keymap))) - (cond ((featurep 'jkl) - (define-key map [return] 'magit-show-commit) - (define-key map (kbd "i") 'magit-blame-previous-chunk) - (define-key map (kbd "I") 'magit-blame-previous-chunk-same-commit) - (define-key map (kbd "k") 'magit-blame-next-chunk) - (define-key map (kbd "K") 'magit-blame-next-chunk-same-commit) - (define-key map (kbd "j") 'magit-blame-addition) - (define-key map (kbd "l") 'magit-blame-removal) - (define-key map (kbd "f") 'magit-blame-reverse) - (define-key map (kbd "b") 'magit-blame)) - (t - (define-key map (kbd "C-m") 'magit-show-commit) - (define-key map (kbd "p") 'magit-blame-previous-chunk) - (define-key map (kbd "P") 'magit-blame-previous-chunk-same-commit) - (define-key map (kbd "n") 'magit-blame-next-chunk) - (define-key map (kbd "N") 'magit-blame-next-chunk-same-commit) - (define-key map (kbd "b") 'magit-blame-addition) - (define-key map (kbd "r") 'magit-blame-removal) - (define-key map (kbd "f") 'magit-blame-reverse) - (define-key map (kbd "B") 'magit-blame))) + (define-key map (kbd "C-m") 'magit-show-commit) + (define-key map (kbd "p") 'magit-blame-previous-chunk) + (define-key map (kbd "P") 'magit-blame-previous-chunk-same-commit) + (define-key map (kbd "n") 'magit-blame-next-chunk) + (define-key map (kbd "N") 'magit-blame-next-chunk-same-commit) + (define-key map (kbd "b") 'magit-blame-addition) + (define-key map (kbd "r") 'magit-blame-removal) + (define-key map (kbd "f") 'magit-blame-reverse) + (define-key map (kbd "B") 'magit-blame) (define-key map (kbd "c") 'magit-blame-cycle-style) (define-key map (kbd "q") 'magit-blame-quit) (define-key map (kbd "M-w") 'magit-blame-copy-hash) diff --git a/elpa/magit-20191227.1438/magit-blame.elc b/elpa/magit-20200126.1750/magit-blame.elc similarity index 92% rename from elpa/magit-20191227.1438/magit-blame.elc rename to elpa/magit-20200126.1750/magit-blame.elc index d14ebb66..78b00d59 100644 Binary files a/elpa/magit-20191227.1438/magit-blame.elc and b/elpa/magit-20200126.1750/magit-blame.elc differ diff --git a/elpa/magit-20191227.1438/magit-bookmark.el b/elpa/magit-20200126.1750/magit-bookmark.el similarity index 99% rename from elpa/magit-20191227.1438/magit-bookmark.el rename to elpa/magit-20200126.1750/magit-bookmark.el index 49ba9c70..bd6c6838 100644 --- a/elpa/magit-20191227.1438/magit-bookmark.el +++ b/elpa/magit-20200126.1750/magit-bookmark.el @@ -1,6 +1,6 @@ ;;; magit-bookmark.el --- bookmark support for Magit -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-bookmark.elc b/elpa/magit-20200126.1750/magit-bookmark.elc similarity index 63% rename from elpa/magit-20191227.1438/magit-bookmark.elc rename to elpa/magit-20200126.1750/magit-bookmark.elc index ab012386..da2deb49 100644 Binary files a/elpa/magit-20191227.1438/magit-bookmark.elc and b/elpa/magit-20200126.1750/magit-bookmark.elc differ diff --git a/elpa/magit-20191227.1438/magit-branch.el b/elpa/magit-20200126.1750/magit-branch.el similarity index 99% rename from elpa/magit-20191227.1438/magit-branch.el rename to elpa/magit-20200126.1750/magit-branch.el index 9d7dc251..a7ac1b54 100644 --- a/elpa/magit-20191227.1438/magit-branch.el +++ b/elpa/magit-20200126.1750/magit-branch.el @@ -1,6 +1,6 @@ ;;; magit-branch.el --- branch support -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-branch.elc b/elpa/magit-20200126.1750/magit-branch.elc similarity index 91% rename from elpa/magit-20191227.1438/magit-branch.elc rename to elpa/magit-20200126.1750/magit-branch.elc index d589df55..2fb16cce 100644 Binary files a/elpa/magit-20191227.1438/magit-branch.elc and b/elpa/magit-20200126.1750/magit-branch.elc differ diff --git a/elpa/magit-20191227.1438/magit-clone.el b/elpa/magit-20200126.1750/magit-clone.el similarity index 98% rename from elpa/magit-20191227.1438/magit-clone.el rename to elpa/magit-20200126.1750/magit-clone.el index a4128940..e2b3f695 100644 --- a/elpa/magit-20191227.1438/magit-clone.el +++ b/elpa/magit-20200126.1750/magit-clone.el @@ -1,6 +1,6 @@ ;;; magit-clone.el --- clone a repository -*- lexical-binding: t -*- -;; Copyright (C) 2008-2019 The Magit Project Contributors +;; Copyright (C) 2008-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -64,7 +64,7 @@ with the remote url as only argument and use the returned value." If nil, then a prefix argument has to be used to show the transient popup instead of invoking the default suffix `magit-clone-regular' directly." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-commands :type 'boolean) @@ -87,7 +87,7 @@ default user specified in the matched entry is used. If USER contains a dot, then it is treated as a Git variable and the value of that is used as the username. Otherwise it is used as the username itself." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-commands :type '(repeat (list regexp (string :tag "hostname") @@ -97,7 +97,7 @@ as the username itself." "Format used when turning repository names into urls. %h is the hostname and %n is the repository name, including the name of the owner. Also see `magit-clone-name-alist'." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-commands :type 'regexp) diff --git a/elpa/magit-20191227.1438/magit-clone.elc b/elpa/magit-20200126.1750/magit-clone.elc similarity index 77% rename from elpa/magit-20191227.1438/magit-clone.elc rename to elpa/magit-20200126.1750/magit-clone.elc index 769973d5..565fd7e8 100644 Binary files a/elpa/magit-20191227.1438/magit-clone.elc and b/elpa/magit-20200126.1750/magit-clone.elc differ diff --git a/elpa/magit-20191227.1438/magit-commit.el b/elpa/magit-20200126.1750/magit-commit.el similarity index 99% rename from elpa/magit-20191227.1438/magit-commit.el rename to elpa/magit-20200126.1750/magit-commit.el index 6a560560..d7572cec 100644 --- a/elpa/magit-20191227.1438/magit-commit.el +++ b/elpa/magit-20200126.1750/magit-commit.el @@ -1,6 +1,6 @@ ;;; magit-commit.el --- create Git commits -*- lexical-binding: t -*- -;; Copyright (C) 2008-2019 The Magit Project Contributors +;; Copyright (C) 2008-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-commit.elc b/elpa/magit-20200126.1750/magit-commit.elc similarity index 90% rename from elpa/magit-20191227.1438/magit-commit.elc rename to elpa/magit-20200126.1750/magit-commit.elc index eedf01db..2b75604e 100644 Binary files a/elpa/magit-20191227.1438/magit-commit.elc and b/elpa/magit-20200126.1750/magit-commit.elc differ diff --git a/elpa/magit-20191227.1438/magit-core.el b/elpa/magit-20200126.1750/magit-core.el similarity index 95% rename from elpa/magit-20191227.1438/magit-core.el rename to elpa/magit-20200126.1750/magit-core.el index b705052f..900f2c54 100644 --- a/elpa/magit-20191227.1438/magit-core.el +++ b/elpa/magit-20200126.1750/magit-core.el @@ -1,6 +1,6 @@ ;;; magit-core.el --- core functionality -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -102,6 +102,8 @@ Each of these options falls into one or more of these categories: (custom-add-to-group 'magit-faces 'git-commit-faces 'custom-group) (custom-add-to-group 'magit-modes 'git-rebase 'custom-group) (custom-add-to-group 'magit-faces 'git-rebase-faces 'custom-group) +(custom-add-to-group 'magit 'magit-section 'custom-group) +(custom-add-to-group 'magit-faces 'magit-section-faces 'custom-group) (custom-add-to-group 'magit-process 'with-editor 'custom-group) (defgroup magit-related nil diff --git a/elpa/magit-20200126.1750/magit-core.elc b/elpa/magit-20200126.1750/magit-core.elc new file mode 100644 index 00000000..53d77f1d Binary files /dev/null and b/elpa/magit-20200126.1750/magit-core.elc differ diff --git a/elpa/magit-20191227.1438/magit-diff.el b/elpa/magit-20200126.1750/magit-diff.el similarity index 96% rename from elpa/magit-20191227.1438/magit-diff.el rename to elpa/magit-20200126.1750/magit-diff.el index 9d351a87..75031626 100644 --- a/elpa/magit-20191227.1438/magit-diff.el +++ b/elpa/magit-20200126.1750/magit-diff.el @@ -1,6 +1,6 @@ ;;; magit-diff.el --- inspect Git diffs -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -171,7 +171,7 @@ t Show fine differences for the current diff hunk only. (defcustom magit-diff-refine-ignore-whitespace smerge-refine-ignore-whitespace "Whether to ignore whitespace changes in word-granularity differences." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :set-after '(smerge-refine-ignore-whitespace) :group 'magit-diff :safe 'booleanp @@ -236,7 +236,7 @@ whitespace errors are highlighted." t Highlight only in added lines. `both' Highlight in added and removed lines. `all' Highlight in added, removed and context lines." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-diff :safe (lambda (val) (memq val '(t both all))) :type '(choice (const :tag "in added lines" t) @@ -446,7 +446,7 @@ for commits before the rename event. When this option is nil, the revision buffer ignores the log's filter if the log arguments include --follow. If non-nil, the log's file filter is always honored." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-revision :type 'boolean) @@ -482,7 +482,7 @@ Previously this function used to visit the worktree file not only for added lines but also for such removed lines. If you prefer the old behaviors, then set this to t." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-diff :type 'boolean) @@ -813,6 +813,27 @@ and `:slant'." (setq magit-buffer-diff-files files) (magit-refresh))) +;;; Section Classes + +(defclass magit-file-section (magit-section) + ((source :initform nil) + (header :initform nil))) + +(defclass magit-module-section (magit-file-section) + ()) + +(defclass magit-hunk-section (magit-section) + ((refined :initform nil) + (combined :initform nil) + (from-range :initform nil) + (from-ranges :initform nil) + (to-range :initform nil) + (about :initform nil))) + +(setf (alist-get 'hunk magit--section-type-alist) 'magit-hunk-section) +(setf (alist-get 'module magit--section-type-alist) 'magit-module-section) +(setf (alist-get 'file magit--section-type-alist) 'magit-file-section) + ;;; Commands ;;;; Prefix Commands @@ -1780,6 +1801,36 @@ commit or stash at point, then prompt for a commit." (funcall cmd rev)))) (call-interactively #'magit-show-commit)))) +;;;; Section Commands + +(defun magit-section-cycle-diffs () + "Cycle visibility of diff-related sections in the current buffer." + (interactive) + (when-let ((sections + (cond ((derived-mode-p 'magit-status-mode) + (--mapcat + (when it + (when (oref it hidden) + (magit-section-show it)) + (oref it children)) + (list (magit-get-section '((staged) (status))) + (magit-get-section '((unstaged) (status)))))) + ((derived-mode-p 'magit-diff-mode) + (-filter #'magit-file-section-p + (oref magit-root-section children)))))) + (if (--any-p (oref it hidden) sections) + (dolist (s sections) + (magit-section-show s) + (magit-section-hide-children s)) + (let ((children (--mapcat (oref it children) sections))) + (cond ((and (--any-p (oref it hidden) children) + (--any-p (oref it children) children)) + (mapc 'magit-section-show-headings sections)) + ((-any-p 'magit-section-hidden-body children) + (mapc 'magit-section-show-children sections)) + (t + (mapc 'magit-section-hide sections))))))) + ;;; Diff Mode (defvar magit-diff-mode-map @@ -1868,9 +1919,8 @@ Staging and applying changes is documented in info node (defvar magit-file-section-map (let ((map (make-sparse-keymap))) - (unless (featurep 'jkl) - (define-key map (kbd "C-j") 'magit-diff-visit-worktree-file)) - (define-key map [C-return] 'magit-diff-visit-worktree-file) + (define-key map (kbd "C-j") 'magit-diff-visit-worktree-file) + (define-key map [C-return] 'magit-diff-visit-worktree-file) (define-key map [remap magit-visit-thing] 'magit-diff-visit-file) (define-key map [remap magit-delete-thing] 'magit-discard) (define-key map [remap magit-revert-no-commit] 'magit-reverse) @@ -1886,8 +1936,7 @@ Staging and applying changes is documented in info node (defvar magit-hunk-section-map (let ((map (make-sparse-keymap))) - (unless (featurep 'jkl) - (define-key map (kbd "C-j") 'magit-diff-visit-worktree-file)) + (define-key map (kbd "C-j") 'magit-diff-visit-worktree-file) (define-key map [C-return] 'magit-diff-visit-worktree-file) (define-key map [remap magit-visit-thing] 'magit-diff-visit-file) (define-key map [remap magit-delete-thing] 'magit-discard) @@ -1945,6 +1994,17 @@ Staging and applying changes is documented in info node (let ((magit-git-global-arguments (remove "--literal-pathspecs" magit-git-global-arguments))) (setq args (-flatten args)) + ;; As of Git 2.19.0, we need to generate diffs with + ;; --ita-visible-in-index so that `magit-stage' can work with + ;; intent-to-add files (see #4026). Cache the result for each + ;; repo to avoid a `git version' call for every diff insertion. + (when (pcase (magit-repository-local-get 'diff-ita-kludge-p 'unset) + (`unset + (let ((val (version<= "2.19.0" (magit-git-version)))) + (magit-repository-local-set 'diff-ita-kludge-p val) + val)) + (val val)) + (push "--ita-visible-in-index" (cdr args))) (when (cl-member-if (lambda (arg) (string-prefix-p "--color-moved" arg)) args) (push "--color=always" (cdr args)) (setq magit-git-global-arguments @@ -2235,6 +2295,8 @@ section or a child thereof." magit-diff-expansion-threshold) 'hide)) +(add-hook 'magit-section-set-visibility-hook #'magit-diff-expansion-threshold) + ;;; Revision Mode (define-derived-mode magit-revision-mode magit-diff-mode "Magit Rev" @@ -2596,6 +2658,39 @@ or a ref which is not a branch, then it inserts nothing." ;;; Diff Sections +(defun magit-hunk-set-window-start (section) + "When SECTION is a `hunk', ensure that its beginning is visible. +It the SECTION has a different type, then do nothing." + (when (magit-hunk-section-p section) + (magit-section-set-window-start section))) + +(add-hook 'magit-section-movement-hook #'magit-hunk-set-window-start) + +(defun magit-hunk-goto-successor (section arg) + (and (magit-hunk-section-p section) + (when-let ((parent (magit-get-section + (magit-section-ident + (oref section parent))))) + (let* ((children (oref parent children)) + (siblings (magit-section-siblings section 'prev)) + (previous (nth (length siblings) children))) + (if (not arg) + (--when-let (or previous (car (last children))) + (magit-section-goto it) + t) + (when previous + (magit-section-goto previous)) + (if (and (stringp arg) + (re-search-forward arg (oref parent end) t)) + (goto-char (match-beginning 0)) + (goto-char (oref (car (last children)) end)) + (forward-line -1) + (while (looking-at "^ ") (forward-line -1)) + (while (looking-at "^[-+]") (forward-line -1)) + (forward-line))))))) + +(add-hook 'magit-section-goto-successor-hook #'magit-hunk-goto-successor) + (defvar magit-unstaged-section-map (let ((map (make-sparse-keymap))) (define-key map [remap magit-visit-thing] 'magit-diff-unstaged) @@ -2759,6 +2854,9 @@ actually a `diff' but a `diffstat' section." ;;; Diff Highlight +(add-hook 'magit-section-unhighlight-hook #'magit-diff-unhighlight) +(add-hook 'magit-section-highlight-hook #'magit-diff-highlight) + (defun magit-diff-unhighlight (section selection) "Remove the highlighting of the diff-related SECTION." (when (magit-hunk-section-p section) diff --git a/elpa/magit-20191227.1438/magit-diff.elc b/elpa/magit-20200126.1750/magit-diff.elc similarity index 69% rename from elpa/magit-20191227.1438/magit-diff.elc rename to elpa/magit-20200126.1750/magit-diff.elc index c45cfd31..5a4b6920 100644 Binary files a/elpa/magit-20191227.1438/magit-diff.elc and b/elpa/magit-20200126.1750/magit-diff.elc differ diff --git a/elpa/magit-20191227.1438/magit-ediff.el b/elpa/magit-20200126.1750/magit-ediff.el similarity index 99% rename from elpa/magit-20191227.1438/magit-ediff.el rename to elpa/magit-20200126.1750/magit-ediff.el index 8d45717f..058dd882 100644 --- a/elpa/magit-20191227.1438/magit-ediff.el +++ b/elpa/magit-20200126.1750/magit-ediff.el @@ -1,6 +1,6 @@ ;;; magit-ediff.el --- Ediff extension for Magit -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-ediff.elc b/elpa/magit-20200126.1750/magit-ediff.elc similarity index 80% rename from elpa/magit-20191227.1438/magit-ediff.elc rename to elpa/magit-20200126.1750/magit-ediff.elc index 6226afe9..11d7108f 100644 Binary files a/elpa/magit-20191227.1438/magit-ediff.elc and b/elpa/magit-20200126.1750/magit-ediff.elc differ diff --git a/elpa/magit-20191227.1438/magit-extras.el b/elpa/magit-20200126.1750/magit-extras.el similarity index 99% rename from elpa/magit-20191227.1438/magit-extras.el rename to elpa/magit-20200126.1750/magit-extras.el index 4c01ce4c..fe47d290 100644 --- a/elpa/magit-20191227.1438/magit-extras.el +++ b/elpa/magit-20200126.1750/magit-extras.el @@ -1,6 +1,6 @@ ;;; magit-extras.el --- additional functionality for Magit -*- lexical-binding: t -*- -;; Copyright (C) 2008-2019 The Magit Project Contributors +;; Copyright (C) 2008-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -465,7 +465,7 @@ that)." (defcustom magit-copy-revision-abbreviated nil "Whether to save abbreviated revision to `kill-ring' and `magit-revision-stack'." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-miscellaneous :type 'boolean) diff --git a/elpa/magit-20191227.1438/magit-extras.elc b/elpa/magit-20200126.1750/magit-extras.elc similarity index 92% rename from elpa/magit-20191227.1438/magit-extras.elc rename to elpa/magit-20200126.1750/magit-extras.elc index 9cc5d20e..c2e142b6 100644 Binary files a/elpa/magit-20191227.1438/magit-extras.elc and b/elpa/magit-20200126.1750/magit-extras.elc differ diff --git a/elpa/magit-20191227.1438/magit-fetch.el b/elpa/magit-20200126.1750/magit-fetch.el similarity index 96% rename from elpa/magit-20191227.1438/magit-fetch.el rename to elpa/magit-20200126.1750/magit-fetch.el index 4a1676ec..a3a0cc65 100644 --- a/elpa/magit-20191227.1438/magit-fetch.el +++ b/elpa/magit-20200126.1750/magit-fetch.el @@ -1,6 +1,6 @@ ;;; magit-fetch.el --- download objects and refs -*- lexical-binding: t -*- -;; Copyright (C) 2008-2019 The Magit Project Contributors +;; Copyright (C) 2008-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -70,9 +70,9 @@ Ignored for Git versions before v2.8.0." (define-suffix-command magit-fetch-from-pushremote (args) "Fetch from the current push-remote. -When the push-remote is not configured, then read the push-remote -from the user, set it, and then fetch from it. With a prefix -argument the push-remote can be changed before fetching from it." +With a prefix argument or when the push-remote is either not +configured or unusable, then let the user first configure the +push-remote." :description 'magit-fetch--pushremote-description (interactive (list (magit-fetch-arguments))) (let ((remote (magit-get-push-remote))) diff --git a/elpa/magit-20191227.1438/magit-fetch.elc b/elpa/magit-20200126.1750/magit-fetch.elc similarity index 88% rename from elpa/magit-20191227.1438/magit-fetch.elc rename to elpa/magit-20200126.1750/magit-fetch.elc index dac6c214..78416596 100644 Binary files a/elpa/magit-20191227.1438/magit-fetch.elc and b/elpa/magit-20200126.1750/magit-fetch.elc differ diff --git a/elpa/magit-20191227.1438/magit-files.el b/elpa/magit-20200126.1750/magit-files.el similarity index 97% rename from elpa/magit-20191227.1438/magit-files.el rename to elpa/magit-20200126.1750/magit-files.el index 20ec596b..3f0758d2 100644 --- a/elpa/magit-20191227.1438/magit-files.el +++ b/elpa/magit-20200126.1750/magit-files.el @@ -1,6 +1,6 @@ ;;; magit-files.el --- finding files -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -355,18 +355,11 @@ Currently this only adds the following key bindings. (defvar magit-blob-mode-map (let ((map (make-sparse-keymap))) - (cond ((featurep 'jkl) - (define-key map "i" 'magit-blob-previous) - (define-key map "k" 'magit-blob-next) - (define-key map "j" 'magit-blame-addition) - (define-key map "l" 'magit-blame-removal) - (define-key map "f" 'magit-blame-reverse)) - (t - (define-key map "p" 'magit-blob-previous) - (define-key map "n" 'magit-blob-next) - (define-key map "b" 'magit-blame-addition) - (define-key map "r" 'magit-blame-removal) - (define-key map "f" 'magit-blame-reverse))) + (define-key map "p" 'magit-blob-previous) + (define-key map "n" 'magit-blob-next) + (define-key map "b" 'magit-blame-addition) + (define-key map "r" 'magit-blame-removal) + (define-key map "f" 'magit-blame-reverse) (define-key map "q" 'magit-kill-this-buffer) map) "Keymap for `magit-blob-mode'.") diff --git a/elpa/magit-20191227.1438/magit-files.elc b/elpa/magit-20200126.1750/magit-files.elc similarity index 94% rename from elpa/magit-20191227.1438/magit-files.elc rename to elpa/magit-20200126.1750/magit-files.elc index b53c4a49..0717d0ed 100644 Binary files a/elpa/magit-20191227.1438/magit-files.elc and b/elpa/magit-20200126.1750/magit-files.elc differ diff --git a/elpa/magit-20191227.1438/magit-git.el b/elpa/magit-20200126.1750/magit-git.el similarity index 99% rename from elpa/magit-20191227.1438/magit-git.el rename to elpa/magit-20200126.1750/magit-git.el index 801433fe..ebd56103 100644 --- a/elpa/magit-20191227.1438/magit-git.el +++ b/elpa/magit-20200126.1750/magit-git.el @@ -1,6 +1,6 @@ ;;; magit-git.el --- Git functionality -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-git.elc b/elpa/magit-20200126.1750/magit-git.elc similarity index 99% rename from elpa/magit-20191227.1438/magit-git.elc rename to elpa/magit-20200126.1750/magit-git.elc index 4b8c4a87..5dbe6e1a 100644 Binary files a/elpa/magit-20191227.1438/magit-git.elc and b/elpa/magit-20200126.1750/magit-git.elc differ diff --git a/elpa/magit-20191227.1438/magit-gitignore.el b/elpa/magit-20200126.1750/magit-gitignore.el similarity index 99% rename from elpa/magit-20191227.1438/magit-gitignore.el rename to elpa/magit-20200126.1750/magit-gitignore.el index 21c0239d..ad1ac91d 100644 --- a/elpa/magit-20191227.1438/magit-gitignore.el +++ b/elpa/magit-20200126.1750/magit-gitignore.el @@ -1,6 +1,6 @@ ;;; magit-gitignore.el --- intentionally untracked files -*- lexical-binding: t -*- -;; Copyright (C) 2008-2019 The Magit Project Contributors +;; Copyright (C) 2008-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-gitignore.elc b/elpa/magit-20200126.1750/magit-gitignore.elc similarity index 99% rename from elpa/magit-20191227.1438/magit-gitignore.elc rename to elpa/magit-20200126.1750/magit-gitignore.elc index 56c7e850..75e57b3f 100644 Binary files a/elpa/magit-20191227.1438/magit-gitignore.elc and b/elpa/magit-20200126.1750/magit-gitignore.elc differ diff --git a/elpa/magit-20191227.1438/magit-imenu.el b/elpa/magit-20200126.1750/magit-imenu.el similarity index 99% rename from elpa/magit-20191227.1438/magit-imenu.el rename to elpa/magit-20200126.1750/magit-imenu.el index 5125e8a8..bba7eed5 100644 --- a/elpa/magit-20191227.1438/magit-imenu.el +++ b/elpa/magit-20200126.1750/magit-imenu.el @@ -1,6 +1,6 @@ ;;; magit-imenu.el --- Integrate Imenu in magit major modes -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-imenu.elc b/elpa/magit-20200126.1750/magit-imenu.elc similarity index 99% rename from elpa/magit-20191227.1438/magit-imenu.elc rename to elpa/magit-20200126.1750/magit-imenu.elc index 424915fd..3b6d7f02 100644 Binary files a/elpa/magit-20191227.1438/magit-imenu.elc and b/elpa/magit-20200126.1750/magit-imenu.elc differ diff --git a/elpa/magit-20191227.1438/magit-log.el b/elpa/magit-20200126.1750/magit-log.el similarity index 99% rename from elpa/magit-20191227.1438/magit-log.el rename to elpa/magit-20200126.1750/magit-log.el index ff851c8f..39b8fe9b 100644 --- a/elpa/magit-20191227.1438/magit-log.el +++ b/elpa/magit-20200126.1750/magit-log.el @@ -1,6 +1,6 @@ ;;; magit-log.el --- inspect Git history -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -124,7 +124,7 @@ This option only controls whether the committer date is displayed instead of the author date. Whether some date is displayed in the margin and whether the margin is displayed at all is controlled by other options." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-log :group 'magit-margin :type 'boolean) @@ -155,7 +155,7 @@ This is useful if you use really long branch names." This is used by the command `magit-log-trace-definition'. You should prefer `magit-which-function' over `which-function' because the latter may make use of Imenu's outdated cache." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-log :type '(choice (function-item magit-which-function) (function-item which-function) @@ -1289,6 +1289,8 @@ exists mostly for backward compatibility reasons." (forward-line -1) (magit-section-forward))) +(add-hook 'magit-section-movement-hook #'magit-log-maybe-show-more-commits) + (defvar magit--update-revision-buffer nil) (defun magit-log-maybe-update-revision-buffer (&optional _) @@ -1297,6 +1299,8 @@ If there is no revision buffer in the same frame, then do nothing." (when (derived-mode-p 'magit-log-mode 'magit-cherry-mode 'magit-reflog-mode) (magit--maybe-update-revision-buffer))) +(add-hook 'magit-section-movement-hook #'magit-log-maybe-update-revision-buffer) + (defun magit--maybe-update-revision-buffer () (when-let ((commit (magit-section-value-if 'commit)) (buffer (magit-get-mode-buffer 'magit-revision-mode nil t))) diff --git a/elpa/magit-20191227.1438/magit-log.elc b/elpa/magit-20200126.1750/magit-log.elc similarity index 83% rename from elpa/magit-20191227.1438/magit-log.elc rename to elpa/magit-20200126.1750/magit-log.elc index 9e95021f..2bbf7beb 100644 Binary files a/elpa/magit-20191227.1438/magit-log.elc and b/elpa/magit-20200126.1750/magit-log.elc differ diff --git a/elpa/magit-20191227.1438/magit-margin.el b/elpa/magit-20200126.1750/magit-margin.el similarity index 99% rename from elpa/magit-20191227.1438/magit-margin.el rename to elpa/magit-20200126.1750/magit-margin.el index b3137c68..af85389c 100644 --- a/elpa/magit-20191227.1438/magit-margin.el +++ b/elpa/magit-20200126.1750/magit-margin.el @@ -1,6 +1,6 @@ ;;; magit-margin.el --- margins in Magit buffers -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-margin.elc b/elpa/magit-20200126.1750/magit-margin.elc similarity index 91% rename from elpa/magit-20191227.1438/magit-margin.elc rename to elpa/magit-20200126.1750/magit-margin.elc index 540eee21..f6ed55f6 100644 Binary files a/elpa/magit-20191227.1438/magit-margin.elc and b/elpa/magit-20200126.1750/magit-margin.elc differ diff --git a/elpa/magit-20191227.1438/magit-merge.el b/elpa/magit-20200126.1750/magit-merge.el similarity index 99% rename from elpa/magit-20191227.1438/magit-merge.el rename to elpa/magit-20200126.1750/magit-merge.el index 415d0733..18de7a57 100644 --- a/elpa/magit-20191227.1438/magit-merge.el +++ b/elpa/magit-20200126.1750/magit-merge.el @@ -1,6 +1,6 @@ ;;; magit-merge.el --- merge functionality -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-merge.elc b/elpa/magit-20200126.1750/magit-merge.elc similarity index 88% rename from elpa/magit-20191227.1438/magit-merge.elc rename to elpa/magit-20200126.1750/magit-merge.elc index 723a8abf..b2dcb3d4 100644 Binary files a/elpa/magit-20191227.1438/magit-merge.elc and b/elpa/magit-20200126.1750/magit-merge.elc differ diff --git a/elpa/magit-20191227.1438/magit-mode.el b/elpa/magit-20200126.1750/magit-mode.el similarity index 94% rename from elpa/magit-20191227.1438/magit-mode.el rename to elpa/magit-20200126.1750/magit-mode.el index 3a84fcc4..6c8b4a76 100644 --- a/elpa/magit-20191227.1438/magit-mode.el +++ b/elpa/magit-20200126.1750/magit-mode.el @@ -1,6 +1,6 @@ ;;; magit-mode.el --- create and refresh Magit buffers -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -50,6 +50,8 @@ (declare-function magit-auto-revert-buffers "magit-autorevert" ()) ;; For `magit-refresh-buffer' (declare-function magit-process-unset-mode-line-error-status "magit-process" ()) +;; For `magit-refresh-get-relative-position' +(declare-function magit-hunk-section-p "magit-diff" (obj)) ;; For `magit-mode-setup-internal' (declare-function magit-status-goto-initial-section "magit-status" ()) ;; For `magit-mode' from `bookmark' @@ -63,7 +65,7 @@ (defcustom magit-mode-hook '(magit-load-config-extensions) "Hook run when entering a mode derived from Magit mode." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-modes :type 'hook :options '(magit-load-config-extensions @@ -230,7 +232,7 @@ Valid values are: For more information see info node `(magit)Transient Arguments and Buffer Arguments'." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-buffers :group 'magit-commands :type '(choice (const :tag "always use args from buffer" always) @@ -259,7 +261,7 @@ Valid values are: For more information see info node `(magit)Transient Arguments and Buffer Arguments'." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-buffers :group 'magit-commands :type '(choice (const :tag "always use args from buffer" always) @@ -329,56 +331,22 @@ recommended value." ;;; Key Bindings (defvar magit-mode-map - (let ((map (make-keymap))) - (suppress-keymap map t) - (cond ((featurep 'jkl) - (define-key map [return] 'magit-visit-thing) - (define-key map [C-return] 'magit-dired-jump) - (define-key map [tab] 'magit-section-toggle) - (define-key map [C-tab] 'magit-section-cycle) - (define-key map [M-tab] 'magit-section-cycle-diffs) - (define-key map [S-tab] 'magit-section-cycle-global) - (define-key map (kbd "M-o") 'magit-section-up) - (define-key map (kbd "i") 'magit-section-backward) - (define-key map (kbd "k") 'magit-section-forward) - (define-key map (kbd "M-i") 'magit-section-backward-sibling) - (define-key map (kbd "M-k") 'magit-section-forward-sibling) - (define-key map (kbd "p") 'magit-push) - (define-key map (kbd ",") 'magit-delete-thing) - (define-key map (kbd ";") 'magit-file-untrack) - (define-key map (kbd "C-c C-i") 'magit-gitignore)) - (t - (define-key map [C-return] 'magit-visit-thing) - (define-key map (kbd "C-m") 'magit-visit-thing) - (define-key map (kbd "C-M-i") 'magit-dired-jump) - (define-key map (kbd "C-i") 'magit-section-toggle) - (define-key map [C-tab] 'magit-section-cycle) - (define-key map [M-tab] 'magit-section-cycle-diffs) - ;; [backtab] is the most portable binding for Shift+Tab. - (define-key map [backtab] 'magit-section-cycle-global) - (define-key map (kbd "^") 'magit-section-up) - (define-key map (kbd "p") 'magit-section-backward) - (define-key map (kbd "n") 'magit-section-forward) - (define-key map (kbd "M-p") 'magit-section-backward-sibling) - (define-key map (kbd "M-n") 'magit-section-forward-sibling) - (define-key map (kbd "P") 'magit-push) - (define-key map (kbd "k") 'magit-delete-thing) - (define-key map (kbd "K") 'magit-file-untrack) - (define-key map (kbd "i") 'magit-gitignore) - (define-key map (kbd "I") 'magit-gitignore))) + (let ((map (make-sparse-keymap))) + (set-keymap-parent map magit-section-mode-map) + (define-key map [C-return] 'magit-visit-thing) + (define-key map (kbd "C-m") 'magit-visit-thing) + (define-key map (kbd "C-M-i") 'magit-dired-jump) + (define-key map [M-tab] 'magit-section-cycle-diffs) + (define-key map (kbd "P") 'magit-push) + (define-key map (kbd "k") 'magit-delete-thing) + (define-key map (kbd "K") 'magit-file-untrack) + (define-key map (kbd "i") 'magit-gitignore) + (define-key map (kbd "I") 'magit-gitignore) (define-key map (kbd "SPC") 'magit-diff-show-or-scroll-up) (define-key map (kbd "DEL") 'magit-diff-show-or-scroll-down) (define-key map "+" 'magit-diff-more-context) (define-key map "-" 'magit-diff-less-context) (define-key map "0" 'magit-diff-default-context) - (define-key map "1" 'magit-section-show-level-1) - (define-key map "2" 'magit-section-show-level-2) - (define-key map "3" 'magit-section-show-level-3) - (define-key map "4" 'magit-section-show-level-4) - (define-key map (kbd "M-1") 'magit-section-show-level-1-all) - (define-key map (kbd "M-2") 'magit-section-show-level-2-all) - (define-key map (kbd "M-3") 'magit-section-show-level-3-all) - (define-key map (kbd "M-4") 'magit-section-show-level-4-all) (define-key map "$" 'magit-process-buffer) (define-key map "%" 'magit-worktree) (define-key map "a" 'magit-cherry-apply) @@ -406,10 +374,10 @@ recommended value." (define-key map "q" 'magit-mode-bury-buffer) (define-key map "r" 'magit-rebase) (define-key map "R" 'magit-file-rename) - (define-key map "t" 'magit-tag) - (define-key map "T" 'magit-notes) (define-key map "s" 'magit-stage-file) (define-key map "S" 'magit-stage-modified) + (define-key map "t" 'magit-tag) + (define-key map "T" 'magit-notes) (define-key map "u" 'magit-unstage-file) (define-key map "U" 'magit-unstage-all) (define-key map "v" 'magit-revert-no-commit) @@ -577,13 +545,13 @@ Magit is documented in info node `(magit)'." "Obsolete. Possibly the arguments used to refresh the current buffer. Some third-party packages might still use this, but Magit does not.") (put 'magit-refresh-args 'permanent-local t) -(make-obsolete-variable 'magit-refresh-args nil "Magit 2.91.0") +(make-obsolete-variable 'magit-refresh-args nil "Magit 3.0.0") (defvar magit-buffer-lock-functions nil "Obsolete buffer-locking support for third-party modes. Implement the generic function `magit-buffer-value' for your mode instead of adding an entry to this variable.") -(make-obsolete-variable 'magit-buffer-lock-functions nil "Magit 2.91.0") +(make-obsolete-variable 'magit-buffer-lock-functions nil "Magit 3.0.0") (cl-defgeneric magit-buffer-value () (when-let ((fn (cdr (assq major-mode magit-buffer-lock-functions)))) @@ -632,7 +600,7 @@ your mode instead of adding an entry to this variable.") (defun magit-mode-setup (mode &rest args) "Setup up a MODE buffer using ARGS to generate its content." - (declare (obsolete magit-setup-buffer "Magit 2.91.0")) + (declare (obsolete magit-setup-buffer "Magit 3.0.0")) (with-no-warnings (magit-mode-setup-internal mode args))) @@ -640,7 +608,7 @@ your mode instead of adding an entry to this variable.") "Setup up a MODE buffer using ARGS to generate its content. When optional LOCKED is non-nil, then create a buffer that is locked to its value, which is derived from MODE and ARGS." - (declare (obsolete magit-setup-buffer "Magit 2.91.0")) + (declare (obsolete magit-setup-buffer "Magit 3.0.0")) (let* ((value (and locked (with-temp-buffer (with-no-warnings @@ -883,7 +851,7 @@ If a frame, then only consider buffers on that frame." (magit--not-inside-repository-error))) (defun magit-mode-get-buffer (mode &optional create frame value) - (declare (obsolete magit-get-mode-buffer "Magit 2.91.0")) + (declare (obsolete magit-get-mode-buffer "Magit 3.0.0")) (when create (error "`magit-mode-get-buffer's CREATE argument is obsolete")) (if-let ((topdir (magit-toplevel))) @@ -1111,10 +1079,10 @@ Run hooks `magit-pre-refresh-hook' and `magit-post-refresh-hook'." (erase-buffer) (save-excursion (apply refresh (with-no-warnings magit-refresh-args)))) - (dolist (window windows) - (with-selected-window (car window) + (pcase-dolist (`(,window . ,args) windows) + (with-selected-window window (with-current-buffer buffer - (apply #'magit-section-goto-successor (cdr window))))) + (apply #'magit-section-goto-successor args)))) (run-hooks 'magit-refresh-buffer-hook) (magit-section-update-highlight) (set-buffer-modified-p nil)) diff --git a/elpa/magit-20191227.1438/magit-mode.elc b/elpa/magit-20200126.1750/magit-mode.elc similarity index 68% rename from elpa/magit-20191227.1438/magit-mode.elc rename to elpa/magit-20200126.1750/magit-mode.elc index cae218dc..32967e9b 100644 Binary files a/elpa/magit-20191227.1438/magit-mode.elc and b/elpa/magit-20200126.1750/magit-mode.elc differ diff --git a/elpa/magit-20191227.1438/magit-notes.el b/elpa/magit-20200126.1750/magit-notes.el similarity index 99% rename from elpa/magit-20191227.1438/magit-notes.el rename to elpa/magit-20200126.1750/magit-notes.el index 1bd1fd34..99196089 100644 --- a/elpa/magit-20191227.1438/magit-notes.el +++ b/elpa/magit-20200126.1750/magit-notes.el @@ -1,6 +1,6 @@ ;;; magit-notes.el --- notes support -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-notes.elc b/elpa/magit-20200126.1750/magit-notes.elc similarity index 99% rename from elpa/magit-20191227.1438/magit-notes.elc rename to elpa/magit-20200126.1750/magit-notes.elc index c0648b52..bbbefeef 100644 Binary files a/elpa/magit-20191227.1438/magit-notes.elc and b/elpa/magit-20200126.1750/magit-notes.elc differ diff --git a/elpa/magit-20191227.1438/magit-obsolete.el b/elpa/magit-20200126.1750/magit-obsolete.el similarity index 89% rename from elpa/magit-20191227.1438/magit-obsolete.el rename to elpa/magit-20200126.1750/magit-obsolete.el index 59766d0f..d7c2f1b9 100644 --- a/elpa/magit-20191227.1438/magit-obsolete.el +++ b/elpa/magit-20200126.1750/magit-obsolete.el @@ -1,6 +1,6 @@ ;;; magit-obsolete.el --- obsolete definitions -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -29,28 +29,28 @@ (require 'magit) -;;; Obsolete since v2.91.0 +;;; Obsolete since v3.0.0 (define-obsolete-function-alias 'magit-diff-visit-file-worktree - 'magit-diff-visit-worktree-file "Magit 2.91.0") + 'magit-diff-visit-worktree-file "Magit 3.0.0") (define-obsolete-function-alias 'magit-status-internal - 'magit-status-setup-buffer "Magit 2.91.0") + 'magit-status-setup-buffer "Magit 3.0.0") (define-obsolete-variable-alias 'magit-mode-setup-hook - 'magit-setup-buffer-hook "Magit 2.91.0") + 'magit-setup-buffer-hook "Magit 3.0.0") (define-obsolete-variable-alias 'magit-branch-popup-show-variables - 'magit-branch-direct-configure "Magit 2.91.0") + 'magit-branch-direct-configure "Magit 3.0.0") (define-obsolete-function-alias 'magit-dispatch-popup - 'magit-dispatch "Magit 2.91.0") + 'magit-dispatch "Magit 3.0.0") (define-obsolete-function-alias 'magit-repolist-column-dirty - 'magit-repolist-column-flag "Magit 2.91.0") + 'magit-repolist-column-flag "Magit 3.0.0") (define-obsolete-variable-alias 'magit-disable-line-numbers - 'magit-section-disable-line-numbers "Magit 2.91.0") + 'magit-section-disable-line-numbers "Magit 3.0.0") (defun magit--magit-popup-warning () (display-warning 'magit "\ diff --git a/elpa/magit-20191227.1438/magit-obsolete.elc b/elpa/magit-20200126.1750/magit-obsolete.elc similarity index 88% rename from elpa/magit-20191227.1438/magit-obsolete.elc rename to elpa/magit-20200126.1750/magit-obsolete.elc index adbfbffd..ca174f6c 100644 Binary files a/elpa/magit-20191227.1438/magit-obsolete.elc and b/elpa/magit-20200126.1750/magit-obsolete.elc differ diff --git a/elpa/magit-20191227.1438/magit-patch.el b/elpa/magit-20200126.1750/magit-patch.el similarity index 99% rename from elpa/magit-20191227.1438/magit-patch.el rename to elpa/magit-20200126.1750/magit-patch.el index 621effc6..713a2d6a 100644 --- a/elpa/magit-20191227.1438/magit-patch.el +++ b/elpa/magit-20200126.1750/magit-patch.el @@ -1,6 +1,6 @@ ;;; magit-patch.el --- creating and applying patches -*- lexical-binding: t -*- -;; Copyright (C) 2008-2019 The Magit Project Contributors +;; Copyright (C) 2008-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-patch.elc b/elpa/magit-20200126.1750/magit-patch.elc similarity index 99% rename from elpa/magit-20191227.1438/magit-patch.elc rename to elpa/magit-20200126.1750/magit-patch.elc index 27a1b687..8f9d0a76 100644 Binary files a/elpa/magit-20191227.1438/magit-patch.elc and b/elpa/magit-20200126.1750/magit-patch.elc differ diff --git a/elpa/magit-20191227.1438/magit-pkg.el b/elpa/magit-20200126.1750/magit-pkg.el similarity index 79% rename from elpa/magit-20191227.1438/magit-pkg.el rename to elpa/magit-20200126.1750/magit-pkg.el index bbddc3d8..352f1413 100644 --- a/elpa/magit-20191227.1438/magit-pkg.el +++ b/elpa/magit-20200126.1750/magit-pkg.el @@ -1,4 +1,4 @@ -(define-package "magit" "20191227.1438" "A Git porcelain inside Emacs." +(define-package "magit" "20200126.1750" "A Git porcelain inside Emacs." '((emacs "25.1") (async "20180527") (dash "20180910") diff --git a/elpa/magit-20191227.1438/magit-process.el b/elpa/magit-20200126.1750/magit-process.el similarity index 99% rename from elpa/magit-20191227.1438/magit-process.el rename to elpa/magit-20200126.1750/magit-process.el index 75fa9d1d..c7780b07 100644 --- a/elpa/magit-20191227.1438/magit-process.el +++ b/elpa/magit-20200126.1750/magit-process.el @@ -1,6 +1,6 @@ ;;; magit-process.el --- process functionality -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -165,7 +165,7 @@ itself from the hook, to avoid further futile attempts." (defcustom magit-process-password-prompt-regexps '("^\\(Enter \\)?[Pp]assphrase\\( for \\(RSA \\)?key '.*'\\)?: ?$" ;; Match-group 99 is used to identify the "user@host" part. - "^\\(Enter \\)?[Pp]assword\\( for '\\(https?://\\)?\\(?99:.*\\)'\\)?: ?$" + "^\\(Enter \\)?[Pp]assword\\( for '?\\(https?://\\)?\\(?99:[^']*\\)'?\\)?: ?$" "^.*'s password: ?$" "^Yubikey for .*: ?$" "^Enter PIN for .*: ?$") @@ -226,7 +226,7 @@ While functions such as `magit-process-yes-or-no-prompt' may not be sufficient to handle some prompt, it may still be of benefit to look at the implementations to gain some insights on how to implement such functions." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-process :type 'hook) diff --git a/elpa/magit-20191227.1438/magit-process.elc b/elpa/magit-20200126.1750/magit-process.elc similarity index 89% rename from elpa/magit-20191227.1438/magit-process.elc rename to elpa/magit-20200126.1750/magit-process.elc index 123983d3..18c4d6b0 100644 Binary files a/elpa/magit-20191227.1438/magit-process.elc and b/elpa/magit-20200126.1750/magit-process.elc differ diff --git a/elpa/magit-20191227.1438/magit-pull.el b/elpa/magit-20200126.1750/magit-pull.el similarity index 94% rename from elpa/magit-20191227.1438/magit-pull.el rename to elpa/magit-20200126.1750/magit-pull.el index 6aff89f7..33b2bf9f 100644 --- a/elpa/magit-20191227.1438/magit-pull.el +++ b/elpa/magit-20200126.1750/magit-pull.el @@ -1,6 +1,6 @@ ;;; magit-pull.el --- update local objects and refs -*- lexical-binding: t -*- -;; Copyright (C) 2008-2019 The Magit Project Contributors +;; Copyright (C) 2008-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -33,7 +33,7 @@ (defcustom magit-pull-or-fetch nil "Whether `magit-pull' also offers some fetch suffixes." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-commands :type 'boolean) @@ -45,7 +45,8 @@ :man-page "git-pull" [:description (lambda () (if magit-pull-or-fetch "Pull arguments" "Arguments")) - ("-r" "Rebase local commits" ("-r" "--rebase"))] + ("-r" "Rebase local commits" ("-r" "--rebase")) + ("-A" "Autostash" "--autostash" :level 7)] [:description (lambda () (if-let ((branch (magit-get-current-branch))) @@ -79,9 +80,9 @@ (define-suffix-command magit-pull-from-pushremote (args) "Pull from the push-remote of the current branch. -When the push-remote is not configured, then read the push-remote -from the user, set it, and then pull from it. With a prefix -argument the push-remote can be changed before pulling from it." +With a prefix argument or when the push-remote is either not +configured or unusable, then let the user first configure the +push-remote." :if 'magit-get-current-branch :description 'magit-pull--pushbranch-description (interactive (list (magit-pull-arguments))) diff --git a/elpa/magit-20191227.1438/magit-pull.elc b/elpa/magit-20200126.1750/magit-pull.elc similarity index 66% rename from elpa/magit-20191227.1438/magit-pull.elc rename to elpa/magit-20200126.1750/magit-pull.elc index bc4ac81c..42663d63 100644 Binary files a/elpa/magit-20191227.1438/magit-pull.elc and b/elpa/magit-20200126.1750/magit-pull.elc differ diff --git a/elpa/magit-20191227.1438/magit-push.el b/elpa/magit-20200126.1750/magit-push.el similarity index 96% rename from elpa/magit-20191227.1438/magit-push.el rename to elpa/magit-20200126.1750/magit-push.el index 3b5733c6..910c5141 100644 --- a/elpa/magit-20191227.1438/magit-push.el +++ b/elpa/magit-20200126.1750/magit-push.el @@ -1,6 +1,6 @@ ;;; magit-push.el --- update remote objects and refs -*- lexical-binding: t -*- -;; Copyright (C) 2008-2019 The Magit Project Contributors +;; Copyright (C) 2008-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -58,7 +58,8 @@ ("r" "explicit refspecs" magit-push-refspecs) ("m" "matching branches" magit-push-matching)] [("T" "a tag" magit-push-tag) - ("t" "all tags" magit-push-tags)]] + ("t" "all tags" magit-push-tags) + (6 "n" "a note ref" magit-push-notes-ref)]] ["Configure" ("C" "Set variables..." magit-branch-configure)]) @@ -250,6 +251,17 @@ branch as default." (run-hooks 'magit-credential-hook) (magit-run-git-async "push" remote tag args)) +;;;###autoload +(defun magit-push-notes-ref (ref remote &optional args) + "Push a notes ref to another repository." + (interactive + (let ((note (magit-notes-read-ref "Push notes" nil nil))) + (list note + (magit-read-remote (format "Push %s to remote" note) nil t) + (magit-push-arguments)))) + (run-hooks 'magit-credential-hook) + (magit-run-git-async "push" remote ref args)) + ;;;###autoload (defun magit-push-implicitly (args) "Push somewhere without using an explicit refspec. diff --git a/elpa/magit-20191227.1438/magit-push.elc b/elpa/magit-20200126.1750/magit-push.elc similarity index 89% rename from elpa/magit-20191227.1438/magit-push.elc rename to elpa/magit-20200126.1750/magit-push.elc index 5e1ee8ea..a1b60bae 100644 Binary files a/elpa/magit-20191227.1438/magit-push.elc and b/elpa/magit-20200126.1750/magit-push.elc differ diff --git a/elpa/magit-20191227.1438/magit-reflog.el b/elpa/magit-20200126.1750/magit-reflog.el similarity index 98% rename from elpa/magit-20191227.1438/magit-reflog.el rename to elpa/magit-20200126.1750/magit-reflog.el index 715fee35..5576cdc9 100644 --- a/elpa/magit-20191227.1438/magit-reflog.el +++ b/elpa/magit-20200126.1750/magit-reflog.el @@ -1,6 +1,6 @@ ;;; magit-reflog.el --- inspect ref history -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -39,7 +39,7 @@ "Maximal number of entries initially shown in reflog buffers. The limit in the current buffer can be changed using \"+\" and \"-\"." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-commands :type 'number) diff --git a/elpa/magit-20191227.1438/magit-reflog.elc b/elpa/magit-20200126.1750/magit-reflog.elc similarity index 75% rename from elpa/magit-20191227.1438/magit-reflog.elc rename to elpa/magit-20200126.1750/magit-reflog.elc index 5d66b4b7..e65752fb 100644 Binary files a/elpa/magit-20191227.1438/magit-reflog.elc and b/elpa/magit-20200126.1750/magit-reflog.elc differ diff --git a/elpa/magit-20191227.1438/magit-refs.el b/elpa/magit-20200126.1750/magit-refs.el similarity index 99% rename from elpa/magit-20191227.1438/magit-refs.el rename to elpa/magit-20200126.1750/magit-refs.el index 4f78d0f1..1d090f0a 100644 --- a/elpa/magit-20191227.1438/magit-refs.el +++ b/elpa/magit-20200126.1750/magit-refs.el @@ -1,6 +1,6 @@ ;;; magit-refs.el --- listing references -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-refs.elc b/elpa/magit-20200126.1750/magit-refs.elc similarity index 94% rename from elpa/magit-20191227.1438/magit-refs.elc rename to elpa/magit-20200126.1750/magit-refs.elc index 902ab96e..0f4f09b4 100644 Binary files a/elpa/magit-20191227.1438/magit-refs.elc and b/elpa/magit-20200126.1750/magit-refs.elc differ diff --git a/elpa/magit-20191227.1438/magit-remote.el b/elpa/magit-20200126.1750/magit-remote.el similarity index 99% rename from elpa/magit-20191227.1438/magit-remote.el rename to elpa/magit-20200126.1750/magit-remote.el index 0e6a82fd..ab74ac81 100644 --- a/elpa/magit-20191227.1438/magit-remote.el +++ b/elpa/magit-20200126.1750/magit-remote.el @@ -1,6 +1,6 @@ ;;; magit-remote.el --- transfer Git commits -*- lexical-binding: t -*- -;; Copyright (C) 2008-2019 The Magit Project Contributors +;; Copyright (C) 2008-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -57,7 +57,7 @@ has to be used to view and change remote related variables." (defcustom magit-prefer-push-default nil "Whether to prefer `remote.pushDefault' over per-branch variables." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-commands :type 'boolean) diff --git a/elpa/magit-20191227.1438/magit-remote.elc b/elpa/magit-20200126.1750/magit-remote.elc similarity index 82% rename from elpa/magit-20191227.1438/magit-remote.elc rename to elpa/magit-20200126.1750/magit-remote.elc index af91a315..dad6c58a 100644 Binary files a/elpa/magit-20191227.1438/magit-remote.elc and b/elpa/magit-20200126.1750/magit-remote.elc differ diff --git a/elpa/magit-20191227.1438/magit-repos.el b/elpa/magit-20200126.1750/magit-repos.el similarity index 98% rename from elpa/magit-20191227.1438/magit-repos.el rename to elpa/magit-20200126.1750/magit-repos.el index c51a956d..b59de628 100644 --- a/elpa/magit-20191227.1438/magit-repos.el +++ b/elpa/magit-20200126.1750/magit-repos.el @@ -1,6 +1,6 @@ ;;; magit-repos.el --- listing repositories -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -51,7 +51,7 @@ repositories. If it is 0, then only add DIRECTORY itself. This option controls which repositories are being listed by `magit-list-repositories'. It also affects `magit-status' \(which see) in potentially surprising ways." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-essentials :type '(repeat (cons directory (integer :tag "Depth")))) @@ -114,7 +114,7 @@ called with no arguments, with `default-directory' bound to the top level of a repository working tree, until one of them returns a non-nil value. FLAG corresponding to that function is returned as the value of `magit-repolist-column-flag'." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-repolist :type '(alist :key-type (function :tag "Predicate Function") :value-type (string :tag "Flag"))) @@ -142,8 +142,7 @@ repositories are displayed." (defvar magit-repolist-mode-map (let ((map (make-sparse-keymap))) (set-keymap-parent map tabulated-list-mode-map) - (define-key map (if (featurep 'jkl) [return] (kbd "C-m")) - 'magit-repolist-status) + (define-key map (kbd "C-m") 'magit-repolist-status) map) "Local keymap for Magit-Repolist mode buffers.") diff --git a/elpa/magit-20191227.1438/magit-repos.elc b/elpa/magit-20200126.1750/magit-repos.elc similarity index 77% rename from elpa/magit-20191227.1438/magit-repos.elc rename to elpa/magit-20200126.1750/magit-repos.elc index 8cbe2b67..d699fec9 100644 Binary files a/elpa/magit-20191227.1438/magit-repos.elc and b/elpa/magit-20200126.1750/magit-repos.elc differ diff --git a/elpa/magit-20191227.1438/magit-reset.el b/elpa/magit-20200126.1750/magit-reset.el similarity index 98% rename from elpa/magit-20191227.1438/magit-reset.el rename to elpa/magit-20200126.1750/magit-reset.el index e16e9b20..823a6753 100644 --- a/elpa/magit-20191227.1438/magit-reset.el +++ b/elpa/magit-20200126.1750/magit-reset.el @@ -1,6 +1,6 @@ ;;; magit-reset.el --- reset fuctionality -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-reset.elc b/elpa/magit-20200126.1750/magit-reset.elc similarity index 99% rename from elpa/magit-20191227.1438/magit-reset.elc rename to elpa/magit-20200126.1750/magit-reset.elc index cfde1a9f..bcf61ab8 100644 Binary files a/elpa/magit-20191227.1438/magit-reset.elc and b/elpa/magit-20200126.1750/magit-reset.elc differ diff --git a/elpa/magit-20191227.1438/magit-section.el b/elpa/magit-20200126.1750/magit-section.el similarity index 91% rename from elpa/magit-20191227.1438/magit-section.el rename to elpa/magit-20200126.1750/magit-section.el index 5d52d9c5..2216a120 100644 --- a/elpa/magit-20191227.1438/magit-section.el +++ b/elpa/magit-20200126.1750/magit-section.el @@ -1,6 +1,6 @@ -;;; magit-section.el --- section functionality -*- lexical-binding: t -*- +;;; magit-section.el --- Sections for read-only buffers -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -8,24 +8,29 @@ ;; Author: Jonas Bernoulli ;; Maintainer: Jonas Bernoulli -;; Magit is free software; you can redistribute it and/or modify it -;; under the terms of the GNU General Public License as published by +;; Package-Requires: ((emacs "25.1") (dash "20180910")) +;; Keywords: tools +;; Homepage: https://github.com/magit/magit + +;; Magit-Section 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, or (at your option) ;; any later version. ;; -;; Magit 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. +;; Magit-Section 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 Magit. If not, see http://www.gnu.org/licenses. ;;; Commentary: -;; This library implements "sections" as used in all Magit buffers. -;; If you have used Magit before, then you probably know what that -;; means, otherwise think "read-only Org-Mode for Git", kinda. +;; This package implements the main user interface of Magit — the +;; collapsible sections that make up its buffers. This package used +;; to be distributed as part of Magit but now it can also be used by +;; other packages that have nothing to do with Magit or Git. ;;; Code: @@ -37,12 +42,45 @@ (require 'benchmark) (require 'subr-x)) +;;; Hooks + +(defvar magit-section-movement-hook nil + "Hook run by `magit-section-goto'. +That function in turn is used by all section movement commands.") + +(defvar magit-section-highlight-hook + '(magit-section-highlight + magit-section-highlight-selection) + "Functions used to highlight the current section. +Each function is run with the current section as only argument +until one of them returns non-nil.") + +(defvar magit-section-unhighlight-hook nil + "Functions used to unhighlight the previously current section. +Each function is run with the current section as only argument +until one of them returns non-nil. Most sections are properly +unhighlighted without requiring a specialized unhighlighter, +diff-related sections being the only exception.") + +(defvar magit-section-set-visibility-hook + '(magit-section-cached-visibility) + "Hook used to set the initial visibility of a section. +Stop at the first function that returns non-nil. The returned +value should be `show', `hide' or nil. If no function returns +non-nil, determine the visibility as usual, i.e. use the +hardcoded section specific default (see `magit-insert-section').") + +(defvar magit-section-goto-successor-hook nil + "Hook used to go to the same section as was current before a refresh. +This is only used if the standard mechanism for doing so did not +succeed.") + ;;; Options (defgroup magit-section nil "Expandable sections." :link '(info-link "(magit)Sections") - :group 'magit) + :group 'extensions) (defcustom magit-section-show-child-count t "Whether to append the number of children to section headings. @@ -51,64 +89,6 @@ This only applies to sections for which doing so makes sense." :group 'magit-section :type 'boolean) -(defcustom magit-section-movement-hook - '(magit-hunk-set-window-start - magit-log-maybe-update-revision-buffer - magit-log-maybe-show-more-commits) - "Hook run by `magit-section-goto'. -That function in turn is used by all section movement commands." - :package-version '(magit . "2.3.0") - :group 'magit-section - :type 'hook - :options '(magit-hunk-set-window-start - magit-status-maybe-update-revision-buffer - magit-status-maybe-update-stash-buffer - magit-status-maybe-update-blob-buffer - magit-log-maybe-update-revision-buffer - magit-log-maybe-update-blob-buffer - magit-log-maybe-show-more-commits - magit-stashes-maybe-update-stash-buffer)) - -(defcustom magit-section-highlight-hook - '(magit-diff-highlight - magit-section-highlight - magit-section-highlight-selection) - "Functions used to highlight the current section. -Each function is run with the current section as only argument -until one of them returns non-nil." - :package-version '(magit . "2.1.0") - :group 'magit-section - :type 'hook - :options '(magit-diff-highlight - magit-section-highlight - magit-section-highlight-selection)) - -(defcustom magit-section-unhighlight-hook - '(magit-diff-unhighlight) - "Functions used to unhighlight the previously current section. -Each function is run with the current section as only argument -until one of them returns non-nil. Most sections are properly -unhighlighted without requiring a specialized unhighlighter, -diff-related sections being the only exception." - :package-version '(magit . "2.1.0") - :group 'magit-section - :type 'hook - :options '(magit-diff-unhighlight)) - -(defcustom magit-section-set-visibility-hook - '(magit-diff-expansion-threshold - magit-section-cached-visibility) - "Hook used to set the initial visibility of a section. -Stop at the first function that returns non-nil. The returned -value should be `show', `hide' or nil. If no function returns -non-nil, determine the visibility as usual, i.e. use the -hardcoded section specific default (see `magit-insert-section')." - :package-version '(magit . "2.4.0") - :group 'magit-section - :type 'hook - :options '(magit-diff-expansion-threshold - magit-section-cached-visibility)) - (defcustom magit-section-cache-visibility t "Whether to cache visibility of sections. @@ -180,7 +160,7 @@ Otherwise the value has to have one of these two forms: these ellipsis take section highlighting into account. Doing so might potentially have an impact on performance, while not doing so is kinda ugly." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-section :type '(choice (const :tag "No indicators" nil) (cons :tag "Use +- fringe indicators" @@ -257,10 +237,17 @@ to be displayed everywhere except in Magit buffers. Other users do not expect Magit buffers to be treated differently. At least in theory users in the first group should not use the global mode, but that ship has sailed, thus this option." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-section :type 'boolean) +;;; Faces + +(defgroup magit-section-faces nil + "Faces used by Magit-Section." + :group 'magit-section + :group 'faces) + (defface magit-section-highlight `((((class color) (background light)) ,@(and (>= emacs-major-version 27) '(:extend t)) @@ -269,7 +256,7 @@ but that ship has sailed, thus this option." ,@(and (>= emacs-major-version 27) '(:extend t)) :background "grey20")) "Face for highlighting the current section." - :group 'magit-faces) + :group 'magit-section-faces) (defface magit-section-heading `((((class color) (background light)) @@ -281,13 +268,13 @@ but that ship has sailed, thus this option." :foreground "LightGoldenrod2" :weight bold)) "Face for section headings." - :group 'magit-faces) + :group 'magit-section-faces) (defface magit-section-secondary-heading `((t ,@(and (>= emacs-major-version 27) '(:extend t)) :weight bold)) "Face for section headings of some secondary headings." - :group 'magit-faces) + :group 'magit-section-faces) (defface magit-section-heading-selection `((((class color) (background light)) @@ -297,19 +284,14 @@ but that ship has sailed, thus this option." ,@(and (>= emacs-major-version 27) '(:extend t)) :foreground "LightSalmon3")) "Face for selected section headings." - :group 'magit-faces) + :group 'magit-section-faces) ;;; Classes (defvar magit--current-section-hook nil "Internal variable used for `magit-describe-section'.") -(defvar magit--section-type-alist - '( - (file . magit-file-section) - (hunk . magit-hunk-section) - (module . magit-module-section) - )) +(defvar magit--section-type-alist nil) (defclass magit-section () ((keymap :initform nil :allocation :class) @@ -326,25 +308,33 @@ but that ship has sailed, thus this option." (parent :initform nil :initarg :parent) (children :initform nil))) -(defclass magit-file-section (magit-section) - ((source :initform nil) - (header :initform nil))) - -(defclass magit-hunk-section (magit-section) - ((refined :initform nil) - (combined :initform nil) - (from-range :initform nil) - (from-ranges :initform nil) - (to-range :initform nil) - (about :initform nil))) - -(defclass magit-module-section (magit-file-section) - ()) - ;;; Mode (defvar symbol-overlay-inhibit-map) +(defvar magit-section-mode-map + (let ((map (make-keymap))) + (suppress-keymap map t) + (define-key map (kbd "C-i") 'magit-section-toggle) + (define-key map [C-tab] 'magit-section-cycle) + (define-key map [M-tab] 'magit-section-cycle) + ;; [backtab] is the most portable binding for Shift+Tab. + (define-key map [backtab] 'magit-section-cycle-global) + (define-key map (kbd "^") 'magit-section-up) + (define-key map (kbd "p") 'magit-section-backward) + (define-key map (kbd "n") 'magit-section-forward) + (define-key map (kbd "M-p") 'magit-section-backward-sibling) + (define-key map (kbd "M-n") 'magit-section-forward-sibling) + (define-key map "1" 'magit-section-show-level-1) + (define-key map "2" 'magit-section-show-level-2) + (define-key map "3" 'magit-section-show-level-3) + (define-key map "4" 'magit-section-show-level-4) + (define-key map (kbd "M-1") 'magit-section-show-level-1-all) + (define-key map (kbd "M-2") 'magit-section-show-level-2-all) + (define-key map (kbd "M-3") 'magit-section-show-level-3-all) + (define-key map (kbd "M-4") 'magit-section-show-level-4-all) + map)) + (define-derived-mode magit-section-mode special-mode "Magit-Sections" "Parent major mode from which major modes with Magit-like sections inherit. @@ -561,12 +551,6 @@ If there is no previous sibling section, then move to the parent." (unless (pos-visible-in-window-p (oref section end)) (set-window-start (selected-window) (oref section start)))) -(defun magit-hunk-set-window-start (section) - "When SECTION is a `hunk', ensure that its beginning is visible. -It the SECTION has a different type, then do nothing." - (when (magit-hunk-section-p section) - (magit-section-set-window-start section))) - (defmacro magit-define-section-jumper (name heading type &optional value) "Define an interactive function to go some section. Together TYPE and VALUE identify the section. @@ -716,34 +700,6 @@ hidden." (t (mapc 'magit-section-hide children))))) -(defun magit-section-cycle-diffs () - "Cycle visibility of diff-related sections in the current buffer." - (interactive) - (when-let ((sections - (cond ((derived-mode-p 'magit-status-mode) - (--mapcat - (when it - (when (oref it hidden) - (magit-section-show it)) - (oref it children)) - (list (magit-get-section '((staged) (status))) - (magit-get-section '((unstaged) (status)))))) - ((derived-mode-p 'magit-diff-mode) - (-filter #'magit-file-section-p - (oref magit-root-section children)))))) - (if (--any-p (oref it hidden) sections) - (dolist (s sections) - (magit-section-show s) - (magit-section-hide-children s)) - (let ((children (--mapcat (oref it children) sections))) - (cond ((and (--any-p (oref it hidden) children) - (--any-p (oref it children) children)) - (mapc 'magit-section-show-headings sections)) - ((-any-p 'magit-section-hidden-body children) - (mapc 'magit-section-show-children sections)) - (t - (mapc 'magit-section-hide sections))))))) - (defun magit-section-hidden-body (section &optional pred) (--if-let (oref section children) (funcall (or pred '-any-p) 'magit-section-hidden-body it) @@ -1028,13 +984,11 @@ what you are doing and are sure there is no other way.") (defmacro magit-insert-section (&rest args) "Insert a section at point. -TYPE is the section type, a symbol. Many commands that act on -the current section behave differently depending on that type. -Also if a variable `magit-TYPE-section-map' exists, then use -that as the text-property `keymap' of all text belonging to the -section (but this may be overwritten in subsections). TYPE can -also have the form `(eval FORM)' in which case FORM is evaluated -at runtime. +TYPE is the section type, a symbol which is prefixed with the +name of the package. (For historic reasons the types used by +Magit and Forge do not use a package prefix.) Many commands +that act on the current section behave differently depending +on its type. Optional VALUE is the value of the section, usually a string that is required when acting on the section. @@ -1049,7 +1003,7 @@ still honored). BODY is any number of forms that actually insert the section's heading and body. Optional NAME, if specified, has to be a -symbol, which is then bound to the struct of the section being +symbol, which is then bound to the object of the section being inserted. Before BODY is evaluated the `start' of the section object is set @@ -1063,6 +1017,12 @@ of the partially inserted section. This can happen when creating a section by washing Git's output and Git didn't actually output anything this time around. +For historic reasons, if a variable `magit-TYPE-section-map' +or `forge-TYPE-section-map' exists, then use that as the +text-property `keymap' of all text belonging to the section (but +this may be overwritten in subsections). TYPE can also have the +form `(eval FORM)' in which case FORM is evaluated at runtime. + \(fn [NAME] (TYPE &optional VALUE HIDE) &rest BODY)" (declare (indent defun) (debug ([&optional symbolp] @@ -1181,7 +1141,7 @@ anywhere inside any of these strings, then insert all of them unchanged. Otherwise use the `magit-section-heading' face for all inserted text. -The `content' property of the section struct is the end of the +The `content' property of the section object is the end of the heading (which lasts from `start' to `content') and the beginning of the the body (which lasts from `content' to `end'). If the value of `content' is nil, then the section has no heading and @@ -1367,27 +1327,8 @@ invisible." (forward-char char)) (unless (eq (magit-current-section) it) (goto-char start)))) - (or (and (magit-hunk-section-p section) - (when-let ((parent (magit-get-section - (magit-section-ident - (oref section parent))))) - (let* ((children (oref parent children)) - (siblings (magit-section-siblings section 'prev)) - (previous (nth (length siblings) children))) - (if (not arg) - (--when-let (or previous (car (last children))) - (magit-section-goto it) - t) - (when previous - (magit-section-goto previous)) - (if (and (stringp arg) - (re-search-forward arg (oref parent end) t)) - (goto-char (match-beginning 0)) - (goto-char (oref (car (last children)) end)) - (forward-line -1) - (while (looking-at "^ ") (forward-line -1)) - (while (looking-at "^[-+]") (forward-line -1)) - (forward-line)))))) + (or (run-hook-with-args-until-success + 'magit-section-goto-successor-hook section arg) (goto-char (--if-let (magit-section-goto-successor-1 section) (if (eq (oref it type) 'button) (point-min) diff --git a/elpa/magit-20191227.1438/magit-section.elc b/elpa/magit-20200126.1750/magit-section.elc similarity index 69% rename from elpa/magit-20191227.1438/magit-section.elc rename to elpa/magit-20200126.1750/magit-section.elc index e6045549..2cb6e33a 100644 Binary files a/elpa/magit-20191227.1438/magit-section.elc and b/elpa/magit-20200126.1750/magit-section.elc differ diff --git a/elpa/magit-20191227.1438/magit-sequence.el b/elpa/magit-20200126.1750/magit-sequence.el similarity index 99% rename from elpa/magit-20191227.1438/magit-sequence.el rename to elpa/magit-20200126.1750/magit-sequence.el index f70cb750..e5b82cb3 100644 --- a/elpa/magit-20191227.1438/magit-sequence.el +++ b/elpa/magit-20200126.1750/magit-sequence.el @@ -1,6 +1,6 @@ ;;; magit-sequence.el --- history manipulation in Magit -*- lexical-binding: t -*- -;; Copyright (C) 2011-2019 The Magit Project Contributors +;; Copyright (C) 2011-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -548,10 +548,9 @@ This discards all changes made since the sequence started." (define-suffix-command magit-rebase-onto-pushremote (args) "Rebase the current branch onto its push-remote branch. -When the push-remote is not configured, then read the push-remote -from the user, set it, and then rebase onto it. With a prefix -argument the push-remote can be changed before rebasing onto to -it." +With a prefix argument or when the push-remote is either not +configured or unusable, then let the user first configure the +push-remote." :if 'magit-get-current-branch :description 'magit-pull--pushbranch-description (interactive (list (magit-rebase-arguments))) diff --git a/elpa/magit-20191227.1438/magit-sequence.elc b/elpa/magit-20200126.1750/magit-sequence.elc similarity index 93% rename from elpa/magit-20191227.1438/magit-sequence.elc rename to elpa/magit-20200126.1750/magit-sequence.elc index f8ae21b5..c667482c 100644 Binary files a/elpa/magit-20191227.1438/magit-sequence.elc and b/elpa/magit-20200126.1750/magit-sequence.elc differ diff --git a/elpa/magit-20191227.1438/magit-stash.el b/elpa/magit-20200126.1750/magit-stash.el similarity index 99% rename from elpa/magit-20191227.1438/magit-stash.el rename to elpa/magit-20200126.1750/magit-stash.el index 09e3c378..7ac1b29c 100644 --- a/elpa/magit-20191227.1438/magit-stash.el +++ b/elpa/magit-20200126.1750/magit-stash.el @@ -1,6 +1,6 @@ ;;; magit-stash.el --- stash support for Magit -*- lexical-binding: t -*- -;; Copyright (C) 2008-2019 The Magit Project Contributors +;; Copyright (C) 2008-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-stash.elc b/elpa/magit-20200126.1750/magit-stash.elc similarity index 99% rename from elpa/magit-20191227.1438/magit-stash.elc rename to elpa/magit-20200126.1750/magit-stash.elc index 4b430e04..38c33acd 100644 Binary files a/elpa/magit-20191227.1438/magit-stash.elc and b/elpa/magit-20200126.1750/magit-stash.elc differ diff --git a/elpa/magit-20191227.1438/magit-status.el b/elpa/magit-20200126.1750/magit-status.el similarity index 99% rename from elpa/magit-20191227.1438/magit-status.el rename to elpa/magit-20200126.1750/magit-status.el index c2d34be7..90e8980d 100644 --- a/elpa/magit-20191227.1438/magit-status.el +++ b/elpa/magit-20200126.1750/magit-status.el @@ -1,6 +1,6 @@ ;;; magit-status.el --- the grand overview -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -132,7 +132,7 @@ no effect. The command `magit-status-here' tries to go to that position, regardless of the value of this option." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-status :type 'boolean) diff --git a/elpa/magit-20191227.1438/magit-status.elc b/elpa/magit-20200126.1750/magit-status.elc similarity index 93% rename from elpa/magit-20191227.1438/magit-status.elc rename to elpa/magit-20200126.1750/magit-status.elc index 8e72dc15..1c2ebae4 100644 Binary files a/elpa/magit-20191227.1438/magit-status.elc and b/elpa/magit-20200126.1750/magit-status.elc differ diff --git a/elpa/magit-20191227.1438/magit-submodule.el b/elpa/magit-20200126.1750/magit-submodule.el similarity index 99% rename from elpa/magit-20191227.1438/magit-submodule.el rename to elpa/magit-20200126.1750/magit-submodule.el index 8bc787bf..3f201631 100644 --- a/elpa/magit-20191227.1438/magit-submodule.el +++ b/elpa/magit-20200126.1750/magit-submodule.el @@ -1,6 +1,6 @@ ;;; magit-submodule.el --- submodule support for Magit -*- lexical-binding: t -*- -;; Copyright (C) 2011-2019 The Magit Project Contributors +;; Copyright (C) 2011-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -477,9 +477,8 @@ or, failing that, the abbreviated HEAD commit hash." (defvar magit-module-section-map (let ((map (make-sparse-keymap))) (set-keymap-parent map magit-file-section-map) - (unless (featurep 'jkl) - (define-key map "\C-j" 'magit-submodule-visit)) - (define-key map [C-return] 'magit-submodule-visit) + (define-key map (kbd "C-j") 'magit-submodule-visit) + (define-key map [C-return] 'magit-submodule-visit) (define-key map [remap magit-visit-thing] 'magit-submodule-visit) (define-key map [remap magit-delete-thing] 'magit-submodule-unpopulate) (define-key map "K" 'magit-file-untrack) diff --git a/elpa/magit-20191227.1438/magit-submodule.elc b/elpa/magit-20200126.1750/magit-submodule.elc similarity index 96% rename from elpa/magit-20191227.1438/magit-submodule.elc rename to elpa/magit-20200126.1750/magit-submodule.elc index 648112cd..e8561810 100644 Binary files a/elpa/magit-20191227.1438/magit-submodule.elc and b/elpa/magit-20200126.1750/magit-submodule.elc differ diff --git a/elpa/magit-20191227.1438/magit-subtree.el b/elpa/magit-20200126.1750/magit-subtree.el similarity index 99% rename from elpa/magit-20191227.1438/magit-subtree.el rename to elpa/magit-20200126.1750/magit-subtree.el index b8375f71..1ea3bbe0 100644 --- a/elpa/magit-20191227.1438/magit-subtree.el +++ b/elpa/magit-20200126.1750/magit-subtree.el @@ -1,6 +1,6 @@ ;;; magit-subtree.el --- subtree support for Magit -*- lexical-binding: t -*- -;; Copyright (C) 2011-2019 The Magit Project Contributors +;; Copyright (C) 2011-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-subtree.elc b/elpa/magit-20200126.1750/magit-subtree.elc similarity index 99% rename from elpa/magit-20191227.1438/magit-subtree.elc rename to elpa/magit-20200126.1750/magit-subtree.elc index 206a17e7..f9555aff 100644 Binary files a/elpa/magit-20191227.1438/magit-subtree.elc and b/elpa/magit-20200126.1750/magit-subtree.elc differ diff --git a/elpa/magit-20191227.1438/magit-tag.el b/elpa/magit-20200126.1750/magit-tag.el similarity index 99% rename from elpa/magit-20191227.1438/magit-tag.el rename to elpa/magit-20200126.1750/magit-tag.el index 9a4859c6..c11dae8b 100644 --- a/elpa/magit-20191227.1438/magit-tag.el +++ b/elpa/magit-20200126.1750/magit-tag.el @@ -1,6 +1,6 @@ ;;; magit-tag.el --- tag functionality -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-tag.elc b/elpa/magit-20200126.1750/magit-tag.elc similarity index 99% rename from elpa/magit-20191227.1438/magit-tag.elc rename to elpa/magit-20200126.1750/magit-tag.elc index 2c797822..430ef41a 100644 Binary files a/elpa/magit-20191227.1438/magit-tag.elc and b/elpa/magit-20200126.1750/magit-tag.elc differ diff --git a/elpa/magit-20191227.1438/magit-transient.el b/elpa/magit-20200126.1750/magit-transient.el similarity index 99% rename from elpa/magit-20191227.1438/magit-transient.el rename to elpa/magit-20200126.1750/magit-transient.el index 5fa683fa..830eb507 100644 --- a/elpa/magit-20191227.1438/magit-transient.el +++ b/elpa/magit-20200126.1750/magit-transient.el @@ -1,6 +1,6 @@ ;;; magit-transient.el --- support for transients -*- lexical-binding: t -*- -;; Copyright (C) 2008-2019 The Magit Project Contributors +;; Copyright (C) 2008-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-transient.elc b/elpa/magit-20200126.1750/magit-transient.elc similarity index 99% rename from elpa/magit-20191227.1438/magit-transient.elc rename to elpa/magit-20200126.1750/magit-transient.elc index 422e4522..29254b5f 100644 Binary files a/elpa/magit-20191227.1438/magit-transient.elc and b/elpa/magit-20200126.1750/magit-transient.elc differ diff --git a/elpa/magit-20191227.1438/magit-utils.el b/elpa/magit-20200126.1750/magit-utils.el similarity index 99% rename from elpa/magit-20191227.1438/magit-utils.el rename to elpa/magit-20200126.1750/magit-utils.el index 58831685..8177a7e2 100644 --- a/elpa/magit-20191227.1438/magit-utils.el +++ b/elpa/magit-20200126.1750/magit-utils.el @@ -1,6 +1,6 @@ ;;; magit-utils.el --- various utilities -*- lexical-binding: t; coding: utf-8 -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-utils.elc b/elpa/magit-20200126.1750/magit-utils.elc similarity index 98% rename from elpa/magit-20191227.1438/magit-utils.elc rename to elpa/magit-20200126.1750/magit-utils.elc index f9981748..547ec65d 100644 Binary files a/elpa/magit-20191227.1438/magit-utils.elc and b/elpa/magit-20200126.1750/magit-utils.elc differ diff --git a/elpa/magit-20191227.1438/magit-wip.el b/elpa/magit-20200126.1750/magit-wip.el similarity index 99% rename from elpa/magit-20191227.1438/magit-wip.el rename to elpa/magit-20200126.1750/magit-wip.el index 6f6ab3be..6fcdf19b 100644 --- a/elpa/magit-20191227.1438/magit-wip.el +++ b/elpa/magit-20200126.1750/magit-wip.el @@ -1,6 +1,6 @@ ;;; magit-wip.el --- commit snapshots to work-in-progress refs -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit-wip.elc b/elpa/magit-20200126.1750/magit-wip.elc similarity index 99% rename from elpa/magit-20191227.1438/magit-wip.elc rename to elpa/magit-20200126.1750/magit-wip.elc index c15e296a..47e37903 100644 Binary files a/elpa/magit-20191227.1438/magit-wip.elc and b/elpa/magit-20200126.1750/magit-wip.elc differ diff --git a/elpa/magit-20191227.1438/magit-worktree.el b/elpa/magit-20200126.1750/magit-worktree.el similarity index 98% rename from elpa/magit-20191227.1438/magit-worktree.el rename to elpa/magit-20200126.1750/magit-worktree.el index a8ea3c7b..609a4a32 100644 --- a/elpa/magit-20191227.1438/magit-worktree.el +++ b/elpa/magit-20200126.1750/magit-worktree.el @@ -1,6 +1,6 @@ ;;; magit-worktree.el --- worktree support -*- lexical-binding: t -*- -;; Copyright (C) 2010-2019 The Magit Project Contributors +;; Copyright (C) 2010-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. @@ -36,7 +36,7 @@ This is called with one argument, the prompt, and can be used to e.g. use a base directory other than `default-directory'. Used by `magit-worktree-checkout' and `magit-worktree-branch'." - :package-version '(magit . "2.91.0") + :package-version '(magit . "3.0.0") :group 'magit-commands :type 'function) diff --git a/elpa/magit-20191227.1438/magit-worktree.elc b/elpa/magit-20200126.1750/magit-worktree.elc similarity index 94% rename from elpa/magit-20191227.1438/magit-worktree.elc rename to elpa/magit-20200126.1750/magit-worktree.elc index 06dfbde9..3ec7d5b0 100644 Binary files a/elpa/magit-20191227.1438/magit-worktree.elc and b/elpa/magit-20200126.1750/magit-worktree.elc differ diff --git a/elpa/magit-20191227.1438/magit.el b/elpa/magit-20200126.1750/magit.el similarity index 99% rename from elpa/magit-20191227.1438/magit.el rename to elpa/magit-20200126.1750/magit.el index 9f26c71f..6af8b22e 100644 --- a/elpa/magit-20191227.1438/magit.el +++ b/elpa/magit-20200126.1750/magit.el @@ -1,6 +1,6 @@ ;;; magit.el --- A Git porcelain inside Emacs -*- lexical-binding: t; coding: utf-8 -*- -;; Copyright (C) 2008-2019 The Magit Project Contributors +;; Copyright (C) 2008-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file which ;; lists all contributors. If not, see http://magit.vc/authors. diff --git a/elpa/magit-20191227.1438/magit.elc b/elpa/magit-20200126.1750/magit.elc similarity index 99% rename from elpa/magit-20191227.1438/magit.elc rename to elpa/magit-20200126.1750/magit.elc index 6ed985a0..8096f689 100644 Binary files a/elpa/magit-20191227.1438/magit.elc and b/elpa/magit-20200126.1750/magit.elc differ diff --git a/elpa/magit-20200126.1750/magit.info b/elpa/magit-20200126.1750/magit.info new file mode 100644 index 00000000..0b515dd9 --- /dev/null +++ b/elpa/magit-20200126.1750/magit.info @@ -0,0 +1,193 @@ +This is magit.info, produced by makeinfo version 6.5 from magit.texi. + + Copyright (C) 2015-2020 Jonas Bernoulli + + You can redistribute this document 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 document 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. + +INFO-DIR-SECTION Emacs +START-INFO-DIR-ENTRY +* Magit: (magit). Using Git from Emacs with Magit. +END-INFO-DIR-ENTRY + + +Indirect: +magit.info-1: 754 +magit.info-2: 301088 + +Tag Table: +(Indirect) +Node: Top754 +Node: Introduction6475 +Node: Installation11198 +Node: Installing from Melpa11528 +Node: Installing from the Git Repository12601 +Node: Post-Installation Tasks14949 +Node: Getting Started16234 +Node: Interface Concepts21683 +Node: Modes and Buffers22044 +Node: Switching Buffers23793 +Node: Naming Buffers28544 +Node: Quitting Windows31851 +Node: Automatic Refreshing of Magit Buffers33597 +Node: Automatic Saving of File-Visiting Buffers36449 +Node: Automatic Reverting of File-Visiting Buffers37634 +Node: Risk of Reverting Automatically42629 +Node: Sections45011 +Node: Section Movement45937 +Node: Section Visibility50847 +Node: Section Hooks56924 +Node: Section Types and Values59331 +Node: Section Options60634 +Node: Transient Commands61106 +Node: Transient Arguments and Buffer Variables62343 +Node: Completion Confirmation and the Selection69361 +Node: Action Confirmation69805 +Node: Completion and Confirmation77155 +Node: The Selection80341 +Node: The hunk-internal region83240 +Node: Support for Completion Frameworks84329 +Node: Additional Completion Options89236 +Node: Running Git89835 +Node: Viewing Git Output90108 +Node: Git Process Status91241 +Node: Running Git Manually92206 +Node: Git Executable94676 +Node: Global Git Arguments96958 +Node: Inspecting97764 +Node: Status Buffer98921 +Node: Status Sections102911 +Node: Status Header Sections108463 +Node: Status Module Sections111093 +Node: Status Options113598 +Node: Repository List115473 +Node: Logging118511 +Node: Refreshing Logs121074 +Node: Log Buffer122520 +Node: Log Margin126376 +Node: Select from Log129555 +Node: Reflog131780 +Node: Cherries133437 +Node: Diffing135285 +Node: Refreshing Diffs138366 +Node: Commands Available in Diffs141945 +Node: Diff Options144481 +Node: Revision Buffer149519 +Node: Ediffing152849 +Node: References Buffer156497 +Node: References Sections167017 +Node: Bisecting167878 +Node: Visiting Files and Blobs169691 +Node: General-Purpose Visit Commands170161 +Node: Visiting Files and Blobs from a Diff171117 +Node: Blaming174576 +Node: Manipulating181139 +Node: Creating Repository181481 +Node: Cloning Repository182036 +Node: Staging and Unstaging187279 +Node: Staging from File-Visiting Buffers191362 +Node: Applying192530 +Node: Committing194423 +Node: Initiating a Commit195006 +Node: Editing Commit Messages198391 +Node: Using the Revision Stack201194 +Node: Commit Pseudo Headers204245 +Node: Commit Mode and Hooks205581 +Node: Commit Message Conventions208519 +Node: Branching210647 +Node: The Two Remotes210873 +Node: Branch Commands213526 +Node: Branch Git Variables225909 +Node: Auxiliary Branch Commands231300 +Node: Merging232418 +Node: Resolving Conflicts236426 +Node: Rebasing241427 +Node: Editing Rebase Sequences246286 +Node: Information About In-Progress Rebase250614 +Ref: Information About In-Progress Rebase-Footnote-1259496 +Node: Cherry Picking260092 +Node: Reverting264423 +Node: Resetting265872 +Node: Stashing267526 +Node: Transferring272227 +Node: Remotes272449 +Node: Remote Commands272601 +Node: Remote Git Variables276682 +Node: Fetching277961 +Node: Pulling280448 +Node: Pushing281494 +Node: Plain Patches284964 +Node: Maildir Patches286455 +Node: Miscellaneous287969 +Node: Tagging288285 +Node: Notes290213 +Node: Submodules292585 +Node: Listing Submodules292803 +Node: Submodule Transient294731 +Node: Subtree297253 +Node: Worktree299229 +Node: Common Commands301088 +Node: Wip Modes303135 +Node: Wip Graph308068 +Node: Legacy Wip Modes310382 +Node: Minor Mode for Buffers Visiting Files313277 +Node: Minor Mode for Buffers Visiting Blobs320378 +Node: Customizing321191 +Node: Per-Repository Configuration322787 +Node: Essential Settings325042 +Node: Safety325366 +Node: Performance327127 +Node: Microsoft Windows Performance334188 +Node: MacOS Performance335379 +Ref: MacOS Performance-Footnote-1336084 +Node: Plumbing336166 +Node: Calling Git336995 +Node: Getting a Value from Git338520 +Node: Calling Git for Effect341606 +Node: Section Plumbing348126 +Node: Creating Sections348354 +Node: Section Selection352254 +Node: Matching Sections354053 +Node: Refreshing Buffers360026 +Node: Conventions363174 +Node: Theming Faces363366 +Node: FAQ371481 +Node: FAQ - How to ...?371923 +Node: How to show git's output?372283 +Node: How to install the gitman info manual?373037 +Node: How to show diffs for gpg-encrypted files?374007 +Node: How does branching and pushing work?374603 +Node: Can Magit be used as ediff-version-control-package?374966 +Node: FAQ - Issues and Errors376955 +Node: Magit is slow377887 +Node: I changed several thousand files at once and now Magit is unusable378101 +Node: I am having problems committing378830 +Node: I am using MS Windows and cannot push with Magit379311 +Node: I am using OS X and SOMETHING works in shell but not in Magit379928 +Node: Diffs contain control sequences380734 +Node: Expanding a file to show the diff causes it to disappear381847 +Node: Point is wrong in the COMMIT_EDITMSG buffer382398 +Node: The mode-line information isn't always up-to-date383444 +Node: A branch and tag sharing the same name breaks SOMETHING384526 +Node: My Git hooks work on the command-line but not inside Magit385414 +Node: git-commit-mode isn't used when committing from the command-line386260 +Node: Point ends up inside invisible text when jumping to a file-visiting buffer388527 +Node: Debugging Tools389325 +Node: Keystroke Index391504 +Node: Command Index425488 +Node: Function Index462513 +Node: Variable Index478865 + +End Tag Table + + +Local Variables: +coding: utf-8 +End: diff --git a/elpa/magit-20191227.1438/magit.info-1 b/elpa/magit-20200126.1750/magit.info-1 similarity index 98% rename from elpa/magit-20191227.1438/magit.info-1 rename to elpa/magit-20200126.1750/magit.info-1 index b1b96737..f6f7de09 100644 --- a/elpa/magit-20191227.1438/magit.info-1 +++ b/elpa/magit-20200126.1750/magit.info-1 @@ -1,6 +1,6 @@ This is magit.info, produced by makeinfo version 6.5 from magit.texi. - Copyright (C) 2015-2019 Jonas Bernoulli + Copyright (C) 2015-2020 Jonas Bernoulli You can redistribute this document and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -31,9 +31,9 @@ to perform almost all of their daily version control tasks directly from within Emacs. While many fine Git clients exist, only Magit and Git itself deserve to be called porcelains. -This manual is for Magit version 2.90.1 (v2.90.1-873-ge88242679+1). +This manual is for Magit version 2.90.1 (v2.90.1-900-g14c70a5ac+1). - Copyright (C) 2015-2019 Jonas Bernoulli + Copyright (C) 2015-2020 Jonas Bernoulli You can redistribute this document and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -763,8 +763,7 @@ File: magit.info, Node: Switching Buffers, Next: Naming Buffers, Up: Modes an itself can be used here, in which case the display actions have to be specified by adding them to ‘display-buffer-alist’ instead. - To learn about display actions, see *note (elisp)Choosing a Window - for Display::. + To learn about display actions, see *note (elisp)Choosing Window::. -- Function: magit-display-buffer-traditional buffer @@ -1279,6 +1278,14 @@ section use the following commands. The above commands all call the hook ‘magit-section-movement-hook’. Any of the functions listed below can be used as members of this hook. + You might want to remove some of the functions that Magit adds using +‘add-hook’. In doing so you have to make sure you do not attempt to +remove function that haven’t even been added yet, for example: + + (with-eval-after-load 'magit-diff + (remove-hook 'magit-section-movement-hook + 'magit-hunk-set-window-start)) + -- Variable: magit-section-movement-hook This hook is run by all of the above movement commands, after @@ -1288,8 +1295,9 @@ Any of the functions listed below can be used as members of this hook. This hook function ensures that the beginning of the current section is visible, provided it is a ‘hunk’ section. Otherwise, it - does nothing. This function is a member of the hook’s default - value. + does nothing. + + Loading ‘magit-diff’ adds this function to the hook. -- Function: magit-section-set-window-start @@ -1302,15 +1310,17 @@ Any of the functions listed below can be used as members of this hook. This hook function only has an effect in log buffers, and ‘point’ is on the "show more" section. If that is the case, then it - doubles the number of commits that are being shown. This function - is a member of the hook’s default value. + doubles the number of commits that are being shown. + + Loading ‘magit-log’ adds this function to the hook. -- Function: magit-log-maybe-update-revision-buffer When moving inside a log buffer, then this function updates the revision buffer, provided it is already being displayed in another - window of the same frame. This function is a member of the hook’s - default value. + window of the same frame. + + Loading ‘magit-log’ adds this function to the hook. -- Function: magit-log-maybe-update-blob-buffer @@ -6193,18 +6203,17 @@ Two Remotes::. This command rebases the current branch onto its push-remote. - When ‘magit-remote-set-if-missing’ is non-nil and the push-remote - is not configured, then configure it before rebasing. With a - prefix argument let the user change the push-remote before rebasing - onto it. + With a prefix argument or when the push-remote is either not + configured or unusable, then let the user first configure the + push-remote. ‘r u’ (‘magit-rebase-onto-upstream’) This command rebases the current branch onto its upstream branch. - When ‘magit-remote-set-if-missing’ is non-nil and the upstream is - not configured, then configure it before rebasing. With a prefix - argument let the user change the upstream before rebasing onto it. + With a prefix argument or when the upstream is either not + configured or unusable, then let the user first configure the + upstream. ‘r e’ (‘magit-rebase-branch’) @@ -7117,28 +7126,6 @@ These variables can be set from the transient prefix command value, then only tags are fetched that are reachable from fetched branches. - -- User Option: magit-remote-set-if-missing - - This option controls whether missing remotes are configured before - fetching, pulling, pushing and rebasing. - - When ‘nil’, then commands such as ‘magit-pull-from-upstream’ and - ‘magit-rebase-onto-uptream’ are not available as suffix commands if - the push-remote or upstream is not configured. - - When ‘non-nil’, then these commands are always available in their - respective transient, but if the required configuration is missing, - then they do appear in a way that indicates that this is the case. - If the user invokes such a command, then it asks for the necessary - configuration, stores the configuration, and only then performs the - action. - - This option also affects whether the argument ‘--set-upstream’ is - available in ‘magit-push’. If the value is ‘non-nil’, then that - argument would be redundant. But note that changing the value of - this option does not take affect immediately, the argument will - only be added or removed after restarting Emacs. -  File: magit.info, Node: Fetching, Next: Pulling, Prev: Remotes, Up: Transferring @@ -7156,20 +7143,24 @@ and the push-remote, see *note The Two Remotes::. ‘f p’ (‘magit-fetch-from-pushremote’) - This command fetches from the push-remote of the current branch. + This command fetches from the current push-remote. - When ‘magit-remote-set-if-missing’ is non-nil and the push-remote - is not configured, then configure it before fetching. With a - prefix argument let the user change the push-remote before fetching - from it. + With a prefix argument or when the push-remote is either not + configured or unusable, then let the user first configure the + push-remote. ‘f u’ (‘magit-fetch-from-upstream’) This command fetch from the upstream of the current branch. - When ‘magit-remote-set-if-missing’ is non-nil and the upstream is - not configured, then configure it before fetching. With a prefix - argument let the user change the upstream before fetching from it. + If the upstream is configured for the current branch and names an + existing remote, then use that. Otherwise try to use another + remote: If only a single remote is configured, then use that. + Otherwise if a remote named "origin" exists, then use that. + + If no remote can be determined, then this command is not available + from the ‘magit-fetch’ transient prefix and invoking it directly + results in an error. ‘f e’ (‘magit-fetch-other’) @@ -7225,18 +7216,17 @@ and the push-remote, see *note The Two Remotes::. This command pulls from the push-remote of the current branch. - When ‘magit-remote-set-if-missing’ is non-nil and the push-remote - is not configured, then configure it before pulling. With a prefix - argument let the user change the push-remote before pulling from - it. + With a prefix argument or when the push-remote is either not + configured or unusable, then let the user first configure the + push-remote. ‘F u’ (‘magit-pull-from-upstream’) This command pulls from the upstream of the current branch. - When ‘magit-remote-set-if-missing’ is non-nil and the upstream is - not configured, then configure it before pulling. With a prefix - argument let the user change the upstream before pulling from it. + With a prefix argument or when the upstream is either not + configured or unusable, then let the user first configure the + upstream. ‘F e’ (‘magit-pull-branch’) @@ -7261,17 +7251,17 @@ and the push-remote, see *note The Two Remotes::. This command pushes the current branch to its push-remote. - When ‘magit-remote-set-if-missing’ is non-nil and the push-remote - is not configured, then configure it before pushing. With a prefix - argument let the user change the push-remote before pushing to it. + With a prefix argument or when the push-remote is either not + configured or unusable, then let the user first configure the + push-remote. ‘P u’ (‘magit-push-current-to-upstream’) This command pushes the current branch to its upstream branch. - When ‘magit-remote-set-if-missing’ is non-nil and the upstream is - not configured, then configure it before pushing. With a prefix - argument let the user change the upstream before pushing to it. + With a prefix argument or when the upstream is either not + configured or unusable, then let the user first configure the + upstream. ‘P e’ (‘magit-push-current’) @@ -7756,3 +7746,41 @@ Also see *note (gitman)git-subtree::. This command extracts the history of the subtree PREFIX. + +File: magit.info, Node: Worktree, Next: Common Commands, Prev: Subtree, Up: Miscellaneous + +8.5 Worktree +============ + +Also see *note (gitman)git-worktree::. + +‘%’ (‘magit-worktree’) + + This transient prefix command binds the following suffix commands + and displays them in a temporary buffer until a suffix is invoked. + +‘% b’ (‘magit-worktree-checkout’) + + Checkout BRANCH in a new worktree at PATH. + +‘% c’ (‘magit-worktree-branch’) + + Create a new BRANCH and check it out in a new worktree at PATH. + +‘% m’ (‘magit-worktree-move’) + + Move an existing worktree to a new PATH. + +‘% k’ (‘magit-worktree-delete’) + + Delete a worktree, defaulting to the worktree at point. The + primary worktree cannot be deleted. + +‘% g’ (‘magit-worktree-status’) + + Show the status for the worktree at point. + + If there is no worktree at point, then read one in the minibuffer. + If the worktree at point is the one whose status is already being + displayed in the current buffer, then show it in Dired instead. + diff --git a/elpa/magit-20191227.1438/magit.info-2 b/elpa/magit-20200126.1750/magit.info-2 similarity index 99% rename from elpa/magit-20191227.1438/magit.info-2 rename to elpa/magit-20200126.1750/magit.info-2 index 3ec7e4ac..326359e8 100644 --- a/elpa/magit-20191227.1438/magit.info-2 +++ b/elpa/magit-20200126.1750/magit.info-2 @@ -1,6 +1,6 @@ This is magit.info, produced by makeinfo version 6.5 from magit.texi. - Copyright (C) 2015-2019 Jonas Bernoulli + Copyright (C) 2015-2020 Jonas Bernoulli You can redistribute this document and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -17,44 +17,6 @@ START-INFO-DIR-ENTRY * Magit: (magit). Using Git from Emacs with Magit. END-INFO-DIR-ENTRY - -File: magit.info, Node: Worktree, Next: Common Commands, Prev: Subtree, Up: Miscellaneous - -8.5 Worktree -============ - -Also see *note (gitman)git-worktree::. - -‘%’ (‘magit-worktree’) - - This transient prefix command binds the following suffix commands - and displays them in a temporary buffer until a suffix is invoked. - -‘% b’ (‘magit-worktree-checkout’) - - Checkout BRANCH in a new worktree at PATH. - -‘% c’ (‘magit-worktree-branch’) - - Create a new BRANCH and check it out in a new worktree at PATH. - -‘% m’ (‘magit-worktree-move’) - - Move an existing worktree to a new PATH. - -‘% k’ (‘magit-worktree-delete’) - - Delete a worktree, defaulting to the worktree at point. The - primary worktree cannot be deleted. - -‘% g’ (‘magit-worktree-status’) - - Show the status for the worktree at point. - - If there is no worktree at point, then read one in the minibuffer. - If the worktree at point is the one whose status is already being - displayed in the current buffer, then show it in Dired instead. -  File: magit.info, Node: Common Commands, Next: Wip Modes, Prev: Worktree, Up: Miscellaneous @@ -1799,7 +1761,7 @@ A.1.4 How does branching and pushing work? ------------------------------------------ Please see *note Branching:: and - +  File: magit.info, Node: Can Magit be used as ediff-version-control-package?, Prev: How does branching and pushing work?, Up: FAQ - How to ...? @@ -2371,18 +2333,18 @@ Appendix C Keystroke Index (line 63) * f <1>: Fetching. (line 9) * F: Pulling. (line 9) -* f a: Fetching. (line 46) +* f a: Fetching. (line 50) * f C: Branch Commands. (line 30) * F C: Branch Commands. (line 31) -* f e: Fetching. (line 32) -* F e: Pulling. (line 31) -* f m: Fetching. (line 50) -* f o: Fetching. (line 36) +* f e: Fetching. (line 36) +* F e: Pulling. (line 30) +* f m: Fetching. (line 54) +* f o: Fetching. (line 40) * f p: Fetching. (line 15) * F p: Pulling. (line 14) -* f r: Fetching. (line 41) -* f u: Fetching. (line 24) -* F u: Pulling. (line 23) +* f r: Fetching. (line 45) +* f u: Fetching. (line 23) +* F u: Pulling. (line 22) * g: Automatic Refreshing of Magit Buffers. (line 24) * G: Automatic Refreshing of Magit Buffers. @@ -2526,19 +2488,19 @@ Appendix C Keystroke Index * r: Rebasing. (line 9) * r <1>: Editing Rebase Sequences. (line 51) -* r a: Rebasing. (line 124) -* r e: Rebasing. (line 45) -* r e <1>: Rebasing. (line 119) -* r f: Rebasing. (line 85) -* r i: Rebasing. (line 81) -* r k: Rebasing. (line 100) -* r m: Rebasing. (line 90) +* r a: Rebasing. (line 123) +* r e: Rebasing. (line 44) +* r e <1>: Rebasing. (line 118) +* r f: Rebasing. (line 84) +* r i: Rebasing. (line 80) +* r k: Rebasing. (line 99) +* r m: Rebasing. (line 89) * r p: Rebasing. (line 28) -* r r: Rebasing. (line 107) -* r s: Rebasing. (line 51) -* r s <1>: Rebasing. (line 114) -* r u: Rebasing. (line 37) -* r w: Rebasing. (line 95) +* r r: Rebasing. (line 106) +* r s: Rebasing. (line 50) +* r s <1>: Rebasing. (line 113) +* r u: Rebasing. (line 36) +* r w: Rebasing. (line 94) * RET: References Buffer. (line 181) * RET <1>: Visiting Files and Blobs from a Diff. (line 8) @@ -2858,13 +2820,13 @@ Appendix D Command Index (line 136) * magit-emacs-Q-command: Debugging Tools. (line 16) * magit-fetch: Fetching. (line 9) -* magit-fetch-all: Fetching. (line 46) -* magit-fetch-branch: Fetching. (line 36) +* magit-fetch-all: Fetching. (line 50) +* magit-fetch-branch: Fetching. (line 40) * magit-fetch-from-pushremote: Fetching. (line 15) -* magit-fetch-from-upstream: Fetching. (line 24) +* magit-fetch-from-upstream: Fetching. (line 23) * magit-fetch-modules: Submodule Transient. (line 58) -* magit-fetch-other: Fetching. (line 32) -* magit-fetch-refspec: Fetching. (line 41) +* magit-fetch-other: Fetching. (line 36) +* magit-fetch-refspec: Fetching. (line 45) * magit-file-checkout: Resetting. (line 44) * magit-file-checkout <1>: Minor Mode for Buffers Visiting Files. (line 165) @@ -2952,9 +2914,9 @@ Appendix D Command Index * magit-process: Viewing Git Output. (line 16) * magit-process-kill: Viewing Git Output. (line 24) * magit-pull: Pulling. (line 9) -* magit-pull-branch: Pulling. (line 31) +* magit-pull-branch: Pulling. (line 30) * magit-pull-from-pushremote: Pulling. (line 14) -* magit-pull-from-upstream: Pulling. (line 23) +* magit-pull-from-upstream: Pulling. (line 22) * magit-push: Pushing. (line 9) * magit-push-current: Pushing. (line 31) * magit-push-current-to-pushremote: Pushing. (line 15) @@ -2967,19 +2929,19 @@ Appendix D Command Index * magit-push-tags: Pushing. (line 58) * magit-push-to-remote remote args: Pushing. (line 85) * magit-rebase: Rebasing. (line 9) -* magit-rebase-abort: Rebasing. (line 124) -* magit-rebase-autosquash: Rebasing. (line 85) -* magit-rebase-branch: Rebasing. (line 45) -* magit-rebase-continue: Rebasing. (line 107) -* magit-rebase-edit: Rebasing. (line 119) -* magit-rebase-edit-commit: Rebasing. (line 90) -* magit-rebase-interactive: Rebasing. (line 81) +* magit-rebase-abort: Rebasing. (line 123) +* magit-rebase-autosquash: Rebasing. (line 84) +* magit-rebase-branch: Rebasing. (line 44) +* magit-rebase-continue: Rebasing. (line 106) +* magit-rebase-edit: Rebasing. (line 118) +* magit-rebase-edit-commit: Rebasing. (line 89) +* magit-rebase-interactive: Rebasing. (line 80) * magit-rebase-onto-pushremote: Rebasing. (line 28) -* magit-rebase-onto-upstream: Rebasing. (line 37) -* magit-rebase-remove-commit: Rebasing. (line 100) -* magit-rebase-reword-commit: Rebasing. (line 95) -* magit-rebase-skip: Rebasing. (line 114) -* magit-rebase-subset: Rebasing. (line 51) +* magit-rebase-onto-upstream: Rebasing. (line 36) +* magit-rebase-remove-commit: Rebasing. (line 99) +* magit-rebase-reword-commit: Rebasing. (line 94) +* magit-rebase-skip: Rebasing. (line 113) +* magit-rebase-subset: Rebasing. (line 50) * magit-reflog-current: Reflog. (line 11) * magit-reflog-head: Reflog. (line 19) * magit-reflog-other: Reflog. (line 15) @@ -3088,7 +3050,7 @@ Appendix D Command Index * magit-status: Status Buffer. (line 22) * magit-submodule: Submodule Transient. (line 6) * magit-submodule-add: Submodule Transient. (line 20) -* magit-submodule-fetch: Fetching. (line 50) +* magit-submodule-fetch: Fetching. (line 54) * magit-submodule-populate: Submodule Transient. (line 34) * magit-submodule-register: Submodule Transient. (line 27) * magit-submodule-synchronize: Submodule Transient. (line 44) @@ -3204,14 +3166,14 @@ Appendix E Function Index * magit-disable-section-inserter: Per-Repository Configuration. (line 31) * magit-display-buffer: Switching Buffers. (line 6) -* magit-display-buffer-fullcolumn-most-v1: Switching Buffers. (line 76) +* magit-display-buffer-fullcolumn-most-v1: Switching Buffers. (line 75) * magit-display-buffer-fullframe-status-topleft-v1: Switching Buffers. - (line 66) + (line 65) * magit-display-buffer-fullframe-status-v1: Switching Buffers. - (line 60) + (line 59) * magit-display-buffer-same-window-except-diff-v1: Switching Buffers. - (line 54) -* magit-display-buffer-traditional: Switching Buffers. (line 46) + (line 53) +* magit-display-buffer-traditional: Switching Buffers. (line 45) * magit-file-checkout: Minor Mode for Buffers Visiting Files. (line 165) * magit-file-delete: Minor Mode for Buffers Visiting Files. @@ -3253,7 +3215,7 @@ Appendix E Function Index (line 24) * magit-git-wash: Calling Git for Effect. (line 70) -* magit-hunk-set-window-start: Section Movement. (line 43) +* magit-hunk-set-window-start: Section Movement. (line 51) * magit-ido-completing-read: Support for Completion Frameworks. (line 48) * magit-insert-am-sequence: Status Sections. (line 28) @@ -3319,10 +3281,10 @@ Appendix E Function Index (line 75) * magit-list-repositories: Repository List. (line 6) * magit-list-submodules: Listing Submodules. (line 13) -* magit-log-maybe-show-more-commits: Section Movement. (line 57) -* magit-log-maybe-update-blob-buffer: Section Movement. (line 71) -* magit-log-maybe-update-revision-buffer: Section Movement. (line 64) -* magit-maybe-set-dedicated: Switching Buffers. (line 101) +* magit-log-maybe-show-more-commits: Section Movement. (line 66) +* magit-log-maybe-update-blob-buffer: Section Movement. (line 82) +* magit-log-maybe-update-revision-buffer: Section Movement. (line 74) +* magit-maybe-set-dedicated: Switching Buffers. (line 100) * magit-mode-display-buffer: Refreshing Buffers. (line 33) * magit-mode-quit-window: Quitting Windows. (line 34) * magit-mode-setup: Refreshing Buffers. (line 17) @@ -3357,13 +3319,13 @@ Appendix E Function Index (line 40) * magit-run-git-with-logfile: Calling Git for Effect. (line 56) -* magit-save-window-configuration: Switching Buffers. (line 90) +* magit-save-window-configuration: Switching Buffers. (line 89) * magit-section-case: Matching Sections. (line 71) * magit-section-hide: Section Visibility. (line 49) * magit-section-hide-children: Section Visibility. (line 64) * magit-section-ident: Matching Sections. (line 11) * magit-section-match: Matching Sections. (line 21) -* magit-section-set-window-start: Section Movement. (line 50) +* magit-section-set-window-start: Section Movement. (line 59) * magit-section-show: Section Visibility. (line 45) * magit-section-show-children: Section Visibility. (line 58) * magit-section-show-headings: Section Visibility. (line 53) @@ -3373,11 +3335,11 @@ Appendix E Function Index (line 105) * magit-start-process: Calling Git for Effect. (line 124) -* magit-stashes-maybe-update-stash-buffer: Section Movement. (line 95) -* magit-status-maybe-update-blob-buffer: Section Movement. (line 89) +* magit-stashes-maybe-update-stash-buffer: Section Movement. (line 106) +* magit-status-maybe-update-blob-buffer: Section Movement. (line 100) * magit-status-maybe-update-revision-buffer: Section Movement. - (line 77) -* magit-status-maybe-update-stash-buffer: Section Movement. (line 83) + (line 88) +* magit-status-maybe-update-stash-buffer: Section Movement. (line 94) * magit-wip-log: Wip Modes. (line 48) * magit-wip-log-current: Wip Modes. (line 57) * with-editor-usage-message: Commit Mode and Hooks. @@ -3530,15 +3492,15 @@ Appendix F Variable Index * magit-no-confirm: Action Confirmation. (line 18) * magit-pop-revision-stack-format: Using the Revision Stack. (line 35) -* magit-post-display-buffer-hook: Switching Buffers. (line 96) -* magit-pre-display-buffer-hook: Switching Buffers. (line 85) +* magit-post-display-buffer-hook: Switching Buffers. (line 95) +* magit-pre-display-buffer-hook: Switching Buffers. (line 84) * magit-prefer-remote-upstream: Branch Git Variables. (line 126) * magit-prefix-use-buffer-arguments: Transient Arguments and Buffer Variables. (line 64) * magit-process-raise-error: Calling Git for Effect. (line 151) -* magit-pull-or-fetch: Fetching. (line 55) +* magit-pull-or-fetch: Fetching. (line 59) * magit-reflog-margin: Reflog. (line 23) * magit-refresh-args: Refreshing Buffers. (line 55) * magit-refresh-buffer-hook: Automatic Refreshing of Magit Buffers. @@ -3557,8 +3519,6 @@ Appendix F Variable Index * magit-refs-show-remote-prefix: References Buffer. (line 62) * magit-remote-add-set-remote.pushDefault: Remote Commands. (line 92) * magit-remote-direct-configure: Remote Commands. (line 21) -* magit-remote-set-if-missing: Remote Git Variables. - (line 39) * magit-repolist-columns: Repository List. (line 14) * magit-repository-directories: Status Buffer. (line 58) * magit-revision-filter-files-on-follow: Revision Buffer. (line 64) @@ -3570,7 +3530,7 @@ Appendix F Variable Index (line 13) * magit-section-cache-visibility: Section Visibility. (line 95) * magit-section-initial-visibility-alist: Section Visibility. (line 78) -* magit-section-movement-hook: Section Movement. (line 38) +* magit-section-movement-hook: Section Movement. (line 46) * magit-section-set-visibility-hook: Section Visibility. (line 106) * magit-section-show-child-count: Section Options. (line 9) * magit-section-visibility-indicator: Section Visibility. (line 124) @@ -3588,7 +3548,7 @@ Appendix F Variable Index * magit-uniquify-buffer-names: Naming Buffers. (line 74) * magit-unstage-committed: Staging and Unstaging. (line 56) -* magit-update-other-window-delay: Section Movement. (line 101) +* magit-update-other-window-delay: Section Movement. (line 112) * magit-visit-ref-behavior: References Buffer. (line 192) * magit-wip-after-apply-mode: Legacy Wip Modes. (line 19) * magit-wip-after-apply-mode-lighter: Legacy Wip Modes. (line 59) diff --git a/elpa/markdown-mode-20190802.2215/markdown-mode-autoloads.el b/elpa/markdown-mode-20191230.1055/markdown-mode-autoloads.el similarity index 100% rename from elpa/markdown-mode-20190802.2215/markdown-mode-autoloads.el rename to elpa/markdown-mode-20191230.1055/markdown-mode-autoloads.el diff --git a/elpa/markdown-mode-20190802.2215/markdown-mode-pkg.el b/elpa/markdown-mode-20191230.1055/markdown-mode-pkg.el similarity index 70% rename from elpa/markdown-mode-20190802.2215/markdown-mode-pkg.el rename to elpa/markdown-mode-20191230.1055/markdown-mode-pkg.el index a7913206..bf1cf623 100644 --- a/elpa/markdown-mode-20190802.2215/markdown-mode-pkg.el +++ b/elpa/markdown-mode-20191230.1055/markdown-mode-pkg.el @@ -1,2 +1,2 @@ ;;; -*- no-byte-compile: t -*- -(define-package "markdown-mode" "20190802.2215" "Major mode for Markdown-formatted text" '((emacs "24.4") (cl-lib "0.5")) :commit "f3c54e34cc5228001af36a5301883325319f21d4" :keywords '("markdown" "github flavored markdown" "itex") :authors '(("Jason R. Blevins" . "jblevins@xbeta.org")) :maintainer '("Jason R. Blevins" . "jblevins@xbeta.org") :url "https://jblevins.org/projects/markdown-mode/") +(define-package "markdown-mode" "20191230.1055" "Major mode for Markdown-formatted text" '((emacs "24.4") (cl-lib "0.5")) :commit "e9dff50d572caa96b68a7466c18c97a8d6ed651c" :keywords '("markdown" "github flavored markdown" "itex") :authors '(("Jason R. Blevins" . "jblevins@xbeta.org")) :maintainer '("Jason R. Blevins" . "jblevins@xbeta.org") :url "https://jblevins.org/projects/markdown-mode/") diff --git a/elpa/markdown-mode-20190802.2215/markdown-mode.el b/elpa/markdown-mode-20191230.1055/markdown-mode.el similarity index 99% rename from elpa/markdown-mode-20190802.2215/markdown-mode.el rename to elpa/markdown-mode-20191230.1055/markdown-mode.el index 0f9b43cc..4003f8a2 100644 --- a/elpa/markdown-mode-20190802.2215/markdown-mode.el +++ b/elpa/markdown-mode-20191230.1055/markdown-mode.el @@ -7,7 +7,7 @@ ;; Maintainer: Jason R. Blevins ;; Created: May 24, 2007 ;; Version: 2.4-dev -;; Package-Version: 20190802.2215 +;; Package-Version: 20191230.1055 ;; Package-Requires: ((emacs "24.4") (cl-lib "0.5")) ;; Keywords: Markdown, GitHub Flavored Markdown, itex ;; URL: https://jblevins.org/projects/markdown-mode/ @@ -2253,7 +2253,7 @@ Depending on your font, some reasonable choices are: ;;; Compatibility ============================================================= (defun markdown-replace-regexp-in-string (regexp rep string) - "Replace ocurrences of REGEXP with REP in STRING. + "Replace occurrences of REGEXP with REP in STRING. This is a compatibility wrapper to provide `replace-regexp-in-string' in XEmacs 21." (if (featurep 'xemacs) @@ -3686,7 +3686,7 @@ Return a cons cell containing updated bounds for the region." (cons beg (- end removed))))) (defun markdown-insert-hr (arg) - "Insert or replace a horizonal rule. + "Insert or replace a horizontal rule. By default, use the first element of `markdown-hr-strings'. When ARG is non-nil, as when given a prefix, select a different element as follows. When prefixed with \\[universal-argument], @@ -4749,7 +4749,7 @@ Then the returned list is: ((\"^1\" . 478) (\"^marker\" . 475))" (defun markdown-kill-thing-at-point () "Kill thing at point and add important text, without markup, to kill ring. Possible things to kill include (roughly in order of precedence): -inline code, headers, horizonal rules, links (add link text to +inline code, headers, horizontal rules, links (add link text to kill ring), images (add alt text to kill ring), angle uri, email addresses, bold, italics, reference definition (add URI to kill ring), footnote markers and text (kill both marker and text, add @@ -4769,7 +4769,7 @@ text to kill ring), and list items." ((thing-at-point-looking-at markdown-regex-header-setext) (kill-new (match-string 1)) (delete-region (match-beginning 0) (match-end 0))) - ;; Horizonal rule + ;; Horizontal rule ((thing-at-point-looking-at markdown-regex-hr) (kill-new (match-string 0)) (delete-region (match-beginning 0) (match-end 0))) @@ -4912,7 +4912,7 @@ duplicate positions, which are handled up by calling functions." (if (and prev-line-pos (> prev-line-pos tab-width)) (setq positions (cons (- prev-line-pos tab-width) positions))) - ;; Indentation of all preceeding list markers (when in a list) + ;; Indentation of all preceding list markers (when in a list) (when (setq pos (markdown-calculate-list-levels)) (setq positions (append pos positions))) @@ -7186,7 +7186,7 @@ markup." ;; Promote setext heading ((thing-at-point-looking-at markdown-regex-header-setext) (markdown-cycle-setext -1)) - ;; Promote horizonal rule + ;; Promote horizontal rule ((thing-at-point-looking-at markdown-regex-hr) (markdown-cycle-hr -1)) ;; Promote list item @@ -7218,7 +7218,7 @@ or remove markup." ;; Demote setext heading ((thing-at-point-looking-at markdown-regex-header-setext) (markdown-cycle-setext 1)) - ;; Demote horizonal rule + ;; Demote horizontal rule ((thing-at-point-looking-at markdown-regex-hr) (markdown-cycle-hr 1)) ;; Demote list item @@ -8169,7 +8169,7 @@ This is an exact copy of `line-number-at-pos' for use in emacs21." (thing-at-point-looking-at (markdown-make-regex-link-generic)))) (defun markdown-line-is-reference-definition-p () - "Return whether the current line is a (non-footnote) reference defition." + "Return whether the current line is a (non-footnote) reference definition." (save-excursion (move-beginning-of-line 1) (and (looking-at-p markdown-regex-reference-definition) diff --git a/elpa/markdown-mode-20190802.2215/markdown-mode.elc b/elpa/markdown-mode-20191230.1055/markdown-mode.elc similarity index 93% rename from elpa/markdown-mode-20190802.2215/markdown-mode.elc rename to elpa/markdown-mode-20191230.1055/markdown-mode.elc index 73f6ca1e..5fab0251 100644 Binary files a/elpa/markdown-mode-20190802.2215/markdown-mode.elc and b/elpa/markdown-mode-20191230.1055/markdown-mode.elc differ diff --git a/elpa/nord-theme-20191203.1851/nord-theme-pkg.el b/elpa/nord-theme-20191203.1851/nord-theme-pkg.el deleted file mode 100644 index c116f8c5..00000000 --- a/elpa/nord-theme-20191203.1851/nord-theme-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "nord-theme" "20191203.1851" "An arctic, north-bluish clean and elegant theme" '((emacs "24")) :commit "2fc8fe41105d995a8c5d2bad0443ad3ae45c2573" :authors '(("Arctic Ice Studio" . "development@arcticicestudio.com")) :maintainer '("Arctic Ice Studio" . "development@arcticicestudio.com") :url "https://github.com/arcticicestudio/nord-emacs") diff --git a/elpa/nord-theme-20191203.1851/nord-theme-autoloads.el b/elpa/nord-theme-20200108.833/nord-theme-autoloads.el similarity index 100% rename from elpa/nord-theme-20191203.1851/nord-theme-autoloads.el rename to elpa/nord-theme-20200108.833/nord-theme-autoloads.el diff --git a/elpa/nord-theme-20200108.833/nord-theme-pkg.el b/elpa/nord-theme-20200108.833/nord-theme-pkg.el new file mode 100644 index 00000000..a0ac5342 --- /dev/null +++ b/elpa/nord-theme-20200108.833/nord-theme-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "nord-theme" "20200108.833" "An arctic, north-bluish clean and elegant theme" '((emacs "24")) :commit "d828752e270978a56bde19986c98b1bbe8f51386" :authors '(("Arctic Ice Studio" . "development@arcticicestudio.com")) :maintainer '("Arctic Ice Studio" . "development@arcticicestudio.com") :url "https://github.com/arcticicestudio/nord-emacs") diff --git a/elpa/nord-theme-20191203.1851/nord-theme.el b/elpa/nord-theme-20200108.833/nord-theme.el similarity index 90% rename from elpa/nord-theme-20191203.1851/nord-theme.el rename to elpa/nord-theme-20200108.833/nord-theme.el index 60036245..a1749238 100644 --- a/elpa/nord-theme-20191203.1851/nord-theme.el +++ b/elpa/nord-theme-20200108.833/nord-theme.el @@ -5,8 +5,8 @@ ;; Title: Nord Theme ;; Project: nord-emacs -;; Version: 0.4.0 -;; Package-Version: 20191203.1851 +;; Version: 0.5.0 +;; Package-Version: 20200108.833 ;; URL: https://github.com/arcticicestudio/nord-emacs ;; Author: Arctic Ice Studio ;; Package-Requires: ((emacs "24")) @@ -94,39 +94,43 @@ Please see https://github.com/arcticicestudio/nord-emacs/issues/73 for more details." "0.4.0") +(defun nord-display-truecolor-or-graphic-p () + "Returns whether the display can display nord colors" + (or (= (display-color-cells) 16777216) (display-graphic-p))) + ;;;; Color Constants (let ((class '((class color) (min-colors 89))) - (nord0 (if (display-graphic-p) "#2E3440" nil)) - (nord1 (if (display-graphic-p) "#3B4252" "black")) - (nord2 (if (display-graphic-p) "#434C5E" "#434C5E")) - (nord3 (if (display-graphic-p) "#4C566A" "brightblack")) - (nord4 (if (display-graphic-p) "#D8DEE9" "#D8DEE9")) - (nord5 (if (display-graphic-p) "#E5E9F0" "white")) - (nord6 (if (display-graphic-p) "#ECEFF4" "brightwhite")) - (nord7 (if (display-graphic-p) "#8FBCBB" "cyan")) - (nord8 (if (display-graphic-p) "#88C0D0" "brightcyan")) - (nord9 (if (display-graphic-p) "#81A1C1" "blue")) - (nord10 (if (display-graphic-p) "#5E81AC" "brightblue")) - (nord11 (if (display-graphic-p) "#BF616A" "red")) - (nord12 (if (display-graphic-p) "#D08770" "brightyellow")) - (nord13 (if (display-graphic-p) "#EBCB8B" "yellow")) - (nord14 (if (display-graphic-p) "#A3BE8C" "green")) - (nord15 (if (display-graphic-p) "#B48EAD" "magenta")) - (nord-annotation (if (display-graphic-p) "#D08770" "brightyellow")) - (nord-attribute (if (display-graphic-p) "#8FBCBB" "cyan")) - (nord-class (if (display-graphic-p) "#8FBCBB" "cyan")) - (nord-comment (if (display-graphic-p) (nord-theme--brightened-comment-color nord-comment-brightness) "brightblack")) - (nord-escape (if (display-graphic-p) "#D08770" "brightyellow")) - (nord-method (if (display-graphic-p) "#88C0D0" "brightcyan")) - (nord-keyword (if (display-graphic-p) "#81A1C1" "blue")) - (nord-numeric (if (display-graphic-p) "#B48EAD" "magenta")) - (nord-operator (if (display-graphic-p) "#81A1C1" "blue")) - (nord-preprocessor (if (display-graphic-p) "#5E81AC" "brightblue")) - (nord-punctuation (if (display-graphic-p) "#D8DEE9" "#D8DEE9")) - (nord-regexp (if (display-graphic-p) "#EBCB8B" "yellow")) - (nord-string (if (display-graphic-p) "#A3BE8C" "green")) - (nord-tag (if (display-graphic-p) "#81A1C1" "blue")) - (nord-variable (if (display-graphic-p) "#D8DEE9" "#D8DEE9")) + (nord0 (if (nord-display-truecolor-or-graphic-p) "#2E3440" nil)) + (nord1 (if (nord-display-truecolor-or-graphic-p) "#3B4252" "black")) + (nord2 (if (nord-display-truecolor-or-graphic-p) "#434C5E" "#434C5E")) + (nord3 (if (nord-display-truecolor-or-graphic-p) "#4C566A" "brightblack")) + (nord4 (if (nord-display-truecolor-or-graphic-p) "#D8DEE9" "#D8DEE9")) + (nord5 (if (nord-display-truecolor-or-graphic-p) "#E5E9F0" "white")) + (nord6 (if (nord-display-truecolor-or-graphic-p) "#ECEFF4" "brightwhite")) + (nord7 (if (nord-display-truecolor-or-graphic-p) "#8FBCBB" "cyan")) + (nord8 (if (nord-display-truecolor-or-graphic-p) "#88C0D0" "brightcyan")) + (nord9 (if (nord-display-truecolor-or-graphic-p) "#81A1C1" "blue")) + (nord10 (if (nord-display-truecolor-or-graphic-p) "#5E81AC" "brightblue")) + (nord11 (if (nord-display-truecolor-or-graphic-p) "#BF616A" "red")) + (nord12 (if (nord-display-truecolor-or-graphic-p) "#D08770" "brightyellow")) + (nord13 (if (nord-display-truecolor-or-graphic-p) "#EBCB8B" "yellow")) + (nord14 (if (nord-display-truecolor-or-graphic-p) "#A3BE8C" "green")) + (nord15 (if (nord-display-truecolor-or-graphic-p) "#B48EAD" "magenta")) + (nord-annotation (if (nord-display-truecolor-or-graphic-p) "#D08770" "brightyellow")) + (nord-attribute (if (nord-display-truecolor-or-graphic-p) "#8FBCBB" "cyan")) + (nord-class (if (nord-display-truecolor-or-graphic-p) "#8FBCBB" "cyan")) + (nord-comment (if (nord-display-truecolor-or-graphic-p) (nord-theme--brightened-comment-color nord-comment-brightness) "brightblack")) + (nord-escape (if (nord-display-truecolor-or-graphic-p) "#D08770" "brightyellow")) + (nord-method (if (nord-display-truecolor-or-graphic-p) "#88C0D0" "brightcyan")) + (nord-keyword (if (nord-display-truecolor-or-graphic-p) "#81A1C1" "blue")) + (nord-numeric (if (nord-display-truecolor-or-graphic-p) "#B48EAD" "magenta")) + (nord-operator (if (nord-display-truecolor-or-graphic-p) "#81A1C1" "blue")) + (nord-preprocessor (if (nord-display-truecolor-or-graphic-p) "#5E81AC" "brightblue")) + (nord-punctuation (if (nord-display-truecolor-or-graphic-p) "#D8DEE9" "#D8DEE9")) + (nord-regexp (if (nord-display-truecolor-or-graphic-p) "#EBCB8B" "yellow")) + (nord-string (if (nord-display-truecolor-or-graphic-p) "#A3BE8C" "green")) + (nord-tag (if (nord-display-truecolor-or-graphic-p) "#81A1C1" "blue")) + (nord-variable (if (nord-display-truecolor-or-graphic-p) "#D8DEE9" "#D8DEE9")) (nord-region-highlight-foreground (if (or (string= nord-region-highlight "frost") (string= nord-region-highlight "snowstorm")) "#2E3440" nil)) @@ -272,8 +276,17 @@ `(region ((,class (:foreground ,nord-region-highlight-foreground :background ,nord-region-highlight-background)))) `(scroll-bar ((,class (:background ,nord3)))) `(secondary-selection ((,class (:background ,nord2)))) + + ;; `show-paren-match-face` and `show-paren-mismatch-face` are deprecated since Emacs version 22.1 and were + ;; removed in Emacs 25. + ;; https://github.com/arcticicestudio/nord-emacs/issues/75 + ;; http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=c430f7e23fc2c22f251ace4254e37dea1452dfc3 + ;; https://github.com/emacs-mirror/emacs/commit/c430f7e23fc2c22f251ace4254e37dea1452dfc3 `(show-paren-match-face ((,class (:foreground ,nord0 :background ,nord8)))) `(show-paren-mismatch-face ((,class (:background ,nord11)))) + + `(show-paren-match ((,class (:foreground ,nord0 :background ,nord8)))) + `(show-paren-mismatch ((,class (:background ,nord11)))) `(success ((,class (:foreground ,nord14)))) `(term ((,class (:foreground ,nord4 :background ,nord0)))) `(term-color-black ((,class (:foreground ,nord1 :background ,nord1)))) @@ -627,6 +640,9 @@ `(neo-vc-up-to-date-face ((,class (:foreground ,nord4)))) `(neo-vc-user-face ((,class (:foreground ,nord4)))) + ;; > Cider + `(cider-result-overlay-face ((t (:background unspecified)))) + ;; > Org `(org-level-1 ((,class (:foreground ,nord7 :weight extra-bold)))) `(org-level-2 ((,class (:foreground ,nord8 :weight bold)))) @@ -682,7 +698,15 @@ `(org-agenda-date-weekend ((,class (:foreground ,nord9)))) `(org-agenda-date-today ((,class (:foreground ,nord8 :weight bold)))) `(org-agenda-done ((,class (:foreground ,nord14)))) - `(org-verbatim ((,class (:foreground ,nord7)))))) + `(org-verbatim ((,class (:foreground ,nord7)))) + + ;; > ivy-mode + `(ivy-current-match ((,class (:inherit region)))) + `(ivy-minibuffer-match-face-1 ((,class (:inherit default)))) + `(ivy-minibuffer-match-face-2 ((,class (:background ,nord7 :foreground ,nord0)))) + `(ivy-minibuffer-match-face-3 ((,class (:background ,nord8 :foreground ,nord0)))) + `(ivy-minibuffer-match-face-4 ((,class (:background ,nord9 :foreground ,nord0)))) + `(ivy-remote ((,class (:foreground ,nord14)))))) ;;;###autoload (when (and (boundp 'custom-theme-load-path) load-file-name) diff --git a/elpa/ob-restclient-20191119.924/ob-restclient-pkg.el b/elpa/ob-restclient-20191119.924/ob-restclient-pkg.el deleted file mode 100644 index 3c0bf55e..00000000 --- a/elpa/ob-restclient-20191119.924/ob-restclient-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "ob-restclient" "20191119.924" "org-babel functions for restclient-mode" '((restclient "0")) :commit "fa4ac671756c9d4e395bd481405239d06b202bae" :keywords '("literate programming" "reproducible research") :authors '(("Alf Lervåg")) :maintainer '("Alf Lervåg") :url "https://github.com/alf/ob-restclient.el") diff --git a/elpa/ob-restclient-20191119.924/ob-restclient-autoloads.el b/elpa/ob-restclient-20200109.730/ob-restclient-autoloads.el similarity index 100% rename from elpa/ob-restclient-20191119.924/ob-restclient-autoloads.el rename to elpa/ob-restclient-20200109.730/ob-restclient-autoloads.el diff --git a/elpa/ob-restclient-20200109.730/ob-restclient-pkg.el b/elpa/ob-restclient-20200109.730/ob-restclient-pkg.el new file mode 100644 index 00000000..9e190622 --- /dev/null +++ b/elpa/ob-restclient-20200109.730/ob-restclient-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "ob-restclient" "20200109.730" "org-babel functions for restclient-mode" '((restclient "0")) :commit "c5c22e603531dca48575d0a425fddff16dc0f391" :keywords '("literate programming" "reproducible research") :authors '(("Alf Lervåg")) :maintainer '("Alf Lervåg") :url "https://github.com/alf/ob-restclient.el") diff --git a/elpa/ob-restclient-20191119.924/ob-restclient.el b/elpa/ob-restclient-20200109.730/ob-restclient.el similarity index 97% rename from elpa/ob-restclient-20191119.924/ob-restclient.el rename to elpa/ob-restclient-20200109.730/ob-restclient.el index 5991c34d..de89a0cd 100644 --- a/elpa/ob-restclient-20191119.924/ob-restclient.el +++ b/elpa/ob-restclient-20200109.730/ob-restclient.el @@ -4,7 +4,7 @@ ;; Author: Alf Lervåg ;; Keywords: literate programming, reproducible research -;; Package-Version: 20191119.924 +;; Package-Version: 20200109.730 ;; Homepage: https://github.com/alf/ob-restclient.el ;; Version: 0.02 ;; Package-Requires: ((restclient "0")) @@ -64,7 +64,7 @@ This function is called by `org-babel-execute-src-block'" (let ((key (car p)) (value (cdr p))) (when (eql key :var) - (insert (format ":%s = %s\n" (car value) (cdr value)))))) + (insert (format ":%s = <<\n%s\n#\n" (car value) (cdr value)))))) (insert body) (goto-char (point-min)) (delete-trailing-whitespace) diff --git a/elpa/ob-restclient-20191119.924/ob-restclient.elc b/elpa/ob-restclient-20200109.730/ob-restclient.elc similarity index 80% rename from elpa/ob-restclient-20191119.924/ob-restclient.elc rename to elpa/ob-restclient-20200109.730/ob-restclient.elc index 7f655199..8afa0f95 100644 Binary files a/elpa/ob-restclient-20191119.924/ob-restclient.elc and b/elpa/ob-restclient-20200109.730/ob-restclient.elc differ diff --git a/elpa/org-9.3.2.signed b/elpa/org-9.3.2.signed new file mode 100644 index 00000000..d7938f4e --- /dev/null +++ b/elpa/org-9.3.2.signed @@ -0,0 +1 @@ +Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) (trust undefined) created at 2020-01-26T23:05:02+0100 using RSA \ No newline at end of file diff --git a/elpa/org-9.3.1/COPYING b/elpa/org-9.3.2/COPYING similarity index 100% rename from elpa/org-9.3.1/COPYING rename to elpa/org-9.3.2/COPYING diff --git a/elpa/org-9.3.1/README_ELPA b/elpa/org-9.3.2/README_ELPA similarity index 100% rename from elpa/org-9.3.1/README_ELPA rename to elpa/org-9.3.2/README_ELPA diff --git a/elpa/org-9.3.1/dir b/elpa/org-9.3.2/dir similarity index 100% rename from elpa/org-9.3.1/dir rename to elpa/org-9.3.2/dir diff --git a/elpa/org-9.3.1/etc/ORG-NEWS b/elpa/org-9.3.2/etc/ORG-NEWS similarity index 99% rename from elpa/org-9.3.1/etc/ORG-NEWS rename to elpa/org-9.3.2/etc/ORG-NEWS index bf422e9c..d46d1bd7 100644 --- a/elpa/org-9.3.1/etc/ORG-NEWS +++ b/elpa/org-9.3.2/etc/ORG-NEWS @@ -5,7 +5,7 @@ ORG NEWS -- history of user-visible changes. -*- mode: org; coding: utf-8 -*- #+LINK: doc https://orgmode.org/worg/doc.html#%s #+LINK: git https://code.orgmode.org/bzg/org-mode/commit/%s -Copyright (C) 2012-2019 Free Software Foundation, Inc. +Copyright (C) 2012-2020 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Org bug reports to mailto:emacs-orgmode@gnu.org. diff --git a/elpa/org-9.3.1/etc/styles/OrgOdtContentTemplate.xml b/elpa/org-9.3.2/etc/styles/OrgOdtContentTemplate.xml similarity index 100% rename from elpa/org-9.3.1/etc/styles/OrgOdtContentTemplate.xml rename to elpa/org-9.3.2/etc/styles/OrgOdtContentTemplate.xml diff --git a/elpa/org-9.3.1/etc/styles/OrgOdtStyles.xml b/elpa/org-9.3.2/etc/styles/OrgOdtStyles.xml similarity index 100% rename from elpa/org-9.3.1/etc/styles/OrgOdtStyles.xml rename to elpa/org-9.3.2/etc/styles/OrgOdtStyles.xml diff --git a/elpa/org-9.3.1/etc/styles/README b/elpa/org-9.3.2/etc/styles/README similarity index 95% rename from elpa/org-9.3.1/etc/styles/README rename to elpa/org-9.3.2/etc/styles/README index 496ccb05..100c577e 100644 --- a/elpa/org-9.3.1/etc/styles/README +++ b/elpa/org-9.3.2/etc/styles/README @@ -1,7 +1,7 @@ The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the following copyright information: -Copyright (C) 2010-2019 Free Software Foundation, Inc. +Copyright (C) 2010-2020 Free Software Foundation, Inc. These files are part of GNU Emacs. diff --git a/elpa/org-9.3.1/ob-C.el b/elpa/org-9.3.2/ob-C.el similarity index 99% rename from elpa/org-9.3.1/ob-C.el rename to elpa/org-9.3.2/ob-C.el index ca587ccb..3a26bc01 100644 --- a/elpa/org-9.3.1/ob-C.el +++ b/elpa/org-9.3.2/ob-C.el @@ -1,6 +1,6 @@ ;;; ob-C.el --- Babel Functions for C and Similar Languages -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Thierry Banel diff --git a/elpa/org-9.3.1/ob-C.elc b/elpa/org-9.3.2/ob-C.elc similarity index 68% rename from elpa/org-9.3.1/ob-C.elc rename to elpa/org-9.3.2/ob-C.elc index f1f0639e..b222b199 100644 Binary files a/elpa/org-9.3.1/ob-C.elc and b/elpa/org-9.3.2/ob-C.elc differ diff --git a/elpa/org-9.3.1/ob-J.el b/elpa/org-9.3.2/ob-J.el similarity index 99% rename from elpa/org-9.3.1/ob-J.el rename to elpa/org-9.3.2/ob-J.el index b48562d2..c0145211 100644 --- a/elpa/org-9.3.1/ob-J.el +++ b/elpa/org-9.3.2/ob-J.el @@ -1,6 +1,6 @@ ;;; ob-J.el --- Babel Functions for J -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2019 Free Software Foundation, Inc. +;; Copyright (C) 2011-2020 Free Software Foundation, Inc. ;; Author: Oleh Krehel ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-J.elc b/elpa/org-9.3.2/ob-J.elc similarity index 99% rename from elpa/org-9.3.1/ob-J.elc rename to elpa/org-9.3.2/ob-J.elc index dbb287e4..dce10b34 100644 Binary files a/elpa/org-9.3.1/ob-J.elc and b/elpa/org-9.3.2/ob-J.elc differ diff --git a/elpa/org-9.3.1/ob-R.el b/elpa/org-9.3.2/ob-R.el similarity index 99% rename from elpa/org-9.3.1/ob-R.el rename to elpa/org-9.3.2/ob-R.el index 9e738a8a..b52c7591 100644 --- a/elpa/org-9.3.1/ob-R.el +++ b/elpa/org-9.3.2/ob-R.el @@ -1,6 +1,6 @@ ;;; ob-R.el --- Babel Functions for R -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Dan Davison diff --git a/elpa/org-9.3.1/ob-R.elc b/elpa/org-9.3.2/ob-R.elc similarity index 76% rename from elpa/org-9.3.1/ob-R.elc rename to elpa/org-9.3.2/ob-R.elc index 63e0a63c..ed402cab 100644 Binary files a/elpa/org-9.3.1/ob-R.elc and b/elpa/org-9.3.2/ob-R.elc differ diff --git a/elpa/org-9.3.1/ob-abc.el b/elpa/org-9.3.2/ob-abc.el similarity index 98% rename from elpa/org-9.3.1/ob-abc.el rename to elpa/org-9.3.2/ob-abc.el index 43ee1d99..d4731186 100644 --- a/elpa/org-9.3.1/ob-abc.el +++ b/elpa/org-9.3.2/ob-abc.el @@ -1,6 +1,6 @@ ;;; ob-abc.el --- Org Babel Functions for ABC -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2019 Free Software Foundation, Inc. +;; Copyright (C) 2013-2020 Free Software Foundation, Inc. ;; Author: William Waites ;; Keywords: literate programming, music diff --git a/elpa/org-9.3.1/ob-abc.elc b/elpa/org-9.3.2/ob-abc.elc similarity index 98% rename from elpa/org-9.3.1/ob-abc.elc rename to elpa/org-9.3.2/ob-abc.elc index 5fcb0a5b..edba97c6 100644 Binary files a/elpa/org-9.3.1/ob-abc.elc and b/elpa/org-9.3.2/ob-abc.elc differ diff --git a/elpa/org-9.3.1/ob-asymptote.el b/elpa/org-9.3.2/ob-asymptote.el similarity index 98% rename from elpa/org-9.3.1/ob-asymptote.el rename to elpa/org-9.3.2/ob-asymptote.el index 3fc0cebd..bdc74b84 100644 --- a/elpa/org-9.3.1/ob-asymptote.el +++ b/elpa/org-9.3.2/ob-asymptote.el @@ -1,6 +1,6 @@ ;;; ob-asymptote.el --- Babel Functions for Asymptote -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-asymptote.elc b/elpa/org-9.3.2/ob-asymptote.elc similarity index 99% rename from elpa/org-9.3.1/ob-asymptote.elc rename to elpa/org-9.3.2/ob-asymptote.elc index 2fac448b..d3c62032 100644 Binary files a/elpa/org-9.3.1/ob-asymptote.elc and b/elpa/org-9.3.2/ob-asymptote.elc differ diff --git a/elpa/org-9.3.1/ob-awk.el b/elpa/org-9.3.2/ob-awk.el similarity index 98% rename from elpa/org-9.3.1/ob-awk.el rename to elpa/org-9.3.2/ob-awk.el index 0d5f47d5..74bbc4c2 100644 --- a/elpa/org-9.3.1/ob-awk.el +++ b/elpa/org-9.3.2/ob-awk.el @@ -1,6 +1,6 @@ ;;; ob-awk.el --- Babel Functions for Awk -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2019 Free Software Foundation, Inc. +;; Copyright (C) 2011-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-awk.elc b/elpa/org-9.3.2/ob-awk.elc similarity index 99% rename from elpa/org-9.3.1/ob-awk.elc rename to elpa/org-9.3.2/ob-awk.elc index bd84b230..21b49925 100644 Binary files a/elpa/org-9.3.1/ob-awk.elc and b/elpa/org-9.3.2/ob-awk.elc differ diff --git a/elpa/org-9.3.1/ob-calc.el b/elpa/org-9.3.2/ob-calc.el similarity index 98% rename from elpa/org-9.3.1/ob-calc.el rename to elpa/org-9.3.2/ob-calc.el index d888f988..85bcf1d4 100644 --- a/elpa/org-9.3.1/ob-calc.el +++ b/elpa/org-9.3.2/ob-calc.el @@ -1,6 +1,6 @@ ;;; ob-calc.el --- Babel Functions for Calc -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-calc.elc b/elpa/org-9.3.2/ob-calc.elc similarity index 98% rename from elpa/org-9.3.1/ob-calc.elc rename to elpa/org-9.3.2/ob-calc.elc index 72af0b80..53482230 100644 Binary files a/elpa/org-9.3.1/ob-calc.elc and b/elpa/org-9.3.2/ob-calc.elc differ diff --git a/elpa/org-9.3.1/ob-clojure.el b/elpa/org-9.3.2/ob-clojure.el similarity index 99% rename from elpa/org-9.3.1/ob-clojure.el rename to elpa/org-9.3.2/ob-clojure.el index 0e5642ad..0d6d1c0a 100644 --- a/elpa/org-9.3.1/ob-clojure.el +++ b/elpa/org-9.3.2/ob-clojure.el @@ -1,6 +1,6 @@ ;;; ob-clojure.el --- Babel Functions for Clojure -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Joel Boehland, Eric Schulte, Oleh Krehel, Frederick Giasson ;; diff --git a/elpa/org-9.3.1/ob-clojure.elc b/elpa/org-9.3.2/ob-clojure.elc similarity index 55% rename from elpa/org-9.3.1/ob-clojure.elc rename to elpa/org-9.3.2/ob-clojure.elc index 45261623..29cc1cfc 100644 Binary files a/elpa/org-9.3.1/ob-clojure.elc and b/elpa/org-9.3.2/ob-clojure.elc differ diff --git a/elpa/org-9.3.1/ob-comint.el b/elpa/org-9.3.2/ob-comint.el similarity index 99% rename from elpa/org-9.3.1/ob-comint.el rename to elpa/org-9.3.2/ob-comint.el index aa0d341d..552b7a03 100644 --- a/elpa/org-9.3.1/ob-comint.el +++ b/elpa/org-9.3.2/ob-comint.el @@ -1,6 +1,6 @@ ;;; ob-comint.el --- Babel Functions for Interaction with Comint Buffers -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, comint diff --git a/elpa/org-9.3.1/ob-comint.elc b/elpa/org-9.3.2/ob-comint.elc similarity index 99% rename from elpa/org-9.3.1/ob-comint.elc rename to elpa/org-9.3.2/ob-comint.elc index 2e76adbc..40c1bc4e 100644 Binary files a/elpa/org-9.3.1/ob-comint.elc and b/elpa/org-9.3.2/ob-comint.elc differ diff --git a/elpa/org-9.3.1/ob-coq.el b/elpa/org-9.3.2/ob-coq.el similarity index 97% rename from elpa/org-9.3.1/ob-coq.el rename to elpa/org-9.3.2/ob-coq.el index 26682c18..56a57cdf 100644 --- a/elpa/org-9.3.1/ob-coq.el +++ b/elpa/org-9.3.2/ob-coq.el @@ -1,6 +1,6 @@ ;;; ob-coq.el --- Babel Functions for Coq -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-coq.elc b/elpa/org-9.3.2/ob-coq.elc similarity index 98% rename from elpa/org-9.3.1/ob-coq.elc rename to elpa/org-9.3.2/ob-coq.elc index 7b5a3d88..84d9fc71 100644 Binary files a/elpa/org-9.3.1/ob-coq.elc and b/elpa/org-9.3.2/ob-coq.elc differ diff --git a/elpa/org-9.3.1/ob-core.el b/elpa/org-9.3.2/ob-core.el similarity index 99% rename from elpa/org-9.3.1/ob-core.el rename to elpa/org-9.3.2/ob-core.el index f877ff51..651561a2 100644 --- a/elpa/org-9.3.1/ob-core.el +++ b/elpa/org-9.3.2/ob-core.el @@ -1,6 +1,6 @@ ;;; ob-core.el --- Working with Code Blocks -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison diff --git a/elpa/org-9.3.1/ob-core.elc b/elpa/org-9.3.2/ob-core.elc similarity index 95% rename from elpa/org-9.3.1/ob-core.elc rename to elpa/org-9.3.2/ob-core.elc index 7087010b..05b2df79 100644 Binary files a/elpa/org-9.3.1/ob-core.elc and b/elpa/org-9.3.2/ob-core.elc differ diff --git a/elpa/org-9.3.1/ob-css.el b/elpa/org-9.3.2/ob-css.el similarity index 96% rename from elpa/org-9.3.1/ob-css.el rename to elpa/org-9.3.2/ob-css.el index ce663b26..b03e8fac 100644 --- a/elpa/org-9.3.1/ob-css.el +++ b/elpa/org-9.3.2/ob-css.el @@ -1,6 +1,6 @@ ;;; ob-css.el --- Babel Functions for CSS -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-css.elc b/elpa/org-9.3.2/ob-css.elc similarity index 97% rename from elpa/org-9.3.1/ob-css.elc rename to elpa/org-9.3.2/ob-css.elc index 98982785..cce1a6ed 100644 Binary files a/elpa/org-9.3.1/ob-css.elc and b/elpa/org-9.3.2/ob-css.elc differ diff --git a/elpa/org-9.3.1/ob-ditaa.el b/elpa/org-9.3.2/ob-ditaa.el similarity index 98% rename from elpa/org-9.3.1/ob-ditaa.el rename to elpa/org-9.3.2/ob-ditaa.el index c8a5e018..369a080b 100644 --- a/elpa/org-9.3.1/ob-ditaa.el +++ b/elpa/org-9.3.2/ob-ditaa.el @@ -1,6 +1,6 @@ ;;; ob-ditaa.el --- Babel Functions for ditaa -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-ditaa.elc b/elpa/org-9.3.2/ob-ditaa.elc similarity index 99% rename from elpa/org-9.3.1/ob-ditaa.elc rename to elpa/org-9.3.2/ob-ditaa.elc index ae296463..63247cf4 100644 Binary files a/elpa/org-9.3.1/ob-ditaa.elc and b/elpa/org-9.3.2/ob-ditaa.elc differ diff --git a/elpa/org-9.3.1/ob-dot.el b/elpa/org-9.3.2/ob-dot.el similarity index 98% rename from elpa/org-9.3.1/ob-dot.el rename to elpa/org-9.3.2/ob-dot.el index 73a16738..df83068b 100644 --- a/elpa/org-9.3.1/ob-dot.el +++ b/elpa/org-9.3.2/ob-dot.el @@ -1,6 +1,6 @@ ;;; ob-dot.el --- Babel Functions for dot -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-dot.elc b/elpa/org-9.3.2/ob-dot.elc similarity index 98% rename from elpa/org-9.3.1/ob-dot.elc rename to elpa/org-9.3.2/ob-dot.elc index f0dd19ad..81d657bb 100644 Binary files a/elpa/org-9.3.1/ob-dot.elc and b/elpa/org-9.3.2/ob-dot.elc differ diff --git a/elpa/org-9.3.1/ob-ebnf.el b/elpa/org-9.3.2/ob-ebnf.el similarity index 98% rename from elpa/org-9.3.1/ob-ebnf.el rename to elpa/org-9.3.2/ob-ebnf.el index c2292285..65151bf2 100644 --- a/elpa/org-9.3.1/ob-ebnf.el +++ b/elpa/org-9.3.2/ob-ebnf.el @@ -1,6 +1,6 @@ ;;; ob-ebnf.el --- Babel Functions for EBNF -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2019 Free Software Foundation, Inc. +;; Copyright (C) 2013-2020 Free Software Foundation, Inc. ;; Author: Michael Gauland ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-ebnf.elc b/elpa/org-9.3.2/ob-ebnf.elc similarity index 98% rename from elpa/org-9.3.1/ob-ebnf.elc rename to elpa/org-9.3.2/ob-ebnf.elc index f921e77c..1c73a5ea 100644 Binary files a/elpa/org-9.3.1/ob-ebnf.elc and b/elpa/org-9.3.2/ob-ebnf.elc differ diff --git a/elpa/org-9.3.1/ob-emacs-lisp.el b/elpa/org-9.3.2/ob-emacs-lisp.el similarity index 98% rename from elpa/org-9.3.1/ob-emacs-lisp.el rename to elpa/org-9.3.2/ob-emacs-lisp.el index 18b0d484..095fbdb4 100644 --- a/elpa/org-9.3.1/ob-emacs-lisp.el +++ b/elpa/org-9.3.2/ob-emacs-lisp.el @@ -1,6 +1,6 @@ ;;; ob-emacs-lisp.el --- Babel Functions for Emacs-lisp Code -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-emacs-lisp.elc b/elpa/org-9.3.2/ob-emacs-lisp.elc similarity index 99% rename from elpa/org-9.3.1/ob-emacs-lisp.elc rename to elpa/org-9.3.2/ob-emacs-lisp.elc index 2df9c636..2ca22b21 100644 Binary files a/elpa/org-9.3.1/ob-emacs-lisp.elc and b/elpa/org-9.3.2/ob-emacs-lisp.elc differ diff --git a/elpa/org-9.3.1/ob-eshell.el b/elpa/org-9.3.2/ob-eshell.el similarity index 98% rename from elpa/org-9.3.1/ob-eshell.el rename to elpa/org-9.3.2/ob-eshell.el index bfb24f8a..4edd3cf6 100644 --- a/elpa/org-9.3.1/ob-eshell.el +++ b/elpa/org-9.3.2/ob-eshell.el @@ -1,6 +1,6 @@ ;;; ob-eshell.el --- Babel Functions for Eshell -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2019 Free Software Foundation, Inc. +;; Copyright (C) 2018-2020 Free Software Foundation, Inc. ;; Author: stardiviner ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-eshell.elc b/elpa/org-9.3.2/ob-eshell.elc similarity index 99% rename from elpa/org-9.3.1/ob-eshell.elc rename to elpa/org-9.3.2/ob-eshell.elc index c39eac34..5e1aa12e 100644 Binary files a/elpa/org-9.3.1/ob-eshell.elc and b/elpa/org-9.3.2/ob-eshell.elc differ diff --git a/elpa/org-9.3.1/ob-eval.el b/elpa/org-9.3.2/ob-eval.el similarity index 98% rename from elpa/org-9.3.1/ob-eval.el rename to elpa/org-9.3.2/ob-eval.el index 8d5b7ed2..a939d934 100644 --- a/elpa/org-9.3.1/ob-eval.el +++ b/elpa/org-9.3.2/ob-eval.el @@ -1,6 +1,6 @@ ;;; ob-eval.el --- Babel Functions for External Code Evaluation -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, comint diff --git a/elpa/org-9.3.1/ob-eval.elc b/elpa/org-9.3.2/ob-eval.elc similarity index 99% rename from elpa/org-9.3.1/ob-eval.elc rename to elpa/org-9.3.2/ob-eval.elc index ab84bfc7..ee393740 100644 Binary files a/elpa/org-9.3.1/ob-eval.elc and b/elpa/org-9.3.2/ob-eval.elc differ diff --git a/elpa/org-9.3.1/ob-exp.el b/elpa/org-9.3.2/ob-exp.el similarity index 99% rename from elpa/org-9.3.1/ob-exp.el rename to elpa/org-9.3.2/ob-exp.el index c06e262d..bbf9b55a 100644 --- a/elpa/org-9.3.1/ob-exp.el +++ b/elpa/org-9.3.2/ob-exp.el @@ -1,6 +1,6 @@ ;;; ob-exp.el --- Exportation of Babel Source Blocks -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison diff --git a/elpa/org-9.3.1/ob-exp.elc b/elpa/org-9.3.2/ob-exp.elc similarity index 86% rename from elpa/org-9.3.1/ob-exp.elc rename to elpa/org-9.3.2/ob-exp.elc index 03ce9cb5..b1ad97d0 100644 Binary files a/elpa/org-9.3.1/ob-exp.elc and b/elpa/org-9.3.2/ob-exp.elc differ diff --git a/elpa/org-9.3.1/ob-forth.el b/elpa/org-9.3.2/ob-forth.el similarity index 98% rename from elpa/org-9.3.1/ob-forth.el rename to elpa/org-9.3.2/ob-forth.el index 5d4fe304..aef6784c 100644 --- a/elpa/org-9.3.1/ob-forth.el +++ b/elpa/org-9.3.2/ob-forth.el @@ -1,6 +1,6 @@ ;;; ob-forth.el --- Babel Functions for Forth -*- lexical-binding: t; -*- -;; Copyright (C) 2014-2019 Free Software Foundation, Inc. +;; Copyright (C) 2014-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, forth diff --git a/elpa/org-9.3.1/ob-forth.elc b/elpa/org-9.3.2/ob-forth.elc similarity index 98% rename from elpa/org-9.3.1/ob-forth.elc rename to elpa/org-9.3.2/ob-forth.elc index 7f4ee931..df05e138 100644 Binary files a/elpa/org-9.3.1/ob-forth.elc and b/elpa/org-9.3.2/ob-forth.elc differ diff --git a/elpa/org-9.3.1/ob-fortran.el b/elpa/org-9.3.2/ob-fortran.el similarity index 99% rename from elpa/org-9.3.1/ob-fortran.el rename to elpa/org-9.3.2/ob-fortran.el index 1431eb40..154465f2 100644 --- a/elpa/org-9.3.1/ob-fortran.el +++ b/elpa/org-9.3.2/ob-fortran.el @@ -1,6 +1,6 @@ ;;; ob-fortran.el --- Babel Functions for Fortran -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2019 Free Software Foundation, Inc. +;; Copyright (C) 2011-2020 Free Software Foundation, Inc. ;; Authors: Sergey Litvinov ;; Eric Schulte diff --git a/elpa/org-9.3.1/ob-fortran.elc b/elpa/org-9.3.2/ob-fortran.elc similarity index 99% rename from elpa/org-9.3.1/ob-fortran.elc rename to elpa/org-9.3.2/ob-fortran.elc index 3262d841..3eac1650 100644 Binary files a/elpa/org-9.3.1/ob-fortran.elc and b/elpa/org-9.3.2/ob-fortran.elc differ diff --git a/elpa/org-9.3.1/ob-gnuplot.el b/elpa/org-9.3.2/ob-gnuplot.el similarity index 99% rename from elpa/org-9.3.1/ob-gnuplot.el rename to elpa/org-9.3.2/ob-gnuplot.el index cc4c3cb2..d11c55f7 100644 --- a/elpa/org-9.3.1/ob-gnuplot.el +++ b/elpa/org-9.3.2/ob-gnuplot.el @@ -1,6 +1,6 @@ ;;; ob-gnuplot.el --- Babel Functions for Gnuplot -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-gnuplot.elc b/elpa/org-9.3.2/ob-gnuplot.elc similarity index 99% rename from elpa/org-9.3.1/ob-gnuplot.elc rename to elpa/org-9.3.2/ob-gnuplot.elc index 8f5a726c..3deacdc4 100644 Binary files a/elpa/org-9.3.1/ob-gnuplot.elc and b/elpa/org-9.3.2/ob-gnuplot.elc differ diff --git a/elpa/org-9.3.1/ob-groovy.el b/elpa/org-9.3.2/ob-groovy.el similarity index 98% rename from elpa/org-9.3.1/ob-groovy.el rename to elpa/org-9.3.2/ob-groovy.el index a22e21df..38e2a169 100644 --- a/elpa/org-9.3.1/ob-groovy.el +++ b/elpa/org-9.3.2/ob-groovy.el @@ -1,6 +1,6 @@ ;;; ob-groovy.el --- Babel Functions for Groovy -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2019 Free Software Foundation, Inc. +;; Copyright (C) 2013-2020 Free Software Foundation, Inc. ;; Author: Miro Bezjak ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-groovy.elc b/elpa/org-9.3.2/ob-groovy.elc similarity index 66% rename from elpa/org-9.3.1/ob-groovy.elc rename to elpa/org-9.3.2/ob-groovy.elc index 240624bf..4f903778 100644 Binary files a/elpa/org-9.3.1/ob-groovy.elc and b/elpa/org-9.3.2/ob-groovy.elc differ diff --git a/elpa/org-9.3.1/ob-haskell.el b/elpa/org-9.3.2/ob-haskell.el similarity index 99% rename from elpa/org-9.3.1/ob-haskell.el rename to elpa/org-9.3.2/ob-haskell.el index a683b110..e004a340 100644 --- a/elpa/org-9.3.1/ob-haskell.el +++ b/elpa/org-9.3.2/ob-haskell.el @@ -1,6 +1,6 @@ ;;; ob-haskell.el --- Babel Functions for Haskell -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-haskell.elc b/elpa/org-9.3.2/ob-haskell.elc similarity index 76% rename from elpa/org-9.3.1/ob-haskell.elc rename to elpa/org-9.3.2/ob-haskell.elc index 9546e74a..45285091 100644 Binary files a/elpa/org-9.3.1/ob-haskell.elc and b/elpa/org-9.3.2/ob-haskell.elc differ diff --git a/elpa/org-9.3.1/ob-hledger.el b/elpa/org-9.3.2/ob-hledger.el similarity index 97% rename from elpa/org-9.3.1/ob-hledger.el rename to elpa/org-9.3.2/ob-hledger.el index 4fb1f694..06d03b67 100644 --- a/elpa/org-9.3.1/ob-hledger.el +++ b/elpa/org-9.3.2/ob-hledger.el @@ -1,6 +1,6 @@ ;; ob-hledger.el --- Babel Functions for hledger -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Simon Michael ;; Keywords: literate programming, reproducible research, plain text accounting diff --git a/elpa/org-9.3.1/ob-hledger.elc b/elpa/org-9.3.2/ob-hledger.elc similarity index 98% rename from elpa/org-9.3.1/ob-hledger.elc rename to elpa/org-9.3.2/ob-hledger.elc index cd525eae..155183d5 100644 Binary files a/elpa/org-9.3.1/ob-hledger.elc and b/elpa/org-9.3.2/ob-hledger.elc differ diff --git a/elpa/org-9.3.1/ob-io.el b/elpa/org-9.3.2/ob-io.el similarity index 98% rename from elpa/org-9.3.1/ob-io.el rename to elpa/org-9.3.2/ob-io.el index 9817c641..4d1f1542 100644 --- a/elpa/org-9.3.1/ob-io.el +++ b/elpa/org-9.3.2/ob-io.el @@ -1,6 +1,6 @@ ;;; ob-io.el --- Babel Functions for Io -*- lexical-binding: t; -*- -;; Copyright (C) 2012-2019 Free Software Foundation, Inc. +;; Copyright (C) 2012-2020 Free Software Foundation, Inc. ;; Author: Andrzej Lichnerowicz ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-io.elc b/elpa/org-9.3.2/ob-io.elc similarity index 61% rename from elpa/org-9.3.1/ob-io.elc rename to elpa/org-9.3.2/ob-io.elc index b1cb7674..afeed571 100644 Binary files a/elpa/org-9.3.1/ob-io.elc and b/elpa/org-9.3.2/ob-io.elc differ diff --git a/elpa/org-9.3.1/ob-java.el b/elpa/org-9.3.2/ob-java.el similarity index 98% rename from elpa/org-9.3.1/ob-java.el rename to elpa/org-9.3.2/ob-java.el index b055f85e..4b3d4548 100644 --- a/elpa/org-9.3.1/ob-java.el +++ b/elpa/org-9.3.2/ob-java.el @@ -1,6 +1,6 @@ ;;; ob-java.el --- Babel Functions for Java -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2019 Free Software Foundation, Inc. +;; Copyright (C) 2011-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-java.elc b/elpa/org-9.3.2/ob-java.elc similarity index 99% rename from elpa/org-9.3.1/ob-java.elc rename to elpa/org-9.3.2/ob-java.elc index 1b8a99c7..e9d362e9 100644 Binary files a/elpa/org-9.3.1/ob-java.elc and b/elpa/org-9.3.2/ob-java.elc differ diff --git a/elpa/org-9.3.1/ob-js.el b/elpa/org-9.3.2/ob-js.el similarity index 99% rename from elpa/org-9.3.1/ob-js.el rename to elpa/org-9.3.2/ob-js.el index dd53ef69..8f66d102 100644 --- a/elpa/org-9.3.1/ob-js.el +++ b/elpa/org-9.3.2/ob-js.el @@ -1,6 +1,6 @@ ;;; ob-js.el --- Babel Functions for Javascript -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, js diff --git a/elpa/org-9.3.1/ob-js.elc b/elpa/org-9.3.2/ob-js.elc similarity index 99% rename from elpa/org-9.3.1/ob-js.elc rename to elpa/org-9.3.2/ob-js.elc index 7b490459..c1e8f12a 100644 Binary files a/elpa/org-9.3.1/ob-js.elc and b/elpa/org-9.3.2/ob-js.elc differ diff --git a/elpa/org-9.3.1/ob-latex.el b/elpa/org-9.3.2/ob-latex.el similarity index 99% rename from elpa/org-9.3.1/ob-latex.el rename to elpa/org-9.3.2/ob-latex.el index adf83d46..e0cc1033 100644 --- a/elpa/org-9.3.1/ob-latex.el +++ b/elpa/org-9.3.2/ob-latex.el @@ -1,6 +1,6 @@ ;;; ob-latex.el --- Babel Functions for LaTeX -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-latex.elc b/elpa/org-9.3.2/ob-latex.elc similarity index 99% rename from elpa/org-9.3.1/ob-latex.elc rename to elpa/org-9.3.2/ob-latex.elc index fc70ba07..7cca0939 100644 Binary files a/elpa/org-9.3.1/ob-latex.elc and b/elpa/org-9.3.2/ob-latex.elc differ diff --git a/elpa/org-9.3.1/ob-ledger.el b/elpa/org-9.3.2/ob-ledger.el similarity index 97% rename from elpa/org-9.3.1/ob-ledger.el rename to elpa/org-9.3.2/ob-ledger.el index 56599298..e63e1060 100644 --- a/elpa/org-9.3.1/ob-ledger.el +++ b/elpa/org-9.3.2/ob-ledger.el @@ -1,6 +1,6 @@ ;;; ob-ledger.el --- Babel Functions for Ledger -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Eric S Fraga ;; Keywords: literate programming, reproducible research, accounting diff --git a/elpa/org-9.3.1/ob-ledger.elc b/elpa/org-9.3.2/ob-ledger.elc similarity index 98% rename from elpa/org-9.3.1/ob-ledger.elc rename to elpa/org-9.3.2/ob-ledger.elc index 9cb1e758..4673cb39 100644 Binary files a/elpa/org-9.3.1/ob-ledger.elc and b/elpa/org-9.3.2/ob-ledger.elc differ diff --git a/elpa/org-9.3.1/ob-lilypond.el b/elpa/org-9.3.2/ob-lilypond.el similarity index 99% rename from elpa/org-9.3.1/ob-lilypond.el rename to elpa/org-9.3.2/ob-lilypond.el index 4538ed5c..eb3372fa 100644 --- a/elpa/org-9.3.1/ob-lilypond.el +++ b/elpa/org-9.3.2/ob-lilypond.el @@ -1,6 +1,6 @@ ;;; ob-lilypond.el --- Babel Functions for Lilypond -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Martyn Jago ;; Keywords: babel language, literate programming diff --git a/elpa/org-9.3.1/ob-lilypond.elc b/elpa/org-9.3.2/ob-lilypond.elc similarity index 85% rename from elpa/org-9.3.1/ob-lilypond.elc rename to elpa/org-9.3.2/ob-lilypond.elc index 9ee7d37a..92a70397 100644 Binary files a/elpa/org-9.3.1/ob-lilypond.elc and b/elpa/org-9.3.2/ob-lilypond.elc differ diff --git a/elpa/org-9.3.1/ob-lisp.el b/elpa/org-9.3.2/ob-lisp.el similarity index 98% rename from elpa/org-9.3.1/ob-lisp.el rename to elpa/org-9.3.2/ob-lisp.el index 398ed219..f0e1ff63 100644 --- a/elpa/org-9.3.1/ob-lisp.el +++ b/elpa/org-9.3.2/ob-lisp.el @@ -1,6 +1,6 @@ ;;; ob-lisp.el --- Babel Functions for Common Lisp -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Authors: Joel Boehland ;; Eric Schulte diff --git a/elpa/org-9.3.1/ob-lisp.elc b/elpa/org-9.3.2/ob-lisp.elc similarity index 60% rename from elpa/org-9.3.1/ob-lisp.elc rename to elpa/org-9.3.2/ob-lisp.elc index 01813238..94cebd13 100644 Binary files a/elpa/org-9.3.1/ob-lisp.elc and b/elpa/org-9.3.2/ob-lisp.elc differ diff --git a/elpa/org-9.3.1/ob-lob.el b/elpa/org-9.3.2/ob-lob.el similarity index 99% rename from elpa/org-9.3.1/ob-lob.el rename to elpa/org-9.3.2/ob-lob.el index a6194c4b..8c341e67 100644 --- a/elpa/org-9.3.1/ob-lob.el +++ b/elpa/org-9.3.2/ob-lob.el @@ -1,6 +1,6 @@ ;;; ob-lob.el --- Functions Supporting the Library of Babel -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison diff --git a/elpa/org-9.3.1/ob-lob.elc b/elpa/org-9.3.2/ob-lob.elc similarity index 84% rename from elpa/org-9.3.1/ob-lob.elc rename to elpa/org-9.3.2/ob-lob.elc index 1f82eac3..557f1e31 100644 Binary files a/elpa/org-9.3.1/ob-lob.elc and b/elpa/org-9.3.2/ob-lob.elc differ diff --git a/elpa/org-9.3.1/ob-lua.el b/elpa/org-9.3.2/ob-lua.el similarity index 99% rename from elpa/org-9.3.1/ob-lua.el rename to elpa/org-9.3.2/ob-lua.el index 530376a4..b046b54b 100644 --- a/elpa/org-9.3.1/ob-lua.el +++ b/elpa/org-9.3.2/ob-lua.el @@ -1,6 +1,6 @@ ;;; ob-lua.el --- Org Babel functions for Lua evaluation -*- lexical-binding: t; -*- -;; Copyright (C) 2014, 2016-2019 Free Software Foundation, Inc. +;; Copyright (C) 2014, 2016-2020 Free Software Foundation, Inc. ;; Authors: Dieter Schoen ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-lua.elc b/elpa/org-9.3.2/ob-lua.elc similarity index 68% rename from elpa/org-9.3.1/ob-lua.elc rename to elpa/org-9.3.2/ob-lua.elc index b65e9aff..fd25dbfe 100644 Binary files a/elpa/org-9.3.1/ob-lua.elc and b/elpa/org-9.3.2/ob-lua.elc differ diff --git a/elpa/org-9.3.1/ob-makefile.el b/elpa/org-9.3.2/ob-makefile.el similarity index 96% rename from elpa/org-9.3.1/ob-makefile.el rename to elpa/org-9.3.2/ob-makefile.el index 938d17bd..15bf6ee8 100644 --- a/elpa/org-9.3.1/ob-makefile.el +++ b/elpa/org-9.3.2/ob-makefile.el @@ -1,6 +1,6 @@ ;;; ob-makefile.el --- Babel Functions for Makefile -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Thomas S. Dye diff --git a/elpa/org-9.3.1/ob-makefile.elc b/elpa/org-9.3.2/ob-makefile.elc similarity index 97% rename from elpa/org-9.3.1/ob-makefile.elc rename to elpa/org-9.3.2/ob-makefile.elc index 2e5f63d6..3e25dc3d 100644 Binary files a/elpa/org-9.3.1/ob-makefile.elc and b/elpa/org-9.3.2/ob-makefile.elc differ diff --git a/elpa/org-9.3.1/ob-matlab.el b/elpa/org-9.3.2/ob-matlab.el similarity index 95% rename from elpa/org-9.3.1/ob-matlab.el rename to elpa/org-9.3.2/ob-matlab.el index 4ad188ad..958357f3 100644 --- a/elpa/org-9.3.1/ob-matlab.el +++ b/elpa/org-9.3.2/ob-matlab.el @@ -1,6 +1,6 @@ ;;; ob-matlab.el --- Babel support for Matlab -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Dan Davison ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-matlab.elc b/elpa/org-9.3.2/ob-matlab.elc similarity index 94% rename from elpa/org-9.3.1/ob-matlab.elc rename to elpa/org-9.3.2/ob-matlab.elc index f2ecb5d3..a304e273 100644 Binary files a/elpa/org-9.3.1/ob-matlab.elc and b/elpa/org-9.3.2/ob-matlab.elc differ diff --git a/elpa/org-9.3.1/ob-maxima.el b/elpa/org-9.3.2/ob-maxima.el similarity index 98% rename from elpa/org-9.3.1/ob-maxima.el rename to elpa/org-9.3.2/ob-maxima.el index c8f3a61f..5d38cc30 100644 --- a/elpa/org-9.3.1/ob-maxima.el +++ b/elpa/org-9.3.2/ob-maxima.el @@ -1,6 +1,6 @@ ;;; ob-maxima.el --- Babel Functions for Maxima -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric S Fraga ;; Eric Schulte diff --git a/elpa/org-9.3.1/ob-maxima.elc b/elpa/org-9.3.2/ob-maxima.elc similarity index 99% rename from elpa/org-9.3.1/ob-maxima.elc rename to elpa/org-9.3.2/ob-maxima.elc index b25fb993..a0644cbf 100644 Binary files a/elpa/org-9.3.1/ob-maxima.elc and b/elpa/org-9.3.2/ob-maxima.elc differ diff --git a/elpa/org-9.3.1/ob-mscgen.el b/elpa/org-9.3.2/ob-mscgen.el similarity index 97% rename from elpa/org-9.3.1/ob-mscgen.el rename to elpa/org-9.3.2/ob-mscgen.el index 86fcc284..fa4d3e3a 100644 --- a/elpa/org-9.3.1/ob-mscgen.el +++ b/elpa/org-9.3.2/ob-mscgen.el @@ -1,6 +1,6 @@ ;;; ob-msc.el --- Babel Functions for Mscgen -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Juan Pechiar ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-mscgen.elc b/elpa/org-9.3.2/ob-mscgen.elc similarity index 98% rename from elpa/org-9.3.1/ob-mscgen.elc rename to elpa/org-9.3.2/ob-mscgen.elc index 934be5fb..dc2bc2b0 100644 Binary files a/elpa/org-9.3.1/ob-mscgen.elc and b/elpa/org-9.3.2/ob-mscgen.elc differ diff --git a/elpa/org-9.3.1/ob-ocaml.el b/elpa/org-9.3.2/ob-ocaml.el similarity index 99% rename from elpa/org-9.3.1/ob-ocaml.el rename to elpa/org-9.3.2/ob-ocaml.el index 54bc49a2..6972dae2 100644 --- a/elpa/org-9.3.1/ob-ocaml.el +++ b/elpa/org-9.3.2/ob-ocaml.el @@ -1,6 +1,6 @@ ;;; ob-ocaml.el --- Babel Functions for Ocaml -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-ocaml.elc b/elpa/org-9.3.2/ob-ocaml.elc similarity index 99% rename from elpa/org-9.3.1/ob-ocaml.elc rename to elpa/org-9.3.2/ob-ocaml.elc index 1ea7ab55..e0a101ff 100644 Binary files a/elpa/org-9.3.1/ob-ocaml.elc and b/elpa/org-9.3.2/ob-ocaml.elc differ diff --git a/elpa/org-9.3.1/ob-octave.el b/elpa/org-9.3.2/ob-octave.el similarity index 99% rename from elpa/org-9.3.1/ob-octave.el rename to elpa/org-9.3.2/ob-octave.el index d334fa51..fbfc9b97 100644 --- a/elpa/org-9.3.1/ob-octave.el +++ b/elpa/org-9.3.2/ob-octave.el @@ -1,6 +1,6 @@ ;;; ob-octave.el --- Babel Functions for Octave and Matlab -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Dan Davison ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-octave.elc b/elpa/org-9.3.2/ob-octave.elc similarity index 69% rename from elpa/org-9.3.1/ob-octave.elc rename to elpa/org-9.3.2/ob-octave.elc index a66ccf3c..322b7f5f 100644 Binary files a/elpa/org-9.3.1/ob-octave.elc and b/elpa/org-9.3.2/ob-octave.elc differ diff --git a/elpa/org-9.3.1/ob-org.el b/elpa/org-9.3.2/ob-org.el similarity index 97% rename from elpa/org-9.3.1/ob-org.el rename to elpa/org-9.3.2/ob-org.el index def25096..63165019 100644 --- a/elpa/org-9.3.1/ob-org.el +++ b/elpa/org-9.3.2/ob-org.el @@ -1,6 +1,6 @@ ;;; ob-org.el --- Babel Functions for Org Code Blocks -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-org.elc b/elpa/org-9.3.2/ob-org.elc similarity index 98% rename from elpa/org-9.3.1/ob-org.elc rename to elpa/org-9.3.2/ob-org.elc index e6b870fb..b15dd0b5 100644 Binary files a/elpa/org-9.3.1/ob-org.elc and b/elpa/org-9.3.2/ob-org.elc differ diff --git a/elpa/org-9.3.1/ob-perl.el b/elpa/org-9.3.2/ob-perl.el similarity index 98% rename from elpa/org-9.3.1/ob-perl.el rename to elpa/org-9.3.2/ob-perl.el index 810271f5..2daf5774 100644 --- a/elpa/org-9.3.1/ob-perl.el +++ b/elpa/org-9.3.2/ob-perl.el @@ -1,6 +1,6 @@ ;;; ob-perl.el --- Babel Functions for Perl -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Authors: Dan Davison ;; Eric Schulte diff --git a/elpa/org-9.3.1/ob-perl.elc b/elpa/org-9.3.2/ob-perl.elc similarity index 75% rename from elpa/org-9.3.1/ob-perl.elc rename to elpa/org-9.3.2/ob-perl.elc index 627ad41e..843b172e 100644 Binary files a/elpa/org-9.3.1/ob-perl.elc and b/elpa/org-9.3.2/ob-perl.elc differ diff --git a/elpa/org-9.3.1/ob-picolisp.el b/elpa/org-9.3.2/ob-picolisp.el similarity index 99% rename from elpa/org-9.3.1/ob-picolisp.el rename to elpa/org-9.3.2/ob-picolisp.el index 4f702529..ec2a2284 100644 --- a/elpa/org-9.3.1/ob-picolisp.el +++ b/elpa/org-9.3.2/ob-picolisp.el @@ -1,6 +1,6 @@ ;;; ob-picolisp.el --- Babel Functions for Picolisp -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Authors: Thorsten Jolitz ;; Eric Schulte diff --git a/elpa/org-9.3.1/ob-picolisp.elc b/elpa/org-9.3.2/ob-picolisp.elc similarity index 99% rename from elpa/org-9.3.1/ob-picolisp.elc rename to elpa/org-9.3.2/ob-picolisp.elc index c1317858..3b775773 100644 Binary files a/elpa/org-9.3.1/ob-picolisp.elc and b/elpa/org-9.3.2/ob-picolisp.elc differ diff --git a/elpa/org-9.3.1/ob-plantuml.el b/elpa/org-9.3.2/ob-plantuml.el similarity index 98% rename from elpa/org-9.3.1/ob-plantuml.el rename to elpa/org-9.3.2/ob-plantuml.el index 28c7b854..14fc4361 100644 --- a/elpa/org-9.3.1/ob-plantuml.el +++ b/elpa/org-9.3.2/ob-plantuml.el @@ -1,6 +1,6 @@ ;;; ob-plantuml.el --- Babel Functions for Plantuml -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Zhang Weize ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-plantuml.elc b/elpa/org-9.3.2/ob-plantuml.elc similarity index 99% rename from elpa/org-9.3.1/ob-plantuml.elc rename to elpa/org-9.3.2/ob-plantuml.elc index a6e33837..bf99eb22 100644 Binary files a/elpa/org-9.3.1/ob-plantuml.elc and b/elpa/org-9.3.2/ob-plantuml.elc differ diff --git a/elpa/org-9.3.1/ob-processing.el b/elpa/org-9.3.2/ob-processing.el similarity index 99% rename from elpa/org-9.3.1/ob-processing.el rename to elpa/org-9.3.2/ob-processing.el index 7bb9fa1b..fc1beadf 100644 --- a/elpa/org-9.3.1/ob-processing.el +++ b/elpa/org-9.3.2/ob-processing.el @@ -1,6 +1,6 @@ ;;; ob-processing.el --- Babel functions for processing -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2019 Free Software Foundation, Inc. +;; Copyright (C) 2015-2020 Free Software Foundation, Inc. ;; Author: Jarmo Hurri (adapted from ob-asymptote.el written by Eric Schulte) ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-processing.elc b/elpa/org-9.3.2/ob-processing.elc similarity index 99% rename from elpa/org-9.3.1/ob-processing.elc rename to elpa/org-9.3.2/ob-processing.elc index 499d632d..0e0fdbdd 100644 Binary files a/elpa/org-9.3.1/ob-processing.elc and b/elpa/org-9.3.2/ob-processing.elc differ diff --git a/elpa/org-9.3.1/ob-python.el b/elpa/org-9.3.2/ob-python.el similarity index 99% rename from elpa/org-9.3.1/ob-python.el rename to elpa/org-9.3.2/ob-python.el index c36bf2dc..823f6e63 100644 --- a/elpa/org-9.3.1/ob-python.el +++ b/elpa/org-9.3.2/ob-python.el @@ -1,6 +1,6 @@ ;;; ob-python.el --- Babel Functions for Python -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison diff --git a/elpa/org-9.3.1/ob-python.elc b/elpa/org-9.3.2/ob-python.elc similarity index 66% rename from elpa/org-9.3.1/ob-python.elc rename to elpa/org-9.3.2/ob-python.elc index 4c353046..f98f1a20 100644 Binary files a/elpa/org-9.3.1/ob-python.elc and b/elpa/org-9.3.2/ob-python.elc differ diff --git a/elpa/org-9.3.1/ob-ref.el b/elpa/org-9.3.2/ob-ref.el similarity index 99% rename from elpa/org-9.3.1/ob-ref.el rename to elpa/org-9.3.2/ob-ref.el index 8c066f71..19905bf6 100644 --- a/elpa/org-9.3.1/ob-ref.el +++ b/elpa/org-9.3.2/ob-ref.el @@ -1,6 +1,6 @@ ;;; ob-ref.el --- Babel Functions for Referencing External Data -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Dan Davison diff --git a/elpa/org-9.3.1/ob-ref.elc b/elpa/org-9.3.2/ob-ref.elc similarity index 72% rename from elpa/org-9.3.1/ob-ref.elc rename to elpa/org-9.3.2/ob-ref.elc index e54f748d..9b721a11 100644 Binary files a/elpa/org-9.3.1/ob-ref.elc and b/elpa/org-9.3.2/ob-ref.elc differ diff --git a/elpa/org-9.3.1/ob-ruby.el b/elpa/org-9.3.2/ob-ruby.el similarity index 99% rename from elpa/org-9.3.1/ob-ruby.el rename to elpa/org-9.3.2/ob-ruby.el index be76727a..90956271 100644 --- a/elpa/org-9.3.1/ob-ruby.el +++ b/elpa/org-9.3.2/ob-ruby.el @@ -1,6 +1,6 @@ ;;; ob-ruby.el --- Babel Functions for Ruby -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-ruby.elc b/elpa/org-9.3.2/ob-ruby.elc similarity index 65% rename from elpa/org-9.3.1/ob-ruby.elc rename to elpa/org-9.3.2/ob-ruby.elc index b5a609d5..64e07d8d 100644 Binary files a/elpa/org-9.3.1/ob-ruby.elc and b/elpa/org-9.3.2/ob-ruby.elc differ diff --git a/elpa/org-9.3.1/ob-sass.el b/elpa/org-9.3.2/ob-sass.el similarity index 97% rename from elpa/org-9.3.1/ob-sass.el rename to elpa/org-9.3.2/ob-sass.el index b19314c6..60c081dc 100644 --- a/elpa/org-9.3.1/ob-sass.el +++ b/elpa/org-9.3.2/ob-sass.el @@ -1,6 +1,6 @@ ;;; ob-sass.el --- Babel Functions for the Sass CSS generation language -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-sass.elc b/elpa/org-9.3.2/ob-sass.elc similarity index 98% rename from elpa/org-9.3.1/ob-sass.elc rename to elpa/org-9.3.2/ob-sass.elc index 4bdabf1b..5be88c30 100644 Binary files a/elpa/org-9.3.1/ob-sass.elc and b/elpa/org-9.3.2/ob-sass.elc differ diff --git a/elpa/org-9.3.1/ob-scheme.el b/elpa/org-9.3.2/ob-scheme.el similarity index 99% rename from elpa/org-9.3.1/ob-scheme.el rename to elpa/org-9.3.2/ob-scheme.el index 21d9fad2..bfd53d5d 100644 --- a/elpa/org-9.3.1/ob-scheme.el +++ b/elpa/org-9.3.2/ob-scheme.el @@ -1,6 +1,6 @@ ;;; ob-scheme.el --- Babel Functions for Scheme -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Michael Gauland diff --git a/elpa/org-9.3.1/ob-scheme.elc b/elpa/org-9.3.2/ob-scheme.elc similarity index 99% rename from elpa/org-9.3.1/ob-scheme.elc rename to elpa/org-9.3.2/ob-scheme.elc index 3e4d39b8..081e94c1 100644 Binary files a/elpa/org-9.3.1/ob-scheme.elc and b/elpa/org-9.3.2/ob-scheme.elc differ diff --git a/elpa/org-9.3.1/ob-screen.el b/elpa/org-9.3.2/ob-screen.el similarity index 98% rename from elpa/org-9.3.1/ob-screen.el rename to elpa/org-9.3.2/ob-screen.el index a3d79841..ad00ee07 100644 --- a/elpa/org-9.3.1/ob-screen.el +++ b/elpa/org-9.3.2/ob-screen.el @@ -1,6 +1,6 @@ ;;; ob-screen.el --- Babel Support for Interactive Terminal -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Benjamin Andresen ;; Keywords: literate programming, interactive shell diff --git a/elpa/org-9.3.1/ob-screen.elc b/elpa/org-9.3.2/ob-screen.elc similarity index 99% rename from elpa/org-9.3.1/ob-screen.elc rename to elpa/org-9.3.2/ob-screen.elc index ced51cad..8bd275e5 100644 Binary files a/elpa/org-9.3.1/ob-screen.elc and b/elpa/org-9.3.2/ob-screen.elc differ diff --git a/elpa/org-9.3.1/ob-sed.el b/elpa/org-9.3.2/ob-sed.el similarity index 98% rename from elpa/org-9.3.1/ob-sed.el rename to elpa/org-9.3.2/ob-sed.el index be4cff48..f926da89 100644 --- a/elpa/org-9.3.1/ob-sed.el +++ b/elpa/org-9.3.2/ob-sed.el @@ -1,6 +1,6 @@ ;;; ob-sed.el --- Babel Functions for Sed Scripts -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2019 Free Software Foundation, Inc. +;; Copyright (C) 2015-2020 Free Software Foundation, Inc. ;; Author: Bjarte Johansen ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-sed.elc b/elpa/org-9.3.2/ob-sed.elc similarity index 99% rename from elpa/org-9.3.1/ob-sed.elc rename to elpa/org-9.3.2/ob-sed.elc index 70f3145f..05ce163d 100644 Binary files a/elpa/org-9.3.1/ob-sed.elc and b/elpa/org-9.3.2/ob-sed.elc differ diff --git a/elpa/org-9.3.1/ob-shell.el b/elpa/org-9.3.2/ob-shell.el similarity index 99% rename from elpa/org-9.3.1/ob-shell.el rename to elpa/org-9.3.2/ob-shell.el index 88342bab..1383f42f 100644 --- a/elpa/org-9.3.1/ob-shell.el +++ b/elpa/org-9.3.2/ob-shell.el @@ -1,6 +1,6 @@ ;;; ob-shell.el --- Babel Functions for Shell Evaluation -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-shell.elc b/elpa/org-9.3.2/ob-shell.elc similarity index 99% rename from elpa/org-9.3.1/ob-shell.elc rename to elpa/org-9.3.2/ob-shell.elc index f655342e..921e1c82 100644 Binary files a/elpa/org-9.3.1/ob-shell.elc and b/elpa/org-9.3.2/ob-shell.elc differ diff --git a/elpa/org-9.3.1/ob-shen.el b/elpa/org-9.3.2/ob-shen.el similarity index 97% rename from elpa/org-9.3.1/ob-shen.el rename to elpa/org-9.3.2/ob-shen.el index f2daa676..1ce71132 100644 --- a/elpa/org-9.3.1/ob-shen.el +++ b/elpa/org-9.3.2/ob-shen.el @@ -1,6 +1,6 @@ ;;; ob-shen.el --- Babel Functions for Shen -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, shen diff --git a/elpa/org-9.3.1/ob-shen.elc b/elpa/org-9.3.2/ob-shen.elc similarity index 98% rename from elpa/org-9.3.1/ob-shen.elc rename to elpa/org-9.3.2/ob-shen.elc index 34bfbd87..4e44b803 100644 Binary files a/elpa/org-9.3.1/ob-shen.elc and b/elpa/org-9.3.2/ob-shen.elc differ diff --git a/elpa/org-9.3.1/ob-sql.el b/elpa/org-9.3.2/ob-sql.el similarity index 99% rename from elpa/org-9.3.1/ob-sql.el rename to elpa/org-9.3.2/ob-sql.el index 1bbfd445..59cf1956 100644 --- a/elpa/org-9.3.1/ob-sql.el +++ b/elpa/org-9.3.2/ob-sql.el @@ -1,6 +1,6 @@ ;;; ob-sql.el --- Babel Functions for SQL -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-sql.elc b/elpa/org-9.3.2/ob-sql.elc similarity index 58% rename from elpa/org-9.3.1/ob-sql.elc rename to elpa/org-9.3.2/ob-sql.elc index 649139be..a7c9ae8a 100644 Binary files a/elpa/org-9.3.1/ob-sql.elc and b/elpa/org-9.3.2/ob-sql.elc differ diff --git a/elpa/org-9.3.1/ob-sqlite.el b/elpa/org-9.3.2/ob-sqlite.el similarity index 98% rename from elpa/org-9.3.1/ob-sqlite.el rename to elpa/org-9.3.2/ob-sqlite.el index 7522c836..957ee653 100644 --- a/elpa/org-9.3.1/ob-sqlite.el +++ b/elpa/org-9.3.2/ob-sqlite.el @@ -1,6 +1,6 @@ ;;; ob-sqlite.el --- Babel Functions for SQLite Databases -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-sqlite.elc b/elpa/org-9.3.2/ob-sqlite.elc similarity index 99% rename from elpa/org-9.3.1/ob-sqlite.elc rename to elpa/org-9.3.2/ob-sqlite.elc index 9d0783b1..c46d6307 100644 Binary files a/elpa/org-9.3.1/ob-sqlite.elc and b/elpa/org-9.3.2/ob-sqlite.elc differ diff --git a/elpa/org-9.3.1/ob-stan.el b/elpa/org-9.3.2/ob-stan.el similarity index 98% rename from elpa/org-9.3.1/ob-stan.el rename to elpa/org-9.3.2/ob-stan.el index 47b871d1..c563a6c3 100644 --- a/elpa/org-9.3.1/ob-stan.el +++ b/elpa/org-9.3.2/ob-stan.el @@ -1,6 +1,6 @@ ;;; ob-stan.el --- Babel Functions for Stan -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2019 Free Software Foundation, Inc. +;; Copyright (C) 2015-2020 Free Software Foundation, Inc. ;; Author: Kyle Meyer ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-stan.elc b/elpa/org-9.3.2/ob-stan.elc similarity index 98% rename from elpa/org-9.3.1/ob-stan.elc rename to elpa/org-9.3.2/ob-stan.elc index 6243b53b..555ba6d8 100644 Binary files a/elpa/org-9.3.1/ob-stan.elc and b/elpa/org-9.3.2/ob-stan.elc differ diff --git a/elpa/org-9.3.1/ob-table.el b/elpa/org-9.3.2/ob-table.el similarity index 98% rename from elpa/org-9.3.1/ob-table.el rename to elpa/org-9.3.2/ob-table.el index 42eecea1..3132965c 100644 --- a/elpa/org-9.3.1/ob-table.el +++ b/elpa/org-9.3.2/ob-table.el @@ -1,6 +1,6 @@ ;;; ob-table.el --- Support for Calling Babel Functions from Tables -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-table.elc b/elpa/org-9.3.2/ob-table.elc similarity index 99% rename from elpa/org-9.3.1/ob-table.elc rename to elpa/org-9.3.2/ob-table.elc index b55ed2ef..870fe39a 100644 Binary files a/elpa/org-9.3.1/ob-table.elc and b/elpa/org-9.3.2/ob-table.elc differ diff --git a/elpa/org-9.3.1/ob-tangle.el b/elpa/org-9.3.2/ob-tangle.el similarity index 99% rename from elpa/org-9.3.1/ob-tangle.el rename to elpa/org-9.3.2/ob-tangle.el index 2ea33418..94603986 100644 --- a/elpa/org-9.3.1/ob-tangle.el +++ b/elpa/org-9.3.2/ob-tangle.el @@ -1,6 +1,6 @@ ;;; ob-tangle.el --- Extract Source Code From Org Files -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-tangle.elc b/elpa/org-9.3.2/ob-tangle.elc similarity index 99% rename from elpa/org-9.3.1/ob-tangle.elc rename to elpa/org-9.3.2/ob-tangle.elc index 731ec07d..84e9acb4 100644 Binary files a/elpa/org-9.3.1/ob-tangle.elc and b/elpa/org-9.3.2/ob-tangle.elc differ diff --git a/elpa/org-9.3.1/ob-vala.el b/elpa/org-9.3.2/ob-vala.el similarity index 98% rename from elpa/org-9.3.1/ob-vala.el rename to elpa/org-9.3.2/ob-vala.el index 85868d8e..e9c214f7 100644 --- a/elpa/org-9.3.1/ob-vala.el +++ b/elpa/org-9.3.2/ob-vala.el @@ -1,6 +1,6 @@ ;;; ob-vala.el --- Babel functions for Vala evaluation -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2019 Free Software Foundation, Inc. +;; Copyright (C) 2017-2020 Free Software Foundation, Inc. ;; Author: Christian Garbs ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob-vala.elc b/elpa/org-9.3.2/ob-vala.elc similarity index 99% rename from elpa/org-9.3.1/ob-vala.elc rename to elpa/org-9.3.2/ob-vala.elc index 61559f22..70c60b1d 100644 Binary files a/elpa/org-9.3.1/ob-vala.elc and b/elpa/org-9.3.2/ob-vala.elc differ diff --git a/elpa/org-9.3.1/ob.el b/elpa/org-9.3.2/ob.el similarity index 95% rename from elpa/org-9.3.1/ob.el rename to elpa/org-9.3.2/ob.el index 6dffa23e..7347baba 100644 --- a/elpa/org-9.3.1/ob.el +++ b/elpa/org-9.3.2/ob.el @@ -1,6 +1,6 @@ ;;; ob.el --- Working with Code Blocks in Org -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Authors: Eric Schulte ;; Keywords: literate programming, reproducible research diff --git a/elpa/org-9.3.1/ob.elc b/elpa/org-9.3.2/ob.elc similarity index 96% rename from elpa/org-9.3.1/ob.elc rename to elpa/org-9.3.2/ob.elc index aaa781d0..76b8afa6 100644 Binary files a/elpa/org-9.3.1/ob.elc and b/elpa/org-9.3.2/ob.elc differ diff --git a/elpa/org-9.3.1/ol-bbdb.el b/elpa/org-9.3.2/ol-bbdb.el similarity index 99% rename from elpa/org-9.3.1/ol-bbdb.el rename to elpa/org-9.3.2/ol-bbdb.el index d53a0cdb..23db47ae 100644 --- a/elpa/org-9.3.1/ol-bbdb.el +++ b/elpa/org-9.3.2/ol-bbdb.el @@ -1,6 +1,6 @@ ;;; ol-bbdb.el --- Links to BBDB entries -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; Authors: Carsten Dominik ;; Thomas Baumann diff --git a/elpa/org-9.3.1/ol-bbdb.elc b/elpa/org-9.3.2/ol-bbdb.elc similarity index 92% rename from elpa/org-9.3.1/ol-bbdb.elc rename to elpa/org-9.3.2/ol-bbdb.elc index 20cff656..9487aed4 100644 Binary files a/elpa/org-9.3.1/ol-bbdb.elc and b/elpa/org-9.3.2/ol-bbdb.elc differ diff --git a/elpa/org-9.3.1/ol-bibtex.el b/elpa/org-9.3.2/ol-bibtex.el similarity index 99% rename from elpa/org-9.3.1/ol-bibtex.el rename to elpa/org-9.3.2/ol-bibtex.el index 78cdd046..ad662271 100644 --- a/elpa/org-9.3.1/ol-bibtex.el +++ b/elpa/org-9.3.2/ol-bibtex.el @@ -1,6 +1,6 @@ ;;; ol-bibtex.el --- Links to BibTeX entries -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2007-2019 Free Software Foundation, Inc. +;; Copyright (C) 2007-2020 Free Software Foundation, Inc. ;; ;; Authors: Bastien Guerry ;; Carsten Dominik diff --git a/elpa/org-9.3.1/ol-bibtex.elc b/elpa/org-9.3.2/ol-bibtex.elc similarity index 94% rename from elpa/org-9.3.1/ol-bibtex.elc rename to elpa/org-9.3.2/ol-bibtex.elc index 73e944ee..d13ed24a 100644 Binary files a/elpa/org-9.3.1/ol-bibtex.elc and b/elpa/org-9.3.2/ol-bibtex.elc differ diff --git a/elpa/org-9.3.1/ol-docview.el b/elpa/org-9.3.2/ol-docview.el similarity index 98% rename from elpa/org-9.3.1/ol-docview.el rename to elpa/org-9.3.2/ol-docview.el index 0aadb9a5..22b63029 100644 --- a/elpa/org-9.3.1/ol-docview.el +++ b/elpa/org-9.3.2/ol-docview.el @@ -1,6 +1,6 @@ ;;; ol-docview.el --- Links to Docview mode buffers -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Jan Böcker ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/ol-docview.elc b/elpa/org-9.3.2/ol-docview.elc similarity index 75% rename from elpa/org-9.3.1/ol-docview.elc rename to elpa/org-9.3.2/ol-docview.elc index c798ca47..373e3540 100644 Binary files a/elpa/org-9.3.1/ol-docview.elc and b/elpa/org-9.3.2/ol-docview.elc differ diff --git a/elpa/org-9.3.1/ol-eshell.el b/elpa/org-9.3.2/ol-eshell.el similarity index 97% rename from elpa/org-9.3.1/ol-eshell.el rename to elpa/org-9.3.2/ol-eshell.el index 137e30f2..7e742f88 100644 --- a/elpa/org-9.3.1/ol-eshell.el +++ b/elpa/org-9.3.2/ol-eshell.el @@ -1,6 +1,6 @@ ;;; ol-eshell.el - Links to Working Directories in Eshell -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2019 Free Software Foundation, Inc. +;; Copyright (C) 2011-2020 Free Software Foundation, Inc. ;; Author: Konrad Hinsen diff --git a/elpa/org-9.3.1/ol-eshell.elc b/elpa/org-9.3.2/ol-eshell.elc similarity index 98% rename from elpa/org-9.3.1/ol-eshell.elc rename to elpa/org-9.3.2/ol-eshell.elc index 87fdd51c..09c42cce 100644 Binary files a/elpa/org-9.3.1/ol-eshell.elc and b/elpa/org-9.3.2/ol-eshell.elc differ diff --git a/elpa/org-9.3.1/ol-eww.el b/elpa/org-9.3.2/ol-eww.el similarity index 99% rename from elpa/org-9.3.1/ol-eww.el rename to elpa/org-9.3.2/ol-eww.el index 96357c4e..f32c06b6 100644 --- a/elpa/org-9.3.1/ol-eww.el +++ b/elpa/org-9.3.2/ol-eww.el @@ -1,6 +1,6 @@ ;;; ol-eww.el --- Store URL and kill from Eww mode -*- lexical-binding: t -*- -;; Copyright (C) 2014-2019 Free Software Foundation, Inc. +;; Copyright (C) 2014-2020 Free Software Foundation, Inc. ;; Author: Marco Wahl a ;; Keywords: link, eww diff --git a/elpa/org-9.3.1/ol-eww.elc b/elpa/org-9.3.2/ol-eww.elc similarity index 99% rename from elpa/org-9.3.1/ol-eww.elc rename to elpa/org-9.3.2/ol-eww.elc index 8c305f3f..8263ce2d 100644 Binary files a/elpa/org-9.3.1/ol-eww.elc and b/elpa/org-9.3.2/ol-eww.elc differ diff --git a/elpa/org-9.3.1/ol-gnus.el b/elpa/org-9.3.2/ol-gnus.el similarity index 99% rename from elpa/org-9.3.1/ol-gnus.el rename to elpa/org-9.3.2/ol-gnus.el index 8ac36f0e..99472315 100644 --- a/elpa/org-9.3.1/ol-gnus.el +++ b/elpa/org-9.3.2/ol-gnus.el @@ -1,6 +1,6 @@ ;;; ol-gnus.el --- Links to Gnus Groups and Messages -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Tassilo Horn diff --git a/elpa/org-9.3.1/ol-gnus.elc b/elpa/org-9.3.2/ol-gnus.elc similarity index 61% rename from elpa/org-9.3.1/ol-gnus.elc rename to elpa/org-9.3.2/ol-gnus.elc index 19d5ba99..a666078a 100644 Binary files a/elpa/org-9.3.1/ol-gnus.elc and b/elpa/org-9.3.2/ol-gnus.elc differ diff --git a/elpa/org-9.3.1/ol-info.el b/elpa/org-9.3.2/ol-info.el similarity index 98% rename from elpa/org-9.3.1/ol-info.el rename to elpa/org-9.3.2/ol-info.el index d145eae7..58d45a7f 100644 --- a/elpa/org-9.3.1/ol-info.el +++ b/elpa/org-9.3.2/ol-info.el @@ -1,6 +1,6 @@ ;;; ol-info.el --- Links to Info Nodes -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/ol-info.elc b/elpa/org-9.3.2/ol-info.elc similarity index 91% rename from elpa/org-9.3.1/ol-info.elc rename to elpa/org-9.3.2/ol-info.elc index 2a35a364..3cb878a9 100644 Binary files a/elpa/org-9.3.1/ol-info.elc and b/elpa/org-9.3.2/ol-info.elc differ diff --git a/elpa/org-9.3.1/ol-irc.el b/elpa/org-9.3.2/ol-irc.el similarity index 99% rename from elpa/org-9.3.1/ol-irc.el rename to elpa/org-9.3.2/ol-irc.el index d39760b7..3a347791 100644 --- a/elpa/org-9.3.1/ol-irc.el +++ b/elpa/org-9.3.2/ol-irc.el @@ -1,6 +1,6 @@ ;;; ol-irc.el --- Links to IRC Sessions -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2008-2019 Free Software Foundation, Inc. +;; Copyright (C) 2008-2020 Free Software Foundation, Inc. ;; ;; Author: Philip Jackson ;; Keywords: erc, irc, link, org diff --git a/elpa/org-9.3.1/ol-irc.elc b/elpa/org-9.3.2/ol-irc.elc similarity index 85% rename from elpa/org-9.3.1/ol-irc.elc rename to elpa/org-9.3.2/ol-irc.elc index b576e18f..3c22d3b2 100644 Binary files a/elpa/org-9.3.1/ol-irc.elc and b/elpa/org-9.3.2/ol-irc.elc differ diff --git a/elpa/org-9.3.1/ol-mhe.el b/elpa/org-9.3.2/ol-mhe.el similarity index 99% rename from elpa/org-9.3.1/ol-mhe.el rename to elpa/org-9.3.2/ol-mhe.el index b2c163c9..099882db 100644 --- a/elpa/org-9.3.1/ol-mhe.el +++ b/elpa/org-9.3.2/ol-mhe.el @@ -1,6 +1,6 @@ ;;; ol-mhe.el --- Links to MH-E Messages -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; Author: Thomas Baumann ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/ol-mhe.elc b/elpa/org-9.3.2/ol-mhe.elc similarity index 99% rename from elpa/org-9.3.1/ol-mhe.elc rename to elpa/org-9.3.2/ol-mhe.elc index 17dbe491..dcbf9b25 100644 Binary files a/elpa/org-9.3.1/ol-mhe.elc and b/elpa/org-9.3.2/ol-mhe.elc differ diff --git a/elpa/org-9.3.1/ol-rmail.el b/elpa/org-9.3.2/ol-rmail.el similarity index 98% rename from elpa/org-9.3.1/ol-rmail.el rename to elpa/org-9.3.2/ol-rmail.el index a62b917d..cad8eaa1 100644 --- a/elpa/org-9.3.1/ol-rmail.el +++ b/elpa/org-9.3.2/ol-rmail.el @@ -1,6 +1,6 @@ ;;; ol-rmail.el --- Links to Rmail Messages -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/ol-rmail.elc b/elpa/org-9.3.2/ol-rmail.elc similarity index 99% rename from elpa/org-9.3.1/ol-rmail.elc rename to elpa/org-9.3.2/ol-rmail.elc index 74a21800..254b83ef 100644 Binary files a/elpa/org-9.3.1/ol-rmail.elc and b/elpa/org-9.3.2/ol-rmail.elc differ diff --git a/elpa/org-9.3.1/ol-w3m.el b/elpa/org-9.3.2/ol-w3m.el similarity index 99% rename from elpa/org-9.3.1/ol-w3m.el rename to elpa/org-9.3.2/ol-w3m.el index 046d3b6b..5b03b8d3 100644 --- a/elpa/org-9.3.1/ol-w3m.el +++ b/elpa/org-9.3.2/ol-w3m.el @@ -1,6 +1,6 @@ ;;; ol-w3m.el --- Copy and Paste From W3M -*- lexical-binding: t; -*- -;; Copyright (C) 2008-2019 Free Software Foundation, Inc. +;; Copyright (C) 2008-2020 Free Software Foundation, Inc. ;; Author: Andy Stewart ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/ol-w3m.elc b/elpa/org-9.3.2/ol-w3m.elc similarity index 99% rename from elpa/org-9.3.1/ol-w3m.elc rename to elpa/org-9.3.2/ol-w3m.elc index 1a950640..fcb6cf29 100644 Binary files a/elpa/org-9.3.1/ol-w3m.elc and b/elpa/org-9.3.2/ol-w3m.elc differ diff --git a/elpa/org-9.3.1/ol.el b/elpa/org-9.3.2/ol.el similarity index 99% rename from elpa/org-9.3.1/ol.el rename to elpa/org-9.3.2/ol.el index e292bd1b..9bdd3ad3 100644 --- a/elpa/org-9.3.1/ol.el +++ b/elpa/org-9.3.2/ol.el @@ -1,6 +1,6 @@ ;;; ol.el --- Org links library -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2019 Free Software Foundation, Inc. +;; Copyright (C) 2018-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/ol.elc b/elpa/org-9.3.2/ol.elc similarity index 95% rename from elpa/org-9.3.1/ol.elc rename to elpa/org-9.3.2/ol.elc index cfbc3824..3149e5ea 100644 Binary files a/elpa/org-9.3.1/ol.elc and b/elpa/org-9.3.2/ol.elc differ diff --git a/elpa/org-9.3.1/org b/elpa/org-9.3.2/org similarity index 99% rename from elpa/org-9.3.1/org rename to elpa/org-9.3.2/org index b1b42f0a..197a4953 100644 --- a/elpa/org-9.3.1/org +++ b/elpa/org-9.3.2/org @@ -2,7 +2,7 @@ This is org, produced by makeinfo version 6.5 from org.texi. This manual is for Org version 9.3. - Copyright © 2004–2019 Free Software Foundation, Inc. + Copyright © 2004–2020 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, @@ -28,7 +28,7 @@ The Org Manual This manual is for Org version 9.3. - Copyright © 2004–2019 Free Software Foundation, Inc. + Copyright © 2004–2020 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, @@ -16191,8 +16191,14 @@ text(1). To make more horizontal space, the headlines are shifted by two characters. Configure ‘org-indent-indentation-per-level’ variable for a -different number. Only one star on each headline is visible, the rest -are masked with the same font color as the background(2). +different number. + + By default, Org Indent mode turns off ‘org-adapt-indentation’ and +does hide leading stars by locally setting ‘org-hide-leading-stars’ to +‘t’: only one star on each headline is visible, the rest are masked with +the same font color as the background. If you want to customize this +default behavior, see ‘org-indent-mode-turns-on-hiding-stars’ and +‘org-indent-mode-turns-off-org-adapt-indentation’. To globally turn on Org Indent mode for all files, customize the variable ‘org-startup-indented’. To control it for individual files, @@ -16208,9 +16214,6 @@ and wrapping long lines of headlines or text. This minor mode also handles Visual Line mode and directly applied settings through ‘word-wrap’. - (2) Note that turning on Org Indent mode sets -‘org-hide-leading-stars’ to ‘t’ and ‘org-adapt-indentation’ to ‘nil’. -  File: org, Node: Hard indentation, Prev: Org Indent Mode, Up: Clean View @@ -17286,10 +17289,10 @@ process of adding Org links to Unix man pages, which look like this [[man:printf][The printf manual]] -The following ‘org-man.el’ file implements it +The following ‘ol-man.el’ file implements it - ;;; org-man.el - Support for links to man pages in Org mode - (require 'org) + ;;; ol-man.el - Support for links to man pages in Org mode + (require 'ol) (org-link-set-parameters "man" :follow org-man-command @@ -17308,7 +17311,7 @@ The following ‘org-man.el’ file implements it (let* ((page (org-man-get-page-name)) (link (concat "man:" page)) (description (format "Man page for %s" page))) - (org-store-link-props + (org-link-store-props :type "man" :link link :description description)))) @@ -17331,17 +17334,17 @@ The following ‘org-man.el’ file implements it (`ascii (format "%s (%s)" desc path)) (t path)))) - (provide 'org-man) - ;;; org-man.el ends here + (provide ol-man) + ;;; ol-man.el ends here To activate links to man pages in Org, enter this in the Emacs init file: - (require 'org-man) + (require 'ol-man) -A review of ‘org-man.el’: +A review of ‘ol-man.el’: - 1. First, ‘(require 'org)’ ensures ‘org.el’ is loaded. + 1. First, ‘(require 'ol)’ ensures that ‘ol.el’ is loaded. 2. Then ‘org-link-set-parameters’ defines a new link type with ‘man’ prefix and associates functions for following, exporting and @@ -22129,6 +22132,9 @@ org-customize’ and then click yourself through the tree. * org-id-link-to-org-use-id: Handling Links. (line 21) * org-imenu-depth: Cooperation. (line 37) * org-indent-indentation-per-level: Org Indent Mode. (line 11) +* org-indent-mode-turns-off-org-adapt-indentation: Org Indent Mode. + (line 15) +* org-indent-mode-turns-on-hiding-stars: Org Indent Mode. (line 15) * org-infojs-options: JavaScript support. (line 71) * org-insert-mode-line-in-empty-file: Activation. (line 30) * org-irc-links-to-logs: Handling Links. (line 45) @@ -22336,7 +22342,7 @@ org-customize’ and then click yourself through the tree. * org-startup-folded <1>: In-buffer Settings. (line 67) * org-startup-folded <2>: Speeding Up Your Agendas. (line 19) -* org-startup-indented: Org Indent Mode. (line 16) +* org-startup-indented: Org Indent Mode. (line 22) * org-startup-indented <1>: In-buffer Settings. (line 77) * org-startup-shrink-all-tables: Column Width and Alignment. (line 64) @@ -22936,67 +22942,66 @@ Ref: Structure Templates-Footnote-1670896 Node: Speed Keys670988 Node: Clean View672160 Node: Org Indent Mode673346 -Ref: Org Indent Mode-Footnote-1674237 -Ref: Org Indent Mode-Footnote-2674461 -Node: Hard indentation674597 -Ref: Hard indentation-Footnote-1676072 -Node: Dynamic Headline Numbering676178 -Node: The Very Busy C-c C-c Key677139 -Node: In-buffer Settings679048 -Ref: In-buffer Settings-Footnote-1687746 -Node: Org Syntax687944 -Node: Documentation Access689594 -Node: Escape Character690008 -Node: Code Evaluation Security690864 -Node: Interaction693726 -Node: Cooperation694144 -Node: Conflicts697031 -Node: TTY Keys701628 -Node: Protocols703225 -Node: The store-link protocol704679 -Node: The capture protocol705522 -Node: The open-source protocol706681 -Node: Org Crypt709913 -Node: Org Mobile711445 -Node: Setting up the staging area712764 -Ref: Setting up the staging area-Footnote-1713999 -Ref: Setting up the staging area-Footnote-2714206 -Node: Pushing to the mobile application714378 -Ref: Pushing to the mobile application-Footnote-1715384 -Ref: Pushing to the mobile application-Footnote-2715475 -Ref: Pushing to the mobile application-Footnote-3715842 -Node: Pulling from the mobile application715918 -Ref: Pulling from the mobile application-Footnote-1718226 -Node: Hacking718279 -Node: Hooks (2)719225 -Node: Add-on Packages719548 -Node: Adding Hyperlink Types720086 -Node: Adding Export Back-ends723503 -Node: Tables in Arbitrary Syntax724755 -Node: Radio tables726019 -Node: A LaTeX example728151 -Ref: A LaTeX example-Footnote-1731998 -Ref: A LaTeX example-Footnote-2732041 -Ref: A LaTeX example-Footnote-3732202 -Node: Translator functions732654 -Node: Dynamic Blocks734825 -Node: Special Agenda Views737066 -Ref: Special Agenda Views-Footnote-1740772 -Ref: Special Agenda Views-Footnote-2740979 -Node: Speeding Up Your Agendas741111 -Node: Extracting Agenda Information742165 -Node: Using the Property API745965 -Node: Using the Mapping API749315 -Node: History and Acknowledgments753346 -Ref: From Carsten753539 -Ref: From Bastien756970 -Ref: List of Contributions759102 -Node: GNU Free Documentation License767305 -Ref: ADDENDUM How to use this License for your documents791256 -Node: Main Index792649 -Node: Key Index889031 -Node: Command and Function Index944833 -Node: Variable Index991097 +Ref: Org Indent Mode-Footnote-1674547 +Node: Hard indentation674771 +Ref: Hard indentation-Footnote-1676246 +Node: Dynamic Headline Numbering676352 +Node: The Very Busy C-c C-c Key677313 +Node: In-buffer Settings679222 +Ref: In-buffer Settings-Footnote-1687920 +Node: Org Syntax688118 +Node: Documentation Access689768 +Node: Escape Character690182 +Node: Code Evaluation Security691038 +Node: Interaction693900 +Node: Cooperation694318 +Node: Conflicts697205 +Node: TTY Keys701802 +Node: Protocols703399 +Node: The store-link protocol704853 +Node: The capture protocol705696 +Node: The open-source protocol706855 +Node: Org Crypt710087 +Node: Org Mobile711619 +Node: Setting up the staging area712938 +Ref: Setting up the staging area-Footnote-1714173 +Ref: Setting up the staging area-Footnote-2714380 +Node: Pushing to the mobile application714552 +Ref: Pushing to the mobile application-Footnote-1715558 +Ref: Pushing to the mobile application-Footnote-2715649 +Ref: Pushing to the mobile application-Footnote-3716016 +Node: Pulling from the mobile application716092 +Ref: Pulling from the mobile application-Footnote-1718400 +Node: Hacking718453 +Node: Hooks (2)719399 +Node: Add-on Packages719722 +Node: Adding Hyperlink Types720260 +Node: Adding Export Back-ends723672 +Node: Tables in Arbitrary Syntax724924 +Node: Radio tables726188 +Node: A LaTeX example728320 +Ref: A LaTeX example-Footnote-1732167 +Ref: A LaTeX example-Footnote-2732210 +Ref: A LaTeX example-Footnote-3732371 +Node: Translator functions732823 +Node: Dynamic Blocks734994 +Node: Special Agenda Views737235 +Ref: Special Agenda Views-Footnote-1740941 +Ref: Special Agenda Views-Footnote-2741148 +Node: Speeding Up Your Agendas741280 +Node: Extracting Agenda Information742334 +Node: Using the Property API746134 +Node: Using the Mapping API749484 +Node: History and Acknowledgments753515 +Ref: From Carsten753708 +Ref: From Bastien757139 +Ref: List of Contributions759271 +Node: GNU Free Documentation License767474 +Ref: ADDENDUM How to use this License for your documents791425 +Node: Main Index792818 +Node: Key Index889200 +Node: Command and Function Index945002 +Node: Variable Index991266  End Tag Table diff --git a/elpa/org-9.3.1/org-agenda.el b/elpa/org-9.3.2/org-agenda.el similarity index 99% rename from elpa/org-9.3.1/org-agenda.el rename to elpa/org-9.3.2/org-agenda.el index e24945f6..43e5495f 100644 --- a/elpa/org-9.3.1/org-agenda.el +++ b/elpa/org-9.3.2/org-agenda.el @@ -1,6 +1,6 @@ ;;; org-agenda.el --- Dynamic task and appointment lists for Org -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -2199,7 +2199,6 @@ The following commands are available: (interactive) (let ((agenda-local-vars-to-keep '(text-scale-mode-amount - text-scale-mode text-scale-mode-lighter face-remapping-alist)) (save (buffer-local-variables))) @@ -7926,7 +7925,7 @@ tags in the FILTER if any of the tags in FILTER are grouptags." filter))) (dolist (x filter) (push (org-agenda-filter-effort-form x) f)))) - (cons 'and (nreverse f)))) + (cons (if (eq type 'category) 'or 'and) (nreverse f)))) (defun org-agenda-filter-make-matcher-tag-exp (tags op) "Return a form associated to tag-expression TAGS. diff --git a/elpa/org-9.3.1/org-agenda.elc b/elpa/org-9.3.2/org-agenda.elc similarity index 92% rename from elpa/org-9.3.1/org-agenda.elc rename to elpa/org-9.3.2/org-agenda.elc index 3d1fe696..60cbd073 100644 Binary files a/elpa/org-9.3.1/org-agenda.elc and b/elpa/org-9.3.2/org-agenda.elc differ diff --git a/elpa/org-9.3.1/org-archive.el b/elpa/org-9.3.2/org-archive.el similarity index 99% rename from elpa/org-9.3.1/org-archive.el rename to elpa/org-9.3.2/org-archive.el index 4721ef79..b33025be 100644 --- a/elpa/org-9.3.1/org-archive.el +++ b/elpa/org-9.3.2/org-archive.el @@ -1,6 +1,6 @@ ;;; org-archive.el --- Archiving for Org -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-archive.elc b/elpa/org-9.3.2/org-archive.elc similarity index 73% rename from elpa/org-9.3.1/org-archive.elc rename to elpa/org-9.3.2/org-archive.elc index b6eb0554..1a841a9e 100644 Binary files a/elpa/org-9.3.1/org-archive.elc and b/elpa/org-9.3.2/org-archive.elc differ diff --git a/elpa/org-9.3.1/org-attach-git.el b/elpa/org-9.3.2/org-attach-git.el similarity index 98% rename from elpa/org-9.3.1/org-attach-git.el rename to elpa/org-9.3.2/org-attach-git.el index 525495f8..31945ff2 100644 --- a/elpa/org-9.3.1/org-attach-git.el +++ b/elpa/org-9.3.2/org-attach-git.el @@ -1,6 +1,6 @@ ;;; org-attach-git.el --- Automatic git commit extension to org-attach -*- lexical-binding: t; -*- -;; Copyright (C) 2019 Free Software Foundation, Inc. +;; Copyright (C) 2019-2020 Free Software Foundation, Inc. ;; Original Author: John Wiegley ;; Restructurer: Gustav Wikström diff --git a/elpa/org-9.3.1/org-attach-git.elc b/elpa/org-9.3.2/org-attach-git.elc similarity index 99% rename from elpa/org-9.3.1/org-attach-git.elc rename to elpa/org-9.3.2/org-attach-git.elc index 2c7a46c7..be6828b7 100644 Binary files a/elpa/org-9.3.1/org-attach-git.elc and b/elpa/org-9.3.2/org-attach-git.elc differ diff --git a/elpa/org-9.3.1/org-attach.el b/elpa/org-9.3.2/org-attach.el similarity index 99% rename from elpa/org-9.3.1/org-attach.el rename to elpa/org-9.3.2/org-attach.el index d3e1c78b..6148657b 100644 --- a/elpa/org-9.3.1/org-attach.el +++ b/elpa/org-9.3.2/org-attach.el @@ -1,6 +1,6 @@ ;;; org-attach.el --- Manage file attachments to Org outlines -*- lexical-binding: t; -*- -;; Copyright (C) 2008-2019 Free Software Foundation, Inc. +;; Copyright (C) 2008-2020 Free Software Foundation, Inc. ;; Author: John Wiegley ;; Keywords: org data attachment diff --git a/elpa/org-9.3.1/org-attach.elc b/elpa/org-9.3.2/org-attach.elc similarity index 92% rename from elpa/org-9.3.1/org-attach.elc rename to elpa/org-9.3.2/org-attach.elc index f15f22a8..eef1d642 100644 Binary files a/elpa/org-9.3.1/org-attach.elc and b/elpa/org-9.3.2/org-attach.elc differ diff --git a/elpa/org-9.3.1/org-autoloads.el b/elpa/org-9.3.2/org-autoloads.el similarity index 96% rename from elpa/org-9.3.1/org-autoloads.el rename to elpa/org-9.3.2/org-autoloads.el index 6dfcbed5..a5291f90 100644 --- a/elpa/org-9.3.1/org-autoloads.el +++ b/elpa/org-9.3.2/org-autoloads.el @@ -397,6 +397,14 @@ (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-table" '("org-"))) +;;;*** + +;;;### (autoloads "actual autoloads are elsewhere" "ob-tangle" "ob-tangle.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from ob-tangle.el + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-tangle" '("org-babel-"))) + ;;;*** ;;;### (autoloads nil "ob-vala" "ob-vala.el" (0 0 0 0)) @@ -1548,6 +1556,14 @@ Dynamic numbering of headlines in an Org buffer. (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-pcomplete" '("pcomplete/org-mode/" "org-"))) +;;;*** + +;;;### (autoloads "actual autoloads are elsewhere" "org-plot" "org-plot.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from org-plot.el + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-plot" '("org-plot"))) + ;;;*** ;;;### (autoloads nil "org-protocol" "org-protocol.el" (0 0 0 0)) @@ -1577,6 +1593,14 @@ Dynamic numbering of headlines in an Org buffer. (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-tempo" '("org-tempo-"))) +;;;*** + +;;;### (autoloads "actual autoloads are elsewhere" "org-timer" "org-timer.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from org-timer.el + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-timer" '("org-timer-"))) + ;;;*** ;;;### (autoloads nil "org-version" "org-version.el" (0 0 0 0)) @@ -1602,6 +1626,22 @@ Inserted by installing Org or when a release is made. (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox" '("org-export-"))) +;;;*** + +;;;### (autoloads "actual autoloads are elsewhere" "ox-ascii" "ox-ascii.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from ox-ascii.el + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-ascii" '("org-ascii-"))) + +;;;*** + +;;;### (autoloads "actual autoloads are elsewhere" "ox-beamer" "ox-beamer.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from ox-beamer.el + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-beamer" '("org-beamer-"))) + ;;;*** ;;;### (autoloads "actual autoloads are elsewhere" "ox-html" "ox-html.el" @@ -1610,6 +1650,14 @@ Inserted by installing Org or when a release is made. (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-html" '("org-html-"))) +;;;*** + +;;;### (autoloads "actual autoloads are elsewhere" "ox-icalendar" +;;;;;; "ox-icalendar.el" (0 0 0 0)) +;;; Generated autoloads from ox-icalendar.el + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-icalendar" '("org-icalendar-"))) + ;;;*** ;;;### (autoloads "actual autoloads are elsewhere" "ox-latex" "ox-latex.el" @@ -1626,6 +1674,30 @@ Inserted by installing Org or when a release is made. (if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-man" '("org-man-"))) +;;;*** + +;;;### (autoloads "actual autoloads are elsewhere" "ox-odt" "ox-odt.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from ox-odt.el + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-odt" '("org-odt-"))) + +;;;*** + +;;;### (autoloads "actual autoloads are elsewhere" "ox-publish" "ox-publish.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from ox-publish.el + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-publish" '("org-publish-"))) + +;;;*** + +;;;### (autoloads "actual autoloads are elsewhere" "ox-texinfo" "ox-texinfo.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from ox-texinfo.el + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-texinfo" '("org-texinfo-"))) + ;;;*** ;;;### (autoloads nil nil ("ob-core.el" "ob-lob.el" "ob-matlab.el" diff --git a/elpa/org-9.3.1/org-capture.el b/elpa/org-9.3.2/org-capture.el similarity index 99% rename from elpa/org-9.3.1/org-capture.el rename to elpa/org-9.3.2/org-capture.el index 3f378125..d4921c04 100644 --- a/elpa/org-9.3.1/org-capture.el +++ b/elpa/org-9.3.2/org-capture.el @@ -1,6 +1,6 @@ ;;; org-capture.el --- Fast note taking in Org -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-capture.elc b/elpa/org-9.3.2/org-capture.elc similarity index 72% rename from elpa/org-9.3.1/org-capture.elc rename to elpa/org-9.3.2/org-capture.elc index ea048d80..96ef7916 100644 Binary files a/elpa/org-9.3.1/org-capture.elc and b/elpa/org-9.3.2/org-capture.elc differ diff --git a/elpa/org-9.3.1/org-clock.el b/elpa/org-9.3.2/org-clock.el similarity index 99% rename from elpa/org-9.3.1/org-clock.el rename to elpa/org-9.3.2/org-clock.el index df4ba624..1e355670 100644 --- a/elpa/org-9.3.1/org-clock.el +++ b/elpa/org-9.3.2/org-clock.el @@ -1,6 +1,6 @@ ;;; org-clock.el --- The time clocking code for Org mode -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -823,6 +823,11 @@ use libnotify if available, or fall back on a message." ((executable-find "notify-send") (start-process "emacs-timer-notification" nil "notify-send" notification)) + ((string-equal system-type "windows-nt") + (w32-notification-close (w32-notification-notify + :title "Org mode message" + :body notification + :urgency 'low))) ;; Maybe the handler will send a message, so only use message as ;; a fall back option (t (message "%s" notification)))) diff --git a/elpa/org-9.3.1/org-clock.elc b/elpa/org-9.3.2/org-clock.elc similarity index 87% rename from elpa/org-9.3.1/org-clock.elc rename to elpa/org-9.3.2/org-clock.elc index d15335b7..c4c52528 100644 Binary files a/elpa/org-9.3.1/org-clock.elc and b/elpa/org-9.3.2/org-clock.elc differ diff --git a/elpa/org-9.3.1/org-colview.el b/elpa/org-9.3.2/org-colview.el similarity index 99% rename from elpa/org-9.3.1/org-colview.el rename to elpa/org-9.3.2/org-colview.el index caef4251..e967154a 100644 --- a/elpa/org-9.3.1/org-colview.el +++ b/elpa/org-9.3.2/org-colview.el @@ -1,6 +1,6 @@ ;;; org-colview.el --- Column View in Org -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-colview.elc b/elpa/org-9.3.2/org-colview.elc similarity index 86% rename from elpa/org-9.3.1/org-colview.elc rename to elpa/org-9.3.2/org-colview.elc index 5c816867..9dbb2deb 100644 Binary files a/elpa/org-9.3.1/org-colview.elc and b/elpa/org-9.3.2/org-colview.elc differ diff --git a/elpa/org-9.3.1/org-compat.el b/elpa/org-9.3.2/org-compat.el similarity index 99% rename from elpa/org-9.3.1/org-compat.el rename to elpa/org-9.3.2/org-compat.el index 4446a169..c1aaf17c 100644 --- a/elpa/org-9.3.1/org-compat.el +++ b/elpa/org-9.3.2/org-compat.el @@ -1,6 +1,6 @@ ;;; org-compat.el --- Compatibility Code for Older Emacsen -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-compat.elc b/elpa/org-9.3.2/org-compat.elc similarity index 99% rename from elpa/org-9.3.1/org-compat.elc rename to elpa/org-9.3.2/org-compat.elc index 034e89e5..139ffedb 100644 Binary files a/elpa/org-9.3.1/org-compat.elc and b/elpa/org-9.3.2/org-compat.elc differ diff --git a/elpa/org-9.3.1/org-crypt.el b/elpa/org-9.3.2/org-crypt.el similarity index 99% rename from elpa/org-9.3.1/org-crypt.el rename to elpa/org-9.3.2/org-crypt.el index 1bdf623e..4b46a314 100644 --- a/elpa/org-9.3.1/org-crypt.el +++ b/elpa/org-9.3.2/org-crypt.el @@ -1,5 +1,5 @@ ;;; org-crypt.el --- Public Key Encryption for Org Entries -*- lexical-binding: t; -*- -;; Copyright (C) 2007-2019 Free Software Foundation, Inc. +;; Copyright (C) 2007-2020 Free Software Foundation, Inc. ;; Emacs Lisp Archive Entry ;; Filename: org-crypt.el diff --git a/elpa/org-9.3.1/org-crypt.elc b/elpa/org-9.3.2/org-crypt.elc similarity index 99% rename from elpa/org-9.3.1/org-crypt.elc rename to elpa/org-9.3.2/org-crypt.elc index 468828b4..179a789e 100644 Binary files a/elpa/org-9.3.1/org-crypt.elc and b/elpa/org-9.3.2/org-crypt.elc differ diff --git a/elpa/org-9.3.1/org-ctags.el b/elpa/org-9.3.2/org-ctags.el similarity index 99% rename from elpa/org-9.3.1/org-ctags.el rename to elpa/org-9.3.2/org-ctags.el index 111be379..08885d26 100644 --- a/elpa/org-9.3.1/org-ctags.el +++ b/elpa/org-9.3.2/org-ctags.el @@ -1,6 +1,6 @@ ;;; org-ctags.el - Integrate Emacs "tags" Facility with Org -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2007-2019 Free Software Foundation, Inc. +;; Copyright (C) 2007-2020 Free Software Foundation, Inc. ;; Author: Paul Sexton diff --git a/elpa/org-9.3.1/org-ctags.elc b/elpa/org-9.3.2/org-ctags.elc similarity index 94% rename from elpa/org-9.3.1/org-ctags.elc rename to elpa/org-9.3.2/org-ctags.elc index f80de0c4..09d2b22a 100644 Binary files a/elpa/org-9.3.1/org-ctags.elc and b/elpa/org-9.3.2/org-ctags.elc differ diff --git a/elpa/org-9.3.1/org-datetree.el b/elpa/org-9.3.2/org-datetree.el similarity index 99% rename from elpa/org-9.3.1/org-datetree.el rename to elpa/org-9.3.2/org-datetree.el index b4797de1..6469abef 100644 --- a/elpa/org-9.3.1/org-datetree.el +++ b/elpa/org-9.3.2/org-datetree.el @@ -1,6 +1,6 @@ ;;; org-datetree.el --- Create date entries in a tree -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-datetree.elc b/elpa/org-9.3.2/org-datetree.elc similarity index 99% rename from elpa/org-9.3.1/org-datetree.elc rename to elpa/org-9.3.2/org-datetree.elc index cefedd49..3421a5f7 100644 Binary files a/elpa/org-9.3.1/org-datetree.elc and b/elpa/org-9.3.2/org-datetree.elc differ diff --git a/elpa/org-9.3.1/org-duration.el b/elpa/org-9.3.2/org-duration.el similarity index 99% rename from elpa/org-9.3.1/org-duration.el rename to elpa/org-9.3.2/org-duration.el index e350bc74..155bfae6 100644 --- a/elpa/org-9.3.1/org-duration.el +++ b/elpa/org-9.3.2/org-duration.el @@ -1,6 +1,6 @@ ;;; org-duration.el --- Library handling durations -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2019 Free Software Foundation, Inc. +;; Copyright (C) 2017-2020 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-duration.elc b/elpa/org-9.3.2/org-duration.elc similarity index 99% rename from elpa/org-9.3.1/org-duration.elc rename to elpa/org-9.3.2/org-duration.elc index 5ba9cbbb..027dcdb1 100644 Binary files a/elpa/org-9.3.1/org-duration.elc and b/elpa/org-9.3.2/org-duration.elc differ diff --git a/elpa/org-9.3.1/org-element.el b/elpa/org-9.3.2/org-element.el similarity index 99% rename from elpa/org-9.3.1/org-element.el rename to elpa/org-9.3.2/org-element.el index 56b3cc41..2788a8b7 100644 --- a/elpa/org-9.3.1/org-element.el +++ b/elpa/org-9.3.2/org-element.el @@ -1,6 +1,6 @@ ;;; org-element.el --- Parser for Org Syntax -*- lexical-binding: t; -*- -;; Copyright (C) 2012-2019 Free Software Foundation, Inc. +;; Copyright (C) 2012-2020 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp @@ -72,7 +72,6 @@ (declare-function org-at-heading-p "org" (&optional _)) (declare-function org-end-of-subtree "org" (&optional invisible-ok to-heading)) (declare-function org-escape-code-in-string "org-src" (s)) -(declare-function org-find-visible "org" ()) (declare-function org-macro-escape-arguments "org-macro" (&rest args)) (declare-function org-macro-extract-arguments "org-macro" (s)) (declare-function org-reduced-level "org" (l)) @@ -4361,54 +4360,52 @@ elements. Elements are accumulated into ACC." (save-excursion (goto-char beg) - ;; Visible only: skip invisible parts at the beginning of the - ;; element. - (when (and visible-only (org-invisible-p2)) - (goto-char (min (1+ (org-find-visible)) end))) ;; When parsing only headlines, skip any text before first one. (when (and (eq granularity 'headline) (not (org-at-heading-p))) (org-with-limited-levels (outline-next-heading))) (let (elements) (while (< (point) end) - ;; Find current element's type and parse it accordingly to - ;; its category. - (let* ((element (org-element--current-element - end granularity mode structure)) - (type (org-element-type element)) - (cbeg (org-element-property :contents-begin element))) - (goto-char (org-element-property :end element)) - ;; Visible only: skip invisible parts between siblings. - (when (and visible-only (org-invisible-p2)) - (goto-char (min (1+ (org-find-visible)) end))) - ;; Fill ELEMENT contents by side-effect. - (cond - ;; If element has no contents, don't modify it. - ((not cbeg)) - ;; Greater element: parse it between `contents-begin' and - ;; `contents-end'. Make sure GRANULARITY allows the - ;; recursion, or ELEMENT is a headline, in which case going - ;; inside is mandatory, in order to get sub-level headings. - ((and (memq type org-element-greater-elements) - (or (memq granularity '(element object nil)) - (and (eq granularity 'greater-element) - (eq type 'section)) - (eq type 'headline))) - (org-element--parse-elements - cbeg (org-element-property :contents-end element) - ;; Possibly switch to a special mode. - (org-element--next-mode type t) - (and (memq type '(item plain-list)) - (org-element-property :structure element)) - granularity visible-only element)) - ;; ELEMENT has contents. Parse objects inside, if - ;; GRANULARITY allows it. - ((memq granularity '(object nil)) - (org-element--parse-objects - cbeg (org-element-property :contents-end element) element - (org-element-restriction type)))) - (push (org-element-put-property element :parent acc) elements) - ;; Update mode. - (setq mode (org-element--next-mode type nil)))) + ;; Visible only: skip invisible parts due to folding. + (if (and visible-only (org-invisible-p nil t)) + (progn + (goto-char (org-find-visible)) + (when (and (eolp) (not (eobp))) (forward-char))) + ;; Find current element's type and parse it accordingly to + ;; its category. + (let* ((element (org-element--current-element + end granularity mode structure)) + (type (org-element-type element)) + (cbeg (org-element-property :contents-begin element))) + (goto-char (org-element-property :end element)) + ;; Fill ELEMENT contents by side-effect. + (cond + ;; If element has no contents, don't modify it. + ((not cbeg)) + ;; Greater element: parse it between `contents-begin' and + ;; `contents-end'. Ensure GRANULARITY allows recursion, + ;; or ELEMENT is a headline, in which case going inside + ;; is mandatory, in order to get sub-level headings. + ((and (memq type org-element-greater-elements) + (or (memq granularity '(element object nil)) + (and (eq granularity 'greater-element) + (eq type 'section)) + (eq type 'headline))) + (org-element--parse-elements + cbeg (org-element-property :contents-end element) + ;; Possibly switch to a special mode. + (org-element--next-mode type t) + (and (memq type '(item plain-list)) + (org-element-property :structure element)) + granularity visible-only element)) + ;; ELEMENT has contents. Parse objects inside, if + ;; GRANULARITY allows it. + ((memq granularity '(object nil)) + (org-element--parse-objects + cbeg (org-element-property :contents-end element) element + (org-element-restriction type)))) + (push (org-element-put-property element :parent acc) elements) + ;; Update mode. + (setq mode (org-element--next-mode type nil))))) ;; Return result. (apply #'org-element-set-contents acc (nreverse elements))))) diff --git a/elpa/org-9.3.1/org-element.elc b/elpa/org-9.3.2/org-element.elc similarity index 82% rename from elpa/org-9.3.1/org-element.elc rename to elpa/org-9.3.2/org-element.elc index 67b6dcb8..bcfbfc5b 100644 Binary files a/elpa/org-9.3.1/org-element.elc and b/elpa/org-9.3.2/org-element.elc differ diff --git a/elpa/org-9.3.1/org-entities.el b/elpa/org-9.3.2/org-entities.el similarity index 99% rename from elpa/org-9.3.1/org-entities.el rename to elpa/org-9.3.2/org-entities.el index a5c05eaa..e32ce269 100644 --- a/elpa/org-9.3.1/org-entities.el +++ b/elpa/org-9.3.2/org-entities.el @@ -1,6 +1,6 @@ ;;; org-entities.el --- Support for Special Entities -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik , ;; Ulf Stegemann diff --git a/elpa/org-9.3.1/org-entities.elc b/elpa/org-9.3.2/org-entities.elc similarity index 99% rename from elpa/org-9.3.1/org-entities.elc rename to elpa/org-9.3.2/org-entities.elc index 561986e4..207f36e6 100644 Binary files a/elpa/org-9.3.1/org-entities.elc and b/elpa/org-9.3.2/org-entities.elc differ diff --git a/elpa/org-9.3.1/org-faces.el b/elpa/org-9.3.2/org-faces.el similarity index 99% rename from elpa/org-9.3.1/org-faces.el rename to elpa/org-9.3.2/org-faces.el index a97d4dc4..30eab9bc 100644 --- a/elpa/org-9.3.1/org-faces.el +++ b/elpa/org-9.3.2/org-faces.el @@ -1,6 +1,6 @@ ;;; org-faces.el --- Face definitions -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-faces.elc b/elpa/org-9.3.2/org-faces.elc similarity index 99% rename from elpa/org-9.3.1/org-faces.elc rename to elpa/org-9.3.2/org-faces.elc index 88a720bb..ca37dfc3 100644 Binary files a/elpa/org-9.3.1/org-faces.elc and b/elpa/org-9.3.2/org-faces.elc differ diff --git a/elpa/org-9.3.1/org-feed.el b/elpa/org-9.3.2/org-feed.el similarity index 99% rename from elpa/org-9.3.1/org-feed.el rename to elpa/org-9.3.2/org-feed.el index f9f5fb05..58bbba7c 100644 --- a/elpa/org-9.3.1/org-feed.el +++ b/elpa/org-9.3.2/org-feed.el @@ -1,6 +1,6 @@ ;;; org-feed.el --- Add RSS feed items to Org files -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-feed.elc b/elpa/org-9.3.2/org-feed.elc similarity index 87% rename from elpa/org-9.3.1/org-feed.elc rename to elpa/org-9.3.2/org-feed.elc index 2c1eeada..88bd0956 100644 Binary files a/elpa/org-9.3.1/org-feed.elc and b/elpa/org-9.3.2/org-feed.elc differ diff --git a/elpa/org-9.3.1/org-footnote.el b/elpa/org-9.3.2/org-footnote.el similarity index 99% rename from elpa/org-9.3.1/org-footnote.el rename to elpa/org-9.3.2/org-footnote.el index 0fe38281..14b0a2a0 100644 --- a/elpa/org-9.3.1/org-footnote.el +++ b/elpa/org-9.3.2/org-footnote.el @@ -1,6 +1,6 @@ ;;; org-footnote.el --- Footnote support in Org -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-footnote.elc b/elpa/org-9.3.2/org-footnote.elc similarity index 96% rename from elpa/org-9.3.1/org-footnote.elc rename to elpa/org-9.3.2/org-footnote.elc index 6e76b02e..bff5626e 100644 Binary files a/elpa/org-9.3.1/org-footnote.elc and b/elpa/org-9.3.2/org-footnote.elc differ diff --git a/elpa/org-9.3.1/org-goto.el b/elpa/org-9.3.2/org-goto.el similarity index 99% rename from elpa/org-9.3.1/org-goto.el rename to elpa/org-9.3.2/org-goto.el index 5ce9b8cb..dd9c0fad 100644 --- a/elpa/org-9.3.1/org-goto.el +++ b/elpa/org-9.3.2/org-goto.el @@ -1,6 +1,6 @@ ;;; org-goto.el --- Fast navigation in an Org buffer -*- lexical-binding: t; -*- -;; Copyright (C) 2012-2019 Free Software Foundation, Inc. +;; Copyright (C) 2012-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-goto.elc b/elpa/org-9.3.2/org-goto.elc similarity index 99% rename from elpa/org-9.3.1/org-goto.elc rename to elpa/org-9.3.2/org-goto.elc index 6a5f70e9..3c83b98f 100644 Binary files a/elpa/org-9.3.1/org-goto.elc and b/elpa/org-9.3.2/org-goto.elc differ diff --git a/elpa/org-9.3.1/org-habit.el b/elpa/org-9.3.2/org-habit.el similarity index 99% rename from elpa/org-9.3.1/org-habit.el rename to elpa/org-9.3.2/org-habit.el index f2212ce6..ec99a8f0 100644 --- a/elpa/org-9.3.1/org-habit.el +++ b/elpa/org-9.3.2/org-habit.el @@ -1,6 +1,6 @@ ;;; org-habit.el --- The habit tracking code for Org -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; Author: John Wiegley ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-habit.elc b/elpa/org-9.3.2/org-habit.elc similarity index 99% rename from elpa/org-9.3.1/org-habit.elc rename to elpa/org-9.3.2/org-habit.elc index 31767025..38b25fed 100644 Binary files a/elpa/org-9.3.1/org-habit.elc and b/elpa/org-9.3.2/org-habit.elc differ diff --git a/elpa/org-9.3.1/org-id.el b/elpa/org-9.3.2/org-id.el similarity index 99% rename from elpa/org-9.3.1/org-id.el rename to elpa/org-9.3.2/org-id.el index 653baf9b..3efbde04 100644 --- a/elpa/org-9.3.1/org-id.el +++ b/elpa/org-9.3.2/org-id.el @@ -1,6 +1,6 @@ ;;; org-id.el --- Global identifiers for Org entries -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2008-2019 Free Software Foundation, Inc. +;; Copyright (C) 2008-2020 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-id.elc b/elpa/org-9.3.2/org-id.elc similarity index 99% rename from elpa/org-9.3.1/org-id.elc rename to elpa/org-9.3.2/org-id.elc index 2d08d1f9..29bc0d92 100644 Binary files a/elpa/org-9.3.1/org-id.elc and b/elpa/org-9.3.2/org-id.elc differ diff --git a/elpa/org-9.3.1/org-indent.el b/elpa/org-9.3.2/org-indent.el similarity index 99% rename from elpa/org-9.3.1/org-indent.el rename to elpa/org-9.3.2/org-indent.el index a69293a8..51719194 100644 --- a/elpa/org-9.3.1/org-indent.el +++ b/elpa/org-9.3.2/org-indent.el @@ -1,6 +1,6 @@ ;;; org-indent.el --- Dynamic indentation for Org -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-indent.elc b/elpa/org-9.3.2/org-indent.elc similarity index 99% rename from elpa/org-9.3.1/org-indent.elc rename to elpa/org-9.3.2/org-indent.elc index 286d5926..7a1cef33 100644 Binary files a/elpa/org-9.3.1/org-indent.elc and b/elpa/org-9.3.2/org-indent.elc differ diff --git a/elpa/org-9.3.1/org-inlinetask.el b/elpa/org-9.3.2/org-inlinetask.el similarity index 99% rename from elpa/org-9.3.1/org-inlinetask.el rename to elpa/org-9.3.2/org-inlinetask.el index c76d7d20..60e3e0cc 100644 --- a/elpa/org-9.3.1/org-inlinetask.el +++ b/elpa/org-9.3.2/org-inlinetask.el @@ -1,6 +1,6 @@ ;;; org-inlinetask.el --- Tasks Independent of Outline Hierarchy -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-inlinetask.elc b/elpa/org-9.3.2/org-inlinetask.elc similarity index 93% rename from elpa/org-9.3.1/org-inlinetask.elc rename to elpa/org-9.3.2/org-inlinetask.elc index a37c3ac4..b78931f7 100644 Binary files a/elpa/org-9.3.1/org-inlinetask.elc and b/elpa/org-9.3.2/org-inlinetask.elc differ diff --git a/elpa/org-9.3.1/org-install.el b/elpa/org-9.3.2/org-install.el similarity index 100% rename from elpa/org-9.3.1/org-install.el rename to elpa/org-9.3.2/org-install.el diff --git a/elpa/org-9.3.1/org-keys.el b/elpa/org-9.3.2/org-keys.el similarity index 99% rename from elpa/org-9.3.1/org-keys.el rename to elpa/org-9.3.2/org-keys.el index 3b8fa5f5..4d4e1241 100644 --- a/elpa/org-9.3.1/org-keys.el +++ b/elpa/org-9.3.2/org-keys.el @@ -1,6 +1,6 @@ ;;; org-keys.el --- Key bindings for Org mode -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2019 Free Software Foundation, Inc. +;; Copyright (C) 2018-2020 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou diff --git a/elpa/org-9.3.1/org-keys.elc b/elpa/org-9.3.2/org-keys.elc similarity index 99% rename from elpa/org-9.3.1/org-keys.elc rename to elpa/org-9.3.2/org-keys.elc index fc7294e2..ce7af51c 100644 Binary files a/elpa/org-9.3.1/org-keys.elc and b/elpa/org-9.3.2/org-keys.elc differ diff --git a/elpa/org-9.3.1/org-lint.el b/elpa/org-9.3.2/org-lint.el similarity index 99% rename from elpa/org-9.3.1/org-lint.el rename to elpa/org-9.3.2/org-lint.el index 5b959db7..5be1ec72 100644 --- a/elpa/org-9.3.1/org-lint.el +++ b/elpa/org-9.3.2/org-lint.el @@ -1,6 +1,6 @@ ;;; org-lint.el --- Linting for Org documents -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2019 Free Software Foundation, Inc. +;; Copyright (C) 2015-2020 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-lint.elc b/elpa/org-9.3.2/org-lint.elc similarity index 86% rename from elpa/org-9.3.1/org-lint.elc rename to elpa/org-9.3.2/org-lint.elc index 67053cc9..9862346b 100644 Binary files a/elpa/org-9.3.1/org-lint.elc and b/elpa/org-9.3.2/org-lint.elc differ diff --git a/elpa/org-9.3.1/org-list.el b/elpa/org-9.3.2/org-list.el similarity index 99% rename from elpa/org-9.3.1/org-list.el rename to elpa/org-9.3.2/org-list.el index a6186a3b..b6140896 100644 --- a/elpa/org-9.3.1/org-list.el +++ b/elpa/org-9.3.2/org-list.el @@ -1,6 +1,6 @@ ;;; org-list.el --- Plain lists for Org -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Bastien Guerry diff --git a/elpa/org-9.3.1/org-list.elc b/elpa/org-9.3.2/org-list.elc similarity index 94% rename from elpa/org-9.3.1/org-list.elc rename to elpa/org-9.3.2/org-list.elc index 4fec8bf3..08f39679 100644 Binary files a/elpa/org-9.3.1/org-list.elc and b/elpa/org-9.3.2/org-list.elc differ diff --git a/elpa/org-9.3.1/org-loaddefs.el b/elpa/org-9.3.2/org-loaddefs.el similarity index 97% rename from elpa/org-9.3.1/org-loaddefs.el rename to elpa/org-9.3.2/org-loaddefs.el index 4315927f..bebb25c3 100644 --- a/elpa/org-9.3.1/org-loaddefs.el +++ b/elpa/org-9.3.2/org-loaddefs.el @@ -72,7 +72,7 @@ ;;;*** -;;;### (autoloads nil "ob-core" "ob-core.el" "90e0da8ba82ee44a2c955674cd34034d") +;;;### (autoloads nil "ob-core" "ob-core.el" "5cd3ac73828f7d2edfbcd2e1bdfa1650") ;;; Generated autoloads from ob-core.el (autoload 'org-babel-execute-safely-maybe "ob-core" "\ @@ -646,7 +646,7 @@ see. ;;;*** -;;;### (autoloads nil "ob-tangle" "ob-tangle.el" (0 0 0 0)) +;;;### (autoloads nil "ob-tangle" "ob-tangle.el" "a2a5faa094ee31d0604b808b19044604") ;;; Generated autoloads from ob-tangle.el (autoload 'org-babel-tangle-file "ob-tangle" "\ @@ -672,8 +672,6 @@ used to limit the exported source code blocks by language. \(fn &optional ARG TARGET-FILE LANG)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ob-tangle" '("org-babel-"))) - ;;;*** ;;;### (autoloads nil "ob-vala" "ob-vala.el" (0 0 0 0)) @@ -683,7 +681,7 @@ used to limit the exported source code blocks by language. ;;;*** -;;;### (autoloads nil "ol-bbdb" "ol-bbdb.el" "edf57f4e15675e4b2d3d76f0b95d1df7") +;;;### (autoloads nil "ol-bbdb" "ol-bbdb.el" "34914c2b6dd87abeeea143f784675968") ;;; Generated autoloads from ol-bbdb.el (autoload 'org-bbdb-anniversaries "ol-bbdb" "\ @@ -693,7 +691,7 @@ Extract anniversaries from BBDB for display in the agenda. ;;;*** -;;;### (autoloads nil "ol-irc" "ol-irc.el" "1470fc98408f57d92e9e4ff178f7ec4f") +;;;### (autoloads nil "ol-irc" "ol-irc.el" "a6742094ce57931eebc68012075b516d") ;;; Generated autoloads from ol-irc.el (autoload 'org-irc-store-link "ol-irc" "\ @@ -981,7 +979,7 @@ to override `appt-message-warning-time'. ;;;*** -;;;### (autoloads nil "org-archive" "org-archive.el" "57c6198ee1f8cfc283350854b170e825") +;;;### (autoloads nil "org-archive" "org-archive.el" "f1ec02a7433b9e18761b97f29ab1ae65") ;;; Generated autoloads from org-archive.el (autoload 'org-add-archive-files "org-archive" "\ @@ -1041,7 +1039,7 @@ This command is set with the variable `org-archive-default-command'. ;;;*** -;;;### (autoloads nil "org-attach" "org-attach.el" "9b7ecbce514fbb9281694d6b2e4524ec") +;;;### (autoloads nil "org-attach" "org-attach.el" "6571ad3471b5b19700e2187c3a8875a1") ;;; Generated autoloads from org-attach.el (autoload 'org-attach "org-attach" "\ @@ -1137,7 +1135,7 @@ Set `org-capture-templates' to be similar to `org-remember-templates'. ;;;*** -;;;### (autoloads nil "org-clock" "org-clock.el" "0b2ca1ee1cc7a31225dcf2e61d0d1b8f") +;;;### (autoloads nil "org-clock" "org-clock.el" "eb7dcac30e5ee869a0a17d10fa6744c8") ;;; Generated autoloads from org-clock.el (autoload 'org-resolve-clocks "org-clock" "\ @@ -1418,7 +1416,7 @@ Try very hard to provide sensible version strings. ;;;*** -;;;### (autoloads nil "org-datetree" "org-datetree.el" "774ad6e1857fe8931bc781835a24a290") +;;;### (autoloads nil "org-datetree" "org-datetree.el" "6ee7ddaa6a942934107278051ca078a6") ;;; Generated autoloads from org-datetree.el (autoload 'org-datetree-find-date-create "org-datetree" "\ @@ -1498,7 +1496,7 @@ with \"H:MM:SS\" format, return `h:mm:ss'. Otherwise, return ;;;*** -;;;### (autoloads nil "org-element" "org-element.el" "3568bf38dc5e13882c5eabdb18fc63a3") +;;;### (autoloads nil "org-element" "org-element.el" "14bbacf67ee8e6e7343ab0af0ee2f893") ;;; Generated autoloads from org-element.el (autoload 'org-element-update-syntax "org-element" "\ @@ -1584,7 +1582,7 @@ Providing it allows for quicker computation. ;;;*** -;;;### (autoloads nil "org-feed" "org-feed.el" "7beece5bb1c80ac11d8c8fc131e03b2b") +;;;### (autoloads nil "org-feed" "org-feed.el" "2787ca4db1e1837f4182bb7d9d759a08") ;;; Generated autoloads from org-feed.el (autoload 'org-feed-update-all "org-feed" "\ @@ -1611,7 +1609,7 @@ Show the raw feed buffer of a feed. ;;;*** -;;;### (autoloads nil "org-footnote" "org-footnote.el" "ece100bf1308ca3450e7e002d2094f49") +;;;### (autoloads nil "org-footnote" "org-footnote.el" "367213d77f17760a0cee9c0afea7e57e") ;;; Generated autoloads from org-footnote.el (autoload 'org-footnote-action "org-footnote" "\ @@ -1675,7 +1673,7 @@ With a prefix argument, use the alternative interface: e.g., if ;;;*** -;;;### (autoloads nil "org-id" "org-id.el" "32f02501f0840f718b8921560ba8cbd0") +;;;### (autoloads nil "org-id" "org-id.el" "22ea6b2bf8ee5c8b6b3181bc7db5e8d1") ;;; Generated autoloads from org-id.el (autoload 'org-id-get-create "org-id" "\ @@ -1767,7 +1765,7 @@ Store a link to the current entry, using its ID. ;;;*** -;;;### (autoloads nil "org-indent" "org-indent.el" "65830b3f864eb27e88fb85cea5eb1530") +;;;### (autoloads nil "org-indent" "org-indent.el" "a709ae700357dd5030ede42f598af697") ;;; Generated autoloads from org-indent.el (autoload 'org-indent-mode "org-indent" "\ @@ -1848,7 +1846,7 @@ Load FILE with optional arguments NOERROR and MUSTSUFFIX. ;;;*** -;;;### (autoloads nil "org-mobile" "org-mobile.el" "f6303075b8e9aa9f52f5848a2a422b6f") +;;;### (autoloads nil "org-mobile" "org-mobile.el" "253ec03c4a1602a599990056d1e3d593") ;;; Generated autoloads from org-mobile.el (autoload 'org-mobile-push "org-mobile" "\ @@ -1904,7 +1902,7 @@ if ARG is `toggle'; disable the mode otherwise. ;;;*** -;;;### (autoloads nil "org-plot" "org-plot.el" (0 0 0 0)) +;;;### (autoloads nil "org-plot" "org-plot.el" "b74b5a66677d21c53b9d1e79ecf3a0f3") ;;; Generated autoloads from org-plot.el (autoload 'org-plot/gnuplot "org-plot" "\ @@ -1914,8 +1912,6 @@ line directly before or after the table. \(fn &optional PARAMS)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-plot" '("org-plot"))) - ;;;*** ;;;### (autoloads nil "org-protocol" "org-protocol.el" (0 0 0 0)) @@ -1932,7 +1928,7 @@ line directly before or after the table. ;;;*** -;;;### (autoloads nil "org-table" "org-table.el" "47b14d37fc254d49b771b9cccb00a383") +;;;### (autoloads nil "org-table" "org-table.el" "af0351b12f157700c254ac5230eee895") ;;; Generated autoloads from org-table.el (autoload 'org-table-create-with-table\.el "org-table" "\ @@ -2710,7 +2706,7 @@ which will prompt for the width. ;;;*** -;;;### (autoloads nil "org-timer" "org-timer.el" (0 0 0 0)) +;;;### (autoloads nil "org-timer" "org-timer.el" "07f32a33f71c5980a9088d2e532ebb14") ;;; Generated autoloads from org-timer.el (autoload 'org-timer-start "org-timer" "\ @@ -2785,8 +2781,6 @@ using three `C-u' prefix arguments. \(fn &optional OPT)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-timer" '("org-timer-"))) - ;;;*** ;;;### (autoloads nil "org-version" "org-version.el" (0 0 0 0)) @@ -3010,7 +3004,7 @@ Call the customize function with org as argument. ;;;*** -;;;### (autoloads nil "ox" "ox.el" "a25d16574d6c53a5e8ed159cd2e96d0a") +;;;### (autoloads nil "ox" "ox.el" "bf7e0d6c4b1ca15b2856f8064e1161e8") ;;; Generated autoloads from ox.el (autoload 'org-export-get-backend "ox" "\ @@ -3199,7 +3193,7 @@ When ARG is `\\[universal-argument] \\[universal-argument]', display the asynchr ;;;*** -;;;### (autoloads nil "ox-ascii" "ox-ascii.el" (0 0 0 0)) +;;;### (autoloads nil "ox-ascii" "ox-ascii.el" "e486804f1465a5da9b378342aab51b39") ;;; Generated autoloads from ox-ascii.el (autoload 'org-ascii-convert-region-to-ascii "ox-ascii" "\ @@ -3307,21 +3301,14 @@ Return output file name. \(fn PLIST FILENAME PUB-DIR)" nil nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-ascii" '("org-ascii-"))) - ;;;*** -;;;### (autoloads nil "ox-beamer" "ox-beamer.el" (0 0 0 0)) +;;;### (autoloads nil "ox-beamer" "ox-beamer.el" "49dea3eb21ddbb32ea3d186811c1b7a5") ;;; Generated autoloads from ox-beamer.el (autoload 'org-beamer-mode "ox-beamer" "\ Support for editing Beamer oriented Org mode files. -If called interactively, enable Org-Beamer mode if ARG is positive, and -disable it if ARG is zero or negative. If called from Lisp, -also enable the mode if ARG is omitted or nil, and toggle it -if ARG is `toggle'; disable the mode otherwise. - \(fn &optional ARG)" t nil) (autoload 'org-beamer-export-as-latex "ox-beamer" "\ @@ -3449,11 +3436,9 @@ Return output file name. \(fn PLIST FILENAME PUB-DIR)" nil nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-beamer" '("org-beamer-"))) - ;;;*** -;;;### (autoloads nil "ox-html" "ox-html.el" "61dd900a375ab2cc3ffa303ace004d32") +;;;### (autoloads nil "ox-html" "ox-html.el" "c6ecd77804a3a44b354eb84eacd8bb86") ;;; Generated autoloads from ox-html.el (put 'org-html-head-include-default-style 'safe-local-variable 'booleanp) @@ -3559,7 +3544,7 @@ Return output file name. ;;;*** -;;;### (autoloads nil "ox-icalendar" "ox-icalendar.el" (0 0 0 0)) +;;;### (autoloads nil "ox-icalendar" "ox-icalendar.el" "c7c03b69aa9a8e7ecce385a1f66a1190") ;;; Generated autoloads from ox-icalendar.el (autoload 'org-icalendar-export-to-ics "ox-icalendar" "\ @@ -3607,11 +3592,9 @@ The file is stored under the name chosen in \(fn &optional ASYNC)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-icalendar" '("org-icalendar-"))) - ;;;*** -;;;### (autoloads nil "ox-latex" "ox-latex.el" "5bd3806acccb46df419011e494d86e81") +;;;### (autoloads nil "ox-latex" "ox-latex.el" "34c654817cdf3847334af5ef9e5d7fc8") ;;; Generated autoloads from ox-latex.el (autoload 'org-latex-make-preamble "ox-latex" "\ @@ -3828,7 +3811,7 @@ Return output file name. ;;;*** -;;;### (autoloads nil "ox-odt" "ox-odt.el" (0 0 0 0)) +;;;### (autoloads nil "ox-odt" "ox-odt.el" "f93435c1ea4d02b23b8bb4fabbeaba8e") ;;; Generated autoloads from ox-odt.el (put 'org-odt-preferred-output-format 'safe-local-variable 'stringp) @@ -3888,8 +3871,6 @@ is non-nil then the newly converted file is opened using \(fn &optional IN-FILE OUT-FMT OPEN)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-odt" '("org-odt-"))) - ;;;*** ;;;### (autoloads nil "ox-org" "ox-org.el" (0 0 0 0)) @@ -3972,7 +3953,7 @@ Return output file name. ;;;*** -;;;### (autoloads nil "ox-publish" "ox-publish.el" (0 0 0 0)) +;;;### (autoloads nil "ox-publish" "ox-publish.el" "874b7fbc7347bb5ec0f7da70a299312f") ;;; Generated autoloads from ox-publish.el (defalias 'org-publish-project 'org-publish) @@ -4013,11 +3994,9 @@ the project. \(fn &optional FORCE ASYNC)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-publish" '("org-publish-"))) - ;;;*** -;;;### (autoloads nil "ox-texinfo" "ox-texinfo.el" (0 0 0 0)) +;;;### (autoloads nil "ox-texinfo" "ox-texinfo.el" "15c22ba49acfc76009bf6acb1a301966") ;;; Generated autoloads from ox-texinfo.el (autoload 'org-texinfo-export-to-texinfo "ox-texinfo" "\ @@ -4102,8 +4081,6 @@ command to convert it. \(fn)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "ox-texinfo" '("org-texinfo-"))) - ;;;*** ;;;### (autoloads nil "ox" "ox.el" (0 0 0 0)) diff --git a/elpa/org-9.3.1/org-macro.el b/elpa/org-9.3.2/org-macro.el similarity index 99% rename from elpa/org-9.3.1/org-macro.el rename to elpa/org-9.3.2/org-macro.el index c928ea73..a1b987a8 100644 --- a/elpa/org-9.3.1/org-macro.el +++ b/elpa/org-9.3.2/org-macro.el @@ -1,6 +1,6 @@ ;;; org-macro.el --- Macro Replacement Code for Org -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2019 Free Software Foundation, Inc. +;; Copyright (C) 2013-2020 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-macro.elc b/elpa/org-9.3.2/org-macro.elc similarity index 99% rename from elpa/org-9.3.1/org-macro.elc rename to elpa/org-9.3.2/org-macro.elc index def319b5..d77fc025 100644 Binary files a/elpa/org-9.3.1/org-macro.elc and b/elpa/org-9.3.2/org-macro.elc differ diff --git a/elpa/org-9.3.1/org-macs.el b/elpa/org-9.3.2/org-macs.el similarity index 97% rename from elpa/org-9.3.1/org-macs.el rename to elpa/org-9.3.2/org-macs.el index 3cc68102..4a40765e 100644 --- a/elpa/org-9.3.1/org-macs.el +++ b/elpa/org-9.3.2/org-macs.el @@ -1,6 +1,6 @@ ;;; org-macs.el --- Top-level Definitions for Org -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp @@ -1065,10 +1065,16 @@ the value in cdr." (get-text-property (or (next-single-property-change 0 prop s) 0) prop s))) -(defun org-invisible-p (&optional pos) +(defun org-invisible-p (&optional pos folding-only) "Non-nil if the character after POS is invisible. -If POS is nil, use `point' instead." - (get-char-property (or pos (point)) 'invisible)) +If POS is nil, use `point' instead. When optional argument +FOLDING-ONLY is non-nil, only consider invisible parts due to +folding of a headline, a block or a drawer, i.e., not because of +fontification." + (let ((value (get-char-property (or pos (point)) 'invisible))) + (cond ((not value) nil) + (folding-only (memq value '(org-hide-block org-hide-drawer outline))) + (t value)))) (defun org-truely-invisible-p () "Check if point is at a character currently not visible. @@ -1086,6 +1092,18 @@ move it back by one char before doing this check." (backward-char 1)) (org-invisible-p))) +(defun org-find-visible () + "Return closest visible buffer position, or `point-max'" + (if (org-invisible-p) + (next-single-char-property-change (point) 'invisible) + (point))) + +(defun org-find-invisible () + "Return closest invisible buffer position, or `point-max'" + (if (org-invisible-p) + (point) + (next-single-char-property-change (point) 'invisible))) + ;;; Time diff --git a/elpa/org-9.3.1/org-macs.elc b/elpa/org-9.3.2/org-macs.elc similarity index 92% rename from elpa/org-9.3.1/org-macs.elc rename to elpa/org-9.3.2/org-macs.elc index 98c6876d..439a0ae5 100644 Binary files a/elpa/org-9.3.1/org-macs.elc and b/elpa/org-9.3.2/org-macs.elc differ diff --git a/elpa/org-9.3.1/org-mobile.el b/elpa/org-9.3.2/org-mobile.el similarity index 99% rename from elpa/org-9.3.1/org-mobile.el rename to elpa/org-9.3.2/org-mobile.el index 26a3f577..8749e496 100644 --- a/elpa/org-9.3.1/org-mobile.el +++ b/elpa/org-9.3.2/org-mobile.el @@ -1,5 +1,5 @@ ;;; org-mobile.el --- Code for Asymmetric Sync With a Mobile Device -*- lexical-binding: t; -*- -;; Copyright (C) 2009-2019 Free Software Foundation, Inc. +;; Copyright (C) 2009-2020 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-mobile.elc b/elpa/org-9.3.2/org-mobile.elc similarity index 99% rename from elpa/org-9.3.1/org-mobile.elc rename to elpa/org-9.3.2/org-mobile.elc index f6da9e7e..621a48d5 100644 Binary files a/elpa/org-9.3.1/org-mobile.elc and b/elpa/org-9.3.2/org-mobile.elc differ diff --git a/elpa/org-9.3.1/org-mouse.el b/elpa/org-9.3.2/org-mouse.el similarity index 99% rename from elpa/org-9.3.1/org-mouse.el rename to elpa/org-9.3.2/org-mouse.el index 13d88dad..02798874 100644 --- a/elpa/org-9.3.1/org-mouse.el +++ b/elpa/org-9.3.2/org-mouse.el @@ -1,6 +1,6 @@ ;;; org-mouse.el --- Better mouse support for Org -*- lexical-binding: t; -*- -;; Copyright (C) 2006-2019 Free Software Foundation, Inc. +;; Copyright (C) 2006-2020 Free Software Foundation, Inc. ;; Author: Piotr Zielinski ;; Maintainer: Carsten Dominik diff --git a/elpa/org-9.3.1/org-mouse.elc b/elpa/org-9.3.2/org-mouse.elc similarity index 81% rename from elpa/org-9.3.1/org-mouse.elc rename to elpa/org-9.3.2/org-mouse.elc index 95de5679..9c66bde1 100644 Binary files a/elpa/org-9.3.1/org-mouse.elc and b/elpa/org-9.3.2/org-mouse.elc differ diff --git a/elpa/org-9.3.1/org-num.el b/elpa/org-9.3.2/org-num.el similarity index 99% rename from elpa/org-9.3.1/org-num.el rename to elpa/org-9.3.2/org-num.el index 7254b581..a6ddce73 100644 --- a/elpa/org-9.3.1/org-num.el +++ b/elpa/org-9.3.2/org-num.el @@ -1,6 +1,6 @@ ;;; org-num.el --- Dynamic Headlines Numbering -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2019 Free Software Foundation, Inc. +;; Copyright (C) 2018-2020 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-num.elc b/elpa/org-9.3.2/org-num.elc similarity index 99% rename from elpa/org-9.3.1/org-num.elc rename to elpa/org-9.3.2/org-num.elc index 81490562..bb7acdd6 100644 Binary files a/elpa/org-9.3.1/org-num.elc and b/elpa/org-9.3.2/org-num.elc differ diff --git a/elpa/org-9.3.1/org-pcomplete.el b/elpa/org-9.3.2/org-pcomplete.el similarity index 99% rename from elpa/org-9.3.1/org-pcomplete.el rename to elpa/org-9.3.2/org-pcomplete.el index e557b1a1..b0ebbc4c 100644 --- a/elpa/org-9.3.1/org-pcomplete.el +++ b/elpa/org-9.3.2/org-pcomplete.el @@ -1,6 +1,6 @@ ;;; org-pcomplete.el --- In-buffer Completion Code -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; John Wiegley diff --git a/elpa/org-9.3.1/org-pcomplete.elc b/elpa/org-9.3.2/org-pcomplete.elc similarity index 99% rename from elpa/org-9.3.1/org-pcomplete.elc rename to elpa/org-9.3.2/org-pcomplete.elc index 3bf88252..69723a92 100644 Binary files a/elpa/org-9.3.1/org-pcomplete.elc and b/elpa/org-9.3.2/org-pcomplete.elc differ diff --git a/elpa/org-9.3.1/org-pkg.el b/elpa/org-9.3.2/org-pkg.el similarity index 82% rename from elpa/org-9.3.1/org-pkg.el rename to elpa/org-9.3.2/org-pkg.el index 52405fe7..270b21da 100644 --- a/elpa/org-9.3.1/org-pkg.el +++ b/elpa/org-9.3.2/org-pkg.el @@ -1,2 +1,2 @@ ;; Generated package description from org.el -*- no-byte-compile: t -*- -(define-package "org" "9.3.1" "Outline-based notes management and organizer" 'nil :keywords '("outlines" "hypermedia" "calendar" "wp") :authors '(("Carsten Dominik ")) :maintainer '("Carsten Dominik ") :url "https://orgmode.org") +(define-package "org" "9.3.2" "Outline-based notes management and organizer" 'nil :keywords '("outlines" "hypermedia" "calendar" "wp") :authors '(("Carsten Dominik ")) :maintainer '("Carsten Dominik ") :url "https://orgmode.org") diff --git a/elpa/org-9.3.1/org-plot.el b/elpa/org-9.3.2/org-plot.el similarity index 99% rename from elpa/org-9.3.1/org-plot.el rename to elpa/org-9.3.2/org-plot.el index 4e84dbe0..8bf88392 100644 --- a/elpa/org-9.3.1/org-plot.el +++ b/elpa/org-9.3.2/org-plot.el @@ -1,6 +1,6 @@ ;;; org-plot.el --- Support for Plotting from Org -*- lexical-binding: t; -*- -;; Copyright (C) 2008-2019 Free Software Foundation, Inc. +;; Copyright (C) 2008-2020 Free Software Foundation, Inc. ;; ;; Author: Eric Schulte ;; Keywords: tables, plotting diff --git a/elpa/org-9.3.1/org-plot.elc b/elpa/org-9.3.2/org-plot.elc similarity index 62% rename from elpa/org-9.3.1/org-plot.elc rename to elpa/org-9.3.2/org-plot.elc index e1aa9d50..281c97af 100644 Binary files a/elpa/org-9.3.1/org-plot.elc and b/elpa/org-9.3.2/org-plot.elc differ diff --git a/elpa/org-9.3.1/org-protocol.el b/elpa/org-9.3.2/org-protocol.el similarity index 99% rename from elpa/org-9.3.1/org-protocol.el rename to elpa/org-9.3.2/org-protocol.el index 44c6abbd..0ff0e401 100644 --- a/elpa/org-9.3.1/org-protocol.el +++ b/elpa/org-9.3.2/org-protocol.el @@ -1,6 +1,6 @@ ;;; org-protocol.el --- Intercept Calls from Emacsclient to Trigger Custom Actions -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2008-2019 Free Software Foundation, Inc. +;; Copyright (C) 2008-2020 Free Software Foundation, Inc. ;; ;; Authors: Bastien Guerry ;; Daniel M German diff --git a/elpa/org-9.3.1/org-protocol.elc b/elpa/org-9.3.2/org-protocol.elc similarity index 99% rename from elpa/org-9.3.1/org-protocol.elc rename to elpa/org-9.3.2/org-protocol.elc index 884f803c..cdff941a 100644 Binary files a/elpa/org-9.3.1/org-protocol.elc and b/elpa/org-9.3.2/org-protocol.elc differ diff --git a/elpa/org-9.3.1/org-src.el b/elpa/org-9.3.2/org-src.el similarity index 99% rename from elpa/org-9.3.1/org-src.el rename to elpa/org-9.3.2/org-src.el index 5e50a1b4..7876deab 100644 --- a/elpa/org-9.3.1/org-src.el +++ b/elpa/org-9.3.2/org-src.el @@ -1,6 +1,6 @@ ;;; org-src.el --- Source code examples in Org -*- lexical-binding: t; -*- ;; -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Bastien Guerry diff --git a/elpa/org-9.3.1/org-src.elc b/elpa/org-9.3.2/org-src.elc similarity index 95% rename from elpa/org-9.3.1/org-src.elc rename to elpa/org-9.3.2/org-src.elc index fc2f9ef8..89514033 100644 Binary files a/elpa/org-9.3.1/org-src.elc and b/elpa/org-9.3.2/org-src.elc differ diff --git a/elpa/org-9.3.1/org-table.el b/elpa/org-9.3.2/org-table.el similarity index 99% rename from elpa/org-9.3.1/org-table.el rename to elpa/org-9.3.2/org-table.el index a2e77e07..49765472 100644 --- a/elpa/org-9.3.1/org-table.el +++ b/elpa/org-9.3.2/org-table.el @@ -1,6 +1,6 @@ ;;; org-table.el --- The Table Editor for Org -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-table.elc b/elpa/org-9.3.2/org-table.elc similarity index 90% rename from elpa/org-9.3.1/org-table.elc rename to elpa/org-9.3.2/org-table.elc index 0542f492..1324ae67 100644 Binary files a/elpa/org-9.3.1/org-table.elc and b/elpa/org-9.3.2/org-table.elc differ diff --git a/elpa/org-9.3.1/org-tempo.el b/elpa/org-9.3.2/org-tempo.el similarity index 99% rename from elpa/org-9.3.1/org-tempo.el rename to elpa/org-9.3.2/org-tempo.el index 78424b28..9ae27005 100644 --- a/elpa/org-9.3.1/org-tempo.el +++ b/elpa/org-9.3.2/org-tempo.el @@ -1,6 +1,6 @@ ;;; org-tempo.el --- Template expansion for Org structures -*- lexical-binding: t; -*- -;; Copyright (C) 2017-2019 Free Software Foundation, Inc. +;; Copyright (C) 2017-2020 Free Software Foundation, Inc. ;; ;; Author: Rasmus Pank Roulund ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-tempo.elc b/elpa/org-9.3.2/org-tempo.elc similarity index 99% rename from elpa/org-9.3.1/org-tempo.elc rename to elpa/org-9.3.2/org-tempo.elc index 734a8b96..980ea986 100644 Binary files a/elpa/org-9.3.1/org-tempo.elc and b/elpa/org-9.3.2/org-tempo.elc differ diff --git a/elpa/org-9.3.1/org-timer.el b/elpa/org-9.3.2/org-timer.el similarity index 99% rename from elpa/org-9.3.1/org-timer.el rename to elpa/org-9.3.2/org-timer.el index 68fe9669..a1eb5e4a 100644 --- a/elpa/org-9.3.1/org-timer.el +++ b/elpa/org-9.3.2/org-timer.el @@ -1,6 +1,6 @@ ;;; org-timer.el --- Timer code for Org mode -*- lexical-binding: t; -*- -;; Copyright (C) 2008-2019 Free Software Foundation, Inc. +;; Copyright (C) 2008-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/org-timer.elc b/elpa/org-9.3.2/org-timer.elc similarity index 92% rename from elpa/org-9.3.1/org-timer.elc rename to elpa/org-9.3.2/org-timer.elc index 2e5d42fd..acf01689 100644 Binary files a/elpa/org-9.3.1/org-timer.elc and b/elpa/org-9.3.2/org-timer.elc differ diff --git a/elpa/org-9.3.1/org-version.el b/elpa/org-9.3.2/org-version.el similarity index 86% rename from elpa/org-9.3.1/org-version.el rename to elpa/org-9.3.2/org-version.el index e79cb5bb..179b5f0b 100644 --- a/elpa/org-9.3.1/org-version.el +++ b/elpa/org-9.3.2/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.1")) + (let ((org-release "9.3.2")) 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.1-elpa")) + (let ((org-git-version "9.3.2-1-g1d426e-elpa")) org-git-version)) (provide 'org-version) diff --git a/elpa/org-9.3.1/org.el b/elpa/org-9.3.2/org.el similarity index 99% rename from elpa/org-9.3.1/org.el rename to elpa/org-9.3.2/org.el index de03fa73..59147518 100644 --- a/elpa/org-9.3.1/org.el +++ b/elpa/org-9.3.2/org.el @@ -1,12 +1,12 @@ ;;; org.el --- Outline-based notes management and organizer -*- lexical-binding: t; -*- ;; Carstens outline-mode for keeping track of everything. -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: https://orgmode.org -;; Version: 9.3.1 +;; Version: 9.3.2 ;; ;; This file is part of GNU Emacs. ;; @@ -7865,7 +7865,7 @@ with the original repeater." (nmin 1) (nmax n) (n-no-remove -1) - (idprop (org-entry-get nil "ID"))) + (idprop (org-entry-get beg "ID"))) (when (and doshift (string-match-p "<[^<>\n]+ [.+]?\\+[0-9]+[hdwmy][^<>\n]*>" template)) @@ -8681,31 +8681,31 @@ a link." ;; a link, a footnote reference. ((memq type '(headline inlinetask)) (org-match-line org-complex-heading-regexp) - (if (and (match-beginning 5) - (>= (point) (match-beginning 5)) - (< (point) (match-end 5))) - ;; On tags. - (org-tags-view - arg - (save-excursion - (let* ((beg (match-beginning 5)) - (end (match-end 5)) - (beg-tag (or (search-backward ":" beg 'at-limit) (point))) - (end-tag (search-forward ":" end nil 2))) - (buffer-substring (1+ beg-tag) (1- end-tag))))) - ;; Not on tags. - (pcase (org-offer-links-in-entry (current-buffer) (point) arg) - (`(nil . ,_) - (require 'org-attach) - (message "Opening attachment-dir") - (if (equal arg '(4)) - (org-attach-reveal-in-emacs) - (org-attach-reveal))) - (`(,links . ,links-end) - (dolist (link (if (stringp links) (list links) links)) - (search-forward link nil links-end) - (goto-char (match-beginning 0)) - (org-open-at-point arg)))))) + (let ((tags-beg (match-beginning 5)) + (tags-end (match-end 5)) + (tags-str (match-string 5))) + (if (and tags-beg (>= (point) tags-beg) (< (point) tags-end)) + ;; On tags. + (org-tags-view + arg + (save-excursion + (let* ((beg-tag (or (search-backward ":" tags-beg 'at-limit) (point))) + (end-tag (search-forward ":" tags-end nil 2))) + (buffer-substring (1+ beg-tag) (1- end-tag))))) + ;; Not on tags. + (pcase (org-offer-links-in-entry (current-buffer) (point) arg) + (`(nil . ,_) + (require 'org-attach) + (when (org-attach-dir) + (message "Opening attachment") + (if (equal arg '(4)) + (org-attach-reveal-in-emacs) + (org-attach-reveal)))) + (`(,links . ,links-end) + (dolist (link (if (stringp links) (list links) links)) + (search-forward link nil links-end) + (goto-char (match-beginning 0)) + (org-open-at-point arg))))))) ;; On a footnote reference or at definition's label. ((or (eq type 'footnote-reference) (and (eq type 'footnote-definition) @@ -16804,7 +16804,9 @@ buffer boundaries with possible narrowing." (overlay-put ov 'modification-hooks (list 'org-display-inline-remove-overlay)) - (overlay-put ov 'keymap image-map) + (when (<= 26 emacs-major-version) + (cl-assert (boundp 'image-map)) + (overlay-put ov 'keymap image-map)) (push ov org-inline-image-overlays)))))))))))))))) (defun org-display-inline-remove-overlay (ov after _beg _end &optional _len) @@ -17620,17 +17622,6 @@ this numeric value." ((org-at-table-p) (call-interactively 'org-table-hline-and-move)) (t (call-interactively 'org-insert-heading)))) -(defun org-find-visible () - (let ((s (point))) - (while (and (not (= (point-max) (setq s (next-overlay-change s)))) - (get-char-property s 'invisible))) - s)) -(defun org-find-invisible () - (let ((s (point))) - (while (and (not (= (point-max) (setq s (next-overlay-change s)))) - (not (get-char-property s 'invisible)))) - s)) - (defun org-copy-visible (beg end) "Copy the visible parts of the region." (interactive "r") @@ -18006,13 +17997,17 @@ Move point to the beginning of first heading or end of buffer." (defun org-kill-note-or-show-branches () "Abort storing current note, or show just branches." (interactive) - (if org-finish-function - (let ((org-note-abort t)) - (funcall org-finish-function)) - (if (org-before-first-heading-p) - (org-show-branches-buffer) - (outline-hide-subtree) - (outline-show-branches)))) + (cond (org-finish-function + (let ((org-note-abort t)) (funcall org-finish-function))) + ((org-before-first-heading-p) + (org-show-branches-buffer) + (org-hide-archived-subtrees (point-min) (point-max))) + (t + (let ((beg (progn (org-back-to-heading) (point))) + (end (save-excursion (org-end-of-subtree t t) (point)))) + (outline-hide-subtree) + (outline-show-branches) + (org-hide-archived-subtrees beg end))))) (defun org-delete-indentation (&optional arg) "Join current line to previous and fix whitespace at join. diff --git a/elpa/org-9.3.1/org.elc b/elpa/org-9.3.2/org.elc similarity index 89% rename from elpa/org-9.3.1/org.elc rename to elpa/org-9.3.2/org.elc index 6ad8e072..811c8ebf 100644 Binary files a/elpa/org-9.3.1/org.elc and b/elpa/org-9.3.2/org.elc differ diff --git a/elpa/org-9.3.1/orgcard.pdf b/elpa/org-9.3.2/orgcard.pdf similarity index 92% rename from elpa/org-9.3.1/orgcard.pdf rename to elpa/org-9.3.2/orgcard.pdf index d42b3753..1d1f9dec 100644 Binary files a/elpa/org-9.3.1/orgcard.pdf and b/elpa/org-9.3.2/orgcard.pdf differ diff --git a/elpa/org-9.3.1/ox-ascii.el b/elpa/org-9.3.2/ox-ascii.el similarity index 99% rename from elpa/org-9.3.1/ox-ascii.el rename to elpa/org-9.3.2/ox-ascii.el index 6e6c17c4..972b58a9 100644 --- a/elpa/org-9.3.1/ox-ascii.el +++ b/elpa/org-9.3.2/ox-ascii.el @@ -1,6 +1,6 @@ ;;; ox-ascii.el --- ASCII Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2012-2019 Free Software Foundation, Inc. +;; Copyright (C) 2012-2020 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/ox-ascii.elc b/elpa/org-9.3.2/ox-ascii.elc similarity index 86% rename from elpa/org-9.3.1/ox-ascii.elc rename to elpa/org-9.3.2/ox-ascii.elc index fece5a37..a8262bd6 100644 Binary files a/elpa/org-9.3.1/ox-ascii.elc and b/elpa/org-9.3.2/ox-ascii.elc differ diff --git a/elpa/org-9.3.1/ox-beamer.el b/elpa/org-9.3.2/ox-beamer.el similarity index 99% rename from elpa/org-9.3.1/ox-beamer.el rename to elpa/org-9.3.2/ox-beamer.el index 0de5e47d..23656db4 100644 --- a/elpa/org-9.3.1/ox-beamer.el +++ b/elpa/org-9.3.2/ox-beamer.el @@ -1,6 +1,6 @@ ;;; ox-beamer.el --- Beamer Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2007-2019 Free Software Foundation, Inc. +;; Copyright (C) 2007-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Nicolas Goaziou diff --git a/elpa/org-9.3.1/ox-beamer.elc b/elpa/org-9.3.2/ox-beamer.elc similarity index 92% rename from elpa/org-9.3.1/ox-beamer.elc rename to elpa/org-9.3.2/ox-beamer.elc index 3705eefd..9cb95d37 100644 Binary files a/elpa/org-9.3.1/ox-beamer.elc and b/elpa/org-9.3.2/ox-beamer.elc differ diff --git a/elpa/org-9.3.1/ox-html.el b/elpa/org-9.3.2/ox-html.el similarity index 99% rename from elpa/org-9.3.1/ox-html.el rename to elpa/org-9.3.2/ox-html.el index 4b5f3079..5c22ea7b 100644 --- a/elpa/org-9.3.1/ox-html.el +++ b/elpa/org-9.3.2/ox-html.el @@ -1,6 +1,6 @@ ;;; ox-html.el --- HTML Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2019 Free Software Foundation, Inc. +;; Copyright (C) 2011-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Jambunathan K @@ -236,7 +236,7 @@ property on the headline itself.") @licstart The following is the entire license notice for the JavaScript code in this tag. -Copyright (C) 2012-2019 Free Software Foundation, Inc. +Copyright (C) 2012-2020 Free Software Foundation, Inc. The JavaScript code in this tag is free software: you can redistribute it and/or modify it under the terms of the GNU @@ -539,7 +539,7 @@ means to use the maximum value consistent with other options." * @licstart The following is the entire license notice for the * JavaScript code in %SCRIPT_PATH. * - * Copyright (C) 2012-2019 Free Software Foundation, Inc. + * Copyright (C) 2012-2020 Free Software Foundation, Inc. * * * The JavaScript code in this tag is free software: you can @@ -568,7 +568,7 @@ means to use the maximum value consistent with other options." @licstart The following is the entire license notice for the JavaScript code in this tag. -Copyright (C) 2012-2019 Free Software Foundation, Inc. +Copyright (C) 2012-2020 Free Software Foundation, Inc. The JavaScript code in this tag is free software: you can redistribute it and/or modify it under the terms of the GNU diff --git a/elpa/org-9.3.1/ox-html.elc b/elpa/org-9.3.2/ox-html.elc similarity index 93% rename from elpa/org-9.3.1/ox-html.elc rename to elpa/org-9.3.2/ox-html.elc index 1dc634a7..b36e4b3b 100644 Binary files a/elpa/org-9.3.1/ox-html.elc and b/elpa/org-9.3.2/ox-html.elc differ diff --git a/elpa/org-9.3.1/ox-icalendar.el b/elpa/org-9.3.2/ox-icalendar.el similarity index 99% rename from elpa/org-9.3.1/ox-icalendar.el rename to elpa/org-9.3.2/ox-icalendar.el index 15c572dc..5968d4ee 100644 --- a/elpa/org-9.3.1/ox-icalendar.el +++ b/elpa/org-9.3.2/ox-icalendar.el @@ -1,6 +1,6 @@ ;;; ox-icalendar.el --- iCalendar Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2004-2019 Free Software Foundation, Inc. +;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Nicolas Goaziou diff --git a/elpa/org-9.3.1/ox-icalendar.elc b/elpa/org-9.3.2/ox-icalendar.elc similarity index 85% rename from elpa/org-9.3.1/ox-icalendar.elc rename to elpa/org-9.3.2/ox-icalendar.elc index 969ef29a..e86e22dd 100644 Binary files a/elpa/org-9.3.1/ox-icalendar.elc and b/elpa/org-9.3.2/ox-icalendar.elc differ diff --git a/elpa/org-9.3.1/ox-latex.el b/elpa/org-9.3.2/ox-latex.el similarity index 99% rename from elpa/org-9.3.1/ox-latex.el rename to elpa/org-9.3.2/ox-latex.el index ddf9a3d6..5db1ed74 100644 --- a/elpa/org-9.3.1/ox-latex.el +++ b/elpa/org-9.3.2/ox-latex.el @@ -1,6 +1,6 @@ ;;; ox-latex.el --- LaTeX Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2019 Free Software Foundation, Inc. +;; Copyright (C) 2011-2020 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/ox-latex.elc b/elpa/org-9.3.2/ox-latex.elc similarity index 91% rename from elpa/org-9.3.1/ox-latex.elc rename to elpa/org-9.3.2/ox-latex.elc index c529b278..df5ce87b 100644 Binary files a/elpa/org-9.3.1/ox-latex.elc and b/elpa/org-9.3.2/ox-latex.elc differ diff --git a/elpa/org-9.3.1/ox-man.el b/elpa/org-9.3.2/ox-man.el similarity index 99% rename from elpa/org-9.3.1/ox-man.el rename to elpa/org-9.3.2/ox-man.el index 00698fc2..36822ff9 100644 --- a/elpa/org-9.3.1/ox-man.el +++ b/elpa/org-9.3.2/ox-man.el @@ -1,6 +1,6 @@ ;; ox-man.el --- Man Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2011-2019 Free Software Foundation, Inc. +;; Copyright (C) 2011-2020 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Luis R Anaya diff --git a/elpa/org-9.3.1/ox-man.elc b/elpa/org-9.3.2/ox-man.elc similarity index 91% rename from elpa/org-9.3.1/ox-man.elc rename to elpa/org-9.3.2/ox-man.elc index 3c1a388b..e5dc8785 100644 Binary files a/elpa/org-9.3.1/ox-man.elc and b/elpa/org-9.3.2/ox-man.elc differ diff --git a/elpa/org-9.3.1/ox-md.el b/elpa/org-9.3.2/ox-md.el similarity index 99% rename from elpa/org-9.3.1/ox-md.el rename to elpa/org-9.3.2/ox-md.el index 0a9441a1..91d5c0ba 100644 --- a/elpa/org-9.3.1/ox-md.el +++ b/elpa/org-9.3.2/ox-md.el @@ -1,6 +1,6 @@ ;;; ox-md.el --- Markdown Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2012-2019 Free Software Foundation, Inc. +;; Copyright (C) 2012-2020 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: org, wp, markdown diff --git a/elpa/org-9.3.1/ox-md.elc b/elpa/org-9.3.2/ox-md.elc similarity index 85% rename from elpa/org-9.3.1/ox-md.elc rename to elpa/org-9.3.2/ox-md.elc index dd653fc8..522b7c34 100644 Binary files a/elpa/org-9.3.1/ox-md.elc and b/elpa/org-9.3.2/ox-md.elc differ diff --git a/elpa/org-9.3.1/ox-odt.el b/elpa/org-9.3.2/ox-odt.el similarity index 99% rename from elpa/org-9.3.1/ox-odt.el rename to elpa/org-9.3.2/ox-odt.el index 1ffdf31a..59480cd4 100644 --- a/elpa/org-9.3.1/ox-odt.el +++ b/elpa/org-9.3.2/ox-odt.el @@ -1,6 +1,6 @@ ;;; ox-odt.el --- OpenDocument Text Exporter for Org Mode -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2019 Free Software Foundation, Inc. +;; Copyright (C) 2010-2020 Free Software Foundation, Inc. ;; Author: Jambunathan K ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/ox-odt.elc b/elpa/org-9.3.2/ox-odt.elc similarity index 84% rename from elpa/org-9.3.1/ox-odt.elc rename to elpa/org-9.3.2/ox-odt.elc index ab68b5ca..7f3eebb7 100644 Binary files a/elpa/org-9.3.1/ox-odt.elc and b/elpa/org-9.3.2/ox-odt.elc differ diff --git a/elpa/org-9.3.1/ox-org.el b/elpa/org-9.3.2/ox-org.el similarity index 99% rename from elpa/org-9.3.1/ox-org.el rename to elpa/org-9.3.2/ox-org.el index 0e7f977f..97d8d0e9 100644 --- a/elpa/org-9.3.1/ox-org.el +++ b/elpa/org-9.3.2/ox-org.el @@ -1,6 +1,6 @@ ;;; ox-org.el --- Org Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2019 Free Software Foundation, Inc. +;; Copyright (C) 2013-2020 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: org, wp diff --git a/elpa/org-9.3.1/ox-org.elc b/elpa/org-9.3.2/ox-org.elc similarity index 99% rename from elpa/org-9.3.1/ox-org.elc rename to elpa/org-9.3.2/ox-org.elc index 9080f47a..63b568d2 100644 Binary files a/elpa/org-9.3.1/ox-org.elc and b/elpa/org-9.3.2/ox-org.elc differ diff --git a/elpa/org-9.3.1/ox-publish.el b/elpa/org-9.3.2/ox-publish.el similarity index 99% rename from elpa/org-9.3.1/ox-publish.el rename to elpa/org-9.3.2/ox-publish.el index 28d063e4..a4767965 100644 --- a/elpa/org-9.3.1/ox-publish.el +++ b/elpa/org-9.3.2/ox-publish.el @@ -1,5 +1,5 @@ ;;; ox-publish.el --- Publish Related Org Mode Files as a Website -*- lexical-binding: t; -*- -;; Copyright (C) 2006-2019 Free Software Foundation, Inc. +;; Copyright (C) 2006-2020 Free Software Foundation, Inc. ;; Author: David O'Toole ;; Maintainer: Carsten Dominik diff --git a/elpa/org-9.3.1/ox-publish.elc b/elpa/org-9.3.2/ox-publish.elc similarity index 95% rename from elpa/org-9.3.1/ox-publish.elc rename to elpa/org-9.3.2/ox-publish.elc index ec270861..0a3e60f2 100644 Binary files a/elpa/org-9.3.1/ox-publish.elc and b/elpa/org-9.3.2/ox-publish.elc differ diff --git a/elpa/org-9.3.1/ox-texinfo.el b/elpa/org-9.3.2/ox-texinfo.el similarity index 99% rename from elpa/org-9.3.1/ox-texinfo.el rename to elpa/org-9.3.2/ox-texinfo.el index 5e746325..4265a85d 100644 --- a/elpa/org-9.3.1/ox-texinfo.el +++ b/elpa/org-9.3.2/ox-texinfo.el @@ -1,6 +1,6 @@ ;;; ox-texinfo.el --- Texinfo Back-End for Org Export Engine -*- lexical-binding: t; -*- -;; Copyright (C) 2012-2019 Free Software Foundation, Inc. +;; Copyright (C) 2012-2020 Free Software Foundation, Inc. ;; Author: Jonathan Leech-Pepin ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/ox-texinfo.elc b/elpa/org-9.3.2/ox-texinfo.elc similarity index 93% rename from elpa/org-9.3.1/ox-texinfo.elc rename to elpa/org-9.3.2/ox-texinfo.elc index 80d80f14..dfbd172f 100644 Binary files a/elpa/org-9.3.1/ox-texinfo.elc and b/elpa/org-9.3.2/ox-texinfo.elc differ diff --git a/elpa/org-9.3.1/ox.el b/elpa/org-9.3.2/ox.el similarity index 99% rename from elpa/org-9.3.1/ox.el rename to elpa/org-9.3.2/ox.el index 10286e18..22cf1d53 100644 --- a/elpa/org-9.3.1/ox.el +++ b/elpa/org-9.3.2/ox.el @@ -1,6 +1,6 @@ ;;; ox.el --- Export Framework for Org Mode -*- lexical-binding: t; -*- -;; Copyright (C) 2012-2019 Free Software Foundation, Inc. +;; Copyright (C) 2012-2020 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou ;; Keywords: outlines, hypermedia, calendar, wp diff --git a/elpa/org-9.3.1/ox.elc b/elpa/org-9.3.2/ox.elc similarity index 92% rename from elpa/org-9.3.1/ox.elc rename to elpa/org-9.3.2/ox.elc index 42840b42..19b83ab0 100644 Binary files a/elpa/org-9.3.1/ox.elc and b/elpa/org-9.3.2/ox.elc differ diff --git a/elpa/page-break-lines-20190519.2238/page-break-lines-pkg.el b/elpa/page-break-lines-20190519.2238/page-break-lines-pkg.el deleted file mode 100644 index 8d71ac4f..00000000 --- a/elpa/page-break-lines-20190519.2238/page-break-lines-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "page-break-lines" "20190519.2238" "Display ^L page breaks as tidy horizontal lines" '((emacs "24.4")) :commit "2e1d274e11071bb8daea4d6f4c0369c84466de7a" :keywords '("convenience" "faces") :authors '(("Steve Purcell" . "steve@sanityinc.com")) :maintainer '("Steve Purcell" . "steve@sanityinc.com") :url "https://github.com/purcell/page-break-lines") diff --git a/elpa/page-break-lines-20190519.2238/page-break-lines-autoloads.el b/elpa/page-break-lines-20200121.837/page-break-lines-autoloads.el similarity index 63% rename from elpa/page-break-lines-20190519.2238/page-break-lines-autoloads.el rename to elpa/page-break-lines-20200121.837/page-break-lines-autoloads.el index 49e25534..331d2451 100644 --- a/elpa/page-break-lines-20190519.2238/page-break-lines-autoloads.el +++ b/elpa/page-break-lines-20200121.837/page-break-lines-autoloads.el @@ -10,33 +10,6 @@ ;;;;;; 0 0 0)) ;;; Generated autoloads from page-break-lines.el -(defvar page-break-lines-char 9472 "\ -Character used to render page break lines.") - -(custom-autoload 'page-break-lines-char "page-break-lines" t) - -(defvar page-break-lines-lighter " PgLn" "\ -Mode-line indicator for `page-break-lines-mode'.") - -(custom-autoload 'page-break-lines-lighter "page-break-lines" t) - -(defvar page-break-lines-max-width nil "\ -If non-nil, maximum width (in characters) of page break indicator. -If nil, indicator will span the width of the frame.") - -(custom-autoload 'page-break-lines-max-width "page-break-lines" t) - -(defvar page-break-lines-modes '(emacs-lisp-mode lisp-mode scheme-mode compilation-mode outline-mode help-mode) "\ -Modes in which to enable `page-break-lines-mode'.") - -(custom-autoload 'page-break-lines-modes "page-break-lines" t) - -(defface page-break-lines '((t :inherit font-lock-comment-face :bold nil :italic nil)) "\ -Face used to colorize page break lines. -If using :bold or :italic, please ensure `page-break-lines-char' -is available in that variant of your font, otherwise it may be -displayed as a junk character." :group (quote page-break-lines)) - (autoload 'page-break-lines-mode "page-break-lines" "\ Toggle Page Break Lines mode. @@ -76,7 +49,7 @@ See `page-break-lines-mode' for more information on Page-Break-Lines mode. \(fn &optional ARG)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "page-break-lines" '("page-break-lines--update-display-table"))) +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "page-break-lines" '("page-break-lines-"))) ;;;*** diff --git a/elpa/page-break-lines-20200121.837/page-break-lines-pkg.el b/elpa/page-break-lines-20200121.837/page-break-lines-pkg.el new file mode 100644 index 00000000..acbd7675 --- /dev/null +++ b/elpa/page-break-lines-20200121.837/page-break-lines-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "page-break-lines" "20200121.837" "Display ^L page breaks as tidy horizontal lines" '((emacs "24.4")) :commit "6fb993a42059b58d1a0219006f2d61ebd3b2c9e6" :keywords '("convenience" "faces") :authors '(("Steve Purcell" . "steve@sanityinc.com")) :maintainer '("Steve Purcell" . "steve@sanityinc.com") :url "https://github.com/purcell/page-break-lines") diff --git a/elpa/page-break-lines-20190519.2238/page-break-lines.el b/elpa/page-break-lines-20200121.837/page-break-lines.el similarity index 98% rename from elpa/page-break-lines-20190519.2238/page-break-lines.el rename to elpa/page-break-lines-20200121.837/page-break-lines.el index c096a7ef..79452c0a 100644 --- a/elpa/page-break-lines-20190519.2238/page-break-lines.el +++ b/elpa/page-break-lines-20200121.837/page-break-lines.el @@ -4,7 +4,7 @@ ;; Author: Steve Purcell ;; URL: https://github.com/purcell/page-break-lines -;; Package-Version: 20190519.2238 +;; Package-Version: 20200121.837 ;; Package-X-Original-Version: 0 ;; Package-Requires: ((emacs "24.4")) ;; Keywords: convenience, faces @@ -64,33 +64,28 @@ :prefix "page-break-lines-" :group 'faces) -;;;###autoload (defcustom page-break-lines-char ?─ "Character used to render page break lines." :type 'character :group 'page-break-lines) -;;;###autoload (defcustom page-break-lines-lighter " PgLn" "Mode-line indicator for `page-break-lines-mode'." :type '(choice (const :tag "No lighter" "") string) :group 'page-break-lines) -;;;###autoload (defcustom page-break-lines-max-width nil "If non-nil, maximum width (in characters) of page break indicator. If nil, indicator will span the width of the frame." :type '(choice integer (const :tag "Full width" nil)) :group 'page-break-lines) -;;;###autoload (defcustom page-break-lines-modes '(emacs-lisp-mode lisp-mode scheme-mode compilation-mode outline-mode help-mode) "Modes in which to enable `page-break-lines-mode'." :type '(repeat symbol) :group 'page-break-lines) -;;;###autoload (defface page-break-lines '((t :inherit font-lock-comment-face :bold nil :italic nil)) "Face used to colorize page break lines. diff --git a/elpa/page-break-lines-20190519.2238/page-break-lines.elc b/elpa/page-break-lines-20200121.837/page-break-lines.elc similarity index 100% rename from elpa/page-break-lines-20190519.2238/page-break-lines.elc rename to elpa/page-break-lines-20200121.837/page-break-lines.elc diff --git a/elpa/racket-mode-20191204.205/dir b/elpa/racket-mode-20200115.2148/dir similarity index 100% rename from elpa/racket-mode-20191204.205/dir rename to elpa/racket-mode-20200115.2148/dir diff --git a/elpa/racket-mode-20191204.205/racket-bug-report.el b/elpa/racket-mode-20200115.2148/racket-bug-report.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-bug-report.el rename to elpa/racket-mode-20200115.2148/racket-bug-report.el diff --git a/elpa/racket-mode-20191204.205/racket-bug-report.elc b/elpa/racket-mode-20200115.2148/racket-bug-report.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-bug-report.elc rename to elpa/racket-mode-20200115.2148/racket-bug-report.elc diff --git a/elpa/racket-mode-20191204.205/racket-collection.el b/elpa/racket-mode-20200115.2148/racket-collection.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-collection.el rename to elpa/racket-mode-20200115.2148/racket-collection.el diff --git a/elpa/racket-mode-20191204.205/racket-collection.elc b/elpa/racket-mode-20200115.2148/racket-collection.elc similarity index 84% rename from elpa/racket-mode-20191204.205/racket-collection.elc rename to elpa/racket-mode-20200115.2148/racket-collection.elc index 3f94c875..935409eb 100644 Binary files a/elpa/racket-mode-20191204.205/racket-collection.elc and b/elpa/racket-mode-20200115.2148/racket-collection.elc differ diff --git a/elpa/racket-mode-20191204.205/racket-common.el b/elpa/racket-mode-20200115.2148/racket-common.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-common.el rename to elpa/racket-mode-20200115.2148/racket-common.el diff --git a/elpa/racket-mode-20191204.205/racket-common.elc b/elpa/racket-mode-20200115.2148/racket-common.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-common.elc rename to elpa/racket-mode-20200115.2148/racket-common.elc diff --git a/elpa/racket-mode-20191204.205/racket-complete.el b/elpa/racket-mode-20200115.2148/racket-complete.el similarity index 99% rename from elpa/racket-mode-20191204.205/racket-complete.el rename to elpa/racket-mode-20200115.2148/racket-complete.el index b62ffa3e..5d6eca6c 100644 --- a/elpa/racket-mode-20191204.205/racket-complete.el +++ b/elpa/racket-mode-20200115.2148/racket-complete.el @@ -258,11 +258,13 @@ Returns the buffer in which the description was written." (goto-char (point-max)) (insert "\n") (insert-text-button "Definition" + 'follow-link t 'action (lambda (_btn) (racket--do-visit-def-or-mod 'def str))) (insert " ") (insert-text-button "Documentation in Browser" + 'follow-link t 'action (lambda (_btn) (racket--cmd/await `(doc ,str)))) diff --git a/elpa/racket-mode-20191204.205/racket-complete.elc b/elpa/racket-mode-20200115.2148/racket-complete.elc similarity index 90% rename from elpa/racket-mode-20191204.205/racket-complete.elc rename to elpa/racket-mode-20200115.2148/racket-complete.elc index 706459de..7bfb1b54 100644 Binary files a/elpa/racket-mode-20191204.205/racket-complete.elc and b/elpa/racket-mode-20200115.2148/racket-complete.elc differ diff --git a/elpa/racket-mode-20191204.205/racket-custom.el b/elpa/racket-mode-20200115.2148/racket-custom.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-custom.el rename to elpa/racket-mode-20200115.2148/racket-custom.el diff --git a/elpa/racket-mode-20191204.205/racket-custom.elc b/elpa/racket-mode-20200115.2148/racket-custom.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-custom.elc rename to elpa/racket-mode-20200115.2148/racket-custom.elc diff --git a/elpa/racket-mode-20191204.205/racket-debug.el b/elpa/racket-mode-20200115.2148/racket-debug.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-debug.el rename to elpa/racket-mode-20200115.2148/racket-debug.el diff --git a/elpa/racket-mode-20191204.205/racket-debug.elc b/elpa/racket-mode-20200115.2148/racket-debug.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-debug.elc rename to elpa/racket-mode-20200115.2148/racket-debug.elc diff --git a/elpa/racket-mode-20191204.205/racket-edit.el b/elpa/racket-mode-20200115.2148/racket-edit.el similarity index 99% rename from elpa/racket-mode-20191204.205/racket-edit.el rename to elpa/racket-mode-20200115.2148/racket-edit.el index 3586d227..efb366b5 100644 --- a/elpa/racket-mode-20191204.205/racket-edit.el +++ b/elpa/racket-mode-20200115.2148/racket-edit.el @@ -92,7 +92,7 @@ function so it can be a menu target." (racket-run '(16))) (defun racket-run-and-switch-to-repl (&optional prefix) - "This is `racket-run' followed by `racket-switch-to-repl'." + "This is `racket-run' followed by `racket-repl'." (interactive "P") (racket-run prefix) (racket-repl)) diff --git a/elpa/racket-mode-20191204.205/racket-edit.elc b/elpa/racket-mode-20200115.2148/racket-edit.elc similarity index 94% rename from elpa/racket-mode-20191204.205/racket-edit.elc rename to elpa/racket-mode-20200115.2148/racket-edit.elc index 5a0fdfa5..c9ce13a2 100644 Binary files a/elpa/racket-mode-20191204.205/racket-edit.elc and b/elpa/racket-mode-20200115.2148/racket-edit.elc differ diff --git a/elpa/racket-mode-20191204.205/racket-font-lock.el b/elpa/racket-mode-20200115.2148/racket-font-lock.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-font-lock.el rename to elpa/racket-mode-20200115.2148/racket-font-lock.el diff --git a/elpa/racket-mode-20191204.205/racket-font-lock.elc b/elpa/racket-mode-20200115.2148/racket-font-lock.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-font-lock.elc rename to elpa/racket-mode-20200115.2148/racket-font-lock.elc diff --git a/elpa/racket-mode-20191204.205/racket-imenu.el b/elpa/racket-mode-20200115.2148/racket-imenu.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-imenu.el rename to elpa/racket-mode-20200115.2148/racket-imenu.el diff --git a/elpa/racket-mode-20191204.205/racket-imenu.elc b/elpa/racket-mode-20200115.2148/racket-imenu.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-imenu.elc rename to elpa/racket-mode-20200115.2148/racket-imenu.elc diff --git a/elpa/racket-mode-20191204.205/racket-indent.el b/elpa/racket-mode-20200115.2148/racket-indent.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-indent.el rename to elpa/racket-mode-20200115.2148/racket-indent.el diff --git a/elpa/racket-mode-20191204.205/racket-indent.elc b/elpa/racket-mode-20200115.2148/racket-indent.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-indent.elc rename to elpa/racket-mode-20200115.2148/racket-indent.elc diff --git a/elpa/racket-mode-20191204.205/racket-keywords-and-builtins.el b/elpa/racket-mode-20200115.2148/racket-keywords-and-builtins.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-keywords-and-builtins.el rename to elpa/racket-mode-20200115.2148/racket-keywords-and-builtins.el diff --git a/elpa/racket-mode-20191204.205/racket-keywords-and-builtins.elc b/elpa/racket-mode-20200115.2148/racket-keywords-and-builtins.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-keywords-and-builtins.elc rename to elpa/racket-mode-20200115.2148/racket-keywords-and-builtins.elc diff --git a/elpa/racket-mode-20191204.205/racket-logger.el b/elpa/racket-mode-20200115.2148/racket-logger.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-logger.el rename to elpa/racket-mode-20200115.2148/racket-logger.el diff --git a/elpa/racket-mode-20191204.205/racket-logger.elc b/elpa/racket-mode-20200115.2148/racket-logger.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-logger.elc rename to elpa/racket-mode-20200115.2148/racket-logger.elc diff --git a/elpa/racket-mode-20191204.205/racket-mode-autoloads.el b/elpa/racket-mode-20200115.2148/racket-mode-autoloads.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-mode-autoloads.el rename to elpa/racket-mode-20200115.2148/racket-mode-autoloads.el diff --git a/elpa/racket-mode-20191204.205/racket-mode-pkg.el b/elpa/racket-mode-20200115.2148/racket-mode-pkg.el similarity index 71% rename from elpa/racket-mode-20191204.205/racket-mode-pkg.el rename to elpa/racket-mode-20200115.2148/racket-mode-pkg.el index 06e67606..6bb461fb 100644 --- a/elpa/racket-mode-20191204.205/racket-mode-pkg.el +++ b/elpa/racket-mode-20200115.2148/racket-mode-pkg.el @@ -1,4 +1,4 @@ -(define-package "racket-mode" "20191204.205" "Major mode for Racket language." +(define-package "racket-mode" "20200115.2148" "Major mode for Racket language." '((emacs "24.3") (faceup "0.0.2")) :authors diff --git a/elpa/racket-mode-20191204.205/racket-mode.el b/elpa/racket-mode-20200115.2148/racket-mode.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-mode.el rename to elpa/racket-mode-20200115.2148/racket-mode.el diff --git a/elpa/racket-mode-20191204.205/racket-mode.elc b/elpa/racket-mode-20200115.2148/racket-mode.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-mode.elc rename to elpa/racket-mode-20200115.2148/racket-mode.elc diff --git a/elpa/racket-mode-20191204.205/racket-mode.info b/elpa/racket-mode-20200115.2148/racket-mode.info similarity index 100% rename from elpa/racket-mode-20191204.205/racket-mode.info rename to elpa/racket-mode-20200115.2148/racket-mode.info diff --git a/elpa/racket-mode-20191204.205/racket-parens.el b/elpa/racket-mode-20200115.2148/racket-parens.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-parens.el rename to elpa/racket-mode-20200115.2148/racket-parens.el diff --git a/elpa/racket-mode-20191204.205/racket-parens.elc b/elpa/racket-mode-20200115.2148/racket-parens.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-parens.elc rename to elpa/racket-mode-20200115.2148/racket-parens.elc diff --git a/elpa/racket-mode-20191204.205/racket-ppss.el b/elpa/racket-mode-20200115.2148/racket-ppss.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-ppss.el rename to elpa/racket-mode-20200115.2148/racket-ppss.el diff --git a/elpa/racket-mode-20191204.205/racket-ppss.elc b/elpa/racket-mode-20200115.2148/racket-ppss.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-ppss.elc rename to elpa/racket-mode-20200115.2148/racket-ppss.elc diff --git a/elpa/racket-mode-20191204.205/racket-profile.el b/elpa/racket-mode-20200115.2148/racket-profile.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-profile.el rename to elpa/racket-mode-20200115.2148/racket-profile.el diff --git a/elpa/racket-mode-20191204.205/racket-profile.elc b/elpa/racket-mode-20200115.2148/racket-profile.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-profile.elc rename to elpa/racket-mode-20200115.2148/racket-profile.elc diff --git a/elpa/racket-mode-20191204.205/racket-repl.el b/elpa/racket-mode-20200115.2148/racket-repl.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-repl.el rename to elpa/racket-mode-20200115.2148/racket-repl.el diff --git a/elpa/racket-mode-20191204.205/racket-repl.elc b/elpa/racket-mode-20200115.2148/racket-repl.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-repl.elc rename to elpa/racket-mode-20200115.2148/racket-repl.elc diff --git a/elpa/racket-mode-20191204.205/racket-smart-open.el b/elpa/racket-mode-20200115.2148/racket-smart-open.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-smart-open.el rename to elpa/racket-mode-20200115.2148/racket-smart-open.el diff --git a/elpa/racket-mode-20191204.205/racket-smart-open.elc b/elpa/racket-mode-20200115.2148/racket-smart-open.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-smart-open.elc rename to elpa/racket-mode-20200115.2148/racket-smart-open.elc diff --git a/elpa/racket-mode-20191204.205/racket-stepper.el b/elpa/racket-mode-20200115.2148/racket-stepper.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-stepper.el rename to elpa/racket-mode-20200115.2148/racket-stepper.el diff --git a/elpa/racket-mode-20191204.205/racket-stepper.elc b/elpa/racket-mode-20200115.2148/racket-stepper.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-stepper.elc rename to elpa/racket-mode-20200115.2148/racket-stepper.elc diff --git a/elpa/racket-mode-20191204.205/racket-unicode-input-method.el b/elpa/racket-mode-20200115.2148/racket-unicode-input-method.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-unicode-input-method.el rename to elpa/racket-mode-20200115.2148/racket-unicode-input-method.el diff --git a/elpa/racket-mode-20191204.205/racket-unicode-input-method.elc b/elpa/racket-mode-20200115.2148/racket-unicode-input-method.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-unicode-input-method.elc rename to elpa/racket-mode-20200115.2148/racket-unicode-input-method.elc diff --git a/elpa/racket-mode-20191204.205/racket-util.el b/elpa/racket-mode-20200115.2148/racket-util.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-util.el rename to elpa/racket-mode-20200115.2148/racket-util.el diff --git a/elpa/racket-mode-20191204.205/racket-util.elc b/elpa/racket-mode-20200115.2148/racket-util.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-util.elc rename to elpa/racket-mode-20200115.2148/racket-util.elc diff --git a/elpa/racket-mode-20191204.205/racket-wsl.el b/elpa/racket-mode-20200115.2148/racket-wsl.el similarity index 100% rename from elpa/racket-mode-20191204.205/racket-wsl.el rename to elpa/racket-mode-20200115.2148/racket-wsl.el diff --git a/elpa/racket-mode-20191204.205/racket-wsl.elc b/elpa/racket-mode-20200115.2148/racket-wsl.elc similarity index 100% rename from elpa/racket-mode-20191204.205/racket-wsl.elc rename to elpa/racket-mode-20200115.2148/racket-wsl.elc diff --git a/elpa/racket-mode-20191204.205/racket/channel.rkt b/elpa/racket-mode-20200115.2148/racket/channel.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/channel.rkt rename to elpa/racket-mode-20200115.2148/racket/channel.rkt diff --git a/elpa/racket-mode-20191204.205/racket/command-server.rkt b/elpa/racket-mode-20200115.2148/racket/command-server.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/command-server.rkt rename to elpa/racket-mode-20200115.2148/racket/command-server.rkt diff --git a/elpa/racket-mode-20191204.205/racket/commands/check-syntax.rkt b/elpa/racket-mode-20200115.2148/racket/commands/check-syntax.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/commands/check-syntax.rkt rename to elpa/racket-mode-20200115.2148/racket/commands/check-syntax.rkt diff --git a/elpa/racket-mode-20191204.205/racket/commands/coverage.rkt b/elpa/racket-mode-20200115.2148/racket/commands/coverage.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/commands/coverage.rkt rename to elpa/racket-mode-20200115.2148/racket/commands/coverage.rkt diff --git a/elpa/racket-mode-20191204.205/racket/commands/describe.rkt b/elpa/racket-mode-20200115.2148/racket/commands/describe.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/commands/describe.rkt rename to elpa/racket-mode-20200115.2148/racket/commands/describe.rkt diff --git a/elpa/racket-mode-20191204.205/racket/commands/find-module.rkt b/elpa/racket-mode-20200115.2148/racket/commands/find-module.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/commands/find-module.rkt rename to elpa/racket-mode-20200115.2148/racket/commands/find-module.rkt diff --git a/elpa/racket-mode-20191204.205/racket/commands/help.rkt b/elpa/racket-mode-20200115.2148/racket/commands/help.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/commands/help.rkt rename to elpa/racket-mode-20200115.2148/racket/commands/help.rkt diff --git a/elpa/racket-mode-20191204.205/racket/commands/macro.rkt b/elpa/racket-mode-20200115.2148/racket/commands/macro.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/commands/macro.rkt rename to elpa/racket-mode-20200115.2148/racket/commands/macro.rkt diff --git a/elpa/racket-mode-20191204.205/racket/commands/profile.rkt b/elpa/racket-mode-20200115.2148/racket/commands/profile.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/commands/profile.rkt rename to elpa/racket-mode-20200115.2148/racket/commands/profile.rkt diff --git a/elpa/racket-mode-20191204.205/racket/commands/requires.rkt b/elpa/racket-mode-20200115.2148/racket/commands/requires.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/commands/requires.rkt rename to elpa/racket-mode-20200115.2148/racket/commands/requires.rkt diff --git a/elpa/racket-mode-20191204.205/racket/debug-annotator.rkt b/elpa/racket-mode-20200115.2148/racket/debug-annotator.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/debug-annotator.rkt rename to elpa/racket-mode-20200115.2148/racket/debug-annotator.rkt diff --git a/elpa/racket-mode-20191204.205/racket/debug.rkt b/elpa/racket-mode-20200115.2148/racket/debug.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/debug.rkt rename to elpa/racket-mode-20200115.2148/racket/debug.rkt diff --git a/elpa/racket-mode-20191204.205/racket/elisp.rkt b/elpa/racket-mode-20200115.2148/racket/elisp.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/elisp.rkt rename to elpa/racket-mode-20200115.2148/racket/elisp.rkt diff --git a/elpa/racket-mode-20191204.205/racket/error.rkt b/elpa/racket-mode-20200115.2148/racket/error.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/error.rkt rename to elpa/racket-mode-20200115.2148/racket/error.rkt diff --git a/elpa/racket-mode-20191204.205/racket/example/example.rkt b/elpa/racket-mode-20200115.2148/racket/example/example.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/example/example.rkt rename to elpa/racket-mode-20200115.2148/racket/example/example.rkt diff --git a/elpa/racket-mode-20191204.205/racket/example/example.rkt.faceup b/elpa/racket-mode-20200115.2148/racket/example/example.rkt.faceup similarity index 100% rename from elpa/racket-mode-20191204.205/racket/example/example.rkt.faceup rename to elpa/racket-mode-20200115.2148/racket/example/example.rkt.faceup diff --git a/elpa/racket-mode-20191204.205/racket/example/indent.rkt b/elpa/racket-mode-20200115.2148/racket/example/indent.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/example/indent.rkt rename to elpa/racket-mode-20200115.2148/racket/example/indent.rkt diff --git a/elpa/racket-mode-20191204.205/racket/example/indent.rkt.faceup b/elpa/racket-mode-20200115.2148/racket/example/indent.rkt.faceup similarity index 100% rename from elpa/racket-mode-20191204.205/racket/example/indent.rkt.faceup rename to elpa/racket-mode-20200115.2148/racket/example/indent.rkt.faceup diff --git a/elpa/racket-mode-20191204.205/racket/find-module-path-completions.rkt b/elpa/racket-mode-20200115.2148/racket/find-module-path-completions.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/find-module-path-completions.rkt rename to elpa/racket-mode-20200115.2148/racket/find-module-path-completions.rkt diff --git a/elpa/racket-mode-20191204.205/racket/find.rkt b/elpa/racket-mode-20200115.2148/racket/find.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/find.rkt rename to elpa/racket-mode-20200115.2148/racket/find.rkt diff --git a/elpa/racket-mode-20191204.205/racket/fresh-line.rkt b/elpa/racket-mode-20200115.2148/racket/fresh-line.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/fresh-line.rkt rename to elpa/racket-mode-20200115.2148/racket/fresh-line.rkt diff --git a/elpa/racket-mode-20191204.205/racket/gui.rkt b/elpa/racket-mode-20200115.2148/racket/gui.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/gui.rkt rename to elpa/racket-mode-20200115.2148/racket/gui.rkt diff --git a/elpa/racket-mode-20191204.205/racket/image.rkt b/elpa/racket-mode-20200115.2148/racket/image.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/image.rkt rename to elpa/racket-mode-20200115.2148/racket/image.rkt diff --git a/elpa/racket-mode-20191204.205/racket/instrument.rkt b/elpa/racket-mode-20200115.2148/racket/instrument.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/instrument.rkt rename to elpa/racket-mode-20200115.2148/racket/instrument.rkt diff --git a/elpa/racket-mode-20191204.205/racket/interactions.rkt b/elpa/racket-mode-20200115.2148/racket/interactions.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/interactions.rkt rename to elpa/racket-mode-20200115.2148/racket/interactions.rkt diff --git a/elpa/racket-mode-20191204.205/racket/keywords.rkt b/elpa/racket-mode-20200115.2148/racket/keywords.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/keywords.rkt rename to elpa/racket-mode-20200115.2148/racket/keywords.rkt diff --git a/elpa/racket-mode-20191204.205/racket/logger.rkt b/elpa/racket-mode-20200115.2148/racket/logger.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/logger.rkt rename to elpa/racket-mode-20200115.2148/racket/logger.rkt diff --git a/elpa/racket-mode-20191204.205/racket/md5.rkt b/elpa/racket-mode-20200115.2148/racket/md5.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/md5.rkt rename to elpa/racket-mode-20200115.2148/racket/md5.rkt diff --git a/elpa/racket-mode-20191204.205/racket/mod.rkt b/elpa/racket-mode-20200115.2148/racket/mod.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/mod.rkt rename to elpa/racket-mode-20200115.2148/racket/mod.rkt diff --git a/elpa/racket-mode-20191204.205/racket/namespace.rkt b/elpa/racket-mode-20200115.2148/racket/namespace.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/namespace.rkt rename to elpa/racket-mode-20200115.2148/racket/namespace.rkt diff --git a/elpa/racket-mode-20191204.205/racket/print.rkt b/elpa/racket-mode-20200115.2148/racket/print.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/print.rkt rename to elpa/racket-mode-20200115.2148/racket/print.rkt diff --git a/elpa/racket-mode-20191204.205/racket/run.rkt b/elpa/racket-mode-20200115.2148/racket/run.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/run.rkt rename to elpa/racket-mode-20200115.2148/racket/run.rkt diff --git a/elpa/racket-mode-20191204.205/racket/scribble.rkt b/elpa/racket-mode-20200115.2148/racket/scribble.rkt similarity index 78% rename from elpa/racket-mode-20191204.205/racket/scribble.rkt rename to elpa/racket-mode-20200115.2148/racket/scribble.rkt index d403a05b..77d56076 100644 --- a/elpa/racket-mode-20191204.205/racket/scribble.rkt +++ b/elpa/racket-mode-20200115.2148/racket/scribble.rkt @@ -3,8 +3,10 @@ (require (only-in html read-html-as-xml) racket/file + racket/format racket/function racket/match + racket/path scribble/xref setup/xref (only-in xml @@ -23,12 +25,14 @@ (and xexpr (xexpr->string xexpr))) (define (scribble-doc/xexpr stx) - (define xexpr (scribble-doc/xexpr-raw stx)) - (and xexpr (massage-xexpr xexpr))) + (define-values (path xexpr) (scribble-doc/xexpr-raw stx)) + (and path xexpr (massage-xexpr path xexpr))) (define (scribble-doc/xexpr-raw stx) (define-values (path anchor) (binding->path+anchor stx)) - (and path anchor (scribble-get-xexpr path anchor))) + (cond [(and path anchor) + (values path (scribble-get-xexpr path anchor))] + [else (values #f #f)])) (define (binding->path+anchor stx) (define xref (load-collections-xref)) @@ -38,15 +42,21 @@ [else (values #f #f)])) (define (scribble-get-xexpr path anchor) + (define (heading-element? x) + (match x + [(cons (or 'h1 'h2 'h3 'h4 'h5 'h6) _) #t] + [_ #f])) (match (let loop ([es (main-elements (html-file->xexpr path))]) (match es [(list) (list)] [(cons (? (curryr anchored-element anchor) this) more) - ;; Accumulate until another intrapara with an anchor + ;; Accumulate until another intrapara with an anchor, or + ;; until a heading element indicating a new subsection. (cons this (let get ([es more]) (match es [(list) (list)] + [(cons (? heading-element?) _) (list)] ;stop [(cons (? anchored-element) _) (list)] ;stop [(cons this more) (cons this (get more))])))] [(cons _ more) (loop more)])) @@ -125,7 +135,13 @@ ;; including contracts. But actually, the best place to address that ;; is up in Elisp, not here -- replace   in the HTML with some ;; temporary character, then replace that character in the shr output. -(define (massage-xexpr x) +(define (massage-xexpr html-pathname xexpr) + ;; In addition to the main x-expression value handled by `walk`, we + ;; have a couple annoying side values. Rather than "thread" them + ;; through `walk` as additional values -- literally or using some + ;; monadic hand-wavery -- I'm just going to set! them. Won't even + ;; try to hide my sin by using make-parameter. I hereby accept the + ;; deduction of Functional Experience Points. (define kind-xexprs '()) (define provide-xexprs '()) (define (walk x) @@ -140,7 +156,7 @@ ;; later. [`(div ([class "RBackgroundLabel SIEHidden"]) (div ([class "RBackgroundLabelInner"]) (p () . ,xs))) - (set! kind-xexprs xs) + (set! kind-xexprs `((i () ,@xs))) ""] ;; Bold RktValDef, which is the name of the thing. [`(a ([class ,(pregexp "RktValDef|RktStxDef")] . ,_) . ,xs) @@ -162,15 +178,25 @@ ;; Let's italicize all RktXXX classes except RktPn. [`(span ([class ,(pregexp "^Rkt(?!Pn)")]) . ,xs) `(i () ,@(map walk xs))] + ;; Image sources need path prepended. + [`(img ,(list-no-order `[src ,src] more ...)) + `(img ([src ,(~a "file://" (path-only html-pathname) src)] . ,more))] ;; Misc element: Just walk kids. [`(,tag ,attrs . ,xs) `(,tag ,attrs ,@(map walk xs))] [x x])) - (match (walk x) + (match (walk xexpr) [`(div () . ,xs) - `(div () - (span ([style "color: #C0C0C0"]) - (i () ,@kind-xexprs) - 'nbsp - ,@provide-xexprs) - ,@xs)])) + (define hs + (match* [kind-xexprs provide-xexprs] + [[`() `()] `()] + [[ks ps] `((span ([style "color: #C0C0C0"]) ,@ks 'nbsp ,@ps))])) + `(div () ,@hs ,@xs)])) + +(module+ test + (check-equal? ;issue 410 + (massage-xexpr (string->path "/path/to/file.html") + `(div () + (img ([x "x"] [src "foo.png"] [y "y"])))) + `(div () + (img ([src "file:///path/to/foo.png"] [x "x"] [y "y"]))))) diff --git a/elpa/racket-mode-20191204.205/racket/syntax.rkt b/elpa/racket-mode-20200115.2148/racket/syntax.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/syntax.rkt rename to elpa/racket-mode-20200115.2148/racket/syntax.rkt diff --git a/elpa/racket-mode-20191204.205/racket/test/find-examples.rkt b/elpa/racket-mode-20200115.2148/racket/test/find-examples.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/test/find-examples.rkt rename to elpa/racket-mode-20200115.2148/racket/test/find-examples.rkt diff --git a/elpa/racket-mode-20191204.205/racket/test/find.rkt b/elpa/racket-mode-20200115.2148/racket/test/find.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/test/find.rkt rename to elpa/racket-mode-20200115.2148/racket/test/find.rkt diff --git a/elpa/racket-mode-20191204.205/racket/util.rkt b/elpa/racket-mode-20200115.2148/racket/util.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/util.rkt rename to elpa/racket-mode-20200115.2148/racket/util.rkt diff --git a/elpa/racket-mode-20191204.205/racket/welcome.rkt b/elpa/racket-mode-20200115.2148/racket/welcome.rkt similarity index 100% rename from elpa/racket-mode-20191204.205/racket/welcome.rkt rename to elpa/racket-mode-20200115.2148/racket/welcome.rkt diff --git a/elpa/request-20191211.2051/request-pkg.el b/elpa/request-20191211.2051/request-pkg.el deleted file mode 100644 index 73508a3a..00000000 --- a/elpa/request-20191211.2051/request-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "request" "20191211.2051" "Compatible layer for URL request in Emacs" '((emacs "24.4")) :commit "d2957086f5012e8a5dd5cfaedf8fec778f69e6e2" :authors '(("Takafumi Arakaki ")) :maintainer '("Takafumi Arakaki ") :url "https://github.com/tkf/emacs-request") diff --git a/elpa/request-20191211.2051/request-autoloads.el b/elpa/request-20200127.21/request-autoloads.el similarity index 100% rename from elpa/request-20191211.2051/request-autoloads.el rename to elpa/request-20200127.21/request-autoloads.el diff --git a/elpa/request-20200127.21/request-pkg.el b/elpa/request-20200127.21/request-pkg.el new file mode 100644 index 00000000..e375bf03 --- /dev/null +++ b/elpa/request-20200127.21/request-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "request" "20200127.21" "Compatible layer for URL request in Emacs" '((emacs "24.4")) :commit "431d14343c61bc51a86c9a9e1acb6c26fe9a6298" :authors '(("Takafumi Arakaki ")) :maintainer '("Takafumi Arakaki ") :url "https://github.com/tkf/emacs-request") diff --git a/elpa/request-20191211.2051/request.el b/elpa/request-20200127.21/request.el similarity index 97% rename from elpa/request-20191211.2051/request.el rename to elpa/request-20200127.21/request.el index 2a27d8af..170215d0 100644 --- a/elpa/request-20191211.2051/request.el +++ b/elpa/request-20200127.21/request.el @@ -6,7 +6,7 @@ ;; Author: Takafumi Arakaki ;; URL: https://github.com/tkf/emacs-request -;; Package-Version: 20191211.2051 +;; Package-Version: 20200127.21 ;; Package-Requires: ((emacs "24.4")) ;; Version: 0.3.2 @@ -50,7 +50,7 @@ (require 'url) (require 'mail-utils) (require 'autorevert) - +(require 'auth-source) (defgroup request nil "Compatible layer for URL request in Emacs." @@ -902,7 +902,7 @@ Currently it is used only for testing.") (make-directory (file-name-directory (request--curl-cookie-jar)) t))) (cl-defun request--curl-command - (url &key type data headers response files* unix-socket encoding + (url &key type data headers response files* unix-socket encoding auth &allow-other-keys &aux (cookie-jar (convert-standard-filename (expand-file-name (request--curl-cookie-jar))))) @@ -911,6 +911,19 @@ Currently it is used only for testing.") (list request-curl "--silent" "--location" "--cookie" cookie-jar "--cookie-jar" cookie-jar) + (when auth + (let* ((host (url-host (url-generic-parse-url url))) + (auth-source-creation-prompts `((user . ,(format "%s user: " host)) + (secret . "Password for %u: "))) + (cred (car (auth-source-search + :host host :require '(:user :secret) :create t :max 1)))) + (split-string (format "--%s --user %s:%s" + auth + (plist-get cred :user) + (let ((secret (plist-get cred :secret))) + (if (functionp secret) + (funcall secret) + secret)))))) (unless (request-url-file-p url) (list "--include" "--write-out" request--curl-write-out-template)) request-curl-options @@ -1022,6 +1035,14 @@ temporary file paths." (run-at-time timeout nil #'request-response--timeout-callback response)))) +(defun request--curl-occlude-secret (command) + "Simple regex filter on anything looking like a secret." + (let ((matched + (string-match (concat (regexp-quote "--user") "\\s-*\\(\\S-+\\)") command))) + (if matched + (replace-match "elided" nil nil command 1) + command))) + (cl-defun request--curl (url &rest settings &key files timeout response encoding semaphore &allow-other-keys) @@ -1055,7 +1076,8 @@ removed from the buffer before it is shown to the parser function. :response response :encoding encoding settings))) (proc (apply #'start-process "request curl" buffer command))) (request--install-timeout timeout response) - (request-log 'debug "request--curl: %s" (mapconcat 'identity command " ")) + (request-log 'debug "request--curl: %s" + (request--curl-occlude-secret (mapconcat 'identity command " "))) (setf (request-response--buffer response) buffer) (process-put proc :request-response response) (set-process-coding-system proc 'no-conversion 'no-conversion) @@ -1151,7 +1173,8 @@ START-URL is the URL requested." (cl-loop for url in (request--curl-absolutify-redirects start-url (mapcar (lambda (response) - (request-response-header response "location")) + (or (request-response-header response "location") + (request-response-url response))) history)) for response in (cdr history) do (setf (request-response-url response) url))) @@ -1211,11 +1234,9 @@ START-URL is the URL requested." (let ((proc (get-buffer-process (request-response--buffer response)))) (auto-revert-set-timer) (when auto-revert-use-notify - (if noninteractive - (dolist (buf (buffer-list)) - (with-current-buffer buf - (request-auto-revert-notify-rm-watch))) - (request-auto-revert-notify-rm-watch))) + (dolist (buf (buffer-list)) + (with-current-buffer buf + (request-auto-revert-notify-rm-watch)))) (with-local-quit (cl-loop with iter = 0 until (or (>= iter 10) finished) diff --git a/elpa/request-20191211.2051/request.elc b/elpa/request-20200127.21/request.elc similarity index 86% rename from elpa/request-20191211.2051/request.elc rename to elpa/request-20200127.21/request.elc index aa6f3a7b..50e694b7 100644 Binary files a/elpa/request-20191211.2051/request.elc and b/elpa/request-20200127.21/request.elc differ diff --git a/elpa/skewer-mode-20180706.1807/cache-table.el b/elpa/skewer-mode-20200103.2247/cache-table.el similarity index 100% rename from elpa/skewer-mode-20180706.1807/cache-table.el rename to elpa/skewer-mode-20200103.2247/cache-table.el diff --git a/elpa/skewer-mode-20180706.1807/cache-table.elc b/elpa/skewer-mode-20200103.2247/cache-table.elc similarity index 99% rename from elpa/skewer-mode-20180706.1807/cache-table.elc rename to elpa/skewer-mode-20200103.2247/cache-table.elc index a3ab2057..a62aa37b 100644 Binary files a/elpa/skewer-mode-20180706.1807/cache-table.elc and b/elpa/skewer-mode-20200103.2247/cache-table.elc differ diff --git a/elpa/skewer-mode-20180706.1807/example.html b/elpa/skewer-mode-20200103.2247/example.html similarity index 100% rename from elpa/skewer-mode-20180706.1807/example.html rename to elpa/skewer-mode-20200103.2247/example.html diff --git a/elpa/skewer-mode-20180706.1807/skewer-bower.el b/elpa/skewer-mode-20200103.2247/skewer-bower.el similarity index 100% rename from elpa/skewer-mode-20180706.1807/skewer-bower.el rename to elpa/skewer-mode-20200103.2247/skewer-bower.el diff --git a/elpa/skewer-mode-20180706.1807/skewer-bower.elc b/elpa/skewer-mode-20200103.2247/skewer-bower.elc similarity index 99% rename from elpa/skewer-mode-20180706.1807/skewer-bower.elc rename to elpa/skewer-mode-20200103.2247/skewer-bower.elc index 8cec795c..aa5181cc 100644 Binary files a/elpa/skewer-mode-20180706.1807/skewer-bower.elc and b/elpa/skewer-mode-20200103.2247/skewer-bower.elc differ diff --git a/elpa/skewer-mode-20180706.1807/skewer-css.el b/elpa/skewer-mode-20200103.2247/skewer-css.el similarity index 100% rename from elpa/skewer-mode-20180706.1807/skewer-css.el rename to elpa/skewer-mode-20200103.2247/skewer-css.el diff --git a/elpa/skewer-mode-20180706.1807/skewer-css.elc b/elpa/skewer-mode-20200103.2247/skewer-css.elc similarity index 99% rename from elpa/skewer-mode-20180706.1807/skewer-css.elc rename to elpa/skewer-mode-20200103.2247/skewer-css.elc index 9da27094..d2500348 100644 Binary files a/elpa/skewer-mode-20180706.1807/skewer-css.elc and b/elpa/skewer-mode-20200103.2247/skewer-css.elc differ diff --git a/elpa/skewer-mode-20180706.1807/skewer-everything.user.js b/elpa/skewer-mode-20200103.2247/skewer-everything.user.js similarity index 100% rename from elpa/skewer-mode-20180706.1807/skewer-everything.user.js rename to elpa/skewer-mode-20200103.2247/skewer-everything.user.js diff --git a/elpa/skewer-mode-20180706.1807/skewer-html.el b/elpa/skewer-mode-20200103.2247/skewer-html.el similarity index 100% rename from elpa/skewer-mode-20180706.1807/skewer-html.el rename to elpa/skewer-mode-20200103.2247/skewer-html.el diff --git a/elpa/skewer-mode-20180706.1807/skewer-html.elc b/elpa/skewer-mode-20200103.2247/skewer-html.elc similarity index 99% rename from elpa/skewer-mode-20180706.1807/skewer-html.elc rename to elpa/skewer-mode-20200103.2247/skewer-html.elc index be264559..a0d1057d 100644 Binary files a/elpa/skewer-mode-20180706.1807/skewer-html.elc and b/elpa/skewer-mode-20200103.2247/skewer-html.elc differ diff --git a/elpa/skewer-mode-20180706.1807/skewer-mode-autoloads.el b/elpa/skewer-mode-20200103.2247/skewer-mode-autoloads.el similarity index 100% rename from elpa/skewer-mode-20180706.1807/skewer-mode-autoloads.el rename to elpa/skewer-mode-20200103.2247/skewer-mode-autoloads.el diff --git a/elpa/skewer-mode-20180706.1807/skewer-mode-pkg.el b/elpa/skewer-mode-20200103.2247/skewer-mode-pkg.el similarity index 71% rename from elpa/skewer-mode-20180706.1807/skewer-mode-pkg.el rename to elpa/skewer-mode-20200103.2247/skewer-mode-pkg.el index e6a4d44d..3cae4f8c 100644 --- a/elpa/skewer-mode-20180706.1807/skewer-mode-pkg.el +++ b/elpa/skewer-mode-20200103.2247/skewer-mode-pkg.el @@ -1,4 +1,4 @@ -(define-package "skewer-mode" "20180706.1807" "live browser JavaScript, CSS, and HTML interaction" +(define-package "skewer-mode" "20200103.2247" "live browser JavaScript, CSS, and HTML interaction" '((simple-httpd "1.4.0") (js2-mode "20090723") (emacs "24"))) diff --git a/elpa/skewer-mode-20180706.1807/skewer-mode.el b/elpa/skewer-mode-20200103.2247/skewer-mode.el similarity index 100% rename from elpa/skewer-mode-20180706.1807/skewer-mode.el rename to elpa/skewer-mode-20200103.2247/skewer-mode.el diff --git a/elpa/skewer-mode-20180706.1807/skewer-mode.elc b/elpa/skewer-mode-20200103.2247/skewer-mode.elc similarity index 98% rename from elpa/skewer-mode-20180706.1807/skewer-mode.elc rename to elpa/skewer-mode-20200103.2247/skewer-mode.elc index f53a8f3a..a61d3ef1 100644 Binary files a/elpa/skewer-mode-20180706.1807/skewer-mode.elc and b/elpa/skewer-mode-20200103.2247/skewer-mode.elc differ diff --git a/elpa/skewer-mode-20180706.1807/skewer-repl.el b/elpa/skewer-mode-20200103.2247/skewer-repl.el similarity index 97% rename from elpa/skewer-mode-20180706.1807/skewer-repl.el rename to elpa/skewer-mode-20200103.2247/skewer-repl.el index c3e17b5e..6a55d134 100644 --- a/elpa/skewer-mode-20180706.1807/skewer-repl.el +++ b/elpa/skewer-mode-20200103.2247/skewer-repl.el @@ -116,8 +116,10 @@ buffer.") (save-excursion (goto-char (point-max)) (forward-line 0) - (backward-char) - (insert (concat "\n" output (skewer-log-filename log)))))))) + (if (bobp) + (insert (concat output (skewer-log-filename log) "\n")) + (backward-char) + (insert (concat "\n" output (skewer-log-filename log))))))))) (defcustom skewer-path-strip-level 1 "Number of folders which will be stripped from url when discovering paths. diff --git a/elpa/skewer-mode-20180706.1807/skewer-repl.elc b/elpa/skewer-mode-20200103.2247/skewer-repl.elc similarity index 87% rename from elpa/skewer-mode-20180706.1807/skewer-repl.elc rename to elpa/skewer-mode-20200103.2247/skewer-repl.elc index 635c1e7f..1b0ae020 100644 Binary files a/elpa/skewer-mode-20180706.1807/skewer-repl.elc and b/elpa/skewer-mode-20200103.2247/skewer-repl.elc differ diff --git a/elpa/skewer-mode-20180706.1807/skewer-setup.el b/elpa/skewer-mode-20200103.2247/skewer-setup.el similarity index 100% rename from elpa/skewer-mode-20180706.1807/skewer-setup.el rename to elpa/skewer-mode-20200103.2247/skewer-setup.el diff --git a/elpa/skewer-mode-20180706.1807/skewer-setup.elc b/elpa/skewer-mode-20200103.2247/skewer-setup.elc similarity index 96% rename from elpa/skewer-mode-20180706.1807/skewer-setup.elc rename to elpa/skewer-mode-20200103.2247/skewer-setup.elc index dc5d0026..78d8ba71 100644 Binary files a/elpa/skewer-mode-20180706.1807/skewer-setup.elc and b/elpa/skewer-mode-20200103.2247/skewer-setup.elc differ diff --git a/elpa/skewer-mode-20180706.1807/skewer.js b/elpa/skewer-mode-20200103.2247/skewer.js similarity index 100% rename from elpa/skewer-mode-20180706.1807/skewer.js rename to elpa/skewer-mode-20200103.2247/skewer.js diff --git a/elpa/slime-20191224.2328/contrib/README.md b/elpa/slime-20200125.1053/contrib/README.md similarity index 100% rename from elpa/slime-20191224.2328/contrib/README.md rename to elpa/slime-20200125.1053/contrib/README.md diff --git a/elpa/slime-20191224.2328/contrib/bridge.el b/elpa/slime-20200125.1053/contrib/bridge.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/bridge.el rename to elpa/slime-20200125.1053/contrib/bridge.el diff --git a/elpa/slime-20191224.2328/contrib/bridge.elc b/elpa/slime-20200125.1053/contrib/bridge.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/bridge.elc rename to elpa/slime-20200125.1053/contrib/bridge.elc diff --git a/elpa/slime-20191224.2328/contrib/inferior-slime.el b/elpa/slime-20200125.1053/contrib/inferior-slime.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/inferior-slime.el rename to elpa/slime-20200125.1053/contrib/inferior-slime.el diff --git a/elpa/slime-20191224.2328/contrib/inferior-slime.elc b/elpa/slime-20200125.1053/contrib/inferior-slime.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/inferior-slime.elc rename to elpa/slime-20200125.1053/contrib/inferior-slime.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-asdf.el b/elpa/slime-20200125.1053/contrib/slime-asdf.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-asdf.el rename to elpa/slime-20200125.1053/contrib/slime-asdf.el diff --git a/elpa/slime-20191224.2328/contrib/slime-asdf.elc b/elpa/slime-20200125.1053/contrib/slime-asdf.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-asdf.elc rename to elpa/slime-20200125.1053/contrib/slime-asdf.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-autodoc.el b/elpa/slime-20200125.1053/contrib/slime-autodoc.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-autodoc.el rename to elpa/slime-20200125.1053/contrib/slime-autodoc.el diff --git a/elpa/slime-20191224.2328/contrib/slime-autodoc.elc b/elpa/slime-20200125.1053/contrib/slime-autodoc.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-autodoc.elc rename to elpa/slime-20200125.1053/contrib/slime-autodoc.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-banner.el b/elpa/slime-20200125.1053/contrib/slime-banner.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-banner.el rename to elpa/slime-20200125.1053/contrib/slime-banner.el diff --git a/elpa/slime-20191224.2328/contrib/slime-banner.elc b/elpa/slime-20200125.1053/contrib/slime-banner.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-banner.elc rename to elpa/slime-20200125.1053/contrib/slime-banner.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-buffer-streams.el b/elpa/slime-20200125.1053/contrib/slime-buffer-streams.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-buffer-streams.el rename to elpa/slime-20200125.1053/contrib/slime-buffer-streams.el diff --git a/elpa/slime-20191224.2328/contrib/slime-buffer-streams.elc b/elpa/slime-20200125.1053/contrib/slime-buffer-streams.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-buffer-streams.elc rename to elpa/slime-20200125.1053/contrib/slime-buffer-streams.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-c-p-c.el b/elpa/slime-20200125.1053/contrib/slime-c-p-c.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-c-p-c.el rename to elpa/slime-20200125.1053/contrib/slime-c-p-c.el diff --git a/elpa/slime-20191224.2328/contrib/slime-c-p-c.elc b/elpa/slime-20200125.1053/contrib/slime-c-p-c.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-c-p-c.elc rename to elpa/slime-20200125.1053/contrib/slime-c-p-c.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-cl-indent.el b/elpa/slime-20200125.1053/contrib/slime-cl-indent.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-cl-indent.el rename to elpa/slime-20200125.1053/contrib/slime-cl-indent.el diff --git a/elpa/slime-20191224.2328/contrib/slime-cl-indent.elc b/elpa/slime-20200125.1053/contrib/slime-cl-indent.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-cl-indent.elc rename to elpa/slime-20200125.1053/contrib/slime-cl-indent.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-clipboard.el b/elpa/slime-20200125.1053/contrib/slime-clipboard.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-clipboard.el rename to elpa/slime-20200125.1053/contrib/slime-clipboard.el diff --git a/elpa/slime-20191224.2328/contrib/slime-clipboard.elc b/elpa/slime-20200125.1053/contrib/slime-clipboard.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-clipboard.elc rename to elpa/slime-20200125.1053/contrib/slime-clipboard.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-compiler-notes-tree.el b/elpa/slime-20200125.1053/contrib/slime-compiler-notes-tree.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-compiler-notes-tree.el rename to elpa/slime-20200125.1053/contrib/slime-compiler-notes-tree.el diff --git a/elpa/slime-20191224.2328/contrib/slime-compiler-notes-tree.elc b/elpa/slime-20200125.1053/contrib/slime-compiler-notes-tree.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-compiler-notes-tree.elc rename to elpa/slime-20200125.1053/contrib/slime-compiler-notes-tree.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-editing-commands.el b/elpa/slime-20200125.1053/contrib/slime-editing-commands.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-editing-commands.el rename to elpa/slime-20200125.1053/contrib/slime-editing-commands.el diff --git a/elpa/slime-20191224.2328/contrib/slime-editing-commands.elc b/elpa/slime-20200125.1053/contrib/slime-editing-commands.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-editing-commands.elc rename to elpa/slime-20200125.1053/contrib/slime-editing-commands.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-enclosing-context.el b/elpa/slime-20200125.1053/contrib/slime-enclosing-context.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-enclosing-context.el rename to elpa/slime-20200125.1053/contrib/slime-enclosing-context.el diff --git a/elpa/slime-20191224.2328/contrib/slime-enclosing-context.elc b/elpa/slime-20200125.1053/contrib/slime-enclosing-context.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-enclosing-context.elc rename to elpa/slime-20200125.1053/contrib/slime-enclosing-context.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-fancy-inspector.el b/elpa/slime-20200125.1053/contrib/slime-fancy-inspector.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-fancy-inspector.el rename to elpa/slime-20200125.1053/contrib/slime-fancy-inspector.el diff --git a/elpa/slime-20191224.2328/contrib/slime-fancy-inspector.elc b/elpa/slime-20200125.1053/contrib/slime-fancy-inspector.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-fancy-inspector.elc rename to elpa/slime-20200125.1053/contrib/slime-fancy-inspector.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-fancy-trace.el b/elpa/slime-20200125.1053/contrib/slime-fancy-trace.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-fancy-trace.el rename to elpa/slime-20200125.1053/contrib/slime-fancy-trace.el diff --git a/elpa/slime-20191224.2328/contrib/slime-fancy-trace.elc b/elpa/slime-20200125.1053/contrib/slime-fancy-trace.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-fancy-trace.elc rename to elpa/slime-20200125.1053/contrib/slime-fancy-trace.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-fancy.el b/elpa/slime-20200125.1053/contrib/slime-fancy.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-fancy.el rename to elpa/slime-20200125.1053/contrib/slime-fancy.el diff --git a/elpa/slime-20191224.2328/contrib/slime-fancy.elc b/elpa/slime-20200125.1053/contrib/slime-fancy.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-fancy.elc rename to elpa/slime-20200125.1053/contrib/slime-fancy.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-fontifying-fu.el b/elpa/slime-20200125.1053/contrib/slime-fontifying-fu.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-fontifying-fu.el rename to elpa/slime-20200125.1053/contrib/slime-fontifying-fu.el diff --git a/elpa/slime-20191224.2328/contrib/slime-fontifying-fu.elc b/elpa/slime-20200125.1053/contrib/slime-fontifying-fu.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-fontifying-fu.elc rename to elpa/slime-20200125.1053/contrib/slime-fontifying-fu.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-fuzzy.el b/elpa/slime-20200125.1053/contrib/slime-fuzzy.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-fuzzy.el rename to elpa/slime-20200125.1053/contrib/slime-fuzzy.el diff --git a/elpa/slime-20191224.2328/contrib/slime-fuzzy.elc b/elpa/slime-20200125.1053/contrib/slime-fuzzy.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-fuzzy.elc rename to elpa/slime-20200125.1053/contrib/slime-fuzzy.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-highlight-edits.el b/elpa/slime-20200125.1053/contrib/slime-highlight-edits.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-highlight-edits.el rename to elpa/slime-20200125.1053/contrib/slime-highlight-edits.el diff --git a/elpa/slime-20191224.2328/contrib/slime-highlight-edits.elc b/elpa/slime-20200125.1053/contrib/slime-highlight-edits.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-highlight-edits.elc rename to elpa/slime-20200125.1053/contrib/slime-highlight-edits.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-hyperdoc.el b/elpa/slime-20200125.1053/contrib/slime-hyperdoc.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-hyperdoc.el rename to elpa/slime-20200125.1053/contrib/slime-hyperdoc.el diff --git a/elpa/slime-20191224.2328/contrib/slime-hyperdoc.elc b/elpa/slime-20200125.1053/contrib/slime-hyperdoc.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-hyperdoc.elc rename to elpa/slime-20200125.1053/contrib/slime-hyperdoc.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-indentation.el b/elpa/slime-20200125.1053/contrib/slime-indentation.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-indentation.el rename to elpa/slime-20200125.1053/contrib/slime-indentation.el diff --git a/elpa/slime-20191224.2328/contrib/slime-indentation.elc b/elpa/slime-20200125.1053/contrib/slime-indentation.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-indentation.elc rename to elpa/slime-20200125.1053/contrib/slime-indentation.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-listener-hooks.el b/elpa/slime-20200125.1053/contrib/slime-listener-hooks.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-listener-hooks.el rename to elpa/slime-20200125.1053/contrib/slime-listener-hooks.el diff --git a/elpa/slime-20191224.2328/contrib/slime-listener-hooks.elc b/elpa/slime-20200125.1053/contrib/slime-listener-hooks.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-listener-hooks.elc rename to elpa/slime-20200125.1053/contrib/slime-listener-hooks.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-macrostep.el b/elpa/slime-20200125.1053/contrib/slime-macrostep.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-macrostep.el rename to elpa/slime-20200125.1053/contrib/slime-macrostep.el diff --git a/elpa/slime-20191224.2328/contrib/slime-macrostep.elc b/elpa/slime-20200125.1053/contrib/slime-macrostep.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-macrostep.elc rename to elpa/slime-20200125.1053/contrib/slime-macrostep.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-mdot-fu.el b/elpa/slime-20200125.1053/contrib/slime-mdot-fu.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-mdot-fu.el rename to elpa/slime-20200125.1053/contrib/slime-mdot-fu.el diff --git a/elpa/slime-20191224.2328/contrib/slime-mdot-fu.elc b/elpa/slime-20200125.1053/contrib/slime-mdot-fu.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-mdot-fu.elc rename to elpa/slime-20200125.1053/contrib/slime-mdot-fu.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-media.el b/elpa/slime-20200125.1053/contrib/slime-media.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-media.el rename to elpa/slime-20200125.1053/contrib/slime-media.el diff --git a/elpa/slime-20191224.2328/contrib/slime-media.elc b/elpa/slime-20200125.1053/contrib/slime-media.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-media.elc rename to elpa/slime-20200125.1053/contrib/slime-media.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-mrepl.el b/elpa/slime-20200125.1053/contrib/slime-mrepl.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-mrepl.el rename to elpa/slime-20200125.1053/contrib/slime-mrepl.el diff --git a/elpa/slime-20191224.2328/contrib/slime-mrepl.elc b/elpa/slime-20200125.1053/contrib/slime-mrepl.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-mrepl.elc rename to elpa/slime-20200125.1053/contrib/slime-mrepl.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-package-fu.el b/elpa/slime-20200125.1053/contrib/slime-package-fu.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-package-fu.el rename to elpa/slime-20200125.1053/contrib/slime-package-fu.el diff --git a/elpa/slime-20191224.2328/contrib/slime-package-fu.elc b/elpa/slime-20200125.1053/contrib/slime-package-fu.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-package-fu.elc rename to elpa/slime-20200125.1053/contrib/slime-package-fu.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-parse.el b/elpa/slime-20200125.1053/contrib/slime-parse.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-parse.el rename to elpa/slime-20200125.1053/contrib/slime-parse.el diff --git a/elpa/slime-20191224.2328/contrib/slime-parse.elc b/elpa/slime-20200125.1053/contrib/slime-parse.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-parse.elc rename to elpa/slime-20200125.1053/contrib/slime-parse.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-presentation-streams.el b/elpa/slime-20200125.1053/contrib/slime-presentation-streams.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-presentation-streams.el rename to elpa/slime-20200125.1053/contrib/slime-presentation-streams.el diff --git a/elpa/slime-20191224.2328/contrib/slime-presentation-streams.elc b/elpa/slime-20200125.1053/contrib/slime-presentation-streams.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-presentation-streams.elc rename to elpa/slime-20200125.1053/contrib/slime-presentation-streams.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-presentations.el b/elpa/slime-20200125.1053/contrib/slime-presentations.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-presentations.el rename to elpa/slime-20200125.1053/contrib/slime-presentations.el diff --git a/elpa/slime-20191224.2328/contrib/slime-presentations.elc b/elpa/slime-20200125.1053/contrib/slime-presentations.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-presentations.elc rename to elpa/slime-20200125.1053/contrib/slime-presentations.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-quicklisp.el b/elpa/slime-20200125.1053/contrib/slime-quicklisp.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-quicklisp.el rename to elpa/slime-20200125.1053/contrib/slime-quicklisp.el diff --git a/elpa/slime-20191224.2328/contrib/slime-quicklisp.elc b/elpa/slime-20200125.1053/contrib/slime-quicklisp.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-quicklisp.elc rename to elpa/slime-20200125.1053/contrib/slime-quicklisp.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-references.el b/elpa/slime-20200125.1053/contrib/slime-references.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-references.el rename to elpa/slime-20200125.1053/contrib/slime-references.el diff --git a/elpa/slime-20191224.2328/contrib/slime-references.elc b/elpa/slime-20200125.1053/contrib/slime-references.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-references.elc rename to elpa/slime-20200125.1053/contrib/slime-references.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-repl.el b/elpa/slime-20200125.1053/contrib/slime-repl.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-repl.el rename to elpa/slime-20200125.1053/contrib/slime-repl.el diff --git a/elpa/slime-20191224.2328/contrib/slime-repl.elc b/elpa/slime-20200125.1053/contrib/slime-repl.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-repl.elc rename to elpa/slime-20200125.1053/contrib/slime-repl.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-sbcl-exts.el b/elpa/slime-20200125.1053/contrib/slime-sbcl-exts.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-sbcl-exts.el rename to elpa/slime-20200125.1053/contrib/slime-sbcl-exts.el diff --git a/elpa/slime-20191224.2328/contrib/slime-sbcl-exts.elc b/elpa/slime-20200125.1053/contrib/slime-sbcl-exts.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-sbcl-exts.elc rename to elpa/slime-20200125.1053/contrib/slime-sbcl-exts.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-scheme.el b/elpa/slime-20200125.1053/contrib/slime-scheme.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-scheme.el rename to elpa/slime-20200125.1053/contrib/slime-scheme.el diff --git a/elpa/slime-20191224.2328/contrib/slime-scheme.elc b/elpa/slime-20200125.1053/contrib/slime-scheme.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-scheme.elc rename to elpa/slime-20200125.1053/contrib/slime-scheme.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-scratch.el b/elpa/slime-20200125.1053/contrib/slime-scratch.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-scratch.el rename to elpa/slime-20200125.1053/contrib/slime-scratch.el diff --git a/elpa/slime-20191224.2328/contrib/slime-scratch.elc b/elpa/slime-20200125.1053/contrib/slime-scratch.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-scratch.elc rename to elpa/slime-20200125.1053/contrib/slime-scratch.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-snapshot.el b/elpa/slime-20200125.1053/contrib/slime-snapshot.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-snapshot.el rename to elpa/slime-20200125.1053/contrib/slime-snapshot.el diff --git a/elpa/slime-20191224.2328/contrib/slime-snapshot.elc b/elpa/slime-20200125.1053/contrib/slime-snapshot.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-snapshot.elc rename to elpa/slime-20200125.1053/contrib/slime-snapshot.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-sprof.el b/elpa/slime-20200125.1053/contrib/slime-sprof.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-sprof.el rename to elpa/slime-20200125.1053/contrib/slime-sprof.el diff --git a/elpa/slime-20191224.2328/contrib/slime-sprof.elc b/elpa/slime-20200125.1053/contrib/slime-sprof.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-sprof.elc rename to elpa/slime-20200125.1053/contrib/slime-sprof.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-trace-dialog.el b/elpa/slime-20200125.1053/contrib/slime-trace-dialog.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-trace-dialog.el rename to elpa/slime-20200125.1053/contrib/slime-trace-dialog.el diff --git a/elpa/slime-20191224.2328/contrib/slime-trace-dialog.elc b/elpa/slime-20200125.1053/contrib/slime-trace-dialog.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-trace-dialog.elc rename to elpa/slime-20200125.1053/contrib/slime-trace-dialog.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-tramp.el b/elpa/slime-20200125.1053/contrib/slime-tramp.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-tramp.el rename to elpa/slime-20200125.1053/contrib/slime-tramp.el diff --git a/elpa/slime-20191224.2328/contrib/slime-tramp.elc b/elpa/slime-20200125.1053/contrib/slime-tramp.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-tramp.elc rename to elpa/slime-20200125.1053/contrib/slime-tramp.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-typeout-frame.el b/elpa/slime-20200125.1053/contrib/slime-typeout-frame.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-typeout-frame.el rename to elpa/slime-20200125.1053/contrib/slime-typeout-frame.el diff --git a/elpa/slime-20191224.2328/contrib/slime-typeout-frame.elc b/elpa/slime-20200125.1053/contrib/slime-typeout-frame.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-typeout-frame.elc rename to elpa/slime-20200125.1053/contrib/slime-typeout-frame.elc diff --git a/elpa/slime-20191224.2328/contrib/slime-xref-browser.el b/elpa/slime-20200125.1053/contrib/slime-xref-browser.el similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-xref-browser.el rename to elpa/slime-20200125.1053/contrib/slime-xref-browser.el diff --git a/elpa/slime-20191224.2328/contrib/slime-xref-browser.elc b/elpa/slime-20200125.1053/contrib/slime-xref-browser.elc similarity index 100% rename from elpa/slime-20191224.2328/contrib/slime-xref-browser.elc rename to elpa/slime-20200125.1053/contrib/slime-xref-browser.elc diff --git a/elpa/slime-20191224.2328/contrib/swank-arglists.lisp b/elpa/slime-20200125.1053/contrib/swank-arglists.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-arglists.lisp rename to elpa/slime-20200125.1053/contrib/swank-arglists.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-asdf.lisp b/elpa/slime-20200125.1053/contrib/swank-asdf.lisp similarity index 98% rename from elpa/slime-20191224.2328/contrib/swank-asdf.lisp rename to elpa/slime-20200125.1053/contrib/swank-asdf.lisp index 0fdd9015..175402d3 100644 --- a/elpa/slime-20191224.2328/contrib/swank-asdf.lisp +++ b/elpa/slime-20200125.1053/contrib/swank-asdf.lisp @@ -506,14 +506,6 @@ already knows." (let ((*recompile-system* (asdf:find-system name))) (operate-on-system-for-emacs name 'asdf:load-op))) -;; Doing list-all-systems-in-central-registry might be quite slow -;; since it accesses a file-system, so run it once at the background -;; to initialize caches. -(when (eql *communication-style* :spawn) - (spawn (lambda () - (ignore-errors (list-all-systems-in-central-registry))) - :name "init-asdf-fs-caches")) - ;;; Hook for compile-file-for-emacs (defun try-compile-file-with-asdf (pathname load-p &rest options) diff --git a/elpa/slime-20191224.2328/contrib/swank-buffer-streams.lisp b/elpa/slime-20200125.1053/contrib/swank-buffer-streams.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-buffer-streams.lisp rename to elpa/slime-20200125.1053/contrib/swank-buffer-streams.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-c-p-c.lisp b/elpa/slime-20200125.1053/contrib/swank-c-p-c.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-c-p-c.lisp rename to elpa/slime-20200125.1053/contrib/swank-c-p-c.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-clipboard.lisp b/elpa/slime-20200125.1053/contrib/swank-clipboard.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-clipboard.lisp rename to elpa/slime-20200125.1053/contrib/swank-clipboard.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-fancy-inspector.lisp b/elpa/slime-20200125.1053/contrib/swank-fancy-inspector.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-fancy-inspector.lisp rename to elpa/slime-20200125.1053/contrib/swank-fancy-inspector.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-fuzzy.lisp b/elpa/slime-20200125.1053/contrib/swank-fuzzy.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-fuzzy.lisp rename to elpa/slime-20200125.1053/contrib/swank-fuzzy.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-goo.goo b/elpa/slime-20200125.1053/contrib/swank-goo.goo similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-goo.goo rename to elpa/slime-20200125.1053/contrib/swank-goo.goo diff --git a/elpa/slime-20191224.2328/contrib/swank-hyperdoc.lisp b/elpa/slime-20200125.1053/contrib/swank-hyperdoc.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-hyperdoc.lisp rename to elpa/slime-20200125.1053/contrib/swank-hyperdoc.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-ikarus.ss b/elpa/slime-20200125.1053/contrib/swank-ikarus.ss similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-ikarus.ss rename to elpa/slime-20200125.1053/contrib/swank-ikarus.ss diff --git a/elpa/slime-20191224.2328/contrib/swank-indentation.lisp b/elpa/slime-20200125.1053/contrib/swank-indentation.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-indentation.lisp rename to elpa/slime-20200125.1053/contrib/swank-indentation.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-jolt.k b/elpa/slime-20200125.1053/contrib/swank-jolt.k similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-jolt.k rename to elpa/slime-20200125.1053/contrib/swank-jolt.k diff --git a/elpa/slime-20191224.2328/contrib/swank-kawa.scm b/elpa/slime-20200125.1053/contrib/swank-kawa.scm similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-kawa.scm rename to elpa/slime-20200125.1053/contrib/swank-kawa.scm diff --git a/elpa/slime-20191224.2328/contrib/swank-larceny.scm b/elpa/slime-20200125.1053/contrib/swank-larceny.scm similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-larceny.scm rename to elpa/slime-20200125.1053/contrib/swank-larceny.scm diff --git a/elpa/slime-20191224.2328/contrib/swank-listener-hooks.lisp b/elpa/slime-20200125.1053/contrib/swank-listener-hooks.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-listener-hooks.lisp rename to elpa/slime-20200125.1053/contrib/swank-listener-hooks.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-macrostep.lisp b/elpa/slime-20200125.1053/contrib/swank-macrostep.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-macrostep.lisp rename to elpa/slime-20200125.1053/contrib/swank-macrostep.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-media.lisp b/elpa/slime-20200125.1053/contrib/swank-media.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-media.lisp rename to elpa/slime-20200125.1053/contrib/swank-media.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-mit-scheme.scm b/elpa/slime-20200125.1053/contrib/swank-mit-scheme.scm similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-mit-scheme.scm rename to elpa/slime-20200125.1053/contrib/swank-mit-scheme.scm diff --git a/elpa/slime-20191224.2328/contrib/swank-mlworks.sml b/elpa/slime-20200125.1053/contrib/swank-mlworks.sml similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-mlworks.sml rename to elpa/slime-20200125.1053/contrib/swank-mlworks.sml diff --git a/elpa/slime-20191224.2328/contrib/swank-mrepl.lisp b/elpa/slime-20200125.1053/contrib/swank-mrepl.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-mrepl.lisp rename to elpa/slime-20200125.1053/contrib/swank-mrepl.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-package-fu.lisp b/elpa/slime-20200125.1053/contrib/swank-package-fu.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-package-fu.lisp rename to elpa/slime-20200125.1053/contrib/swank-package-fu.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-presentation-streams.lisp b/elpa/slime-20200125.1053/contrib/swank-presentation-streams.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-presentation-streams.lisp rename to elpa/slime-20200125.1053/contrib/swank-presentation-streams.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-presentations.lisp b/elpa/slime-20200125.1053/contrib/swank-presentations.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-presentations.lisp rename to elpa/slime-20200125.1053/contrib/swank-presentations.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-quicklisp.lisp b/elpa/slime-20200125.1053/contrib/swank-quicklisp.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-quicklisp.lisp rename to elpa/slime-20200125.1053/contrib/swank-quicklisp.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-r6rs.scm b/elpa/slime-20200125.1053/contrib/swank-r6rs.scm similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-r6rs.scm rename to elpa/slime-20200125.1053/contrib/swank-r6rs.scm diff --git a/elpa/slime-20191224.2328/contrib/swank-repl.lisp b/elpa/slime-20200125.1053/contrib/swank-repl.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-repl.lisp rename to elpa/slime-20200125.1053/contrib/swank-repl.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-sbcl-exts.lisp b/elpa/slime-20200125.1053/contrib/swank-sbcl-exts.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-sbcl-exts.lisp rename to elpa/slime-20200125.1053/contrib/swank-sbcl-exts.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-snapshot.lisp b/elpa/slime-20200125.1053/contrib/swank-snapshot.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-snapshot.lisp rename to elpa/slime-20200125.1053/contrib/swank-snapshot.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-sprof.lisp b/elpa/slime-20200125.1053/contrib/swank-sprof.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-sprof.lisp rename to elpa/slime-20200125.1053/contrib/swank-sprof.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-trace-dialog.lisp b/elpa/slime-20200125.1053/contrib/swank-trace-dialog.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-trace-dialog.lisp rename to elpa/slime-20200125.1053/contrib/swank-trace-dialog.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank-util.lisp b/elpa/slime-20200125.1053/contrib/swank-util.lisp similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank-util.lisp rename to elpa/slime-20200125.1053/contrib/swank-util.lisp diff --git a/elpa/slime-20191224.2328/contrib/swank.rb b/elpa/slime-20200125.1053/contrib/swank.rb similarity index 100% rename from elpa/slime-20191224.2328/contrib/swank.rb rename to elpa/slime-20200125.1053/contrib/swank.rb diff --git a/elpa/slime-20191224.2328/dir b/elpa/slime-20200125.1053/dir similarity index 100% rename from elpa/slime-20191224.2328/dir rename to elpa/slime-20200125.1053/dir diff --git a/elpa/slime-20191224.2328/lib/hyperspec.el b/elpa/slime-20200125.1053/lib/hyperspec.el similarity index 100% rename from elpa/slime-20191224.2328/lib/hyperspec.el rename to elpa/slime-20200125.1053/lib/hyperspec.el diff --git a/elpa/slime-20191224.2328/lib/hyperspec.elc b/elpa/slime-20200125.1053/lib/hyperspec.elc similarity index 100% rename from elpa/slime-20191224.2328/lib/hyperspec.elc rename to elpa/slime-20200125.1053/lib/hyperspec.elc diff --git a/elpa/slime-20191224.2328/metering.lisp b/elpa/slime-20200125.1053/metering.lisp similarity index 100% rename from elpa/slime-20191224.2328/metering.lisp rename to elpa/slime-20200125.1053/metering.lisp diff --git a/elpa/slime-20191224.2328/nregex.lisp b/elpa/slime-20200125.1053/nregex.lisp similarity index 100% rename from elpa/slime-20191224.2328/nregex.lisp rename to elpa/slime-20200125.1053/nregex.lisp diff --git a/elpa/slime-20191224.2328/packages.lisp b/elpa/slime-20200125.1053/packages.lisp similarity index 100% rename from elpa/slime-20191224.2328/packages.lisp rename to elpa/slime-20200125.1053/packages.lisp diff --git a/elpa/slime-20191224.2328/sbcl-pprint-patch.lisp b/elpa/slime-20200125.1053/sbcl-pprint-patch.lisp similarity index 100% rename from elpa/slime-20191224.2328/sbcl-pprint-patch.lisp rename to elpa/slime-20200125.1053/sbcl-pprint-patch.lisp diff --git a/elpa/slime-20191224.2328/slime-autoloads.el b/elpa/slime-20200125.1053/slime-autoloads.el similarity index 100% rename from elpa/slime-20191224.2328/slime-autoloads.el rename to elpa/slime-20200125.1053/slime-autoloads.el diff --git a/elpa/slime-20191224.2328/slime-pkg.el b/elpa/slime-20200125.1053/slime-pkg.el similarity index 75% rename from elpa/slime-20191224.2328/slime-pkg.el rename to elpa/slime-20200125.1053/slime-pkg.el index ddc276e1..e9b3b8e9 100644 --- a/elpa/slime-20191224.2328/slime-pkg.el +++ b/elpa/slime-20200125.1053/slime-pkg.el @@ -1,4 +1,4 @@ -(define-package "slime" "20191224.2328" "Superior Lisp Interaction Mode for Emacs" +(define-package "slime" "20200125.1053" "Superior Lisp Interaction Mode for Emacs" '((cl-lib "0.5") (macrostep "0.9")) :keywords diff --git a/elpa/slime-20191224.2328/slime-tests.el b/elpa/slime-20200125.1053/slime-tests.el similarity index 100% rename from elpa/slime-20191224.2328/slime-tests.el rename to elpa/slime-20200125.1053/slime-tests.el diff --git a/elpa/slime-20191224.2328/slime-tests.elc b/elpa/slime-20200125.1053/slime-tests.elc similarity index 98% rename from elpa/slime-20191224.2328/slime-tests.elc rename to elpa/slime-20200125.1053/slime-tests.elc index 55001ee6..269045f9 100644 Binary files a/elpa/slime-20191224.2328/slime-tests.elc and b/elpa/slime-20200125.1053/slime-tests.elc differ diff --git a/elpa/slime-20191224.2328/slime.el b/elpa/slime-20200125.1053/slime.el similarity index 100% rename from elpa/slime-20191224.2328/slime.el rename to elpa/slime-20200125.1053/slime.el diff --git a/elpa/slime-20191224.2328/slime.elc b/elpa/slime-20200125.1053/slime.elc similarity index 100% rename from elpa/slime-20191224.2328/slime.elc rename to elpa/slime-20200125.1053/slime.elc diff --git a/elpa/slime-20191224.2328/slime.info b/elpa/slime-20200125.1053/slime.info similarity index 97% rename from elpa/slime-20191224.2328/slime.info rename to elpa/slime-20200125.1053/slime.info index 0dfa76fb..a0317bf8 100644 --- a/elpa/slime-20191224.2328/slime.info +++ b/elpa/slime-20200125.1053/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 December 26, 2019) +manual for version 2.24. (Last updated January 29, 2020) Written by Luke Gorrie and others. @@ -3625,112 +3625,112 @@ Variable and Concept Index  Tag Table: Node: Top285 -Node: Introduction2528 -Node: Getting started3809 -Node: Platforms4083 -Node: Downloading5281 -Node: Git5782 -Node: Git Incantations6800 -Node: Installation7330 -Node: Running8596 -Node: Setup Tuning9139 -Node: Basic customization9670 -Node: Multiple Lisps10736 -Node: Loading Swank faster13230 -Ref: init-example14323 -Node: SLIME mode14612 -Node: User-interface conventions15210 -Node: Temporary buffers15619 -Node: Inferior-lisp17072 -Node: Multithreading17897 -Node: Key bindings19142 -Ref: describe-key20608 -Ref: describe-bindings20751 -Ref: describe-mode20894 -Ref: view-lossage21078 -Node: Evaluation22273 -Node: Compilation24178 -Node: Completion26937 -Node: Finding definitions27568 -Node: Documentation28708 -Node: Cross-reference30875 -Node: Xref buffer commands32612 -Node: Macro-expansion33171 -Node: Disassembly34192 -Node: Recovery34737 -Node: Inspector35506 -Node: Profiling37744 -Node: Other38541 -Node: Semantic indentation38794 -Ref: Semantic indentation-Footnote-140925 -Node: Reader conditionals41020 -Node: Debugger41371 -Node: Examining frames42011 -Node: Restarts43143 -Ref: sldb-quit43357 -Node: Frame Navigation43784 -Node: Stepping44484 -Node: Miscellaneous45156 -Node: Misc46095 -Node: slime-selector46282 -Node: slime-macroexpansion-minor-mode47664 -Node: Multiple connections48519 -Node: Customization51579 -Node: Emacs-side customization51754 -Ref: slime-completion-at-point-functions52447 -Ref: slime-net-coding-system53338 -Node: Hooks54011 -Ref: slime-connected-hook54376 -Node: Lisp-side54860 -Node: Communication style55270 -Node: Other configurables57832 -Ref: *SLDB-QUIT-RESTART*59230 -Node: Tips and Tricks61821 -Node: Connecting to a remote lisp62046 -Node: Setting up the lisp image62751 -Ref: Setting up the lisp image-Footnote-164639 -Ref: Setting up the lisp image-Footnote-264719 -Node: Setting up Emacs64895 -Ref: Setting up Emacs-Footnote-165731 -Node: Setting up pathname translations65911 -Node: Global IO Redirection67552 -Node: Auto-SLIME68485 -Node: Contributed Packages68906 -Node: Loading Contribs69655 -Node: REPL71977 -Node: REPL commands73392 -Node: Input Navigation74553 -Node: Shortcuts76077 -Node: slime-mrepl77573 -Node: inferior-slime-mode78081 -Node: Compound Completion78786 -Ref: slime-complete-symbol*78963 -Ref: Compound Completion-Footnote-182215 -Node: Fuzzy Completion82339 -Ref: slime-fuzzy-complete-symbol82592 -Node: slime-autodoc-mode85884 -Node: ASDF87302 -Node: Banner89260 -Node: Editing Commands89706 -Node: Fancy Inspector91333 -Node: Presentations92064 -Ref: Presentations-Footnote-198620 -Node: Typeout frames98861 -Node: TRAMP99985 -Node: Documentation Links100261 -Node: Xref and Class Browser100686 -Node: Highlight Edits101278 -Node: Scratch Buffer101750 -Ref: slime-scratch101912 -Node: SLIME Trace Dialog102567 -Node: slime-sprof106817 -Node: SLIME Enhanced M-.107805 -Node: slime-fancy108187 -Node: Quicklisp108463 -Node: Credits108991 -Node: Key Index114595 -Node: Command Index126385 -Node: Variable Index141627 +Node: Introduction2527 +Node: Getting started3808 +Node: Platforms4082 +Node: Downloading5280 +Node: Git5781 +Node: Git Incantations6799 +Node: Installation7329 +Node: Running8595 +Node: Setup Tuning9138 +Node: Basic customization9669 +Node: Multiple Lisps10735 +Node: Loading Swank faster13229 +Ref: init-example14322 +Node: SLIME mode14611 +Node: User-interface conventions15209 +Node: Temporary buffers15618 +Node: Inferior-lisp17071 +Node: Multithreading17896 +Node: Key bindings19141 +Ref: describe-key20607 +Ref: describe-bindings20750 +Ref: describe-mode20893 +Ref: view-lossage21077 +Node: Evaluation22272 +Node: Compilation24177 +Node: Completion26936 +Node: Finding definitions27567 +Node: Documentation28707 +Node: Cross-reference30874 +Node: Xref buffer commands32611 +Node: Macro-expansion33170 +Node: Disassembly34191 +Node: Recovery34736 +Node: Inspector35505 +Node: Profiling37743 +Node: Other38540 +Node: Semantic indentation38793 +Ref: Semantic indentation-Footnote-140924 +Node: Reader conditionals41019 +Node: Debugger41370 +Node: Examining frames42010 +Node: Restarts43142 +Ref: sldb-quit43356 +Node: Frame Navigation43783 +Node: Stepping44483 +Node: Miscellaneous45155 +Node: Misc46094 +Node: slime-selector46281 +Node: slime-macroexpansion-minor-mode47663 +Node: Multiple connections48518 +Node: Customization51578 +Node: Emacs-side customization51753 +Ref: slime-completion-at-point-functions52446 +Ref: slime-net-coding-system53337 +Node: Hooks54010 +Ref: slime-connected-hook54375 +Node: Lisp-side54859 +Node: Communication style55269 +Node: Other configurables57831 +Ref: *SLDB-QUIT-RESTART*59229 +Node: Tips and Tricks61820 +Node: Connecting to a remote lisp62045 +Node: Setting up the lisp image62750 +Ref: Setting up the lisp image-Footnote-164638 +Ref: Setting up the lisp image-Footnote-264718 +Node: Setting up Emacs64894 +Ref: Setting up Emacs-Footnote-165730 +Node: Setting up pathname translations65910 +Node: Global IO Redirection67551 +Node: Auto-SLIME68484 +Node: Contributed Packages68905 +Node: Loading Contribs69654 +Node: REPL71976 +Node: REPL commands73391 +Node: Input Navigation74552 +Node: Shortcuts76076 +Node: slime-mrepl77572 +Node: inferior-slime-mode78080 +Node: Compound Completion78785 +Ref: slime-complete-symbol*78962 +Ref: Compound Completion-Footnote-182214 +Node: Fuzzy Completion82338 +Ref: slime-fuzzy-complete-symbol82591 +Node: slime-autodoc-mode85883 +Node: ASDF87301 +Node: Banner89259 +Node: Editing Commands89705 +Node: Fancy Inspector91332 +Node: Presentations92063 +Ref: Presentations-Footnote-198619 +Node: Typeout frames98860 +Node: TRAMP99984 +Node: Documentation Links100260 +Node: Xref and Class Browser100685 +Node: Highlight Edits101277 +Node: Scratch Buffer101749 +Ref: slime-scratch101911 +Node: SLIME Trace Dialog102566 +Node: slime-sprof106816 +Node: SLIME Enhanced M-.107804 +Node: slime-fancy108186 +Node: Quicklisp108462 +Node: Credits108990 +Node: Key Index114594 +Node: Command Index126384 +Node: Variable Index141626  End Tag Table diff --git a/elpa/slime-20191224.2328/start-swank.lisp b/elpa/slime-20200125.1053/start-swank.lisp similarity index 100% rename from elpa/slime-20191224.2328/start-swank.lisp rename to elpa/slime-20200125.1053/start-swank.lisp diff --git a/elpa/slime-20191224.2328/swank-loader.lisp b/elpa/slime-20200125.1053/swank-loader.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank-loader.lisp rename to elpa/slime-20200125.1053/swank-loader.lisp diff --git a/elpa/slime-20191224.2328/swank.asd b/elpa/slime-20200125.1053/swank.asd similarity index 100% rename from elpa/slime-20191224.2328/swank.asd rename to elpa/slime-20200125.1053/swank.asd diff --git a/elpa/slime-20191224.2328/swank.lisp b/elpa/slime-20200125.1053/swank.lisp similarity index 99% rename from elpa/slime-20191224.2328/swank.lisp rename to elpa/slime-20200125.1053/swank.lisp index d1d96c15..dfdde579 100644 --- a/elpa/slime-20191224.2328/swank.lisp +++ b/elpa/slime-20200125.1053/swank.lisp @@ -927,7 +927,7 @@ The processing is done in the extent of the toplevel restart." (stop-serving-requests c) (close (connection.socket-io c)) (when (connection.dedicated-output c) - (close (connection.dedicated-output c))) + (ignore-errors (close (connection.dedicated-output c)))) (setf *connections* (remove c *connections*)) (run-hook *connection-closed-hook* c) (when (and condition (not (typep condition 'end-of-file))) diff --git a/elpa/slime-20191224.2328/swank/abcl.lisp b/elpa/slime-20200125.1053/swank/abcl.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/abcl.lisp rename to elpa/slime-20200125.1053/swank/abcl.lisp diff --git a/elpa/slime-20191224.2328/swank/allegro.lisp b/elpa/slime-20200125.1053/swank/allegro.lisp similarity index 96% rename from elpa/slime-20191224.2328/swank/allegro.lisp rename to elpa/slime-20200125.1053/swank/allegro.lisp index 1956106a..942764cd 100644 --- a/elpa/slime-20191224.2328/swank/allegro.lisp +++ b/elpa/slime-20200125.1053/swank/allegro.lisp @@ -913,21 +913,37 @@ to do this, this factors in the length of the inserted header itself." (nconc (mailbox.queue mbox) (list message))) (mp:open-gate (mailbox.gate mbox))))) +(defimplementation wake-thread (thread) + (let* ((mbox (mailbox thread))) + (mp:open-gate (mailbox.gate mbox)))) + (defimplementation receive-if (test &optional timeout) (let ((mbox (mailbox mp:*current-process*))) - (assert (or (not timeout) (eq timeout t))) - (loop - (check-slime-interrupts) - (mp:with-process-lock ((mailbox.lock mbox)) - (let* ((q (mailbox.queue mbox)) - (tail (member-if test q))) - (when tail - (setf (mailbox.queue mbox) (nconc (ldiff q tail) (cdr tail))) - (return (car tail))) - (mp:close-gate (mailbox.gate mbox)))) - (when (eq timeout t) (return (values nil t))) - (mp:process-wait-with-timeout "receive-if" 0.5 - #'mp:gate-open-p (mailbox.gate mbox))))) + (flet ((open-mailbox () + ;; this opens the mailbox and returns if has the message + ;; we are expecting. But first, check for interrupts. + (check-slime-interrupts) + (mp:with-process-lock ((mailbox.lock mbox)) + (let* ((q (mailbox.queue mbox)) + (tail (member-if test q))) + (when tail + (setf (mailbox.queue mbox) (nconc (ldiff q tail) (cdr tail))) + (return-from receive-if (car tail))) + ;; ...if it doesn't, we close the gate (even if it + ;; was already closed) + (mp:close-gate (mailbox.gate mbox)))))) + (cond (timeout + ;; open the mailbox and return asap + (open-mailbox) + (return-from receive-if (values nil t))) + (t + ;; wait until gate open, then open mailbox. If there's + ;; no message there, repeat forever. + (loop + (mp:process-wait + "receive-if (waiting on gate)" + #'mp:gate-open-p (mailbox.gate mbox)) + (open-mailbox))))))) (let ((alist '()) (lock (mp:make-process-lock :name "register-thread"))) diff --git a/elpa/slime-20191224.2328/swank/backend.lisp b/elpa/slime-20200125.1053/swank/backend.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/backend.lisp rename to elpa/slime-20200125.1053/swank/backend.lisp diff --git a/elpa/slime-20191224.2328/swank/ccl.lisp b/elpa/slime-20200125.1053/swank/ccl.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/ccl.lisp rename to elpa/slime-20200125.1053/swank/ccl.lisp diff --git a/elpa/slime-20191224.2328/swank/clasp.lisp b/elpa/slime-20200125.1053/swank/clasp.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/clasp.lisp rename to elpa/slime-20200125.1053/swank/clasp.lisp diff --git a/elpa/slime-20191224.2328/swank/clisp.lisp b/elpa/slime-20200125.1053/swank/clisp.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/clisp.lisp rename to elpa/slime-20200125.1053/swank/clisp.lisp diff --git a/elpa/slime-20191224.2328/swank/cmucl.lisp b/elpa/slime-20200125.1053/swank/cmucl.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/cmucl.lisp rename to elpa/slime-20200125.1053/swank/cmucl.lisp diff --git a/elpa/slime-20191224.2328/swank/corman.lisp b/elpa/slime-20200125.1053/swank/corman.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/corman.lisp rename to elpa/slime-20200125.1053/swank/corman.lisp diff --git a/elpa/slime-20191224.2328/swank/ecl.lisp b/elpa/slime-20200125.1053/swank/ecl.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/ecl.lisp rename to elpa/slime-20200125.1053/swank/ecl.lisp diff --git a/elpa/slime-20191224.2328/swank/gray.lisp b/elpa/slime-20200125.1053/swank/gray.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/gray.lisp rename to elpa/slime-20200125.1053/swank/gray.lisp diff --git a/elpa/slime-20191224.2328/swank/lispworks.lisp b/elpa/slime-20200125.1053/swank/lispworks.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/lispworks.lisp rename to elpa/slime-20200125.1053/swank/lispworks.lisp diff --git a/elpa/slime-20191224.2328/swank/match.lisp b/elpa/slime-20200125.1053/swank/match.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/match.lisp rename to elpa/slime-20200125.1053/swank/match.lisp diff --git a/elpa/slime-20191224.2328/swank/mezzano.lisp b/elpa/slime-20200125.1053/swank/mezzano.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/mezzano.lisp rename to elpa/slime-20200125.1053/swank/mezzano.lisp diff --git a/elpa/slime-20191224.2328/swank/mkcl.lisp b/elpa/slime-20200125.1053/swank/mkcl.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/mkcl.lisp rename to elpa/slime-20200125.1053/swank/mkcl.lisp diff --git a/elpa/slime-20191224.2328/swank/rpc.lisp b/elpa/slime-20200125.1053/swank/rpc.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/rpc.lisp rename to elpa/slime-20200125.1053/swank/rpc.lisp diff --git a/elpa/slime-20191224.2328/swank/sbcl.lisp b/elpa/slime-20200125.1053/swank/sbcl.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/sbcl.lisp rename to elpa/slime-20200125.1053/swank/sbcl.lisp diff --git a/elpa/slime-20191224.2328/swank/scl.lisp b/elpa/slime-20200125.1053/swank/scl.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/scl.lisp rename to elpa/slime-20200125.1053/swank/scl.lisp diff --git a/elpa/slime-20191224.2328/swank/source-file-cache.lisp b/elpa/slime-20200125.1053/swank/source-file-cache.lisp similarity index 100% rename from elpa/slime-20191224.2328/swank/source-file-cache.lisp rename to elpa/slime-20200125.1053/swank/source-file-cache.lisp diff --git a/elpa/slime-20191224.2328/swank/source-path-parser.lisp b/elpa/slime-20200125.1053/swank/source-path-parser.lisp similarity index 98% rename from elpa/slime-20191224.2328/swank/source-path-parser.lisp rename to elpa/slime-20200125.1053/swank/source-path-parser.lisp index bb9c35c4..f48a7162 100644 --- a/elpa/slime-20191224.2328/swank/source-path-parser.lisp +++ b/elpa/slime-20200125.1053/swank/source-path-parser.lisp @@ -112,6 +112,9 @@ subexpressions of the object to stream positions." (let* ((source-map (make-hash-table :test #'eq)) (*readtable* (make-source-recording-readtable *readtable* source-map)) (*read-suppress* nil) + #+sbcl + (*features* (append *features* + (symbol-value (find-symbol "+INTERNAL-FEATURES+" 'sb-impl)))) (start (file-position stream)) (form (ignore-errors (read stream))) (end (file-position stream))) diff --git a/elpa/slime-20191224.2328/xref.lisp b/elpa/slime-20200125.1053/xref.lisp similarity index 100% rename from elpa/slime-20191224.2328/xref.lisp rename to elpa/slime-20200125.1053/xref.lisp diff --git a/elpa/spacemacs-theme-20191227.1039/spacemacs-common.el b/elpa/spacemacs-theme-20200127.1656/spacemacs-common.el similarity index 99% rename from elpa/spacemacs-theme-20191227.1039/spacemacs-common.el rename to elpa/spacemacs-theme-20200127.1656/spacemacs-common.el index e81a69ca..5f61b85b 100644 --- a/elpa/spacemacs-theme-20191227.1039/spacemacs-common.el +++ b/elpa/spacemacs-theme-20200127.1656/spacemacs-common.el @@ -584,6 +584,9 @@ to 'auto, tags may not be properly aligned. " `(ivy-minibuffer-match-face-3 ((,class (:foreground ,head4 :underline t)))) `(ivy-minibuffer-match-face-4 ((,class (:foreground ,head3 :underline t)))) `(ivy-remote ((,class (:foreground ,cyan)))) + +;;;;; ivy-posframe + `(ivy-posframe ((,class (:background ,bg3)))) ;;;;; latex `(font-latex-bold-face ((,class (:foreground ,comp)))) diff --git a/elpa/spacemacs-theme-20191227.1039/spacemacs-dark-theme.el b/elpa/spacemacs-theme-20200127.1656/spacemacs-dark-theme.el similarity index 100% rename from elpa/spacemacs-theme-20191227.1039/spacemacs-dark-theme.el rename to elpa/spacemacs-theme-20200127.1656/spacemacs-dark-theme.el diff --git a/elpa/spacemacs-theme-20191227.1039/spacemacs-dark-theme.elc b/elpa/spacemacs-theme-20200127.1656/spacemacs-dark-theme.elc similarity index 95% rename from elpa/spacemacs-theme-20191227.1039/spacemacs-dark-theme.elc rename to elpa/spacemacs-theme-20200127.1656/spacemacs-dark-theme.elc index 49675e48..f35e636c 100644 Binary files a/elpa/spacemacs-theme-20191227.1039/spacemacs-dark-theme.elc and b/elpa/spacemacs-theme-20200127.1656/spacemacs-dark-theme.elc differ diff --git a/elpa/spacemacs-theme-20191227.1039/spacemacs-light-theme.el b/elpa/spacemacs-theme-20200127.1656/spacemacs-light-theme.el similarity index 100% rename from elpa/spacemacs-theme-20191227.1039/spacemacs-light-theme.el rename to elpa/spacemacs-theme-20200127.1656/spacemacs-light-theme.el diff --git a/elpa/spacemacs-theme-20191227.1039/spacemacs-light-theme.elc b/elpa/spacemacs-theme-20200127.1656/spacemacs-light-theme.elc similarity index 96% rename from elpa/spacemacs-theme-20191227.1039/spacemacs-light-theme.elc rename to elpa/spacemacs-theme-20200127.1656/spacemacs-light-theme.elc index 9b0ccc5a..06e314ca 100644 Binary files a/elpa/spacemacs-theme-20191227.1039/spacemacs-light-theme.elc and b/elpa/spacemacs-theme-20200127.1656/spacemacs-light-theme.elc differ diff --git a/elpa/spacemacs-theme-20191227.1039/spacemacs-theme-autoloads.el b/elpa/spacemacs-theme-20200127.1656/spacemacs-theme-autoloads.el similarity index 100% rename from elpa/spacemacs-theme-20191227.1039/spacemacs-theme-autoloads.el rename to elpa/spacemacs-theme-20200127.1656/spacemacs-theme-autoloads.el diff --git a/elpa/spacemacs-theme-20191227.1039/spacemacs-theme-pkg.el b/elpa/spacemacs-theme-20200127.1656/spacemacs-theme-pkg.el similarity index 72% rename from elpa/spacemacs-theme-20191227.1039/spacemacs-theme-pkg.el rename to elpa/spacemacs-theme-20200127.1656/spacemacs-theme-pkg.el index b48a79b0..83a29054 100644 --- a/elpa/spacemacs-theme-20191227.1039/spacemacs-theme-pkg.el +++ b/elpa/spacemacs-theme-20200127.1656/spacemacs-theme-pkg.el @@ -1,4 +1,4 @@ -(define-package "spacemacs-theme" "20191227.1039" "Color theme with a dark and light versions" 'nil :keywords +(define-package "spacemacs-theme" "20200127.1656" "Color theme with a dark and light versions" 'nil :keywords '("color" "theme") :url "https://github.com/nashamri/spacemacs-theme") ;; Local Variables: diff --git a/elpa/transient-20191226.1938/dir b/elpa/transient-20200125.1308/dir similarity index 100% rename from elpa/transient-20191226.1938/dir rename to elpa/transient-20200125.1308/dir diff --git a/elpa/transient-20191226.1938/transient-autoloads.el b/elpa/transient-20200125.1308/transient-autoloads.el similarity index 100% rename from elpa/transient-20191226.1938/transient-autoloads.el rename to elpa/transient-20200125.1308/transient-autoloads.el diff --git a/elpa/transient-20191226.1938/transient-pkg.el b/elpa/transient-20200125.1308/transient-pkg.el similarity index 80% rename from elpa/transient-20191226.1938/transient-pkg.el rename to elpa/transient-20200125.1308/transient-pkg.el index 1d5d1d2d..ed112f14 100644 --- a/elpa/transient-20191226.1938/transient-pkg.el +++ b/elpa/transient-20200125.1308/transient-pkg.el @@ -1,4 +1,4 @@ -(define-package "transient" "20191226.1938" "Transient commands" +(define-package "transient" "20200125.1308" "Transient commands" '((emacs "25.1")) :keywords '("bindings") diff --git a/elpa/transient-20191226.1938/transient.el b/elpa/transient-20200125.1308/transient.el similarity index 99% rename from elpa/transient-20191226.1938/transient.el rename to elpa/transient-20200125.1308/transient.el index 148e8435..f816a202 100644 --- a/elpa/transient-20191226.1938/transient.el +++ b/elpa/transient-20200125.1308/transient.el @@ -1,6 +1,6 @@ ;;; transient.el --- Transient commands -*- lexical-binding: t; -*- -;; Copyright (C) 2018-2019 Jonas Bernoulli +;; Copyright (C) 2018-2020 Jonas Bernoulli ;; Author: Jonas Bernoulli ;; Homepage: https://github.com/magit/transient @@ -173,7 +173,7 @@ of this variable use \"C-x t\" when a transient is active." :group 'transient :type 'boolean) -(defcustom transient-read-with-initial-input t +(defcustom transient-read-with-initial-input nil "Whether to use the last history element as initial minibuffer input." :package-version '(transient . "0.2.0") :group 'transient @@ -451,7 +451,7 @@ If `transient-save-history' is nil, then do nothing." (command :initarg :command) (level :initarg :level) (variable :initarg :variable :initform nil) - (value :initarg :value) + (value) (default-value :initarg :value) (scope :initarg :scope :initform nil) (history :initarg :history :initform nil) (history-pos :initarg :history-pos :initform 0) @@ -640,7 +640,8 @@ to the setup function: [&optional lambda-doc] [&rest keywordp sexp] [&rest vectorp] - [&optional ("interactive" interactive) def-body]))) + [&optional ("interactive" interactive) def-body])) + (doc-string 3)) (pcase-let ((`(,class ,slots ,suffixes ,docstr ,body) (transient--expand-define-args args))) `(progn @@ -679,7 +680,8 @@ ARGLIST. The infix arguments are usually accessed by using [&optional lambda-doc] [&rest keywordp sexp] ("interactive" interactive) - def-body))) + def-body)) + (doc-string 3)) (pcase-let ((`(,class ,slots ,_ ,docstr ,body) (transient--expand-define-args args))) `(progn @@ -726,7 +728,8 @@ keyword. \(fn NAME ARGLIST [DOCSTRING] [KEYWORD VALUE]...)" (declare (debug (&define name lambda-list [&optional lambda-doc] - [&rest keywordp sexp]))) + [&rest keywordp sexp])) + (doc-string 3)) (pcase-let ((`(,class ,slots ,_ ,docstr ,_) (transient--expand-define-args args))) `(progn @@ -2113,13 +2116,14 @@ Non-infix suffix commands usually don't have a value." nil) (cl-defmethod transient-init-value ((obj transient-prefix)) - (if (slot-boundp obj 'value) - (let ((value (oref obj value))) - (when (functionp value) - (oset obj value (funcall value)))) - (oset obj value - (if-let ((saved (assq (oref obj command) transient-values))) - (cdr saved) + (oset obj value + (if-let ((saved (assq (oref obj command) transient-values))) + (cdr saved) + (if-let ((default (and (slot-boundp obj 'default-value) + (oref obj default-value)))) + (if (functionp default) + (funcall default) + default) nil)))) (cl-defmethod transient-init-value ((obj transient-switch)) @@ -2208,7 +2212,9 @@ it\", in which case it is pointless to preserve history.)" (cons value transient--history))) (initial-input (and transient-read-with-initial-input (car transient--history))) - (history (cons 'transient--history (if initial-input 1 0))) + (history (if initial-input + (cons 'transient--history 1) + 'transient--history)) (value (cond (reader (funcall reader prompt initial-input history)) @@ -2223,6 +2229,9 @@ it\", in which case it is pointless to preserve history.)" ((and (equal value "\"\"") allow-empty) (setq value ""))) (when value + (when (bound-and-true-p ivy-mode) + (set-text-properties 0 (length (car transient--history)) nil + (car transient--history))) (setf (alist-get history-key transient-history) (delete-dups transient--history))) value)))) diff --git a/elpa/transient-20191226.1938/transient.elc b/elpa/transient-20200125.1308/transient.elc similarity index 84% rename from elpa/transient-20191226.1938/transient.elc rename to elpa/transient-20200125.1308/transient.elc index 207f8141..f13f9a76 100644 Binary files a/elpa/transient-20191226.1938/transient.elc and b/elpa/transient-20200125.1308/transient.elc differ diff --git a/elpa/transient-20191226.1938/transient.info b/elpa/transient-20200125.1308/transient.info similarity index 99% rename from elpa/transient-20191226.1938/transient.info rename to elpa/transient-20200125.1308/transient.info index b02ea561..70ec12a9 100644 --- a/elpa/transient-20191226.1938/transient.info +++ b/elpa/transient-20200125.1308/transient.info @@ -1,7 +1,7 @@ This is transient.info, produced by makeinfo version 6.5 from transient.texi. - Copyright (C) 2018-2019 Jonas Bernoulli + Copyright (C) 2018-2020 Jonas Bernoulli You can redistribute this document and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -44,9 +44,9 @@ reading a new value in the minibuffer. Calling a suffix command usually causes the transient to be exited but suffix commands can also be configured to not exit the transient. -This manual is for Transient version 0.1.0 (v0.1.0-131-g6ceb643+1). +This manual is for Transient version 0.1.0 (v0.1.0-134-g83cb1e4+1). - Copyright (C) 2018-2019 Jonas Bernoulli + Copyright (C) 2018-2020 Jonas Bernoulli You can redistribute this document and/or modify it under the terms of the GNU General Public License as published by the Free Software diff --git a/elpa/typescript-mode-20191209.1107/typescript-mode-autoloads.el b/elpa/typescript-mode-20200117.1708/typescript-mode-autoloads.el similarity index 100% rename from elpa/typescript-mode-20191209.1107/typescript-mode-autoloads.el rename to elpa/typescript-mode-20200117.1708/typescript-mode-autoloads.el diff --git a/elpa/typescript-mode-20191209.1107/typescript-mode-pkg.el b/elpa/typescript-mode-20200117.1708/typescript-mode-pkg.el similarity index 74% rename from elpa/typescript-mode-20191209.1107/typescript-mode-pkg.el rename to elpa/typescript-mode-20200117.1708/typescript-mode-pkg.el index aab7b495..3f0c6340 100644 --- a/elpa/typescript-mode-20191209.1107/typescript-mode-pkg.el +++ b/elpa/typescript-mode-20200117.1708/typescript-mode-pkg.el @@ -1,4 +1,4 @@ -(define-package "typescript-mode" "20191209.1107" "Major mode for editing typescript" +(define-package "typescript-mode" "20200117.1708" "Major mode for editing typescript" '((emacs "24.3")) :keywords '("typescript" "languages") diff --git a/elpa/typescript-mode-20191209.1107/typescript-mode-test-utilities.el b/elpa/typescript-mode-20200117.1708/typescript-mode-test-utilities.el similarity index 100% rename from elpa/typescript-mode-20191209.1107/typescript-mode-test-utilities.el rename to elpa/typescript-mode-20200117.1708/typescript-mode-test-utilities.el diff --git a/elpa/typescript-mode-20191209.1107/typescript-mode-test-utilities.elc b/elpa/typescript-mode-20200117.1708/typescript-mode-test-utilities.elc similarity index 76% rename from elpa/typescript-mode-20191209.1107/typescript-mode-test-utilities.elc rename to elpa/typescript-mode-20200117.1708/typescript-mode-test-utilities.elc index b76f7023..fa9ddb1e 100644 Binary files a/elpa/typescript-mode-20191209.1107/typescript-mode-test-utilities.elc and b/elpa/typescript-mode-20200117.1708/typescript-mode-test-utilities.elc differ diff --git a/elpa/typescript-mode-20191209.1107/typescript-mode.el b/elpa/typescript-mode-20200117.1708/typescript-mode.el similarity index 98% rename from elpa/typescript-mode-20191209.1107/typescript-mode.el rename to elpa/typescript-mode-20200117.1708/typescript-mode.el index 633aac1e..3ae8e16a 100644 --- a/elpa/typescript-mode-20191209.1107/typescript-mode.el +++ b/elpa/typescript-mode-20200117.1708/typescript-mode.el @@ -743,36 +743,16 @@ the string from a plain string to a template." (defvar typescript-mode-map (let ((keymap (make-sparse-keymap))) - (dolist (key '("{" "}" "(" ")" ":" ";" ",")) - (define-key keymap key #'typescript-insert-and-indent)) - (dolist (key '("\"" "\'")) - (define-key keymap key #'typescript-insert-and-autoconvert-to-template)) (define-key keymap (kbd "C-c '") #'typescript-convert-to-template) keymap) "Keymap for `typescript-mode'.") -(defun typescript-insert-and-indent (key) - "Run the command bound to KEY, and indent if necessary. -Indentation does not take place if point is in a string or -comment." - (interactive (list (this-command-keys))) - (call-interactively (lookup-key (current-global-map) key)) - (let ((syntax (save-restriction (widen) (syntax-ppss)))) - (when (or (and (not (nth 8 syntax)) - typescript-auto-indent-flag) - (and (nth 4 syntax) - (eq (current-column) - (1+ (current-indentation))))) - (indent-according-to-mode)))) -(put 'typescript-insert-and-indent 'delete-selection t) - -(defun typescript-insert-and-autoconvert-to-template (key) - "Run the command bount to KEY, and autoconvert to template if necessary." - (interactive (list (this-command-keys))) - (call-interactively (lookup-key (current-global-map) key)) - (when typescript-autoconvert-to-template-flag +(defun typescript--post-self-insert-function () + (when (and (derived-mode-p 'typescript-mode) + typescript-autoconvert-to-template-flag + (or (eq last-command-event ?\') + (eq last-command-event ?\"))) (typescript-autoconvert-to-template))) -(put 'typescript-insert-and-autoconvert-to-template 'delete-selection t) ;;; Syntax table and parsing @@ -2845,6 +2825,11 @@ Key bindings: c-comment-start-regexp "/[*/]\\|\\s!" comment-start-skip "\\(//+\\|/\\*+\\)\\s *") + (setq-local electric-indent-chars + (append "{}():;," electric-indent-chars)) + (setq-local electric-layout-rules + '((?\; . after) (?\{ . after) (?\} . before))) + (let ((c-buffer-is-cc-mode t)) ;; FIXME: These are normally set by `c-basic-common-init'. Should ;; we call it instead? (Bug#6071) @@ -2855,6 +2840,9 @@ Key bindings: (make-local-variable 'adaptive-fill-regexp) (c-setup-paragraph-variables)) + (add-hook 'post-self-insert-hook + #'typescript--post-self-insert-function) + (setq-local syntax-begin-function #'typescript--syntax-begin-function)) ;; Set our custom predicate for flyspell prog mode diff --git a/elpa/typescript-mode-20191209.1107/typescript-mode.elc b/elpa/typescript-mode-20200117.1708/typescript-mode.elc similarity index 92% rename from elpa/typescript-mode-20191209.1107/typescript-mode.elc rename to elpa/typescript-mode-20200117.1708/typescript-mode.elc index 985b4a37..6d1a217a 100644 Binary files a/elpa/typescript-mode-20191209.1107/typescript-mode.elc and b/elpa/typescript-mode-20200117.1708/typescript-mode.elc differ diff --git a/elpa/websocket-20191123.2208/websocket-pkg.el b/elpa/websocket-20191123.2208/websocket-pkg.el deleted file mode 100644 index 1057a443..00000000 --- a/elpa/websocket-20191123.2208/websocket-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "websocket" "20191123.2208" "Emacs WebSocket client and server" '((cl-lib "0.5")) :commit "74e4b82bf1a2e9197875ebcc20c494b506095235" :keywords '("communication" "websocket" "server") :authors '(("Andrew Hyatt" . "ahyatt@gmail.com")) :maintainer '("Andrew Hyatt" . "ahyatt@gmail.com")) diff --git a/elpa/websocket-20191123.2208/websocket-autoloads.el b/elpa/websocket-20200102.637/websocket-autoloads.el similarity index 100% rename from elpa/websocket-20191123.2208/websocket-autoloads.el rename to elpa/websocket-20200102.637/websocket-autoloads.el diff --git a/elpa/websocket-20200102.637/websocket-pkg.el b/elpa/websocket-20200102.637/websocket-pkg.el new file mode 100644 index 00000000..c0ecc6dc --- /dev/null +++ b/elpa/websocket-20200102.637/websocket-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "websocket" "20200102.637" "Emacs WebSocket client and server" '((cl-lib "0.5")) :commit "ee44af2cc55415591e7ccb1007193294c702affd" :keywords '("communication" "websocket" "server") :authors '(("Andrew Hyatt" . "ahyatt@gmail.com")) :maintainer '("Andrew Hyatt" . "ahyatt@gmail.com")) diff --git a/elpa/websocket-20191123.2208/websocket.el b/elpa/websocket-20200102.637/websocket.el similarity index 99% rename from elpa/websocket-20191123.2208/websocket.el rename to elpa/websocket-20200102.637/websocket.el index af492799..53217ab0 100644 --- a/elpa/websocket-20191123.2208/websocket.el +++ b/elpa/websocket-20200102.637/websocket.el @@ -4,7 +4,7 @@ ;; Author: Andrew Hyatt ;; Keywords: Communication, Websocket, Server -;; Package-Version: 20191123.2208 +;; Package-Version: 20200102.637 ;; Version: 1.12 ;; Package-Requires: ((cl-lib "0.5")) ;; @@ -723,7 +723,7 @@ to the websocket protocol. conn (websocket-sentinel url conn key protocols extensions custom-header-alist nowait)) (set-process-query-on-exit-flag conn nil) - (websocket-ensure-handshake url conn key protocols extensions custom-header-alist) + (websocket-ensure-handshake url conn key protocols extensions custom-header-alist nowait) websocket)) (defun websocket-sentinel (url conn key protocols extensions custom-header-alist nowait) @@ -732,17 +732,18 @@ to the websocket protocol. (websocket-debug websocket "State change to %s" change) (let ((status (process-status process))) (when (and nowait (eq status 'open)) - (websocket-ensure-handshake url conn key protocols extensions custom-header-alist)) + (websocket-ensure-handshake url conn key protocols extensions custom-header-alist nowait)) (when (and (member status '(closed failed exit signal)) (not (eq 'closed (websocket-ready-state websocket)))) (websocket-try-callback 'websocket-on-close 'on-close websocket)))))) -(defun websocket-ensure-handshake (url conn key protocols extensions custom-header-alist) +(defun websocket-ensure-handshake (url conn key protocols extensions custom-header-alist nowait) (let ((url-struct (url-generic-parse-url url)) (websocket (process-get conn :websocket))) (when (and (eq 'connecting (websocket-ready-state websocket)) - (eq 'open (process-status conn))) + (memq (process-status conn) + (list 'run (if nowait 'connect 'open)))) (process-send-string conn (format "GET %s HTTP/1.1\r\n" (let ((path (url-filename url-struct))) diff --git a/elpa/websocket-20191123.2208/websocket.elc b/elpa/websocket-20200102.637/websocket.elc similarity index 92% rename from elpa/websocket-20191123.2208/websocket.elc rename to elpa/websocket-20200102.637/websocket.elc index 1602debb..9e53e65f 100644 Binary files a/elpa/websocket-20191123.2208/websocket.elc and b/elpa/websocket-20200102.637/websocket.elc differ diff --git a/elpa/with-editor-20191222.1939/dir b/elpa/with-editor-20200102.2147/dir similarity index 100% rename from elpa/with-editor-20191222.1939/dir rename to elpa/with-editor-20200102.2147/dir diff --git a/elpa/with-editor-20191222.1939/with-editor-autoloads.el b/elpa/with-editor-20200102.2147/with-editor-autoloads.el similarity index 100% rename from elpa/with-editor-20191222.1939/with-editor-autoloads.el rename to elpa/with-editor-20200102.2147/with-editor-autoloads.el diff --git a/elpa/with-editor-20191222.1939/with-editor-pkg.el b/elpa/with-editor-20200102.2147/with-editor-pkg.el similarity index 81% rename from elpa/with-editor-20191222.1939/with-editor-pkg.el rename to elpa/with-editor-20200102.2147/with-editor-pkg.el index 3b1ceccf..5d16d290 100644 --- a/elpa/with-editor-20191222.1939/with-editor-pkg.el +++ b/elpa/with-editor-20200102.2147/with-editor-pkg.el @@ -1,4 +1,4 @@ -(define-package "with-editor" "20191222.1939" "Use the Emacsclient as $EDITOR" +(define-package "with-editor" "20200102.2147" "Use the Emacsclient as $EDITOR" '((emacs "24.4") (async "1.9")) :keywords diff --git a/elpa/with-editor-20191222.1939/with-editor.el b/elpa/with-editor-20200102.2147/with-editor.el similarity index 99% rename from elpa/with-editor-20191222.1939/with-editor.el rename to elpa/with-editor-20200102.2147/with-editor.el index 19198da0..76122002 100644 --- a/elpa/with-editor-20191222.1939/with-editor.el +++ b/elpa/with-editor-20200102.2147/with-editor.el @@ -1,6 +1,6 @@ ;;; with-editor.el --- Use the Emacsclient as $EDITOR -*- lexical-binding: t -*- -;; Copyright (C) 2014-2019 The Magit Project Contributors +;; Copyright (C) 2014-2020 The Magit Project Contributors ;; ;; You should have received a copy of the AUTHORS.md file. If not, ;; see https://github.com/magit/with-editor/blob/master/AUTHORS.md. diff --git a/elpa/with-editor-20191222.1939/with-editor.elc b/elpa/with-editor-20200102.2147/with-editor.elc similarity index 99% rename from elpa/with-editor-20191222.1939/with-editor.elc rename to elpa/with-editor-20200102.2147/with-editor.elc index 36268aa5..2d600de3 100644 Binary files a/elpa/with-editor-20191222.1939/with-editor.elc and b/elpa/with-editor-20200102.2147/with-editor.elc differ diff --git a/elpa/with-editor-20191222.1939/with-editor.info b/elpa/with-editor-20200102.2147/with-editor.info similarity index 97% rename from elpa/with-editor-20191222.1939/with-editor.info rename to elpa/with-editor-20200102.2147/with-editor.info index ac899e6b..d3ac1ad6 100644 --- a/elpa/with-editor-20191222.1939/with-editor.info +++ b/elpa/with-editor-20200102.2147/with-editor.info @@ -1,7 +1,7 @@ This is with-editor.info, produced by makeinfo version 6.5 from with-editor.texi. - Copyright (C) 2015-2019 Jonas Bernoulli + Copyright (C) 2015-2020 Jonas Bernoulli You can redistribute this document and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -39,9 +39,9 @@ library is made available as a separate package. It also defines some additional functionality which makes it useful even for end-users, who don’t use Magit or another package which uses it internally. -This manual is for With-Editor version 2.8.3 (v2.8.3-7-gd5c7772+1). +This manual is for With-Editor version 2.9.1. - Copyright (C) 2015-2019 Jonas Bernoulli + Copyright (C) 2015-2020 Jonas Bernoulli You can redistribute this document and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -329,11 +329,11 @@ Emacs and what is the output of ‘M-x with-editor-debug RET’.  Tag Table: Node: Top773 -Node: Using the With-Editor package2535 -Node: Configuring With-Editor3121 -Node: Using With-Editor commands7670 -Node: Using With-Editor as a library10865 -Node: Debugging12828 +Node: Using the With-Editor package2513 +Node: Configuring With-Editor3099 +Node: Using With-Editor commands7648 +Node: Using With-Editor as a library10843 +Node: Debugging12806  End Tag Table