From 8c2ce431f166d512b0b56e338a5662cee9693a94 Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcus-kammer@users.noreply.gitlab.com> Date: Sun, 8 Dec 2019 10:09:47 +0100 Subject: [PATCH 1/4] Update display --- bundle/custom.el | 2 +- bundle/display.el | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bundle/custom.el b/bundle/custom.el index 8912e4eb..b68294d9 100644 --- a/bundle/custom.el +++ b/bundle/custom.el @@ -84,7 +84,7 @@ '(package-selected-packages (quote (flymake-eslint json-mode elpy darkroom dockerfile-mode ein spacemacs-theme flucui-themes leuven-theme htmlize scss-mode berrys-theme web-mode python-docstring sphinx-doc sphinx-frontend sphinx-mode ox-nikola racket-mode slime gherkin-mode powershell typescript-mode ob-http ob-ipython ob-restclient nord-theme restclient request restclient-test yaml-mode magit))) - '(python-shell-interpreter "python3") + '(python-shell-interpreter "python3" t) '(register-preview-delay 2) '(register-separator 43) '(request-log-level (quote debug)) diff --git a/bundle/display.el b/bundle/display.el index 87c75592..1d30a388 100644 --- a/bundle/display.el +++ b/bundle/display.el @@ -1,6 +1,4 @@ -(setq-default *small-font* "Iosevka Term-11" - *big-font* "Iosevka Term-14" - echo-keystrokes 0.02 +(setq-default echo-keystrokes 0.02 column-number-indicator-zero-based nil prettify-symbols-unprettify-at-point 'right-edge show-paren-delay 0 @@ -19,10 +17,18 @@ (when (eq system-type 'windows-nt) (when (display-graphic-p) (add-to-list 'default-frame-alist '(undecorated . nil)) - (add-to-list 'default-frame-alist '(font . "Iosevka Term-12")))) + (add-to-list 'default-frame-alist '(font . "Iosevka Term-12")) + (when (string= (system-name) "XPS-8930") + (add-to-list 'default-frame-alist '(font . "Iosevka Term-10"))))) (when (eq system-type 'gnu/linux) (when (display-graphic-p) (add-to-list 'default-frame-alist '(font . "Iosevka Term Slab-14")))) (provide 'display) + +;; Local Variables: +;; coding: utf-8 +;; fill-column: 79 +;; lisp-indent-offset: 2 +;; End: From ad950747dfd50de7d2a4dd7d6dedf20ff2e12da5 Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcus-kammer@users.noreply.gitlab.com> Date: Wed, 11 Dec 2019 15:35:21 +0100 Subject: [PATCH 2/4] Update packages and bundle files --- .gitignore | 2 + bundle/custom.el | 5 +- bundle/display.el | 9 +- .../ein-ac.el | 0 .../ein-ac.elc | Bin .../ein-autoloads.el | 0 .../ein-cell-edit.el | 0 .../ein-cell-edit.elc | Bin .../ein-cell-output.el | 0 .../ein-cell-output.elc | Bin .../ein-cell.el | 0 .../ein-cell.elc | Bin .../ein-classes.el | 0 .../ein-classes.elc | Bin .../ein-company.el | 0 .../ein-company.elc | Bin .../ein-completer.el | 0 .../ein-completer.elc | Bin 6920 -> 6916 bytes .../ein-connect.el | 0 .../ein-connect.elc | Bin .../ein-console.el | 0 .../ein-console.elc | Bin .../ein-contents-api.el | 0 .../ein-contents-api.elc | Bin .../ein-core.el | 0 .../ein-core.elc | Bin .../ein-dev.el | 0 .../ein-dev.elc | Bin .../ein-events.el | 0 .../ein-events.elc | Bin .../ein-file.el | 0 .../ein-file.elc | Bin 3256 -> 3051 bytes .../ein-helm.el | 0 .../ein-helm.elc | Bin .../ein-hy.el | 0 .../ein-hy.elc | Bin .../ein-iexec.el | 0 .../ein-iexec.elc | Bin .../ein-inspector.el | 0 .../ein-inspector.elc | Bin .../ein-ipdb.el | 0 .../ein-ipdb.elc | Bin .../ein-ipynb-mode.el | 0 .../ein-ipynb-mode.elc | Bin .../ein-jupyter.el | 0 .../ein-jupyter.elc | Bin .../ein-jupyterhub.el | 0 .../ein-jupyterhub.elc | Bin .../ein-kernel.el | 0 .../ein-kernel.elc | Bin .../ein-kernelinfo.el | 0 .../ein-kernelinfo.elc | Bin .../ein-kill-ring.el | 0 .../ein-kill-ring.elc | Bin .../ein-log.el | 0 .../ein-log.elc | Bin .../ein-multilang-fontify.el | 0 .../ein-multilang-fontify.elc | Bin .../ein-multilang.el | 0 .../ein-multilang.elc | Bin .../ein-node.el | 0 .../ein-node.elc | Bin .../ein-notebook.el | 0 .../ein-notebook.elc | Bin .../ein-notebooklist.el | 0 .../ein-notebooklist.elc | Bin .../ein-notification.el | 0 .../ein-notification.elc | Bin .../ein-org.el | 0 .../ein-org.elc | Bin .../ein-output-area.el | 0 .../ein-output-area.elc | Bin .../ein-pager.el | 0 .../ein-pager.elc | Bin .../ein-pkg.el | 2 +- .../ein-process.el | 0 .../ein-process.elc | Bin .../ein-pseudo-console.el | 0 .../ein-pseudo-console.elc | Bin .../ein-python.el | 0 .../ein-python.elc | Bin .../ein-pytools.el | 0 .../ein-pytools.elc | Bin 16850 -> 16876 bytes .../ein-query.el | 0 .../ein-query.elc | Bin .../ein-scratchsheet.el | 0 .../ein-scratchsheet.elc | Bin .../ein-shared-output.el | 0 .../ein-shared-output.elc | Bin .../ein-skewer.el | 0 .../ein-skewer.elc | Bin 3116 -> 3118 bytes .../ein-smartrep.el | 0 .../ein-smartrep.elc | Bin .../ein-subpackages.el | 0 .../ein-subpackages.elc | Bin .../ein-timestamp.el | 0 .../ein-timestamp.elc | Bin .../ein-traceback.el | 0 .../ein-traceback.elc | Bin .../ein-utils.el | 0 .../ein-utils.elc | Bin .../ein-websocket.el | 0 .../ein-websocket.elc | Bin .../ein-worksheet.el | 19 +- .../ein-worksheet.elc | Bin 57183 -> 57255 bytes .../ein.el | 0 .../ein.elc | Bin .../ein_inspector.py | 0 .../ein_remote_safe.py | 0 .../ob-ein.el | 0 .../ob-ein.elc | Bin .../poly-ein.el | 0 .../poly-ein.elc | Bin .../AUTHORS.md | 0 .../LICENSE | 0 .../dir | 0 .../git-rebase.el | 0 .../git-rebase.elc | Bin 28072 -> 27987 bytes .../magit-apply.el | 0 .../magit-apply.elc | Bin 33151 -> 31993 bytes .../magit-autoloads.el | 0 .../magit-autorevert.el | 3 + .../magit-autorevert.elc | Bin 12431 -> 12523 bytes .../magit-bisect.el | 0 .../magit-bisect.elc | Bin 15636 -> 15636 bytes .../magit-blame.el | 0 .../magit-blame.elc | Bin 37852 -> 37852 bytes .../magit-bookmark.el | 0 .../magit-bookmark.elc | Bin 5733 -> 5676 bytes .../magit-branch.el | 0 .../magit-branch.elc | Bin 37397 -> 37160 bytes .../magit-clone.el | 0 .../magit-clone.elc | Bin 11226 -> 11156 bytes .../magit-commit.el | 0 .../magit-commit.elc | Bin 22625 -> 22559 bytes .../magit-core.el | 0 .../magit-core.elc | Bin 2968 -> 2968 bytes .../magit-diff.el | 3 +- .../magit-diff.elc | Bin 157770 -> 156403 bytes .../magit-ediff.el | 0 .../magit-ediff.elc | Bin 19148 -> 18902 bytes .../magit-extras.el | 0 .../magit-extras.elc | Bin 22260 -> 22004 bytes .../magit-fetch.el | 0 .../magit-fetch.elc | Bin 7101 -> 7101 bytes .../magit-files.el | 0 .../magit-files.elc | Bin 27033 -> 26952 bytes .../magit-git.el | 0 .../magit-git.elc | Bin 91100 -> 91100 bytes .../magit-gitignore.el | 0 .../magit-gitignore.elc | Bin 7378 -> 7378 bytes .../magit-imenu.el | 0 .../magit-imenu.elc | Bin 6830 -> 6830 bytes .../magit-log.el | 0 .../magit-log.elc | Bin 98456 -> 98195 bytes .../magit-margin.el | 0 .../magit-margin.elc | Bin 8339 -> 8237 bytes .../magit-merge.el | 0 .../magit-merge.elc | Bin 13710 -> 13563 bytes .../magit-mode.el | 8 +- .../magit-mode.elc | Bin 59591 -> 59591 bytes .../magit-notes.el | 0 .../magit-notes.elc | Bin 9045 -> 9045 bytes .../magit-obsolete.el | 0 .../magit-obsolete.elc | Bin 3795 -> 3795 bytes .../magit-patch.el | 0 .../magit-patch.elc | Bin 13403 -> 13403 bytes .../magit-pkg.el | 2 +- .../magit-process.el | 0 .../magit-process.elc | Bin 45899 -> 45899 bytes .../magit-pull.el | 0 .../magit-pull.elc | Bin 6144 -> 6144 bytes .../magit-push.el | 0 .../magit-push.elc | Bin 12261 -> 12261 bytes .../magit-reflog.el | 0 .../magit-reflog.elc | Bin 9998 -> 9998 bytes .../magit-refs.el | 0 .../magit-refs.elc | Bin 40393 -> 40256 bytes .../magit-remote.el | 0 .../magit-remote.elc | Bin 14931 -> 14859 bytes .../magit-repos.el | 0 .../magit-repos.elc | Bin 14542 -> 14542 bytes .../magit-reset.el | 0 .../magit-reset.elc | Bin 5544 -> 5544 bytes .../magit-section.el | 0 .../magit-section.elc | Bin 62832 -> 62655 bytes .../magit-sequence.el | 0 .../magit-sequence.elc | Bin 52359 -> 52139 bytes .../magit-stash.el | 0 .../magit-stash.elc | Bin 35517 -> 35517 bytes .../magit-status.el | 0 .../magit-status.elc | Bin 57227 -> 57132 bytes .../magit-submodule.el | 0 .../magit-submodule.elc | Bin 38537 -> 38467 bytes .../magit-subtree.el | 0 .../magit-subtree.elc | Bin 9095 -> 9095 bytes .../magit-tag.el | 0 .../magit-tag.elc | Bin 7151 -> 7151 bytes .../magit-transient.el | 0 .../magit-transient.elc | Bin 8360 -> 8360 bytes .../magit-utils.el | 0 .../magit-utils.elc | Bin 40408 -> 40322 bytes .../magit-wip.el | 0 .../magit-wip.elc | Bin 26804 -> 26804 bytes .../magit-worktree.el | 0 .../magit-worktree.elc | Bin 8598 -> 8598 bytes .../magit.el | 0 .../magit.elc | Bin 20434 -> 20434 bytes .../magit.info | 0 .../magit.info-1 | 0 .../magit.info-2 | 0 elpa/pickle-20190923.354/pickle-autoloads.el | 32 ++ elpa/pickle-20190923.354/pickle-pkg.el | 2 + elpa/pickle-20190923.354/pickle.el | 101 +++++++ elpa/pickle-20190923.354/pickle.elc | Bin 0 -> 4038 bytes .../poet-dark-monochrome-theme.el | 273 ++++++++++++++++++ .../poet-dark-monochrome-theme.elc | Bin 0 -> 11258 bytes .../poet-dark-theme.el | 273 ++++++++++++++++++ .../poet-dark-theme.elc | Bin 0 -> 11842 bytes .../poet-monochrome-theme.el | 273 ++++++++++++++++++ .../poet-monochrome-theme.elc | Bin 0 -> 11231 bytes .../poet-theme-autoloads.el | 58 ++++ .../poet-theme-pkg.el | 8 + elpa/poet-theme-20191103.1948/poet-theme.el | 273 ++++++++++++++++++ elpa/poet-theme-20191103.1948/poet-theme.elc | Bin 0 -> 11258 bytes .../poly-lock.el | 0 .../poly-lock.elc | Bin 10784 -> 10784 bytes .../polymode-autoloads.el | 0 .../polymode-base.el | 0 .../polymode-base.elc | Bin 9056 -> 9056 bytes .../polymode-classes.el | 7 - .../polymode-classes.elc | Bin 20167 -> 20056 bytes .../polymode-compat.el | 14 + .../polymode-compat.elc | Bin 8219 -> 8669 bytes .../polymode-core.el | 9 +- .../polymode-core.elc | Bin 53877 -> 53596 bytes .../polymode-debug.el | 0 .../polymode-debug.elc | Bin 20541 -> 20448 bytes .../polymode-export.el | 0 .../polymode-export.elc | Bin 18628 -> 18628 bytes .../polymode-methods.el | 0 .../polymode-methods.elc | Bin 18655 -> 18440 bytes .../polymode-pkg.el | 2 +- .../polymode-tangle.el | 0 .../polymode-tangle.elc | Bin 550 -> 550 bytes .../polymode-test-utils.el | 2 - .../polymode-test-utils.elc | Bin 13803 -> 13765 bytes .../polymode-weave.el | 0 .../polymode-weave.elc | Bin 12582 -> 12582 bytes .../polymode.el | 0 .../polymode.elc | Bin 26308 -> 26100 bytes .../typescript-mode-autoloads.el | 0 .../typescript-mode-pkg.el | 2 +- .../typescript-mode-test-utilities.el | 0 .../typescript-mode-test-utilities.elc | Bin 3495 -> 3495 bytes .../typescript-mode.el | 100 +++---- .../typescript-mode.elc | Bin 80162 -> 80015 bytes init.el | 2 +- 258 files changed, 1396 insertions(+), 88 deletions(-) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-ac.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-ac.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-autoloads.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-cell-edit.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-cell-edit.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-cell-output.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-cell-output.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-cell.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-cell.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-classes.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-classes.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-company.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-company.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-completer.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-completer.elc (83%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-connect.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-connect.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-console.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-console.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-contents-api.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-contents-api.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-core.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-core.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-dev.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-dev.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-events.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-events.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-file.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-file.elc (75%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-helm.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-helm.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-hy.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-hy.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-iexec.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-iexec.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-inspector.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-inspector.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-ipdb.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-ipdb.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-ipynb-mode.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-ipynb-mode.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-jupyter.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-jupyter.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-jupyterhub.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-jupyterhub.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-kernel.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-kernel.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-kernelinfo.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-kernelinfo.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-kill-ring.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-kill-ring.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-log.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-log.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-multilang-fontify.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-multilang-fontify.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-multilang.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-multilang.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-node.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-node.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-notebook.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-notebook.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-notebooklist.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-notebooklist.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-notification.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-notification.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-org.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-org.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-output-area.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-output-area.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-pager.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-pager.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-pkg.el (82%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-process.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-process.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-pseudo-console.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-pseudo-console.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-python.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-python.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-pytools.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-pytools.elc (94%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-query.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-query.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-scratchsheet.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-scratchsheet.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-shared-output.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-shared-output.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-skewer.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-skewer.elc (96%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-smartrep.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-smartrep.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-subpackages.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-subpackages.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-timestamp.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-timestamp.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-traceback.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-traceback.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-utils.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-utils.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-websocket.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-websocket.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-worksheet.el (98%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein-worksheet.elc (87%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein_inspector.py (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ein_remote_safe.py (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ob-ein.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/ob-ein.elc (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/poly-ein.el (100%) rename elpa/{ein-20191201.1831 => ein-20191208.33}/poly-ein.elc (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/AUTHORS.md (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/LICENSE (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/dir (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/git-rebase.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/git-rebase.elc (97%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-apply.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-apply.elc (55%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-autoloads.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-autorevert.el (98%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-autorevert.elc (94%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-bisect.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-bisect.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-blame.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-blame.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-bookmark.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-bookmark.elc (63%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-branch.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-branch.elc (91%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-clone.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-clone.elc (94%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-commit.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-commit.elc (90%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-core.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-core.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-diff.el (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-diff.elc (82%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-ediff.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-ediff.elc (80%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-extras.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-extras.elc (92%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-fetch.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-fetch.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-files.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-files.elc (98%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-git.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-git.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-gitignore.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-gitignore.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-imenu.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-imenu.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-log.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-log.elc (89%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-margin.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-margin.elc (91%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-merge.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-merge.elc (88%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-mode.el (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-mode.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-notes.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-notes.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-obsolete.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-obsolete.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-patch.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-patch.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-pkg.el (79%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-process.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-process.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-pull.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-pull.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-push.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-push.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-reflog.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-reflog.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-refs.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-refs.elc (94%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-remote.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-remote.elc (85%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-repos.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-repos.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-reset.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-reset.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-section.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-section.elc (97%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-sequence.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-sequence.elc (94%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-stash.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-stash.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-status.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-status.elc (97%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-submodule.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-submodule.elc (97%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-subtree.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-subtree.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-tag.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-tag.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-transient.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-transient.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-utils.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-utils.elc (98%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-wip.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-wip.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-worktree.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit-worktree.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit.el (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit.elc (99%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit.info (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit.info-1 (100%) rename elpa/{magit-20191128.1802 => magit-20191210.1617}/magit.info-2 (100%) create mode 100644 elpa/pickle-20190923.354/pickle-autoloads.el create mode 100644 elpa/pickle-20190923.354/pickle-pkg.el create mode 100644 elpa/pickle-20190923.354/pickle.el create mode 100644 elpa/pickle-20190923.354/pickle.elc create mode 100644 elpa/poet-theme-20191103.1948/poet-dark-monochrome-theme.el create mode 100644 elpa/poet-theme-20191103.1948/poet-dark-monochrome-theme.elc create mode 100644 elpa/poet-theme-20191103.1948/poet-dark-theme.el create mode 100644 elpa/poet-theme-20191103.1948/poet-dark-theme.elc create mode 100644 elpa/poet-theme-20191103.1948/poet-monochrome-theme.el create mode 100644 elpa/poet-theme-20191103.1948/poet-monochrome-theme.elc create mode 100644 elpa/poet-theme-20191103.1948/poet-theme-autoloads.el create mode 100644 elpa/poet-theme-20191103.1948/poet-theme-pkg.el create mode 100644 elpa/poet-theme-20191103.1948/poet-theme.el create mode 100644 elpa/poet-theme-20191103.1948/poet-theme.elc rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/poly-lock.el (100%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/poly-lock.elc (99%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-autoloads.el (100%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-base.el (100%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-base.elc (99%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-classes.el (98%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-classes.elc (96%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-compat.el (97%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-compat.elc (94%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-core.el (99%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-core.elc (90%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-debug.el (100%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-debug.elc (95%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-export.el (100%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-export.elc (99%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-methods.el (100%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-methods.elc (84%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-pkg.el (80%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-tangle.el (100%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-tangle.elc (95%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-test-utils.el (99%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-test-utils.elc (94%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-weave.el (100%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode-weave.elc (99%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode.el (100%) rename elpa/{polymode-20190714.2017 => polymode-20191208.1239}/polymode.elc (82%) rename elpa/{typescript-mode-20191120.346 => typescript-mode-20191209.1107}/typescript-mode-autoloads.el (100%) rename elpa/{typescript-mode-20191120.346 => typescript-mode-20191209.1107}/typescript-mode-pkg.el (66%) rename elpa/{typescript-mode-20191120.346 => typescript-mode-20191209.1107}/typescript-mode-test-utilities.el (100%) rename elpa/{typescript-mode-20191120.346 => typescript-mode-20191209.1107}/typescript-mode-test-utilities.elc (99%) rename elpa/{typescript-mode-20191120.346 => typescript-mode-20191209.1107}/typescript-mode.el (98%) rename elpa/{typescript-mode-20191120.346 => typescript-mode-20191209.1107}/typescript-mode.elc (92%) diff --git a/.gitignore b/.gitignore index 47733d79..c3cc8023 100755 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ org-clock-save.el elpa/archives/melpa/archive-contents __pycache__/ elpy/rpc-venv/ +.emacs.desktop +.emacs.desktop.lock diff --git a/bundle/custom.el b/bundle/custom.el index b68294d9..1276ba31 100644 --- a/bundle/custom.el +++ b/bundle/custom.el @@ -9,7 +9,7 @@ '(column-number-mode t) '(custom-safe-themes (quote - ("d6c5b8dc6049f2e9dabdfcafa9ef2079352640e80dffe3e6cc07c0f89cbf9748" "fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" "fa2af0c40576f3bde32290d7f4e7aa865eb6bf7ebe31eb9e37c32aa6f4ae8d10" "e396098fd5bef4f0dd6cedd01ea48df1ecb0554d8be0d8a924fb1d926f02f90f" "acfac6b14461a344f97fad30e2362c26a3fe56a9f095653832d8fc029cb9d05c" "85d1dbf2fc0e5d30f236712b831fb24faf6052f3114964fdeadede8e1b329832" "4639288d273cbd3dc880992e6032f9c817f17c4a91f00f3872009a099f5b3f84" "14c848e2c4a0a11fcd118e2519078aa50bb6020f89035423b40fff421fb24fbd" "cdb4ffdecc682978da78700a461cdc77456c3a6df1c1803ae2dd55c59fa703e3" "9e31aff9afe3c20a33dd966b4c54c6a5151f07659362e4b06bde38ded5370dae" "24fc62afe2e5f0609e436aa2427b396adf9a958a8fa660edbaab5fb13c08aae6" "82358261c32ebedfee2ca0f87299f74008a2e5ba5c502bde7aaa15db20ee3731" "4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default))) + ("64d8237b42b3b01f1487a908836574a5e531ea5efab54b9afa19fb8fda471ab3" "4bdc0dfc53ae06323e031baf691f414babf13c9c9c35014dd07bb42c4db27c24" "d6c5b8dc6049f2e9dabdfcafa9ef2079352640e80dffe3e6cc07c0f89cbf9748" "fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" "fa2af0c40576f3bde32290d7f4e7aa865eb6bf7ebe31eb9e37c32aa6f4ae8d10" "e396098fd5bef4f0dd6cedd01ea48df1ecb0554d8be0d8a924fb1d926f02f90f" "acfac6b14461a344f97fad30e2362c26a3fe56a9f095653832d8fc029cb9d05c" "85d1dbf2fc0e5d30f236712b831fb24faf6052f3114964fdeadede8e1b329832" "4639288d273cbd3dc880992e6032f9c817f17c4a91f00f3872009a099f5b3f84" "14c848e2c4a0a11fcd118e2519078aa50bb6020f89035423b40fff421fb24fbd" "cdb4ffdecc682978da78700a461cdc77456c3a6df1c1803ae2dd55c59fa703e3" "9e31aff9afe3c20a33dd966b4c54c6a5151f07659362e4b06bde38ded5370dae" "24fc62afe2e5f0609e436aa2427b396adf9a958a8fa660edbaab5fb13c08aae6" "82358261c32ebedfee2ca0f87299f74008a2e5ba5c502bde7aaa15db20ee3731" "4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default))) '(default-frame-alist (quote ((fullscreen . maximized) @@ -20,6 +20,7 @@ (menu-bar-lines . 0) (undecorated . t)))) '(delete-selection-mode t) + '(desktop-save-mode t) '(diary-file "~/Documents/Diary/diary") '(display-battery-mode t) '(display-line-numbers nil) @@ -83,7 +84,7 @@ '(package-enable-at-startup t) '(package-selected-packages (quote - (flymake-eslint json-mode elpy darkroom dockerfile-mode ein spacemacs-theme flucui-themes leuven-theme htmlize scss-mode berrys-theme web-mode python-docstring sphinx-doc sphinx-frontend sphinx-mode ox-nikola racket-mode slime gherkin-mode powershell typescript-mode ob-http ob-ipython ob-restclient nord-theme restclient request restclient-test yaml-mode magit))) + (pickle poet-theme flymake-eslint json-mode elpy darkroom dockerfile-mode ein spacemacs-theme flucui-themes leuven-theme htmlize scss-mode berrys-theme web-mode python-docstring sphinx-doc sphinx-frontend sphinx-mode ox-nikola racket-mode slime gherkin-mode powershell typescript-mode ob-http ob-ipython ob-restclient nord-theme restclient request restclient-test yaml-mode magit))) '(python-shell-interpreter "python3" t) '(register-preview-delay 2) '(register-separator 43) diff --git a/bundle/display.el b/bundle/display.el index 1d30a388..bcf4813b 100644 --- a/bundle/display.el +++ b/bundle/display.el @@ -15,11 +15,10 @@ (show-paren-mode) (when (eq system-type 'windows-nt) - (when (display-graphic-p) - (add-to-list 'default-frame-alist '(undecorated . nil)) - (add-to-list 'default-frame-alist '(font . "Iosevka Term-12")) - (when (string= (system-name) "XPS-8930") - (add-to-list 'default-frame-alist '(font . "Iosevka Term-10"))))) + (add-to-list 'default-frame-alist '(undecorated . nil)) + (add-to-list 'default-frame-alist '(font . "Iosevka Term Slab-12")) + (when (string= (system-name) "XPS-8930") + (add-to-list 'default-frame-alist '(font . "Iosevka Term-10")))) (when (eq system-type 'gnu/linux) (when (display-graphic-p) diff --git a/elpa/ein-20191201.1831/ein-ac.el b/elpa/ein-20191208.33/ein-ac.el similarity index 100% rename from elpa/ein-20191201.1831/ein-ac.el rename to elpa/ein-20191208.33/ein-ac.el diff --git a/elpa/ein-20191201.1831/ein-ac.elc b/elpa/ein-20191208.33/ein-ac.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-ac.elc rename to elpa/ein-20191208.33/ein-ac.elc diff --git a/elpa/ein-20191201.1831/ein-autoloads.el b/elpa/ein-20191208.33/ein-autoloads.el similarity index 100% rename from elpa/ein-20191201.1831/ein-autoloads.el rename to elpa/ein-20191208.33/ein-autoloads.el diff --git a/elpa/ein-20191201.1831/ein-cell-edit.el b/elpa/ein-20191208.33/ein-cell-edit.el similarity index 100% rename from elpa/ein-20191201.1831/ein-cell-edit.el rename to elpa/ein-20191208.33/ein-cell-edit.el diff --git a/elpa/ein-20191201.1831/ein-cell-edit.elc b/elpa/ein-20191208.33/ein-cell-edit.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-cell-edit.elc rename to elpa/ein-20191208.33/ein-cell-edit.elc diff --git a/elpa/ein-20191201.1831/ein-cell-output.el b/elpa/ein-20191208.33/ein-cell-output.el similarity index 100% rename from elpa/ein-20191201.1831/ein-cell-output.el rename to elpa/ein-20191208.33/ein-cell-output.el diff --git a/elpa/ein-20191201.1831/ein-cell-output.elc b/elpa/ein-20191208.33/ein-cell-output.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-cell-output.elc rename to elpa/ein-20191208.33/ein-cell-output.elc diff --git a/elpa/ein-20191201.1831/ein-cell.el b/elpa/ein-20191208.33/ein-cell.el similarity index 100% rename from elpa/ein-20191201.1831/ein-cell.el rename to elpa/ein-20191208.33/ein-cell.el diff --git a/elpa/ein-20191201.1831/ein-cell.elc b/elpa/ein-20191208.33/ein-cell.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-cell.elc rename to elpa/ein-20191208.33/ein-cell.elc diff --git a/elpa/ein-20191201.1831/ein-classes.el b/elpa/ein-20191208.33/ein-classes.el similarity index 100% rename from elpa/ein-20191201.1831/ein-classes.el rename to elpa/ein-20191208.33/ein-classes.el diff --git a/elpa/ein-20191201.1831/ein-classes.elc b/elpa/ein-20191208.33/ein-classes.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-classes.elc rename to elpa/ein-20191208.33/ein-classes.elc diff --git a/elpa/ein-20191201.1831/ein-company.el b/elpa/ein-20191208.33/ein-company.el similarity index 100% rename from elpa/ein-20191201.1831/ein-company.el rename to elpa/ein-20191208.33/ein-company.el diff --git a/elpa/ein-20191201.1831/ein-company.elc b/elpa/ein-20191208.33/ein-company.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-company.elc rename to elpa/ein-20191208.33/ein-company.elc diff --git a/elpa/ein-20191201.1831/ein-completer.el b/elpa/ein-20191208.33/ein-completer.el similarity index 100% rename from elpa/ein-20191201.1831/ein-completer.el rename to elpa/ein-20191208.33/ein-completer.el diff --git a/elpa/ein-20191201.1831/ein-completer.elc b/elpa/ein-20191208.33/ein-completer.elc similarity index 83% rename from elpa/ein-20191201.1831/ein-completer.elc rename to elpa/ein-20191208.33/ein-completer.elc index 23a383569433d8ea69d9f680b5eb22a86e1d3bb9..7b38e0e1ef04982e8f8af8f5f9554fd337e7e474 100644 GIT binary patch delta 394 zcmY*UJx{|h5XGT{SZ$y}2#Q#oegI3rj$Nw}EJ*wX&ZSF-JKy=;dwTC)-pRMNbXFCj5^U@Q&Y1@VWab0FnJ|~5k!4~Nx0*l?>ZF~eW1^~?+qGWWkI8T{$dhak zyVu>pBz7;7QD6O9y;h@52?$UR)ET_o!VPDpFeOf99`O+p>J!%xSKs*S#@6oiIk=$Q zNwhibl==h)zN29=H$oVsQwE0a%;+qh&65P1X);PWr~eqF5M*k2O!BK_bm?|;H%k*G z%W)+ndyOX9C!Ul{y;gSBgI!Up_L}-BzZ+o)U$=-A2X+r3zfddB$l$Wz)wF~}@v{C= Kf}0}SdP0A4MP(WQ delta 378 zcmZoM>oD68%~5X{V{Bl=qR3$vV`N|=$N=OS1F;DZo3gRF#3;oW85%GHd1fApK&GJs zqoV_mXC7m0XaK}O-G)X$4Af%?)MIGM#=*t`)MRXE1|kj2R3Ih*1VedoDl54@epTu`v*va03ZbAT|SH zbA=dVBLk3XBSVOgkr7D9I7VsmL{{g?Z&-_^b5biZlM{1vb5ctbGzt<+G890Brh;;` z#$*R}MP8t8BLj0Kg=moQwy(qPLPt6*pzJNX@x*yelew^#rw C?L5)| delta 423 zcmZ{g&q~8U5QjnA*dP|X7^HugWTmviLUuPzpwOFDkRH8ti=;J0F>TT`5qk0gJnl<) z6ujuGc=Rgx3{HYVQ9S%+mSMh+VLyzQ!>9Msy(@+7RrG-r%&zFt!p<-pBjf_BgXv=2 zT`Zmy+{Q3da>nX;Y3M_2b_b^jae+aEBf{MiES{WU6ZYu^mnS1B>HQe?r7!g6#t7fSS%{*FW rQ5tM|pcf=bloYs=oZhrn4I2)_at%K+Noww2#dv0$| diff --git a/elpa/ein-20191201.1831/ein-helm.el b/elpa/ein-20191208.33/ein-helm.el similarity index 100% rename from elpa/ein-20191201.1831/ein-helm.el rename to elpa/ein-20191208.33/ein-helm.el diff --git a/elpa/ein-20191201.1831/ein-helm.elc b/elpa/ein-20191208.33/ein-helm.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-helm.elc rename to elpa/ein-20191208.33/ein-helm.elc diff --git a/elpa/ein-20191201.1831/ein-hy.el b/elpa/ein-20191208.33/ein-hy.el similarity index 100% rename from elpa/ein-20191201.1831/ein-hy.el rename to elpa/ein-20191208.33/ein-hy.el diff --git a/elpa/ein-20191201.1831/ein-hy.elc b/elpa/ein-20191208.33/ein-hy.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-hy.elc rename to elpa/ein-20191208.33/ein-hy.elc diff --git a/elpa/ein-20191201.1831/ein-iexec.el b/elpa/ein-20191208.33/ein-iexec.el similarity index 100% rename from elpa/ein-20191201.1831/ein-iexec.el rename to elpa/ein-20191208.33/ein-iexec.el diff --git a/elpa/ein-20191201.1831/ein-iexec.elc b/elpa/ein-20191208.33/ein-iexec.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-iexec.elc rename to elpa/ein-20191208.33/ein-iexec.elc diff --git a/elpa/ein-20191201.1831/ein-inspector.el b/elpa/ein-20191208.33/ein-inspector.el similarity index 100% rename from elpa/ein-20191201.1831/ein-inspector.el rename to elpa/ein-20191208.33/ein-inspector.el diff --git a/elpa/ein-20191201.1831/ein-inspector.elc b/elpa/ein-20191208.33/ein-inspector.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-inspector.elc rename to elpa/ein-20191208.33/ein-inspector.elc diff --git a/elpa/ein-20191201.1831/ein-ipdb.el b/elpa/ein-20191208.33/ein-ipdb.el similarity index 100% rename from elpa/ein-20191201.1831/ein-ipdb.el rename to elpa/ein-20191208.33/ein-ipdb.el diff --git a/elpa/ein-20191201.1831/ein-ipdb.elc b/elpa/ein-20191208.33/ein-ipdb.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-ipdb.elc rename to elpa/ein-20191208.33/ein-ipdb.elc diff --git a/elpa/ein-20191201.1831/ein-ipynb-mode.el b/elpa/ein-20191208.33/ein-ipynb-mode.el similarity index 100% rename from elpa/ein-20191201.1831/ein-ipynb-mode.el rename to elpa/ein-20191208.33/ein-ipynb-mode.el diff --git a/elpa/ein-20191201.1831/ein-ipynb-mode.elc b/elpa/ein-20191208.33/ein-ipynb-mode.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-ipynb-mode.elc rename to elpa/ein-20191208.33/ein-ipynb-mode.elc diff --git a/elpa/ein-20191201.1831/ein-jupyter.el b/elpa/ein-20191208.33/ein-jupyter.el similarity index 100% rename from elpa/ein-20191201.1831/ein-jupyter.el rename to elpa/ein-20191208.33/ein-jupyter.el diff --git a/elpa/ein-20191201.1831/ein-jupyter.elc b/elpa/ein-20191208.33/ein-jupyter.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-jupyter.elc rename to elpa/ein-20191208.33/ein-jupyter.elc diff --git a/elpa/ein-20191201.1831/ein-jupyterhub.el b/elpa/ein-20191208.33/ein-jupyterhub.el similarity index 100% rename from elpa/ein-20191201.1831/ein-jupyterhub.el rename to elpa/ein-20191208.33/ein-jupyterhub.el diff --git a/elpa/ein-20191201.1831/ein-jupyterhub.elc b/elpa/ein-20191208.33/ein-jupyterhub.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-jupyterhub.elc rename to elpa/ein-20191208.33/ein-jupyterhub.elc diff --git a/elpa/ein-20191201.1831/ein-kernel.el b/elpa/ein-20191208.33/ein-kernel.el similarity index 100% rename from elpa/ein-20191201.1831/ein-kernel.el rename to elpa/ein-20191208.33/ein-kernel.el diff --git a/elpa/ein-20191201.1831/ein-kernel.elc b/elpa/ein-20191208.33/ein-kernel.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-kernel.elc rename to elpa/ein-20191208.33/ein-kernel.elc diff --git a/elpa/ein-20191201.1831/ein-kernelinfo.el b/elpa/ein-20191208.33/ein-kernelinfo.el similarity index 100% rename from elpa/ein-20191201.1831/ein-kernelinfo.el rename to elpa/ein-20191208.33/ein-kernelinfo.el diff --git a/elpa/ein-20191201.1831/ein-kernelinfo.elc b/elpa/ein-20191208.33/ein-kernelinfo.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-kernelinfo.elc rename to elpa/ein-20191208.33/ein-kernelinfo.elc diff --git a/elpa/ein-20191201.1831/ein-kill-ring.el b/elpa/ein-20191208.33/ein-kill-ring.el similarity index 100% rename from elpa/ein-20191201.1831/ein-kill-ring.el rename to elpa/ein-20191208.33/ein-kill-ring.el diff --git a/elpa/ein-20191201.1831/ein-kill-ring.elc b/elpa/ein-20191208.33/ein-kill-ring.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-kill-ring.elc rename to elpa/ein-20191208.33/ein-kill-ring.elc diff --git a/elpa/ein-20191201.1831/ein-log.el b/elpa/ein-20191208.33/ein-log.el similarity index 100% rename from elpa/ein-20191201.1831/ein-log.el rename to elpa/ein-20191208.33/ein-log.el diff --git a/elpa/ein-20191201.1831/ein-log.elc b/elpa/ein-20191208.33/ein-log.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-log.elc rename to elpa/ein-20191208.33/ein-log.elc diff --git a/elpa/ein-20191201.1831/ein-multilang-fontify.el b/elpa/ein-20191208.33/ein-multilang-fontify.el similarity index 100% rename from elpa/ein-20191201.1831/ein-multilang-fontify.el rename to elpa/ein-20191208.33/ein-multilang-fontify.el diff --git a/elpa/ein-20191201.1831/ein-multilang-fontify.elc b/elpa/ein-20191208.33/ein-multilang-fontify.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-multilang-fontify.elc rename to elpa/ein-20191208.33/ein-multilang-fontify.elc diff --git a/elpa/ein-20191201.1831/ein-multilang.el b/elpa/ein-20191208.33/ein-multilang.el similarity index 100% rename from elpa/ein-20191201.1831/ein-multilang.el rename to elpa/ein-20191208.33/ein-multilang.el diff --git a/elpa/ein-20191201.1831/ein-multilang.elc b/elpa/ein-20191208.33/ein-multilang.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-multilang.elc rename to elpa/ein-20191208.33/ein-multilang.elc diff --git a/elpa/ein-20191201.1831/ein-node.el b/elpa/ein-20191208.33/ein-node.el similarity index 100% rename from elpa/ein-20191201.1831/ein-node.el rename to elpa/ein-20191208.33/ein-node.el diff --git a/elpa/ein-20191201.1831/ein-node.elc b/elpa/ein-20191208.33/ein-node.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-node.elc rename to elpa/ein-20191208.33/ein-node.elc diff --git a/elpa/ein-20191201.1831/ein-notebook.el b/elpa/ein-20191208.33/ein-notebook.el similarity index 100% rename from elpa/ein-20191201.1831/ein-notebook.el rename to elpa/ein-20191208.33/ein-notebook.el diff --git a/elpa/ein-20191201.1831/ein-notebook.elc b/elpa/ein-20191208.33/ein-notebook.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-notebook.elc rename to elpa/ein-20191208.33/ein-notebook.elc diff --git a/elpa/ein-20191201.1831/ein-notebooklist.el b/elpa/ein-20191208.33/ein-notebooklist.el similarity index 100% rename from elpa/ein-20191201.1831/ein-notebooklist.el rename to elpa/ein-20191208.33/ein-notebooklist.el diff --git a/elpa/ein-20191201.1831/ein-notebooklist.elc b/elpa/ein-20191208.33/ein-notebooklist.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-notebooklist.elc rename to elpa/ein-20191208.33/ein-notebooklist.elc diff --git a/elpa/ein-20191201.1831/ein-notification.el b/elpa/ein-20191208.33/ein-notification.el similarity index 100% rename from elpa/ein-20191201.1831/ein-notification.el rename to elpa/ein-20191208.33/ein-notification.el diff --git a/elpa/ein-20191201.1831/ein-notification.elc b/elpa/ein-20191208.33/ein-notification.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-notification.elc rename to elpa/ein-20191208.33/ein-notification.elc diff --git a/elpa/ein-20191201.1831/ein-org.el b/elpa/ein-20191208.33/ein-org.el similarity index 100% rename from elpa/ein-20191201.1831/ein-org.el rename to elpa/ein-20191208.33/ein-org.el diff --git a/elpa/ein-20191201.1831/ein-org.elc b/elpa/ein-20191208.33/ein-org.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-org.elc rename to elpa/ein-20191208.33/ein-org.elc diff --git a/elpa/ein-20191201.1831/ein-output-area.el b/elpa/ein-20191208.33/ein-output-area.el similarity index 100% rename from elpa/ein-20191201.1831/ein-output-area.el rename to elpa/ein-20191208.33/ein-output-area.el diff --git a/elpa/ein-20191201.1831/ein-output-area.elc b/elpa/ein-20191208.33/ein-output-area.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-output-area.elc rename to elpa/ein-20191208.33/ein-output-area.elc diff --git a/elpa/ein-20191201.1831/ein-pager.el b/elpa/ein-20191208.33/ein-pager.el similarity index 100% rename from elpa/ein-20191201.1831/ein-pager.el rename to elpa/ein-20191208.33/ein-pager.el diff --git a/elpa/ein-20191201.1831/ein-pager.elc b/elpa/ein-20191208.33/ein-pager.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-pager.elc rename to elpa/ein-20191208.33/ein-pager.elc diff --git a/elpa/ein-20191201.1831/ein-pkg.el b/elpa/ein-20191208.33/ein-pkg.el similarity index 82% rename from elpa/ein-20191201.1831/ein-pkg.el rename to elpa/ein-20191208.33/ein-pkg.el index e1514cd2..98d1cb4a 100644 --- a/elpa/ein-20191201.1831/ein-pkg.el +++ b/elpa/ein-20191208.33/ein-pkg.el @@ -1,4 +1,4 @@ -(define-package "ein" "20191201.1831" "Emacs IPython Notebook" +(define-package "ein" "20191208.33" "Emacs IPython Notebook" '((emacs "25") (websocket "20191017.30") (auto-complete "1.4.0") diff --git a/elpa/ein-20191201.1831/ein-process.el b/elpa/ein-20191208.33/ein-process.el similarity index 100% rename from elpa/ein-20191201.1831/ein-process.el rename to elpa/ein-20191208.33/ein-process.el diff --git a/elpa/ein-20191201.1831/ein-process.elc b/elpa/ein-20191208.33/ein-process.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-process.elc rename to elpa/ein-20191208.33/ein-process.elc diff --git a/elpa/ein-20191201.1831/ein-pseudo-console.el b/elpa/ein-20191208.33/ein-pseudo-console.el similarity index 100% rename from elpa/ein-20191201.1831/ein-pseudo-console.el rename to elpa/ein-20191208.33/ein-pseudo-console.el diff --git a/elpa/ein-20191201.1831/ein-pseudo-console.elc b/elpa/ein-20191208.33/ein-pseudo-console.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-pseudo-console.elc rename to elpa/ein-20191208.33/ein-pseudo-console.elc diff --git a/elpa/ein-20191201.1831/ein-python.el b/elpa/ein-20191208.33/ein-python.el similarity index 100% rename from elpa/ein-20191201.1831/ein-python.el rename to elpa/ein-20191208.33/ein-python.el diff --git a/elpa/ein-20191201.1831/ein-python.elc b/elpa/ein-20191208.33/ein-python.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-python.elc rename to elpa/ein-20191208.33/ein-python.elc diff --git a/elpa/ein-20191201.1831/ein-pytools.el b/elpa/ein-20191208.33/ein-pytools.el similarity index 100% rename from elpa/ein-20191201.1831/ein-pytools.el rename to elpa/ein-20191208.33/ein-pytools.el diff --git a/elpa/ein-20191201.1831/ein-pytools.elc b/elpa/ein-20191208.33/ein-pytools.elc similarity index 94% rename from elpa/ein-20191201.1831/ein-pytools.elc rename to elpa/ein-20191208.33/ein-pytools.elc index af9c4cbf42946b951b6afa76b1d1dab827b13a55..25dcedf2949990a4ec5293b5abfefebb1440f45b 100644 GIT binary patch delta 263 zcmW;GO-jR15C?Fw5R5o{ol%*#i+s40SY38xDs5g)`PG-<_kT@Bl87e7n3Bt8U$iQGhQZfCcv)4wYO69l+$YAVU hz!hMIQ}m%$)xx*O?Xp>`qJ+y*)nWVAH%-;~_CG%M@lNco+X&R&CAPJ<+fY_Wf#@NUpMoCd?@_bwA$zN<< zOnzkR%4jl)M{2T@oeMulOkRwUi76*Hh}3bJJjKGuy45V67dh$63F)eOIofsnnb0vjnWkXwKD_z~>9Nn_SB3)gDl!8p% laxj?zA{8c^*(pvob?oLfQP5CUQP5K`G&3}{oP5?%9sp$1Hy;21 diff --git a/elpa/ein-20191201.1831/ein-query.el b/elpa/ein-20191208.33/ein-query.el similarity index 100% rename from elpa/ein-20191201.1831/ein-query.el rename to elpa/ein-20191208.33/ein-query.el diff --git a/elpa/ein-20191201.1831/ein-query.elc b/elpa/ein-20191208.33/ein-query.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-query.elc rename to elpa/ein-20191208.33/ein-query.elc diff --git a/elpa/ein-20191201.1831/ein-scratchsheet.el b/elpa/ein-20191208.33/ein-scratchsheet.el similarity index 100% rename from elpa/ein-20191201.1831/ein-scratchsheet.el rename to elpa/ein-20191208.33/ein-scratchsheet.el diff --git a/elpa/ein-20191201.1831/ein-scratchsheet.elc b/elpa/ein-20191208.33/ein-scratchsheet.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-scratchsheet.elc rename to elpa/ein-20191208.33/ein-scratchsheet.elc diff --git a/elpa/ein-20191201.1831/ein-shared-output.el b/elpa/ein-20191208.33/ein-shared-output.el similarity index 100% rename from elpa/ein-20191201.1831/ein-shared-output.el rename to elpa/ein-20191208.33/ein-shared-output.el diff --git a/elpa/ein-20191201.1831/ein-shared-output.elc b/elpa/ein-20191208.33/ein-shared-output.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-shared-output.elc rename to elpa/ein-20191208.33/ein-shared-output.elc diff --git a/elpa/ein-20191201.1831/ein-skewer.el b/elpa/ein-20191208.33/ein-skewer.el similarity index 100% rename from elpa/ein-20191201.1831/ein-skewer.el rename to elpa/ein-20191208.33/ein-skewer.el diff --git a/elpa/ein-20191201.1831/ein-skewer.elc b/elpa/ein-20191208.33/ein-skewer.elc similarity index 96% rename from elpa/ein-20191201.1831/ein-skewer.elc rename to elpa/ein-20191208.33/ein-skewer.elc index ee0f536872cc31ccb14487ffdbe8b995f80ca95b..77c5cb7ae422551d0bbf4bbda88cf68888d978b2 100644 GIT binary patch delta 56 zcmZ1@u})%xGz+8UWEmDoCR5AJrYr}T87(${W0z);w$zN(JDB|6rG9kv7+i)#TDBD9SI(Oi5KxPtDBJEzV9Y JPc72q0sx#;54QjS diff --git a/elpa/ein-20191201.1831/ein-smartrep.el b/elpa/ein-20191208.33/ein-smartrep.el similarity index 100% rename from elpa/ein-20191201.1831/ein-smartrep.el rename to elpa/ein-20191208.33/ein-smartrep.el diff --git a/elpa/ein-20191201.1831/ein-smartrep.elc b/elpa/ein-20191208.33/ein-smartrep.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-smartrep.elc rename to elpa/ein-20191208.33/ein-smartrep.elc diff --git a/elpa/ein-20191201.1831/ein-subpackages.el b/elpa/ein-20191208.33/ein-subpackages.el similarity index 100% rename from elpa/ein-20191201.1831/ein-subpackages.el rename to elpa/ein-20191208.33/ein-subpackages.el diff --git a/elpa/ein-20191201.1831/ein-subpackages.elc b/elpa/ein-20191208.33/ein-subpackages.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-subpackages.elc rename to elpa/ein-20191208.33/ein-subpackages.elc diff --git a/elpa/ein-20191201.1831/ein-timestamp.el b/elpa/ein-20191208.33/ein-timestamp.el similarity index 100% rename from elpa/ein-20191201.1831/ein-timestamp.el rename to elpa/ein-20191208.33/ein-timestamp.el diff --git a/elpa/ein-20191201.1831/ein-timestamp.elc b/elpa/ein-20191208.33/ein-timestamp.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-timestamp.elc rename to elpa/ein-20191208.33/ein-timestamp.elc diff --git a/elpa/ein-20191201.1831/ein-traceback.el b/elpa/ein-20191208.33/ein-traceback.el similarity index 100% rename from elpa/ein-20191201.1831/ein-traceback.el rename to elpa/ein-20191208.33/ein-traceback.el diff --git a/elpa/ein-20191201.1831/ein-traceback.elc b/elpa/ein-20191208.33/ein-traceback.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-traceback.elc rename to elpa/ein-20191208.33/ein-traceback.elc diff --git a/elpa/ein-20191201.1831/ein-utils.el b/elpa/ein-20191208.33/ein-utils.el similarity index 100% rename from elpa/ein-20191201.1831/ein-utils.el rename to elpa/ein-20191208.33/ein-utils.el diff --git a/elpa/ein-20191201.1831/ein-utils.elc b/elpa/ein-20191208.33/ein-utils.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-utils.elc rename to elpa/ein-20191208.33/ein-utils.elc diff --git a/elpa/ein-20191201.1831/ein-websocket.el b/elpa/ein-20191208.33/ein-websocket.el similarity index 100% rename from elpa/ein-20191201.1831/ein-websocket.el rename to elpa/ein-20191208.33/ein-websocket.el diff --git a/elpa/ein-20191201.1831/ein-websocket.elc b/elpa/ein-20191208.33/ein-websocket.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-websocket.elc rename to elpa/ein-20191208.33/ein-websocket.elc diff --git a/elpa/ein-20191201.1831/ein-worksheet.el b/elpa/ein-20191208.33/ein-worksheet.el similarity index 98% rename from elpa/ein-20191201.1831/ein-worksheet.el rename to elpa/ein-20191208.33/ein-worksheet.el index 2dcc5b8a..a51e4827 100644 --- a/elpa/ein-20191201.1831/ein-worksheet.el +++ b/elpa/ein-20191208.33/ein-worksheet.el @@ -149,6 +149,7 @@ Normalize `buffer-undo-list' by removing extraneous details, and update the ein: (numberp (car (last u))) (numberp (cdr (last u)))) (append (cl-subseq u 0 3) (cons (+ ,distance (car (last u))) + (+ ,distance (cdr (last u)))))) ((and (consp u) (eq (car u) 'apply) (numberp (nth 2 u)) (numberp (nth 3 u))) @@ -166,13 +167,14 @@ Normalize `buffer-undo-list' by removing extraneous details, and update the ein: result)) (defun ein:worksheet--jigger-undo-list (&optional change-cell-id) - (if (/= (length buffer-undo-list) (length ein:%which-cell%)) + (if (/= (safe-length buffer-undo-list) (length ein:%which-cell%)) (ein:log 'debug "jig %s to %s: %S %S" (length ein:%which-cell%) (length buffer-undo-list) buffer-undo-list ein:%which-cell%)) (ein:and-let* ((old-cell-id (car change-cell-id)) (new-cell-id (cdr change-cell-id)) (changed-p (not (eq old-cell-id new-cell-id)))) - (setq ein:%which-cell% (-replace old-cell-id new-cell-id ein:%which-cell%))) - (let ((fill (- (length buffer-undo-list) (length ein:%which-cell%)))) + (when changed-p + (setq ein:%which-cell% (-replace old-cell-id new-cell-id ein:%which-cell%)))) + (let ((fill (- (safe-length buffer-undo-list) (length ein:%which-cell%)))) (if (> (abs fill) 1) (progn (let ((msg (format "Undo failure diagnostic %s %s | %s" @@ -187,14 +189,15 @@ Normalize `buffer-undo-list' by removing extraneous details, and update the ein: (ein:display-warning msg :error) (error "ein:worksheet--jigger-undo-list: aborting"))) (if (< fill 0) - (setq ein:%which-cell% (nthcdr (- fill) ein:%which-cell%)) + (setq ein:%which-cell% (nthcdr (- fill) ein:%which-cell%)) (if (> fill 0) (setq ein:%which-cell% (nconc (make-list fill (car ein:%which-cell%)) ein:%which-cell%)))))) - (cl-assert (= (length buffer-undo-list) (length ein:%which-cell%)) t + (cl-assert (= (safe-length buffer-undo-list) (length ein:%which-cell%)) + t "ein:worksheet--jigger-undo-list %d != %d" - (length buffer-undo-list) (length ein:%which-cell%))) + (safe-length buffer-undo-list) (length ein:%which-cell%))) (defun ein:worksheet--unshift-undo-list (cell &optional exogenous-input old-cell) "Adjust `buffer-undo-list' for adding CELL. Unshift in list parlance means prepending to list." @@ -234,9 +237,9 @@ Normalize `buffer-undo-list' by removing extraneous details, and update the ein: (ein:log 'debug "unsh adj %s %s" u cell-id) (setq lst (nconc lst (list (funcall func-after-cell u))))) (setq lst (nconc lst (list u))))))) - (cl-assert (= (length buffer-undo-list) (length lst)) t + (cl-assert (= (safe-length buffer-undo-list) (length lst)) t "ein:worksheet--unshift-undo-list %d != %d" - (length buffer-undo-list) (length lst)) + (safe-length buffer-undo-list) (length lst)) (setq buffer-undo-list lst) (ein:worksheet--update-cell-lengths cell exogenous-input))))) diff --git a/elpa/ein-20191201.1831/ein-worksheet.elc b/elpa/ein-20191208.33/ein-worksheet.elc similarity index 87% rename from elpa/ein-20191201.1831/ein-worksheet.elc rename to elpa/ein-20191208.33/ein-worksheet.elc index 95c72276a5ff2979e9cc4487f9e74c1402b924e6..8d8d88c4e7dbdc70a1b6b4a6c8e608427f4f438f 100644 GIT binary patch delta 1587 zcmZuwT})g>6yCYB3oM%sY)w`I<#O*Xi(T4f@141S3oNCnNsGpZCPI;3jYdI`hBnfl zSOcpKJ{So_r%9Dcs?`LEfl9_;8tY#*ZPF$fYNH8iOkaF6^4yr}nY%!u@nJG^&V1*b z?>lGaw=ePBSNM~u9YvoRPK6%b-|bVwA|WtcpP2?M(@**oP9vSLnRRf_%#c5_S6Vxy zWrSk>Kw*!x>!qCwZ7XdMOyMe;if1yJ%>sRD1Na$f&|$NBB+{p}=t4=;hUHX5NkbzX zTvbyg#!UbLMh%kEB@fbA3Ne8Mqb8V)Qi*_owB(>RZ2*iAY3fX*;hvE+#2Tz9Lo8S} zBqQmPFwz84il&*6an=i=X1I3k$!%nZsm1Bm+6aYF=jFnXv|%#!xus81P- z{|B)l5h4H&x}%+b5`dN!-|9)XpM%m+kxC347<7U;n=N~I>j2t=nYdh2`(mTd4D@G@ z^p8A$e2|aFbTOkILy^EKDz#a(yA>ai>WcS5ap*E>voeE^xp_VsBI(S5r-7?eX`dHPf~%*L5xLgz9+2}J>vck z0OAT8LCvHciox5EM68z)yba4Cd7XHrkK!}ek|aQg4R6GTu5I4K(6)}j*oc?N1B6CN zho5YzhJ@mFy1C+CQ(SMTEe()YYPxV*G^E%b@6G*zsbPu(MpYDBmdX3_A7PJDULQWi ztINy8nN}^VcphIps`4i~s>Eu?i(%|ChcDeaAg1>H{SbDkysZ}t!^yCcr(*T!j~I5Y zFL&{=$qI3A^ml|^#{ow{XeZAg0)jHy&Lcyk$F-e91N`o6O8jtYT~YETV4B6Br*jzR zEl=p<5saA|c=_7I;SUyH#fr-U(AvbaVa1h6OI4;{zXS<_s$y(%Q3*SSl^40Qk4H98 zV&z;fAW9J{=jz1d`Mr>hO748*n;1VfQ!eh$^pq*CEqdO63Mrl?mM{6h9n?zD)Lf-# z|FA3)hL`U_VbDMSGs3nh8D)6ceE0&Zp;V#FGo-kW8w`h_cJi z0SSXwuVuwMORp%%;|()^uk+ZV|ne7_D-K0R({AAh6Bg-g=zS4pTl==GhF6Ih>PlwzqbXgGPE{_ z*7?siHlbaPb_%jh6MT`1!elauReN+De4ObqxI`DCe9lb-T5#;V2-6c|@aO0c>ruRm z5$Q5N9>eCWBAa3eNa1J-Zo*uckif=zl@0^*z{AlDH4F-5?!uo_Eb>9ERx zKr!Z7eW4V@$7}|zxwFbwa9}TtpnnQb+~%MQzV8|?XbKXyP>7z>G)1FphX2};Sqhl^}{s+KZ*07qCV)fb0V{hw#mSUN9=4Ri$FWjIQ%x%Hc zwvml(UA=;xFt<1ZAv3}n{dl?nin#G;@8CdR&F=nz0af&fo+q2q52;=07LAy;JXyO; zP41~9#`*{qj(7B0sT^F$mDj!3scReR@wyMg1lBx!qFhCq4u`4ZSaNALs%Ba@RZ+*z zM(*v2hY2?jCD%_BsJ5YL3btAqaS3%iORkJG$_s-`F3#Vt4)1$TqukA?crPVJcDQrzZBT9RcjXd8s1v821_`+O=ObSWXyNo5 zr|wg)ev+FLh7lY{e^j2m994f#&uP@MOmHOS_VXp`-kCib6`n0G&X=o0=RVemfjp9G z`}saXG6MW1a_CNxTDo|M5Z6Nc=xI}(y*wAlzA~~+Ui$nlFh?EjEs_ylGFmmz|DrrNxk;JdmJ(_U3wHH@dgj(UFuA~m%9++G)$(08A-0FCPnk_jOg5kQDPd$b zwKUr7=2yYUYG`R`W0{6>hL b?+N^@%;qNMn>o{turM2#m~Fn0b%O~2q(nRV delta 314 zcmcb7i*dzm#tC|iMjQ3Ry`=94dbHPkB?Yh)xAXXutBCgr3m6lYeYDi|r0q!yPbq!ua^rGn+aqK0~= zFn&o!QEG8Ueol&lfu4n-k*PvKX;Er&enF)|i9$+ZNuq*AX@P>Vi9$+#d7gr?rKYAr zZen_7iEc_}TAD6UW4UgAk#2EvQGQMivuX`}%~d`njLc@{=9@qIRxq*} z85o!vP0sVb#cX11yxBWo6ECx+f$5~Ui)@BwMw+pjlLN%XC(n=P+WaGKIYir{1b$X# W3uB|rTT+j(FdG^hZm!O{!2|#iv)jK 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 C(@B2- delta 9080 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 diff --git a/elpa/magit-20191128.1802/magit-autoloads.el b/elpa/magit-20191210.1617/magit-autoloads.el similarity index 100% rename from elpa/magit-20191128.1802/magit-autoloads.el rename to elpa/magit-20191210.1617/magit-autoloads.el diff --git a/elpa/magit-20191128.1802/magit-autorevert.el b/elpa/magit-20191210.1617/magit-autorevert.el similarity index 98% rename from elpa/magit-20191128.1802/magit-autorevert.el rename to elpa/magit-20191210.1617/magit-autorevert.el index b1b66855..c47ae0c0 100644 --- a/elpa/magit-20191128.1802/magit-autorevert.el +++ b/elpa/magit-20191210.1617/magit-autorevert.el @@ -108,6 +108,9 @@ seconds of user inactivity. That is not desirable." (magit-turn-on-auto-revert-mode-if-desired))) (when (and buffer-file-name (file-readable-p buffer-file-name) + (or (< emacs-major-version 27) + (with-no-warnings + (executable-find magit-git-executable t))) ; see #3684 (magit-toplevel) (or (not magit-auto-revert-tracked-only) (magit-file-tracked-p buffer-file-name)) diff --git a/elpa/magit-20191128.1802/magit-autorevert.elc b/elpa/magit-20191210.1617/magit-autorevert.elc similarity index 94% rename from elpa/magit-20191128.1802/magit-autorevert.elc rename to elpa/magit-20191210.1617/magit-autorevert.elc index b47c64ce4bc8091babe7fa591a0441d0ac756e59..af423ffe0dc07e497cf6340e93fbdf0cdb9c887e 100644 GIT binary patch delta 290 zcmeBAe4RK!kI{Ie{x+U^Ge*T2BSXU&BLh<*h9VHN5J(ur7#o-?XaYseIY3fw3^B%r z1{^@8AT}qEV;Bx(n`nW=jbieEq;ZTAT&0Nugvkx0j4eTGOksLs((EB}ykMFOWU_$? zP=(p#0A5Lz)ZE16V%^-tto$O~vecsD%=|os+{EESEtxFGFFsjcjc0N@ zZ>5NlxdKEqF)1fiH!U+SMWJN!e_jnnlg%1@{+!Ha2F9DK#9g>pEDX%eHXl;7;AFBi l-uy=^h>_XQz;ttXaYseIY3gD3_t-h z4xmyf+gt&{E?aKlCun diff --git a/elpa/magit-20191128.1802/magit-bisect.el b/elpa/magit-20191210.1617/magit-bisect.el similarity index 100% rename from elpa/magit-20191128.1802/magit-bisect.el rename to elpa/magit-20191210.1617/magit-bisect.el diff --git a/elpa/magit-20191128.1802/magit-bisect.elc b/elpa/magit-20191210.1617/magit-bisect.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-bisect.elc rename to elpa/magit-20191210.1617/magit-bisect.elc index f8283177602614c1b36cbb96920d7ad227ebfc86..cd55c53ae067e47b43c86ddcb99b7235925f6646 100644 GIT binary patch delta 12 TcmbPIHKl5T9;5L_{iiknB5DN? delta 12 TcmbPIHKl5T9;4Al{iiknB4q^+ diff --git a/elpa/magit-20191128.1802/magit-blame.el b/elpa/magit-20191210.1617/magit-blame.el similarity index 100% rename from elpa/magit-20191128.1802/magit-blame.el rename to elpa/magit-20191210.1617/magit-blame.el diff --git a/elpa/magit-20191128.1802/magit-blame.elc b/elpa/magit-20191210.1617/magit-blame.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-blame.elc rename to elpa/magit-20191210.1617/magit-blame.elc index d14ebb66b5035621752f131a485e7034ebc1954e..c419d5a992f1277ccb8f7ace965e08a01bdf79a2 100644 GIT binary patch delta 14 Wcmcb!oaxSTrU`nC#vAq5P6hxlx&|Ep delta 14 Wcmcb!oaxSTrU`nCMjQ3lP6hxlwFVpj diff --git a/elpa/magit-20191128.1802/magit-bookmark.el b/elpa/magit-20191210.1617/magit-bookmark.el similarity index 100% rename from elpa/magit-20191128.1802/magit-bookmark.el rename to elpa/magit-20191210.1617/magit-bookmark.el diff --git a/elpa/magit-20191128.1802/magit-bookmark.elc b/elpa/magit-20191210.1617/magit-bookmark.elc similarity index 63% rename from elpa/magit-20191128.1802/magit-bookmark.elc rename to elpa/magit-20191210.1617/magit-bookmark.elc index ab0123868ad69f2ec89fe2b161561925de1c7fad..da2deb49f0fa7aaf3db33168c702f1ba904f5634 100644 GIT binary patch delta 228 zcmaE=vqoov9;5L_eQUmY+ZZDQV?Kr$V?zTV%gBf!#>mhR$TI{>NPr}aP$Z1O5-~~) z94NvjU|~a$dQ%`a?0mL$dusGlXMnFMh&X_!x7$vxv zF;KG+BR7z5Yyi?^0>q|3Y{m^F%#{N`3Jrl0Mh26A^Yzp#7i(lB7H8;|BqrsgDimi{ zr7D;xl%y7yD5MrD6s3aYz@mnFrZ9dRVL1|HHa(+RjLWx33 zVo9QcMsZ1EdTNS-p@Bka9*k|Gker{Jn^{r0%H#ogMn;;N3Q7=lN(xFa MElQjB@#nDt0FHuD*Z=?k diff --git a/elpa/magit-20191128.1802/magit-branch.el b/elpa/magit-20191210.1617/magit-branch.el similarity index 100% rename from elpa/magit-20191128.1802/magit-branch.el rename to elpa/magit-20191210.1617/magit-branch.el diff --git a/elpa/magit-20191128.1802/magit-branch.elc b/elpa/magit-20191210.1617/magit-branch.elc similarity index 91% rename from elpa/magit-20191128.1802/magit-branch.elc rename to elpa/magit-20191210.1617/magit-branch.elc index d589df55c7d228939490de5a7550afffd190806e..2fb16ccebc328fd08a9d82107e61338dd1b46851 100644 GIT binary patch delta 691 zcmZ{hzfTlF6vvqz_8OodL1;)=Hqo$&cr)|n$8ABp!Wc>dS700vf~Z6}2tTgkLWKz( zaYChqF%%RwWNHd~{TsyIT3g@D9twrU%+7n?H=pmDx2I>x`KRRM0fCG9qxl51+n;}v zgC?|TfinxzBsM1&z+_f{uz~?D{ca&Y)V$Av5-2K|!%f=U3eNGQW?~(H3KbdyfnV0w zlTA;S24&6u$q?W=5H(`7n8XWF9uFolADnb_I=o>;f*yTFNoAs|9tHyImY^#4J3)wS zyzw93XrN=Wvn0iO(;I++DFw;>*v4W~(+#7G%>C$$_~X|fND8Wq;kbXic}n_C$rWPWQ?8WnZoRBg!y1^V vyQ}V?`!+G)raQ~2C`*)2Iu~g_XjQoFx0C+GfhDOCP%ODGM|b_tZZYx)Y}pv= zd~39cvE_6WBUmwC+RC#OV-hLKsG^v~+Ii~DI9pMSQz&uv1P)($iV^}huBedENMV|o zCb1OMh^k@)X3%O70yYV90|2<}ofvFcpuiTaVhg`w&m7ZIl2;7?mSSpdiv{L(G2K`c zFt@Ncv}z#1QyI-~S+?tfFfLyAq>@ZASNbqW^y98~-#{oPos|l+{Xb^A z!f?F6ln+bHIpv!E)?K%T`gix<+96E%WuT+t(X%i1>}Fbz!!&MYVSf~%bni`sD9WNV zL(yxLL}jgfB`sd*EKZ^{o{okHx7vhqw4W!@V7h;RGBgac5Y-9Bh!Tkci6|wF1{y|L zIEYc$pC%a^M`;@FM#%G!mc54;d0?01!3PfkqMVdgI0q}^FwLR_{R=)jPksqomqDqd z)gt)o%iN4(*kAXJhuyub*-ygBAa0(%>$#5LQorAsJHEsPd->UM1d+wBzF%{=Y!|oV zp6yCPSOe*Bx>20GI`o s>-y{Fn(pK~HHHaPPxG^yBQVuJa<4czRF)eE+<4K@SMyuNpQFacU!;`~MgRZ+ diff --git a/elpa/magit-20191128.1802/magit-clone.el b/elpa/magit-20191210.1617/magit-clone.el similarity index 100% rename from elpa/magit-20191128.1802/magit-clone.el rename to elpa/magit-20191210.1617/magit-clone.el diff --git a/elpa/magit-20191128.1802/magit-clone.elc b/elpa/magit-20191210.1617/magit-clone.elc similarity index 94% rename from elpa/magit-20191128.1802/magit-clone.elc rename to elpa/magit-20191210.1617/magit-clone.elc index 769973d5f1d61125cddb6a524f4a4a50921cc3bd..b4383bedb9447c9e912e8b1851190335c597361d 100644 GIT binary patch delta 164 zcmcZ=J|%pD9;5L_{W)rEwlPKq#+s9_sCgu~FvJ)c8paqKnt%mO8GuYvAU0D3sxgAg znuBGXfwD#h5EVv-iUCk1#)bwlMrKBgKuIGYHU?@1i5QqGDMU}cs3kMGNZEj7#f)>6qFXFCg&GaDwHUsB$gy9Xc!urD;OFm7#bQWm>2?C z778Zjnwko^iRqaox<#ppDZ0faMVWc&x|9E@M@;^!Dm{6I1`ngs<~EHFOiZQ*lPk1k E0F-P;*8l(j diff --git a/elpa/magit-20191128.1802/magit-commit.el b/elpa/magit-20191210.1617/magit-commit.el similarity index 100% rename from elpa/magit-20191128.1802/magit-commit.el rename to elpa/magit-20191210.1617/magit-commit.el diff --git a/elpa/magit-20191128.1802/magit-commit.elc b/elpa/magit-20191210.1617/magit-commit.elc similarity index 90% rename from elpa/magit-20191128.1802/magit-commit.elc rename to elpa/magit-20191210.1617/magit-commit.elc index eedf01db403cfa3f4baf99f78f78d4b4d738bd24..2b75604e8358d63f62e915bf39e06ec225ca31ce 100644 GIT binary patch delta 646 zcmY*W%W70X5WSDFGm~&ckWOTqWI)rSqbSvCV zcKLqf<Qqzf7>Ele&;tOy#QYJMeILnwE6)_!;`O!dQ2sI13EmIf>uo3o3W!kS8s7If?-jJu2>Si zRXo5B4<2Lh;tm*SoPcsGef@_>Q!i}wx=Cnx*!vfkdl(R|!`mgTmx&9{eNI+>#8?CHxQcg{7x_kLv= lRn5=mKEG`@Rcw7fKRTHn9F}Xd{nyjujaNsr+4Ok4_!s1ymxllV delta 731 zcmX|8&ubG=5Y8rbo3x}CL8xMUO(M-g6ZgG&KeC5XkbqYMVm+)#Y`4uqV&d*b&`bUW zA$Prax3VDq6aEoiz4;&by-cFAv*5)|MyJaF2MneO_SKFy%_{^e~UKaVr)&q-wA3EHv!_{tMj9w|8-VRu^mFtSF zK;CRl#Nk>K#L3^s!%vZ?PzXR*C8>3Z>@i?MR+2lc4_W=#r{@`@EfQAs|2eAs|2e8tKx3ct-Jef zql*CactND(V|r;7tPLgQzs7&7)j;LnUWBzrMjG$6x7S-Hix2T-#E$2a>p1IQEavk#^Y;D&zJ{}e diff --git a/elpa/magit-20191128.1802/magit-core.el b/elpa/magit-20191210.1617/magit-core.el similarity index 100% rename from elpa/magit-20191128.1802/magit-core.el rename to elpa/magit-20191210.1617/magit-core.el diff --git a/elpa/magit-20191128.1802/magit-core.elc b/elpa/magit-20191210.1617/magit-core.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-core.elc rename to elpa/magit-20191210.1617/magit-core.elc index 68430c74dda8c7ed52180937e1f19e73e56f3c3f..177de0ebcbfc2a79dcc5694e0a7e5ca830348b33 100644 GIT binary patch delta 12 TcmbOsK0|zh9;5L_{Y-8E8QlY= delta 12 TcmbOsK0|zh9;4Al{Y-8E8Q24) diff --git a/elpa/magit-20191128.1802/magit-diff.el b/elpa/magit-20191210.1617/magit-diff.el similarity index 99% rename from elpa/magit-20191128.1802/magit-diff.el rename to elpa/magit-20191210.1617/magit-diff.el index 77f2bdac..7eef9663 100644 --- a/elpa/magit-20191128.1802/magit-diff.el +++ b/elpa/magit-20191210.1617/magit-diff.el @@ -3035,7 +3035,8 @@ for added and removed lines as for context lines." 'magit-diff-context-highlight 'magit-diff-context))) (when magit-diff-unmarked-lines-keep-foreground - (setq face (list :background (face-attribute face :background)))) + (setq face `(,@(and (>= emacs-major-version 27) '(:extend t)) + :background ,(face-attribute face :background)))) (magit-diff--make-hunk-overlay (oref section content) (magit-diff-hunk-region-beginning) 'font-lock-face face diff --git a/elpa/magit-20191128.1802/magit-diff.elc b/elpa/magit-20191210.1617/magit-diff.elc similarity index 82% rename from elpa/magit-20191128.1802/magit-diff.elc rename to elpa/magit-20191210.1617/magit-diff.elc index e54b105682b6184de70f9d1d5cec2d5563398723..7938d823b0e026f785dc4ccb8453f4f3012d4c66 100644 GIT binary patch delta 10434 zcmd5?eQ;dWb>Dm6)0brn$CmtsC9hV3SpLB8zWY9Qjlq&_Y%nC}5JL#k|{iF7*_Puk?z4zR6&OKjuUwpacmoK#3eF2kSTvt+si?XgG+Y(vnczANx zCbF&&c=I)42_b@6h)^T4DPV+Cj}by+))2yt5mLyk8@LQ04CwrC zQ$u4D!$+sFITr%GB|kKk1KcV9_`y|{pYbanIQhW;vn?(Chg&V-_~o{TmUjwABvYf; z7bd3iYo{l3!}+zj;@bR#whzC&@u9_?q^Fnw>M}%RJF;E6!G<-d98E-qzx z`NQYZSLWdZT~a34dYC5+(+Lx--`KnGwCHarKlSjM5*cr-Uf0p^Qi2Z{LRYZH=4{GX zwKi=Kn*q{wNnPDBj=;3og=R4+5_AlF)`)*SvuSARB=M6~y&Sy9q?4`G;R`u>5pTJ`^pkyz|B};x?@0-kM~V z??NzdZK^DK`xdLg&!jVwh|2H0F;IEuXB(L9q(ct`n=6w)Uk_;nhWg$2Y^>o0m0$nz zUJl`k%ALRN=eC=cvhvDrK4>woJaKw?rQ`jD94mO0)xTfJZ7)pA^6KAT{PEk_BbF3t zwTiI^EZ=w3i;Vr;_Cw*Q=Qw+b`=PqaVoSImsK+ekbI((+TWkgQg<>{anD!hTZr43* z%t{(NyEVbCB-7wzQ7|77o1rwm6|{lsx7nih8H}q9lxWpHo1Nd}V~mtC`YW5=$-1PQ z^!%hJlf@%b6DO{NJ4mkV=}lgc3}7o>bZ;a37K|kwgwYMn><6SLQOQo9+2b&9gov0+nFU;p%w?-MzVDvPc9jC3xON({(vR83Ln5!YBm*x& zh?r{`$izquK|yF}Rqbdj!g=xKxg4j)NGE%kAQVXSn7jZB;`m;~52HI5uy3_mP9{{l?q}`Mja}?E zM#sxlzgfXP#ty05lk67b|1TwntX*?9TlEkoQeH*c3|jhk>D>S+-4N1p@DVNek~(&WCS$+NCY zn(-WKUN+TFRDgH{K_K^Bo1(dvlmkQvgJ&n{Y8oPutj3Lva%1M#i_}JGh$Ruh^QP)8xo27@Gyv0`Q4O2q0)X z@hV_(h`1XZY`BI-LZ{d#rrMSm)TTiK4hqaB*rjzaSgn8#0KF_Rh>gggFw5LS51DJEhsUEJviHSJ$%FIiiD~j-GYcgNP|k7#;H1NoIS}=_|i-e|Pzu z!<`?0gwKn12JBI0r!!tA`md1P!*TTe=&to_MF&LXI_mMA%)^tA(T{hseOi8@x@b4+ zMmpdjgM|Qawn*oJ@kR?68z2BB6aKtELI6r67@8)w(}1i#(7qG&j@zn70TjE#LOi7= zZy@u9UP_cd8)C9xaw0Vs3D!t`nkzHMP(4@IY20kKz4|rQ(HbVfq$RGc&K2mOvQ3kg zgwXtKBHFOFbdA=md!T;Wt3ZmwWLVYH{*RoS)!^j9dgk%2#a^n(y-Ei=s}pO97MqbN zhMgf2sJA+?(Sz$^VjSlhgJ#U1;IT9dPJV!5p4T%Bxx-0>e)R!vISjis6h^-V=c4+2 z2^|23&Oc7PITPFTxArmuQm3`A^DBg){ zKqo1$2c0kUCJ02K%k}VTsP@%S1)-+ee>T;D8LAATk|w+MY%-lu#A`}dYO?EUWNPp# zwz_oCFf73^1vA4mhxq9cY#&NkGcSV)JDbweWiesVSZ{y1ef`tVb9?Ex7k^+G*a0h75V5p;dW8u>7754MYpK8d-U zaZq~~fn6cn255!&1y5qaa0OaXTe3hfKWok*YQy&4rn+RGY78=vJLcheWefGD=AETgA~Hf;0OwehfVQNqwt8$I>nhz8Zx0iKqrgK73EuU|76t7&p(i)6 z8NlX=_Y)IxQj=>#G&2iKfT1@h5DqA`(kxw@>HC(1Wm!Gi7vYtR2_H=^%0D{2;__@3 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 delta 12274 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 U9pe*Yw+!{?-SehDd+l8KKc#0qF#rGn diff --git a/elpa/magit-20191128.1802/magit-ediff.el b/elpa/magit-20191210.1617/magit-ediff.el similarity index 100% rename from elpa/magit-20191128.1802/magit-ediff.el rename to elpa/magit-20191210.1617/magit-ediff.el diff --git a/elpa/magit-20191128.1802/magit-ediff.elc b/elpa/magit-20191210.1617/magit-ediff.elc similarity index 80% rename from elpa/magit-20191128.1802/magit-ediff.elc rename to elpa/magit-20191210.1617/magit-ediff.elc index 6226afe9c8a3eba67db5ccdc71c370a0c9f74428..11d7108f2b070a40e0fd9193aba15606b024d9f5 100644 GIT binary patch delta 1064 zcmZuvJ#Q015cS^KD*_0E&sM}iS?iR z^NvJ#7a)QZb_$r*>+({{Rf(zzf4pt8uB)MgBOWC09JxXaCIeE_s zV={mRfKn=$-U#{C(R5R?jmeU!hLeiBcd$XGjd8DvAsy?fMov(S6VqC%tg5- z1fsNP`~IRR0E=oKRIUZ&JYX*h7_k1+?e*atdndFYD2uA`e{+6hPe$FTK?A8I3{ol$ zGww!M0lsS4(b7qs)60 zNrwx`86HfGGu&0EhHljrS@zH5_a(Xy<=Kt{5{-^kmZEpJSD_1*R&J|3<#$`vn z$#ZU*-``y?&+IQ8gbD|LW=G|Z?dNb9S?=$?A~|PcL{`i5qG;v{>f+$fi!0@$2h-MH DaW?W9 delta 1350 zcmcIiPiqrF9L*%@V$GqRS|}o;X>C%v?atp#DryS_kA8twS(Bv+CQX}Ng$mM(2Tv*t zo}^d7qwI(9;=zl41TUf=L432jsV$8sk?ig-zd!Tl&3p6JkWX*O>vh6EY&=*Ym(8mc zpD^=rrB#-`A&t5X*BkXC=@Tc|+YGoT0^#ctlC6L<76`!uu6;BRxhgre?HQ+rcBPKG zE@utlbK7v7sU2VdRLH9ZIxitpw1C$)QNAbwj$Kjr&6kE(W2FnI%0Mt~E;Sc+St+09 z*|bITEX6=@Fq0mdc)?KklS$!OTujRBFj&FblF|Y@or86AQ9ZhQo&RY`JBrc(l zv|1yP3a<{X*){kFe~Q~97{izU1JcB@EX?+Ytpw#WMl%@%Umn zrvaeCZUrNRvRqijGR!`xNXM~h@eTIsOTifcHMs@8vH%|Jly;+2dnlFdQ7fa5p+9}> z;feX2N;O}T9<1G)IjYBvUKsb>Bz!oCXxx7qQBIR6PH1#M$5GbHs%%|N@}xJ8;@)V` zrQUjraYgqZkE70L|BxoM8zv!bbVkErKcS4ZXq*6^G9j8x+KtBjCsEfOj=GV%Plw^I z`N8`Cmji?@o>wZ8>GW7TRU*t=eJB0C`3N! zD~N?mYvnWe0$N+<0X#DcS{(T2N-zilMWK8s=KN*L+QfA>NC73n{8-hrl2GYWye8wHqBloe zG#W(r?Tf3hgIpFrE}v(RH%2ZI>Ubreb}9iODlC0kHWN(MR`HBe4H#9o8%@XNoTv}4 zn6-t#>RYtuZQ@h4fAE#D8K-Kq`Cw1XI5-R4iA2!fU)Pf)a}N?Ckwy%P%LGwK4fL@8 zX<@wF0N4Y5gM%DFkYdXm$7rIppq4hwHe`1Y~HFdIQDdR^28zQ17k9G%SYW&olQIWcGC9 delta 782 zcmcJNJ#W-77{@Q<1S%}$O$?}~r)h^vg@a!bJ14OewTOimaY91E459J$BCfe3@u8OG z#5bVI1|I=2plra$=)lT%=*EJbaEJ+sf#I=#{`+}s>-qcigLC@Pc^f$N)6Iu#3rV?< z6w`|x$#7`tlBMW3ap|p_MHEx+%DKTgUq(#i9Qf--xpfPz+~2K5pO)$BDY38Lj%j|)|fr;`+L z5EB}~Y+k6n>FfwJq=`f&2wEOdoNV#{lSprDP;S3b+7l}KfNIY#({7M zv3&(PG}ogi9^~2N83^caY(fCSwAHV_^nN(q7{|2!3@47uSyUf;_-uDT2&<00%k{VZ zt*$F5t*@cA6*p$27Cc#X8D{nSJKxW_oU(dx|CPJg>a3W)gD5NBo iBr0eaC|D>MDi~U5YEFKiF1MLKLzVD0{}(}2Iv3) delta 17 Zcmca}ob}Fe)(LuyMveMg^%>VD0{}(>2Il|( diff --git a/elpa/magit-20191128.1802/magit-gitignore.el b/elpa/magit-20191210.1617/magit-gitignore.el similarity index 100% rename from elpa/magit-20191128.1802/magit-gitignore.el rename to elpa/magit-20191210.1617/magit-gitignore.el diff --git a/elpa/magit-20191128.1802/magit-gitignore.elc b/elpa/magit-20191210.1617/magit-gitignore.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-gitignore.elc rename to elpa/magit-20191210.1617/magit-gitignore.elc index 56c7e850e331b73f6771327c618882c3cb72ddba..75e57b3fa2d9ad19a18ee0679b59feee9bd03969 100644 GIT binary patch delta 12 Tcmca)dC78u9;5L_{lzi>A_fGg delta 12 Tcmca)dC78u9;4Al{lzi>A^`-a diff --git a/elpa/magit-20191128.1802/magit-imenu.el b/elpa/magit-20191210.1617/magit-imenu.el similarity index 100% rename from elpa/magit-20191128.1802/magit-imenu.el rename to elpa/magit-20191210.1617/magit-imenu.el diff --git a/elpa/magit-20191128.1802/magit-imenu.elc b/elpa/magit-20191210.1617/magit-imenu.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-imenu.elc rename to elpa/magit-20191210.1617/magit-imenu.elc index 424915fd7508181cf4967edcc436cc53a2180b22..3b6d7f0237e1cc59d46870631d8f0482d83ac560 100644 GIT binary patch delta 12 TcmZ2yy3TZh9;5L_{dy??9#jM} delta 12 TcmZ2yy3TZh9;4Al{dy??9!~@@ diff --git a/elpa/magit-20191128.1802/magit-log.el b/elpa/magit-20191210.1617/magit-log.el similarity index 100% rename from elpa/magit-20191128.1802/magit-log.el rename to elpa/magit-20191210.1617/magit-log.el diff --git a/elpa/magit-20191128.1802/magit-log.elc b/elpa/magit-20191210.1617/magit-log.elc similarity index 89% rename from elpa/magit-20191128.1802/magit-log.elc rename to elpa/magit-20191210.1617/magit-log.elc index 9e95021f3100bfabf0323bf3a5d67b5533848e14..e17e7a889f88c23507be5d5dccc11e1dc2305fe1 100644 GIT binary patch delta 5225 zcmcgwYm6OL9iMY&?(E$zyL ziSfhS`=9^o{LlY+=G=eWP2SIc^%CZP>l1gZTi0u~N4^(a5ed&f#{#JEguRjA9#CQh zk-4YID>5?YhU{|zUWpek1e2el?{j@@IEgX7iP z_8r(gxc|VeYSOX(@(eq=r#e19t+DBv^{aaw&ldyrV~g36`%)#H z(^sa2BY9@4vP?Ut4?%&_oDbdpDs-jCjvlw|K>4W?KajIkpwfqrzX?%aq$lrs%q8y5 z>8|?o=P@U}>F%Fm!Lmp$Jn?wWD<`j?__h;NDl)zQx_S(rlp>-F6xm zYTS^uu!RyPQLeX&SD(gl&9==d4n?tEHu8nYGDskUgpWt&qP`3a>=vk;78vH6pzpbE z3+8TH3l?sn1^aG$3zjZ6r?tnC?+0#2i=tfY2NXX93rtcXszC`#Ard||ON4ffZ+90q zouwiX_@GIzxDsr^Rc;ZMo1H^Nm~B21p-06dd5Mb2T?F~qxREqjFdRjqK`>Dzq4J~; zbEx!u36cyLRTB9J#t6>IsX%-BrFbz`S3|&&AaF==JSasO*qIzmi2T5_!P|$B#KanM z!f`yp!H?f>v;vKM2&8*9egizJgrBfDd_f`dmB;V{8Fm}Sa>`95%a`kt% zvSrElf8oa4S#kI(S`@$OV02NbCaIAv&tyX_ae50koyb%Zk z%>bP)F+wNhIseoQo!YrZC#i&)AE449mFMJ$3Vm@W0h^)7<2P7vlir3<91O^N-7);- zIRM%o5|*MV{Nb|HS^TxR;&mjmR?BR&++y#nHDWA60nTbmaHIT2ZO~0tVN2#xy>Yld zqu*>Qkl&*DqR65yfzE{T@p~vy`K^|1+x-Iw7)qW3XC7_Fr%6iSQ8~ol<0IC_UcEgu z19Fb7L+3{|o2c;8BKn8dwL7pV57#S#yW)%i zIiVSHs1NP3LckeR{j^672CKawse)xP(e37lg z=U=4BSyGZSbRdSmSP`W%xnu&pzTd=tCMk zjs|C@id&4MKAkQtT!2s*)PyxcN?H`1Yz0$5Wp_XD zvg{($g+p7)VB-FqMF{^W)jGd}me*a4f8L5>%vKQ1dkn{%9x777+~!aT$acJ91i+kOawtz5nr=FChM!>y&EzZ)#@F;pd6;=0k|u?k zxlVLELdya0DTX|z{!Vyl(eP`j3ZP1by1qeF$PVgLdS0S@XrdW0I<#PNBXvj%_b}59 z1Y2}s0cn;r{SmKpmQf*!i)LcnmzBVLK56)HoChDVk!p-089F&?&~&uGfz2!zSUH$a zWF;MT2C^RQdSdE;fP=m!R7{4Lt&xJ-&``BftHtM z%)+y_BNru3dbN*{GIEqZo7!|x9t_F%UhIqudENA(0tK(S=1{ z0Uv%uKv$+2k1B_xIRcSYM#J1{Z=z=xd+hzcs{PExPVvVF3MCFcQf5~>2yRyGLi$;$ z@>aFOhi+Ewv&dPs8yx4&YCm(aQ~ar~pk}q-XBRxas{$Q(vT|0eXyFm_S?(S3x9Vn>)5|zZx#IGW3}DMldnFN3wiSX@4GfDm5EP`?XK;Z zoEonV?%c7fR1W5$r)rbqQxlU_5X?W zrDxf=F-W$5e7JGyJhl>7LqWNIbvJv~;b9;e#bvCE<#{D257eJq&XzY;e}oM#umdjZ zQ|GhyaFG<^j;E_};sW;LHo7O0xM^D2s9nM?g58x$<3W$@X|qES*4;AunXQCs{IbkM z4);A}Uo{q8#(vOdOD}A^u##P$!v&JpD6MAq793G2%lhN%A;ZgFjalCr delta 5524 zcmb_gdyHIF8NX-l?A;eTluFwz#r5t3=-6yIkNX;)rMoRix3si81O~d>-RbT^_rdIJ zOFO!k-rNgvCAv4?!z9KID1W=iV^BSS%J|Z)8uo ze_{R9*uvCcX>9NQg1az%d%=}%sjyIT3%9z(f}Yb{vC*&7rKw_JVQOywgv&QZLi+Cf zVzDqjH-E@2xf5fhF?apU*yMC+uvpl)e{OPcW^SV3B38p3pDGlKhic4RS2pV|E)*rzu!C zJNegbiluTwi(Y>F>#3a9N-n*lVB3KgB~RS-aLNunk!(Bs2WESSD*D{_9B7b<)lc2~ z0<--fjDP*5AEa_BK62kv>41m1Wa!9?%$9+OcZS^wzyGXsI^Gv6-r$!w~9QF2<^lo_fO1FA6m1*v>rZ5Z11 zq2%etP_#6LW$8E#LOHFCvFEfk#=g_u7zYjlteKag(^(%Y?&S9op#&t*Ac4%!!iMDP z4)hhc?V8!{bb*o=Vj{p_IiyLI*_@Zkzu3uu@MuourBs$#EruR-s-pH0+&LA)peE#V z3qecnq!RZWHe9~wI~Rgm!W4N|3YNe!+Ss(MMz*m0sZSC zpPsahqN1Hqo^M08kM;mQq)#kz7N+yc=l$9$u~Q(0a~ggn{*;R!FEey@8@@in4|IG4 z8t|5~4wK@6$3U3iFrekhvsq>sU+ifZz!fs80_8Zp;L_r>Ry*tko-qn0mjlG`9VfG; zA>`-#h#8n9e1eg#(~5-!GM@QG8x!&U-&t2CSHT4=GjuWe#9*tvdTY;c&rr{$P!5qV zADd6A0JsqFXi#&KeAB8zBs!Exf`QJZe6@rhBDJB91R>%;uFz#t#_o6ub_iL+z@%Mr z!7`U29!z40i7@l2-885{nY+|+ACRMSxs>x;;G}}}Z*|Ij#bK0Z|>n2wilk|JFg`DVx z0Hjj+GL<%3NGtf9VXPx06O=CF5>b7y39>*qp-xX_E+@6qQ}`9vSWc#w2FRIqMRM4~ zS`%HPg|01Ag2bn-w%xVF>g6jld!6YralID0!6FdQfaCF=ZKRjaTefZYXW@X_nzl>r z(1vd$6}d}~Z?bmu>P4Z^wU8gC^v*%P>;bo62`fC6zSv8h4fsR>=wcUpXaV}HMy+ry zKB~=wL<*rbwv^nvlpJ45PBfD)7lme;i+xQb78|esRZp4F#UvM%f+6`d^+V-mQmt1A zcnHl>SJK3!brC*lz$RkKa`#f{nhdYhJS32&ruC}(NY?Og*6dr*{)Fvi5g>JadN=Dl z5h7uRwcpx9M(Q(?qgc$$jJ2nqdJXL%&;?xFWGzw%G@M0EIbBW{1O(6O%Fy_%cI(LI zESJI|LX_XHJFmloh11B=t(q$8-v!HAMg7f139VYQU9WG+TV^nYy2c1glWAJg36j(n zE#j#))Ry7^1tB=#nu~*!3<3xf{%s&n06dozXAR(m(!>&cC*H~U4(K6vGrmjDBi0gp zFB61-uL0h4!2gB#1`MOfLmbEyT^->u@a#Is3-Y%t$Wt-VoOd~aZJ^UihXK}lGS=f* zA$ASz37oah8sM|K{}Y&>pH0_5pGNOP{Vv)b?@&G2wSAy%IHb2(?~>Vw+ne?UI;Otr zZ9p2h2;lcKw68{^e5XZck|FMbdf@4f0v6#WapDZ8^97ptqca`{YJZIsIBLy=Bo#BH zBc6+E^)E(raO1Y+07C_2Oh14Rv2wEofXf4vPf8a6>U{zxbZNC{8OX&O9zUgwdQNNHMx)^_wAI|KaMQr0MtD8j zVG1i25?ci^G{8QTgby&PZ5HN`%3AV;$u?QieS6YmUwVi-s2|89_y(-5Y(TWRseuPI zr@p~}e4b*{%tMwAi>iZ)z~89d(77bNEX9<$w5E$I69wg6q$QdPSG%fv2+PLBcB*qa zy5toYNzo`v+F?|NQbTmD#_^USA&Br6%D%c8;$i5lyb6TAl@QE+FuG|SvQSskkVdze zCOsT(6iyu#iLB{KUuPmcPU)lVz}84%z_GbeX?bwb0DIHGjl@c6nh+T)<6ME6>xmIa zx;~IeWzjvI{-yXIC%nOHI;PR((554pdfD{zN!`ADvzK) zWxIOmtjUv%dmmp_-r}6x#^?$F-?D8ieIHXFT_eZ$ztX~Z{MA=pUhYvN{P2$&c*}65 zaLogTD}5Ia8;f`}kvTk!&`XD_l)F$GTj-l|Rp{=WUMP&01`kXxxSps}B;^I!Z2XN^ zH>;YZzQI9gmHO&3q+#AlCJOrtrNZF;>DfZfMe@$8JK1vUQy+eP6gnbTUVUKz^mS5>!utr)9||{6+zkSJ0ypyA zz>{ti;S;%0&JBFejU=Xdj~jptkmXt$7p5m?$4Ypk8l0S)oA~mvRclRpPw*FKOU1>7 zQeh(AajYAEACKpbbtm^8dnsi{VUUc!F^-2HJia{pyAn7aPd5Gj5xn}~Qob`>6?YuZ z#81DuA|5!tI$8hbQQP*zfF_cT&v9>ZUW;V22%ser0}uy_@!hiYWN%J!i3>wx*%%SMkoZ8F2@^`rx^2s@2X# zQH6!u%~U$6V=aeXB&;k(>vHhsdOMkSlzXYz0qn%5wAwq zvn_3Qj;re3d)by$THsNw`s@VzVw)WZor&tq4EuI_+7pUbyAQHGZD-1ypS>~Lv3|Zd RcVHTik>{BGM^R@x{tF6LQTPA= diff --git a/elpa/magit-20191128.1802/magit-margin.el b/elpa/magit-20191210.1617/magit-margin.el similarity index 100% rename from elpa/magit-20191128.1802/magit-margin.el rename to elpa/magit-20191210.1617/magit-margin.el diff --git a/elpa/magit-20191128.1802/magit-margin.elc b/elpa/magit-20191210.1617/magit-margin.elc similarity index 91% rename from elpa/magit-20191128.1802/magit-margin.elc rename to elpa/magit-20191210.1617/magit-margin.elc index 540eee21f35066afe697d686036fa0314237ae13..f6ed55f6760da67033e782b7173d15fa04eca42c 100644 GIT binary patch delta 238 zcmbR2xYl8U9;5L_{XJYcwlPKq#*z#%#s;Q9mXQfVjFF)shzFK121ytycsV+Ngsnkp zbs;K%YV|;pW-&%)MvPFc#s(%(u89GVVa5bhU>;*^XaK~9F-nsUa%M0mrl(F;;ZdG! zARsY$J}>*`EFM=zWBa5-IvF7CeykeUl zi1jit8<-euE|8REWwtOi+dM(;38TEZv4Li+CYMG*QGQuwN~(f-Zen_7iEeIUQF>;c GCKmvrDn4ld delta 326 zcmZ4MFxhc}9;4Al{XJX>F-B(QF-8VPx(qSK2BsjE9*AYA;N|ELV`OM(4HPm~X8

    0LU<7iZM1c0AfQRHi}W2e2_DvUb$E!Be6I`w2W zX|oUSVpbLtLj%LjpM|b5GFzG%Z9XG1g^|U?*i>_JAg{>g3bB4BWUUfL#{Ydg-FHqt3QiT zuwMqzKSKnTJ2rBh^&-fuX;BJMPyA9z@pj0p3{We5A%y<$H*79Zf9=q!n3&dTSPq)6(s>Ze-?g5mw>uA<*+@v29+@pY2YeLAbn za}IW}dEV5IYn$5M{XRW3DN2m;OXHyNmpE)^V4DDhivS=4bpy<{%nJnCnTde3CV4?r#$@w#2zYgO$|1p2b|ZgVcCBIvp02nBg7Hf~45hx97(>Vu1ZIt~WO IsGl^8Keu#i?*IS* delta 590 zcmb7>&q~8U5XLvHP1}&|TcGbz5QK3*;>A<`B8Id^A>8)Ky|yCa9y9PnIj+jn!kaZC28&deyI|N3`sD zayeVlD|%%f3NBbtFYDz6hz=|0YArzZEv-~qKo*y$jgP4jx1u19I!VwUh7b=fLm)`P zIDznd5)5G+W^yKA*UtMS8i#Q-8Xf}g_K<8in~cMQ(b)wga2O;3wCbJCXflrLKm@8z zqHvIQD7a~Y(}UCCXpnSdzsa9&o3ny$Io#Yg<#c&XKAT@&o@|Y&oSig;jkLEg>SH4Tuh)2c8Ecl$Rf)zb@rNyHWJ8CtuqyMd8xZ O-R4fEX!l6IS+#HInV(ny diff --git a/elpa/magit-20191128.1802/magit-mode.el b/elpa/magit-20191210.1617/magit-mode.el similarity index 99% rename from elpa/magit-20191128.1802/magit-mode.el rename to elpa/magit-20191210.1617/magit-mode.el index 32da9fe3..b24fdf84 100644 --- a/elpa/magit-20191128.1802/magit-mode.el +++ b/elpa/magit-20191210.1617/magit-mode.el @@ -379,11 +379,11 @@ starts complicating other things, then it will be removed." (defcustom magit-disable-line-numbers t "In Magit buffers, whether to disable modes that display line numbers. -Some users who turn on `global-disable-line-numbers-mode' (or +Some users who turn on `global-display-line-numbers-mode' (or `global-nlinum-mode' or `global-linum-mode') expect line numbers -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, +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") :group 'magit-miscellaneous diff --git a/elpa/magit-20191128.1802/magit-mode.elc b/elpa/magit-20191210.1617/magit-mode.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-mode.elc rename to elpa/magit-20191210.1617/magit-mode.elc index e9705b1f9fcd1b0b0d837f655a8e6bd9dc802187..c1e12e8a812946f36eb369cea2f801007d533f4f 100644 GIT binary patch delta 43 ycmX?pk@@&V<_UU?#vApOO(y?H5SyG~(#aZ=my)kA`J0I?kd>LIu-U@2e=`7n^$`64 delta 44 zcmX?pk@@&V<_UU?MjQ2&O;{3>a#AOUnapNYNXd`MoBYkhmQ^7$FD7rZg=zn00ClVo AlK=n! diff --git a/elpa/magit-20191128.1802/magit-notes.el b/elpa/magit-20191210.1617/magit-notes.el similarity index 100% rename from elpa/magit-20191128.1802/magit-notes.el rename to elpa/magit-20191210.1617/magit-notes.el diff --git a/elpa/magit-20191128.1802/magit-notes.elc b/elpa/magit-20191210.1617/magit-notes.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-notes.elc rename to elpa/magit-20191210.1617/magit-notes.elc index c0648b52d927dc9d2f41545e662c9aefca9ab3b6..bbbefeefefd230b34b8a3a853d864787abe84c25 100644 GIT binary patch delta 12 TcmccWcGYcy9;5L_eKlnOB3T4d delta 12 TcmccWcGYcy9;4AleKlnOB2)xX diff --git a/elpa/magit-20191128.1802/magit-obsolete.el b/elpa/magit-20191210.1617/magit-obsolete.el similarity index 100% rename from elpa/magit-20191128.1802/magit-obsolete.el rename to elpa/magit-20191210.1617/magit-obsolete.el diff --git a/elpa/magit-20191128.1802/magit-obsolete.elc b/elpa/magit-20191210.1617/magit-obsolete.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-obsolete.elc rename to elpa/magit-20191210.1617/magit-obsolete.elc index 0769173666e5224946c60f22be52eca4c28e75f4..3eb98fe8adce7139203c78d7a00a4cd24852ef65 100644 GIT binary patch delta 12 TcmcaCds%jZ9;5L_{Uv+=AK(OK delta 12 TcmcaCds%jZ9;4Al{Uv+=AKL_E diff --git a/elpa/magit-20191128.1802/magit-patch.el b/elpa/magit-20191210.1617/magit-patch.el similarity index 100% rename from elpa/magit-20191128.1802/magit-patch.el rename to elpa/magit-20191210.1617/magit-patch.el diff --git a/elpa/magit-20191128.1802/magit-patch.elc b/elpa/magit-20191210.1617/magit-patch.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-patch.elc rename to elpa/magit-20191210.1617/magit-patch.elc index 27a1b6878be5924822b01368d0d1c187aa34b705..8f9d0a76d033e13017e8b5f3fbc46c406db421b5 100644 GIT binary patch delta 12 TcmcbeaXVvz9;5L_eH{}3C87km delta 12 TcmcbeaXVvz9;4AleH{}3C7lGg diff --git a/elpa/magit-20191128.1802/magit-pkg.el b/elpa/magit-20191210.1617/magit-pkg.el similarity index 79% rename from elpa/magit-20191128.1802/magit-pkg.el rename to elpa/magit-20191210.1617/magit-pkg.el index f7631cc7..aba2b197 100644 --- a/elpa/magit-20191128.1802/magit-pkg.el +++ b/elpa/magit-20191210.1617/magit-pkg.el @@ -1,4 +1,4 @@ -(define-package "magit" "20191128.1802" "A Git porcelain inside Emacs." +(define-package "magit" "20191210.1617" "A Git porcelain inside Emacs." '((emacs "25.1") (async "20180527") (dash "20180910") diff --git a/elpa/magit-20191128.1802/magit-process.el b/elpa/magit-20191210.1617/magit-process.el similarity index 100% rename from elpa/magit-20191128.1802/magit-process.el rename to elpa/magit-20191210.1617/magit-process.el diff --git a/elpa/magit-20191128.1802/magit-process.elc b/elpa/magit-20191210.1617/magit-process.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-process.elc rename to elpa/magit-20191210.1617/magit-process.elc index 123983d308b3375ba2b9ffb11f1e016f1d05e8d7..4899a05b48bbd6daf8b4411b82b9e3fd564fed01 100644 GIT binary patch delta 14 WcmX^8jOp|+_qS$7sA!|GpXk9#jO7 delta 12 TcmeD4>+_qS$7r-s|GpXk9!~_1 diff --git a/elpa/magit-20191128.1802/magit-refs.el b/elpa/magit-20191210.1617/magit-refs.el similarity index 100% rename from elpa/magit-20191128.1802/magit-refs.el rename to elpa/magit-20191210.1617/magit-refs.el diff --git a/elpa/magit-20191128.1802/magit-refs.elc b/elpa/magit-20191210.1617/magit-refs.elc similarity index 94% rename from elpa/magit-20191128.1802/magit-refs.elc rename to elpa/magit-20191210.1617/magit-refs.elc index 902ab96ef070592699fc4628c4bbc1dccff8bebf..0f4f09b4598945306ed662b2f07fa7a3e51ee5a9 100644 GIT binary patch delta 661 zcmZut!DhYb-Ui4c*1z00D^LG7;Y>Yh0$=odsxU@@aX@Fckiq9;uvcn~6p z9aKbNZ+Z|!8$9U6lOXsD;?09Mzd);dTjIgP4Au2sy;t?Vd}Nwn{%xb zS2i|8+lU)NDH*oUFR(*eMq`ZTG$UzPOaJNuu7T^#P=gSvqR?UbS^C_dj;6T}a^_5$ z18cJqsHxJl15gak5?L3yYpicpMhwwkUb(iJP9cHl0nyCzZWxzO9$+A+VRUAug{RC; z8&g)*=zny~^eCVW?QLAjWRHtT$oQ`kO1>`(DK+0|RHB0z=-#Oa=~P1*#L!UZ%QYB! z#-uRj9y0{v@2oD)CXs1WVX}IQ9cWuh-iYCeb3@TOe}BBr8uUNMze}sz+W#6ayt^oh z5}H+98A*|ZMA`>lGmY5?j>wV&)B4du?wKDVgD q?cIBjQ= z(`iQZ4oP%bD_Pc-({t8OblM*cdxW+-3?v!vCVF!;en2wPi?f(C!+W-pdmV4ihIUUB$;!f?j8!{T2))W7z z6UxwZpYPY5Af)DJ{>*ke6u>-w{laooz|8#qQ_Br0qWtX#+YyT87v6tA%LMmt`E$*2 VGP*bDX>x8m-Wp`BMBh&Rx!)<~;e!AG diff --git a/elpa/magit-20191128.1802/magit-remote.el b/elpa/magit-20191210.1617/magit-remote.el similarity index 100% rename from elpa/magit-20191128.1802/magit-remote.el rename to elpa/magit-20191210.1617/magit-remote.el diff --git a/elpa/magit-20191128.1802/magit-remote.elc b/elpa/magit-20191210.1617/magit-remote.elc similarity index 85% rename from elpa/magit-20191128.1802/magit-remote.elc rename to elpa/magit-20191210.1617/magit-remote.elc index af91a315579bdf9b17b0b96f100f31e61548ce2c..5610244a1f0cc658a914b2602973e44b260dbfd4 100644 GIT binary patch delta 569 zcmY*Vu}T9$5cQI~6B7#+MUfcKQ%O>&yED6crVwId+B6ozrVtDgG(jxc|K?-WP8%|KL5^$O2k*?k(1|Kn)86WoQuG`%`JPq zFsMiIOK|VzS;XV^=Btxeb!Ofd!L%yRIZ*Lr_1pD8)Y>)UEG(JF!gRc|)hiMo;=A2j gXH_6jvQWJk^e?+7ouJY?KJ5;-2Ay7i*r^qM0OzrZhX4Qo delta 625 zcmY*VO;1xn6wT`wkVaz&0*jVh3IvF@&fNKUtt*U+u8h&dxS7oZUT97M*w`U(3k5EPiIq#SH?+h}r z?7lWOCkAy)H+&cwA(#+C4qb#v|YD_Tt6D&m47N2#ge+MH?iLkCfc zycPG*mVY2Eq=OF~cmbeGnoAQwZpxRa)#)p%>ziSFp=hw8!78qVCl>8~7URXv!gp)3 z(!4wqy`T`akIB~w$+WIU_rN#4Hzeu9SoB%{7n;zRPuDJ^$wsy_NU}lOCi|llvf*V4 z0&JRDNI$|j4O~EZN8R4-V4P-y)6pTYPM4#Cv-5F!aC&wD77i1ezz*jMPzvB&0xAu? z7-+-YT{upThPIuhww;Vd(0bxJ0PZa`^D#^-WiCbjcnm~?-8jeih;o*V!G diff --git a/elpa/magit-20191128.1802/magit-repos.el b/elpa/magit-20191210.1617/magit-repos.el similarity index 100% rename from elpa/magit-20191128.1802/magit-repos.el rename to elpa/magit-20191210.1617/magit-repos.el diff --git a/elpa/magit-20191128.1802/magit-repos.elc b/elpa/magit-20191210.1617/magit-repos.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-repos.elc rename to elpa/magit-20191210.1617/magit-repos.elc index 8cbe2b674492bc764e909874d530856c2112fa77..52d30892b8f3bc5114ef67f4bfec18f26fb1842c 100644 GIT binary patch delta 12 TcmX?Cc&>1Q9;5L_{rMIECL#qW delta 12 TcmX?Cc&>1Q9;4Al{rMIECLIMQ diff --git a/elpa/magit-20191128.1802/magit-reset.el b/elpa/magit-20191210.1617/magit-reset.el similarity index 100% rename from elpa/magit-20191128.1802/magit-reset.el rename to elpa/magit-20191210.1617/magit-reset.el diff --git a/elpa/magit-20191128.1802/magit-reset.elc b/elpa/magit-20191210.1617/magit-reset.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-reset.elc rename to elpa/magit-20191210.1617/magit-reset.elc index cfde1a9ff49f41a13beb07373a0653b45afb2b50..bcf61ab8884e7de7f04a5db2c1ec21110d617b59 100644 GIT binary patch delta 12 TcmZ3Xy+V6}9;5L_{Yp^)9QOnV delta 12 TcmZ3Xy+V6}9;4Al{Yp^)9P$JP diff --git a/elpa/magit-20191128.1802/magit-section.el b/elpa/magit-20191210.1617/magit-section.el similarity index 100% rename from elpa/magit-20191128.1802/magit-section.el rename to elpa/magit-20191210.1617/magit-section.el diff --git a/elpa/magit-20191128.1802/magit-section.elc b/elpa/magit-20191210.1617/magit-section.elc similarity index 97% rename from elpa/magit-20191128.1802/magit-section.elc rename to elpa/magit-20191210.1617/magit-section.elc index 6cab6aca2ad53abda9fea499c8645bdb550d3401..b515fda5a0b85d62af78b5cb86c4d427b65f7545 100644 GIT binary patch delta 682 zcmZ{hy=xRf7>9RuE}otsM!^p(oZAGvh2)&C{VIg0XcbgYyE#KJOL8H(?A`92rV2JT zHsW*^f(Tm6`~iZ9oDs!BNi>CpA|@z^rH#()nQ##-X6K#X^YAh|?~e`mWF6kF0`~ZL z=h@N;K{4B735J=j=%^(qA?B2WLk7@ofagFshIreEmy;0#_+P-VFQ`vJ-jrf5GB5zA z1ta)WS)(Pxu)nBtLV*5I;f!tCEcpk5cB=+|tk(37H&RJ)mxWI0In7xq7`u zi;!Th;HO)l5JWswcRqguknup>`0@f2!jMyS?kmy}X0o~d5qc3<7dL(vVMvL({PUMx gCZTyDw^T`53!VB@jE>DuPS>;1G`^bE7aDHq4^+0ni2wiq delta 842 zcmbu7y^9k;7{)U@IZh4)QQ^cxo#f;$TU?x(-PsQtKRXdbEH@l$cE|>D+0E`Is7?L= z8)0h;Kfp>+25hx35Iuxzw=T8rCwkkSTql*hCo3^*s>fT7@U(|a<(*zu+hkDNohoL z%BRQh$sCrZu9PIZn(vv0*%W+nH$25+oGmt-@^~-bjbbA=%=FRVXn!%T_-^d4B<|G~ zM{)B8M>bA#Pmpbgme&$=bZngN5hbUFm9c)BrsEobQjQBp-uM`QkYypNt05wcfFm%#|^?7mX z)jlv|8d$BRckUe!jrESq4Ldz{iHg0i_dv*WO&r>|G6OX!f;SHUG_^cVFKn(tVleS= zvjfgoWJ`Hn)Jp{jrXDh7Ma3znj|cPp(2aOIL3O{` z@}xrlsF?nL#bLyIS&?miEkV?j9ZG{oF+V89TBn9gR9QTZs)#Z9Ly4zvJpgS=#F2M& z7E+6d%O7uoVs<|9;nNQQ8P&zc=a-;pV`7WjUl4%0h12I>-$T{8MM{8zqJ1Qo&W#< diff --git a/elpa/magit-20191128.1802/magit-sequence.el b/elpa/magit-20191210.1617/magit-sequence.el similarity index 100% rename from elpa/magit-20191128.1802/magit-sequence.el rename to elpa/magit-20191210.1617/magit-sequence.el diff --git a/elpa/magit-20191128.1802/magit-sequence.elc b/elpa/magit-20191210.1617/magit-sequence.elc similarity index 94% rename from elpa/magit-20191128.1802/magit-sequence.elc rename to elpa/magit-20191210.1617/magit-sequence.elc index f210bfe5ccf04c22b6964b115b3aeed17b02a3dd..2f2a5b79755447ce88a33e11ddea4bdd9d826e82 100644 GIT binary patch delta 824 zcmY+CTS!zv7=WEKXV-1Le<~)7h0Rkp4(=m5QKEmmmZ2$)7_<(*4=cypdnhB zQUnGgERhmXNGL?|Lr)Tj_!1V>qmT6*NDo0^mpLa3dYED6|Cr17|NrbGyi&jqn-O0< z{#0u_8E1r76va7Va>W{o;*3(c<1VNvLalpYPNFib%VBuV#Dmy9!HFq60ai@3Y&xS+ zSO~mDUW3|Utw}5%tc81_ZwOPJh)81?RvIP|*3BqH8h5-3AyD5uja8FJ!$M<~Vy?18 z?D+SK_cK-EOG^Ms85Ap&!MbfDg>u-9O(RSUTkOU{u+*|%ilf{XotY|_YF|c*Ws3`$ zYB+s%1z~1V_;Y*R zX9h!YPKg{;Mrl-ZbVo3uj#ibJ>hXxWv3=rM z_o|079_|uzeN^1jL81@pRqqI;xPV~QQ0n3 z7e6K*98C>mv{W)Zqy?Qhs12t2b0aA&7}9Q}6W5*nXl^hm$|i|Q?WhfHlLf4B1GaBB zAw^bDo%SO|x1r*0FT&i?#n8-0RqD8X1KqQUGDSCGWB!*9o0bWii^qH=)U?B0VSlLA zw#2*n0Msrm`V?lu+RF_^(HY!Y{p42|ht%2;MJ2Lh{}pTDu@7Fo`QTMd0(Uk)dljyW IYg_fd0U=HBt^fc4 delta 1063 zcmcJO%WG3X6vn-Gk{II)ZHrJ^oF1Vzz;=*Eqp&P|)08yCVI?l<2Y=D_cKb9aoLy2Q?R zYqHjJom&}cI~gft%dCtcWT2ML(pF9Xm1C%7s%3@OWa6w|Vh9@-bx1!^N%rR|{po6M zN73h%!hWAiUiB+g?(gAczkXJCq1$TgtNmra(qAg}anbF9wD{mq+0T~-M|hR@<*GTJ z6dWW64t6TV2MR@6*Dz+v^&(n0zLRgugH!E@)0}BXNewY`wr0RitTAQhR z?H!GILgMCqP4so$gvJcZplcgK8gl^X*2XS%g@YGjt@LG6bU{x8;o< z0dtyN8%^#S2{G5R@j*V0=UUtGaj}Ii4~~XH9)N|(A!J}%_WF{%oS-NI|5Y?b)Y~r zJOH(mc;wKTzu`9;*)2B0`tRZO`wCSRU3J0k(y)3CLaDu_avzuVX#~e=00|x*EaZ2^ z5e|!x1Te@yJjQg(rC&#rnyvzwJQmY*7sx!W5^4$uFP?bIOv9|ldgsw4bm`=V`MTrL zC;S~{uJGvdmF3a7hUcZSsaRr_=i+zlpw&0Wqq^zQyZbM6Mb5y{rxs@KEu=3G$78x_ d(dnnlbX^)W@$5%L_axnV`97js4xV|v^bgSPPfGv* diff --git a/elpa/magit-20191128.1802/magit-stash.el b/elpa/magit-20191210.1617/magit-stash.el similarity index 100% rename from elpa/magit-20191128.1802/magit-stash.el rename to elpa/magit-20191210.1617/magit-stash.el diff --git a/elpa/magit-20191128.1802/magit-stash.elc b/elpa/magit-20191210.1617/magit-stash.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-stash.elc rename to elpa/magit-20191210.1617/magit-stash.elc index 4b430e0415da47fcefa161c95aedd52a3253e7d7..38c33acd97be91de113d0642be730803c96f4fb0 100644 GIT binary patch delta 14 Vcmdlxm1*x(rU`nC#vAqfx&SNA1(N^( delta 14 Vcmdlxm1*x(rU`nCMjQ3}x&SN51(E;& diff --git a/elpa/magit-20191128.1802/magit-status.el b/elpa/magit-20191210.1617/magit-status.el similarity index 100% rename from elpa/magit-20191128.1802/magit-status.el rename to elpa/magit-20191210.1617/magit-status.el diff --git a/elpa/magit-20191128.1802/magit-status.elc b/elpa/magit-20191210.1617/magit-status.elc similarity index 97% rename from elpa/magit-20191128.1802/magit-status.elc rename to elpa/magit-20191210.1617/magit-status.elc index 2993f5cda3848dc3f4cb1fa0daf51908868076c6..e1627b81009a8fa4b61c891093b2af127928fb6e 100644 GIT binary patch delta 186 zcmV;r07d_czXPnk1CTBOGqEr5Xa+MfTrw~-vn6S@1qUK#VQh0{BC|km4h#b^HaN3U zdu<2vk!~y1_L!QGqeAZ7YG9~IWUtMn)L%SHZ!vkn*;&_HZd`? z7@f}$12Ho-v+Aw=0RuEMH?!)m69@z}IW;r00k{na128f$vk|}*0s}BOG?VJDAG1ip o5C{V{GBmSW${_*+H!(P~f6Pt@12Q)-v(VI>3Ij7aG?Q=N9ODH%D*ylh delta 305 zcmZ3pkGXq4^8`IcqmB9>GT6+_V~h-pHmhcCWld8q*2qXK&d@DMOv*`BD9)@(RWMX2 zNi8l>NG&W)%uy&x1xrID^h{y=l8mC%;*9*96a@o43qvDQg@V$e)a3kvN`(@Il*E!m z1r4RN#GK+(B?UuEOHIwq5A*nVxQ)z=HDfiolpRdXCr^yj*sN4-%fW4GZUGTAF#`)u zYL;eaHaE7|yrJtY8?%{##pVSQ#W|RbElelxn)#L4#MEN*rdcdZ%;pAWn|IDRFTiYM zY_Pd|?O#S_Q)8pe-Rp%pSWFE}EH*FN&db4UXlS~5(|%DVWLBxyxuS^%!Y>Mlc!BK0n#RuPfpeW(q@~#OfF_(vM`;T HIZXioI>0lI delta 285 zcmYL=ze>bF5Qoibb%o#q2$Ni4!jYJr&7ZRpl&cTHO4cH0786WJ%x(m&Z0#vMw{PZY1LEd7MU!3m8~iPvV0N1KnbZp zJVGb7ZcAwp@46~FA&aKUAq?geV`%$M+%@epD9AIFflFx$ECosBL diff --git a/elpa/magit-20191128.1802/magit-utils.el b/elpa/magit-20191210.1617/magit-utils.el similarity index 100% rename from elpa/magit-20191128.1802/magit-utils.el rename to elpa/magit-20191210.1617/magit-utils.el diff --git a/elpa/magit-20191128.1802/magit-utils.elc b/elpa/magit-20191210.1617/magit-utils.elc similarity index 98% rename from elpa/magit-20191128.1802/magit-utils.elc rename to elpa/magit-20191210.1617/magit-utils.elc index eb03df2f8ac5898942aad55e28dcae157382f6ad..049cf1d4585beac1e6f89c1d7f1134438b11fa11 100644 GIT binary patch delta 223 zcmcbyo2h9x(*!+6vkG{FlmOje zXbRCidFkYt0-1Sf`3kv-c?w0Tg{7HAshf9BnZU$sXkob7XSzHKlcCY(+}S*gOoqmj StLI!`HMX?0Fq#}Nw*vs5G20*T%0f+&_hCpn@9HWG!WODChSpkr0L!hySrVyFQyC%=9S1#7bNG#6K zElEtuNmVG$tV&fdRwzj=E>TD=R47UX%Yj7=^-N*>l8mC%;*9*96a@o43qvDQg@V$e z)a3kvN`(@Il*E!m1&z$Sw0s34BZb_=JOv{Qh4Oq5!^BWi6KF(XX=YI>SSB~IWOMqI z9wt_xzcgbf^TjD_mYDvRnaR>(v-oTtMkY(k$*OZMu$mYcm|0Bbj?c diff --git a/elpa/magit-20191128.1802/magit-worktree.el b/elpa/magit-20191210.1617/magit-worktree.el similarity index 100% rename from elpa/magit-20191128.1802/magit-worktree.el rename to elpa/magit-20191210.1617/magit-worktree.el diff --git a/elpa/magit-20191128.1802/magit-worktree.elc b/elpa/magit-20191210.1617/magit-worktree.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-worktree.elc rename to elpa/magit-20191210.1617/magit-worktree.elc index 06dfbde938cdd41f7b2c0ec01b68dc5812cb09a2..e71b21d6b76ee2e15c549b6f43bc22242d483bfc 100644 GIT binary patch delta 12 TcmbQ{Jk5E69;5L_{d7eD9Ww+C delta 12 TcmbQ{Jk5E69;4Al{d7eD9WDe6 diff --git a/elpa/magit-20191128.1802/magit.el b/elpa/magit-20191210.1617/magit.el similarity index 100% rename from elpa/magit-20191128.1802/magit.el rename to elpa/magit-20191210.1617/magit.el diff --git a/elpa/magit-20191128.1802/magit.elc b/elpa/magit-20191210.1617/magit.elc similarity index 99% rename from elpa/magit-20191128.1802/magit.elc rename to elpa/magit-20191210.1617/magit.elc index 6ed985a0cc02e3e128883381e33b0444053448d6..8096f689e44dffa392a1c965b9c54e6b9cfb3942 100644 GIT binary patch delta 14 WcmcaKpYhUs#tC|i#vAn)`vU+jn+2%= delta 14 WcmcaKpYhUs#tC|iMjQ1P`vU+jmIbH) diff --git a/elpa/magit-20191128.1802/magit.info b/elpa/magit-20191210.1617/magit.info similarity index 100% rename from elpa/magit-20191128.1802/magit.info rename to elpa/magit-20191210.1617/magit.info diff --git a/elpa/magit-20191128.1802/magit.info-1 b/elpa/magit-20191210.1617/magit.info-1 similarity index 100% rename from elpa/magit-20191128.1802/magit.info-1 rename to elpa/magit-20191210.1617/magit.info-1 diff --git a/elpa/magit-20191128.1802/magit.info-2 b/elpa/magit-20191210.1617/magit.info-2 similarity index 100% rename from elpa/magit-20191128.1802/magit.info-2 rename to elpa/magit-20191210.1617/magit.info-2 diff --git a/elpa/pickle-20190923.354/pickle-autoloads.el b/elpa/pickle-20190923.354/pickle-autoloads.el new file mode 100644 index 00000000..adfea227 --- /dev/null +++ b/elpa/pickle-20190923.354/pickle-autoloads.el @@ -0,0 +1,32 @@ +;;; pickle-autoloads.el --- automatically extracted autoloads +;; +;;; Code: + +(add-to-list 'load-path (directory-file-name + (or (file-name-directory #$) (car load-path)))) + + +;;;### (autoloads nil "pickle" "pickle.el" (0 0 0 0)) +;;; Generated autoloads from pickle.el + +(autoload 'pickle-mode "pickle" "\ + + +\(fn)" t nil) + +(autoload 'pickle-config "pickle" "\ +Default pickle setup and bindings. + +\(fn)" t nil) + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "pickle" '("pickle-" "default-tab-width"))) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; coding: utf-8 +;; End: +;;; pickle-autoloads.el ends here diff --git a/elpa/pickle-20190923.354/pickle-pkg.el b/elpa/pickle-20190923.354/pickle-pkg.el new file mode 100644 index 00000000..707357ae --- /dev/null +++ b/elpa/pickle-20190923.354/pickle-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "pickle" "20190923.354" "Major mode for editing cucumber gherkin files." '((emacs "25.1") (cl-lib "0.6.1")) :commit "3a0a717f2a24827667f34bc53830a3b81cd57460" :keywords '("ahungry" "languages" "cucumber" "gherkin") :authors '(("Matthew Carter" . "m@ahungry.com")) :maintainer '("Matthew Carter" . "m@ahungry.com") :url "https://github.com/ahungry/pickle-mode") diff --git a/elpa/pickle-20190923.354/pickle.el b/elpa/pickle-20190923.354/pickle.el new file mode 100644 index 00000000..a2cd1c5d --- /dev/null +++ b/elpa/pickle-20190923.354/pickle.el @@ -0,0 +1,101 @@ +;;; pickle.el --- Major mode for editing cucumber gherkin files. -*- lexical-binding: t -*- + +;; Copyright (C) 2018-2019 Matthew Carter + +;; Author: Matthew Carter +;; Maintainer: Matthew Carter +;; URL: https://github.com/ahungry/pickle-mode +;; Package-Version: 20190923.354 +;; Version: 0.0.3 +;; Date: 2018-02-15 +;; Keywords: ahungry languages cucumber gherkin +;; Package-Requires: ((emacs "25.1") (cl-lib "0.6.1")) + +;; This file is NOT 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: + +;; A major mode for handling Gherkin files and syntax highlighting. +;; +;; This mode is not coupled to an underlying Cucumber system such as feature-mode. +;; +;; If you want a full-fledged IDE like experience, see: feature-mode (no affiliation). +;; +;; If you just want syntax highlighting in a lightweight mode, use this. +;; + +;;; Code: + +(require 'cl-lib) + +(defvar pickle-mode-default-tab-width 2) + +(defconst pickle-mode-font-lock-keywords-1 + (list + '("#.*" . font-lock-comment-face) + '(" \"\\(.*?\\)\" " . font-lock-variable-name-face) + '("\\(When\\|Then\\|Given\\)" . font-lock-keyword-face) + '("\\(\\w+\\)(" 1 font-lock-function-name-face) + '("Feature: \\(.*\\)" 1 font-lock-variable-name-face) + '("Scenario: \\(.*\\)" 1 font-lock-preprocessor-face) + '("\\(.*?\\): " . font-lock-type-face) + '(") is \\(\\w+\\)" 1 font-lock-preprocessor-face) + )) + +(defvar default-tab-width 2) + +;; This is easy because the syntax just cascades the indent until it +;; resets to 0 again. No need to go back one level at a time etc. +(defun pickle-indent-line () + "Properly indent based on what we're looking at." + (interactive) + (beginning-of-line) + (if (bobp) + (indent-line-to 0) + (let ((not-indented t) + cur-indent) + (if (looking-at "^[ \t]*Feature:") + (setq cur-indent 0) + (save-excursion + (while not-indented + (forward-line -1) + (if (looking-at "^[ \t]*\\(Feature\\|Scenario\\):") + (progn + (setq cur-indent (+ default-tab-width (current-indentation))) + (setq not-indented nil)) + (if (bobp) (setq not-indented nil)) + ))) + ) + (if cur-indent (indent-line-to cur-indent) (indent-line-to 0)))) + ) + +;;;###autoload +(define-derived-mode pickle-mode text-mode "Pickle" () + "Major mode for editing Gherkin (Cucumber) files." + :group 'languages + (set (make-local-variable 'indent-line-function) 'pickle-indent-line) + (set (make-local-variable 'font-lock-defaults) + '(pickle-mode-font-lock-keywords-1))) + +;;;###autoload +(defun pickle-config () + "Default pickle setup and bindings." + (interactive) + (add-to-list 'auto-mode-alist '("\\.feature\\'" . pickle-mode))) + +(provide 'pickle) + +;;; pickle.el ends here diff --git a/elpa/pickle-20190923.354/pickle.elc b/elpa/pickle-20190923.354/pickle.elc new file mode 100644 index 0000000000000000000000000000000000000000..8fe56a88b656af439a63afbdfd43e283b835b64c GIT binary patch literal 4038 zcmbtXOK;mo5O#V>6(m4=NYmutiBv#RY6>DL`H8ei-Lx^%21XO0htP#r4n)k`b-7xO)R{@0yG#gN!s&6lSRsAYQ1cvx}3|dH&|`=!n9ZC`71W;+9q~(um58 zLXpx$Qj&>=lFF5mq$rYD7Nlk%^n9ZiA^4;}HsDkLTCG;Ekbf=WLQ*$OoFty~TfIn5 zFGN9k9G)lAnP-u7a3mIqa+H`j%Q!+tJVS^`A-Xo{6tQ!XEIfD4U z#%)}92#4WfiD3VX*&l9b#SdAiecFc5-ugfH63frA;z3RkiO0c zje&NbmsH3S07UT=D2j@&g>&^YVo$O~8iC~$K<}{AT@nkG&7m{I@L16V(JLud1EQXu z8emk#LZaylJzjLAYO&=2(4l4K4RD)_oKOmJ8n4m8zDHVaP6PAx=HgsBWiEAsmMc{0`%2$O@{D;V=95UE z2i>QgeNZ}To;$FpPdAOvhTM+Z>G#PLgRQUqMn949mdo<0#g^92&59ZUGm5ku(rMf< zEVZBO;C@71gr2;Rk=X!Hwmb@ye6RGu361+LOp9HYeieVhSngT$hGwB@kj+Jq&cLTiv*vM!BimYE7iS8a++?97b~*f`8Kw-=X3LaJ7j3nSbCoN4 zDYHVk-)d1Kln$z=yVX3h!vpBRUS|j2u@l&BwU)CuoWbKlIvCjrCO4Hc5oOEE_`vco z18$djmPQP1I<3679s%{DNCOCAOo((vj6KGyD$F{V^Z0DW{$5Ci%B_|LK7E5npckT~ zL91b@#=b2=koX=*C9pYTnUg8tGX@??DwWJz(Lw{RMly_UvsS~p;2*0^I8y)JG~Trp z^<39DP&fb11BMDc>AAbVz?b(WAK~LOu=$Sw3NFBmTi;~}FjqBbjqhma=`z*!9enNZ zMyMgo8wOL>qv!RQ_W_L_^pwROfWh;EDZc%h!*Gr6;%v-9hNIs$?%vyEdi=uaw!XTz zd01)pc33-GM)x1}K>}Fxw{ceO42f8o?lB3T zbED`3-7R{#q$}ZWJlkd0xUkFBKnXT(kuU=3{TQpqy7_EIY9H$f+cpM-i9qS{L^hq| zROMGnRZXb+q~1Y{8irqf7cxj$)07H*BZ{ceEyS{JptX_D_QpAriuR2iXntz|IBX|g z^Z4ZguCfg*yAdOM1*>=X+JEcL+VlZR{AN>9&rZbU`w0S5y~Omn3+;5;47w4GVYbac z$!bsY#_n#tsCAzC+w`MRTv^AiEOHGzyr}>%${Y7;yl+k8v-L{NqZU1Y*~-<;iz@Fw zD#Jp`FTL1+jKSz|JooTsHJF-rm>}r#%aP?n|AhR?Sbuly)yDR)f?dSG_G-27xBds3 CDe^A> literal 0 HcmV?d00001 diff --git a/elpa/poet-theme-20191103.1948/poet-dark-monochrome-theme.el b/elpa/poet-theme-20191103.1948/poet-dark-monochrome-theme.el new file mode 100644 index 00000000..4eb7002d --- /dev/null +++ b/elpa/poet-theme-20191103.1948/poet-dark-monochrome-theme.el @@ -0,0 +1,273 @@ +;;; poet-dark-monochrome-theme.el --- A dark monochrome theme for prose. + +;; Copyright 2018-now Kunal Bhalla + +;; Author: Kunal Bhalla +;; URL: https://github.com/kunalb/poet/ +;; Version: 2.0 + +;;; Commentary: + +;; Emacs has very good support for multiple fonts in a single +;; file. Poet uses this support to make it much more convenient to +;; write prose within Emacs, with particular attention paid to +;; org-mode and markdown-mode. Code blocks, tables, etc are +;; formatted in monospace text with the appropriate backgrounds. + +;; Theme Customizations +;; - `poet-variable-headers` +;; Enable / disable different text heights for different faces. + +;; Recommended customizations for using this theme +;; +;; - Set up the base fonts you'd like to use in Emacs before loading Poet +;; (set-face-attribute 'default nil :family "Iosevka" :height 130) +;; (set-face-attribute 'fixed-pitch nil :family "Iosevka") +;; (set-face-attribute 'variable-pitch nil :family "Baskerville") +;; On loading this theme captures the default and treats that for fixed-pitch +;; rendering. +;; +;; - Enable variable pitch mode for editing text +;; (add-hook 'text-mode-hook +;; (lambda () +;; (variable-pitch-mode 1)) +;; +;; - Some other modes I like to enable/disable +;; (olivetti-mode 1) ;; Centers text in the buffer +;; (flyspell-mode 1) ;; Catch Spelling mistakes +;; (typo-mode 1) ;; Good for symbols like em-dash +;; (blink-cursor-mode 0) ;; Reduce visual noise +;; (linum-mode 0) ;; No line numbers for prose +;; +;; - And prettier org mode bullets: +;; (setq org-bullets-bullet-list +;; '("◉" "○")) +;; (org-bullets 1) + +;;; Code: + +(defvar poet--monospace-height + (face-attribute 'fixed-pitch :height nil 'default) + "The original height stored as a defvar to stay constant across reloads.") + +(defgroup poet-theme nil + "Customizations to change the behavior of poet") + +(defcustom poet-variable-headers t + "Use varying sizes for headers in org and markdown" + :group 'poet-theme + :type 'boolean) + +(defun poet--height (multiplier) + "Returns the height as MULTIPLIER * monospace-height." + (if poet-variable-headers + (truncate (* poet--monospace-height multiplier)) + poet--monospace-height)) +(deftheme poet-dark-monochrome + "A dark monochrome prose friendly theme.") + +(let ((fg "#e4e4e4") + (bg "#0f0f0f") + (emph "#ededed") + (sep "#434343") + (hlt "#000000") + (bg-hlt "#191919") + (muted "#a9a9a9") + (meta "#e4e4e4") + (link "#d1d1d1") + (link-underline "#d1d1d1") + (vlink-underline "#fefefe") + (header "#b5b5b5") + (button "#a9a9a9") + (glyph "#e7e7e7") + (cursor "#dddddd") + (paren-match-bg "#8a8a8a") + (paren-match-fg "#fefefe") + (search-fg "#fefefe") + (search-bg "#9d9d9d") + (search-fail-bg "#d8d8d8") + (tooltip-fg "#101010") + (tooltip-bg "#b9b9b9") + (shadow "#989898") + (secondary-bg "#000000") + (trailing-bg "#b1b1b1") + (fci "#dddddd") + (lazy-hlt-fg "#000000") + (lazy-hlt-bg "#fefefe") + (evil-rep-fg "#fefefe") + (evil-rep-bg "#3d3d3d") + (mode-line-fg "#d7d7d7") + (header-line-bg "#101010") + (mode-line-hlt "#000000") + (mode-line-inactive "#878787") + (error "#979797") + (builtin "#838383") + (string "#dcdcdc") + (function-name "#9d9d9d") + (keyword "#b4b4b4") + (constant "#a9a9a9") + (type "#b9b9b9") + (variable "#b9b9b9") + (org-meta "#b8b8b8") + (org-document-info "#b8b8b8") + (org-table "#161616") + (org-quote-fg "#efefef") + (org-quote-bg "#161616") + (org-date "#b8b8b8") + (org-title "#929292") + (org-title-underline "#929292") + (org-checkbox "#989898") + (org-scheduled "#dcdcdc") + (org-scheduled-today "#fefefe") + (org-done "#717171") + (org-todo "#7f7f7f") + (org-tag "#a9a9a9") + (org-block-line "#060606") + (org-block-bg "#161616") + (org-agenda-structure-fg "#a9a9a9") + (org-agenda-structure-bg "#101010") + (org-agenda-today-fg "#dcdcdc") + (org-agenda-today-bg "#000000") + (org-special-keyword "#767676") + (org-sched-prev "#d9d9d9") + (org-agenda-done "#bebebe") + (hl-line "#1e1e1e") + (linum-hlt "#bababa") + (linum "#545454") + (markdown-markup "#777777") + (markdown-metadata "#767676") + (markdown-language "#afafaf") + (markdown-list "#fefefe") + (markdown-code-bg "#161616") + (markdown-pre-bg "#161616") + (markdown-header-delimiter "#777777") + (imenu "#b5b5b5")) + (custom-theme-set-faces 'poet-dark-monochrome + `(variable-pitch ((t (:family ,(face-attribute 'variable-pitch :family) :height (lambda (_x) (poet--height 1.23)))))) + `(default ((t (:background ,bg :foreground ,fg)))) + `(italic ((t (:foreground ,emph :slant italic)))) + `(highlight ((t (:background ,hlt :overline nil)))) + `(region ((t (:background ,bg-hlt)))) + `(fringe ((t (:background ,bg)))) + `(button ((t (:inherit default :foreground ,button)))) + `(escape-glyph ((t (:foreground ,glyph)))) + `(link ((t (:underline (:color ,link-underline :style line) :foreground ,link)))) + `(link-visited ((t (:inherit link :foreground ,link :underline (:color ,vlink-underline :style line))))) + `(cursor ((t (:background ,cursor)))) + `(show-paren-match ((t (:background ,paren-match-fg :foreground ,paren-match-bg)))) + `(isearch ((t (:foreground ,search-fg :background ,search-bg)))) + `(isearch-fail ((t (:background ,search-fail-bg)))) + `(query-replace ((t (:inherit isearch)))) + `(tooltip ((t (:inherit default :foreground ,tooltip-fg :background ,tooltip-bg)))) + `(shadow ((t (:foreground ,shadow)))) + `(secondary-selection ((t (:background ,secondary-bg)))) + `(trailing-whitespace ((t (:background ,trailing-bg)))) + `(lazy-highlight ((t (:foreground ,lazy-hlt-fg :background ,lazy-hlt-bg)))) + `(next-error ((t (:inherit region)))) + `(window-divider ((t (:background ,sep :foreground ,sep)))) + `(vertical-border ((t (:background ,sep :foreground ,sep)))) + `(evil-ex-substitute-replacement ((t (:foreground ,evil-rep-fg :background ,evil-rep-bg :underline nil)))) + `(minibuffer-prompt ((t (:inherit fixed-pitch :weight bold :foreground ,meta)))) + `(mode-line ((t (:inherit fixed-pitch :foreground ,mode-line-fg :background ,bg :overline ,sep :box (:line-width 3 :color ,bg))))) + `(header-line ((t (:overline nil :background ,header-line-bg :box (:line-width 3 :color ,header-line-bg) :underline ,sep :inherit mode-line)))) + `(mode-line-buffer-id ((t (:weight bold)))) + `(mode-line-emphasis ((t (:weight bold)))) + `(mode-line-highlight ((t (:background ,mode-line-hlt)))) + `(mode-line-inactive ((t (:inherit mode-line :background ,bg :foreground ,mode-line-inactive :box (:color ,bg :line-width 3))))) + `(error ((t (:foreground ,error :inherit fixed-pitch)))) + `(font-lock-comment-face ((t (:foreground ,muted :inherit fixed-pitch)))) + `(font-lock-builtin-face ((t (:foreground ,builtin :inherit fixed-pitch)))) + `(font-lock-string-face ((t (:inherit fixed-pitch :foreground ,string)))) + `(font-lock-function-name-face ((t (:inherit fixed-pitch :foreground ,function-name)))) + `(font-lock-keyword-face ((t (:inherit fixed-pitch :foreground ,keyword)))) + `(font-lock-comment-delimiter-face ((t (:inherit fixed-pitch :inherit font-lock-comment-face)))) + `(font-lock-constant-face ((t (:inherit fixed-pitch :foreground ,constant)))) + `(font-lock-doc-face ((t (:inherit fixed-pitch :inherit font-lock-string-face)))) + `(font-lock-preprocessor-face ((t (:inherit fixed-pitch :inherit font-lock-builtin-face)))) + `(font-lock-regexp-grouping-backslash ((t (:inherit fixed-pitch :inherit bold)))) + `(font-lock-regexp-grouping-construct ((t (:inherit fixed-pitch :inherit bold)))) + `(font-lock-type-face ((t (:foreground ,type :inherit fixed-pitch)))) + `(font-lock-variable-name-face ((t (:inherit fixed-pitch :foreground ,variable)))) + `(font-lock-warning-face ((t (:inherit error)))) + `(org-level-1 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.5)))))) + `(org-level-2 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.4)))))) + `(org-level-3 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.3)))))) + `(org-level-4 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-level-5 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-level-6 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-level-7 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-level-8 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-meta-line ((t (:inherit fixed-pitch :foreground ,org-meta)))) + `(org-document-info-keyword ((t (:inherit fixed-pitch :foreground ,org-document-info)))) + `(org-document-info ((t (:inherit default :foreground ,org-document-info)))) + `(org-verbatim ((t (:inherit fixed-pitch)))) + `(org-code ((t (:inherit fixed-pitch)))) + `(org-table ((t (:inherit fixed-pitch :background ,org-table)))) + `(org-formula ((t (:inherit org-table :height (lambda (_x) (poet--height 1)))))) + `(org-verse ((t (:inherit default :foreground ,org-quote-fg :background ,org-quote-bg)))) + `(org-quote ((t (:inherit default :foreground ,org-quote-fg :background ,org-quote-bg)))) + `(org-hide ((t (:inherit fixed-pitch :foreground ,bg)))) + `(org-indent ((t (:inherit org-hide)))) + `(org-date ((t (:inherit fixed-pitch :foreground ,org-date :underline nil)))) + `(org-document-title ((t (:inherit default :foreground ,org-title :height (lambda (_x) (poet--height 1.8)) :underline (:color ,org-title-underline))))) + `(org-checkbox ((t (:inherit fixed-pitch :weight bold :foreground ,org-checkbox)))) + `(org-done ((t (:inherit fixed-pitch :foreground ,org-done)))) + `(org-todo ((t (:inherit fixed-pitch :foreground ,org-todo)))) + `(org-tag ((t (:inherit fixed-pitch :height (lambda (_x) (poet--height 1)) :foreground ,org-tag)))) + `(org-block-begin-line ((t (:inherit fixed-pitch :background ,org-block-line)))) + `(org-block-end-line ((t (:inherit fixed-pitch :background ,org-block-line)))) + `(org-block ((t (:background ,org-block-bg :inherit fixed-pitch)))) + `(org-priority ((t (:inherit fixed-pitch :weight normal)))) + `(org-agenda-structure ((t (:foreground ,org-agenda-structure-fg :background ,bg :box (:line-width 3 :color ,bg) :underline ,org-agenda-structure-bg)))) + `(org-scheduled ((t (:foreground ,org-scheduled)))) + `(org-scheduled-today ((t (:foreground ,org-scheduled-today)))) + `(org-agenda-date-weekend ((t (:inherit org-agenda-structure)))) + `(org-agenda-date-today ((t (:box (:line-width 3 :color ,org-agenda-today-bg) :foreground ,org-agenda-today-fg :background ,org-agenda-today-bg)))) + `(org-special-keyword ((t (:inherit fixed-pitch :foreground ,org-special-keyword)))) + `(org-scheduled-previously ((t (:foreground ,org-sched-prev)))) + `(org-agenda-done ((t (:foreground ,org-agenda-done)))) + `(org-footnote ((t (:foreground ,link)))) + `(hl-line ((t (:background ,hl-line)))) + `(linum-highlight-face ((t (:inherit fixed-pitch :foreground ,linum-hlt)))) + `(linum ((t (:inherit fixed-pitch :foreground ,linum)))) + `(line-number ((t (:inherit fixed-pitch :foreground ,linum)))) + `(line-number-current-line ((t (:inherit fixed-pitch :foreground ,linum-hlt)))) + `(markdown-header-face-1 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.5)))))) + `(markdown-header-face-2 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.4)))))) + `(markdown-header-face-3 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.3)))))) + `(markdown-header-face-4 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-header-face-5 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-header-face-6 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-header-face-7 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-header-face-8 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-markup-face ((t (:inherit fixed-pitch :foreground ,markdown-markup)))) + `(markdown-inline-code-face ((t (:inherit fixed-pitch)))) + `(markdown-metadata-key-face ((t (:inherit fixed-pitch :height (lambda (_x) (poet--height 1)) :foreground ,markdown-metadata)))) + `(markdown-metadata-value-face ((t (:inherit fixed-pitch :height (lambda (_x) (poet--height 1)) :foreground ,fg)))) + `(markdown-language-keyword-face ((t (:foreground ,markdown-language)))) + `(markdown-list-face ((t (:inherit fixed-pitch :foreground ,markdown-list)))) + `(markdown-code-face ((t (:inherit fixed-pitch :foreground ,fg :background ,markdown-code-bg)))) + `(markdown-pre-face ((t (:inherit fixed-pitch :color ,fg :background ,markdown-pre-bg)))) + `(markdown-header-delimiter-face ((t (:inherit fixed-pitch :foreground ,markdown-header-delimiter)))) + `(markdown-header-rule-face ((t (:inherit fixed-pitch :foreground ,markdown-header-delimiter)))) + `(markdown-url-face ((t (:inherit fixed-pitch :foreground ,link)))) + `(imenu-list-entry-face-0 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-1 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-2 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-3 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-4 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-5 ((t (:foreground ,imenu)))) + `(helm-source-header ((t (:height (lambda (_x) (poet--height 1))))))) + (custom-theme-set-variables 'poet-dark-monochrome + '(line-spacing .2) + `(fci-rule-color ,fci))) + +;;;###autoload +(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)))) + +(provide-theme 'poet-dark-monochrome) +;;; poet-dark-monochrome-theme ends here diff --git a/elpa/poet-theme-20191103.1948/poet-dark-monochrome-theme.elc b/elpa/poet-theme-20191103.1948/poet-dark-monochrome-theme.elc new file mode 100644 index 0000000000000000000000000000000000000000..4407166abe845702d8f08eac9c3677e0b8918cb6 GIT binary patch literal 11258 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 literal 0 HcmV?d00001 diff --git a/elpa/poet-theme-20191103.1948/poet-dark-theme.el b/elpa/poet-theme-20191103.1948/poet-dark-theme.el new file mode 100644 index 00000000..6d09dcb4 --- /dev/null +++ b/elpa/poet-theme-20191103.1948/poet-dark-theme.el @@ -0,0 +1,273 @@ +;;; poet-dark-theme.el --- A dark theme for prose. + +;; Copyright 2018-now Kunal Bhalla + +;; Author: Kunal Bhalla +;; URL: https://github.com/kunalb/poet/ +;; Version: 2.0 + +;;; Commentary: + +;; Emacs has very good support for multiple fonts in a single +;; file. Poet uses this support to make it much more convenient to +;; write prose within Emacs, with particular attention paid to +;; org-mode and markdown-mode. Code blocks, tables, etc are +;; formatted in monospace text with the appropriate backgrounds. + +;; Theme Customizations +;; - `poet-variable-headers` +;; Enable / disable different text heights for different faces. + +;; Recommended customizations for using this theme +;; +;; - Set up the base fonts you'd like to use in Emacs before loading Poet +;; (set-face-attribute 'default nil :family "Iosevka" :height 130) +;; (set-face-attribute 'fixed-pitch nil :family "Iosevka") +;; (set-face-attribute 'variable-pitch nil :family "Baskerville") +;; On loading this theme captures the default and treats that for fixed-pitch +;; rendering. +;; +;; - Enable variable pitch mode for editing text +;; (add-hook 'text-mode-hook +;; (lambda () +;; (variable-pitch-mode 1)) +;; +;; - Some other modes I like to enable/disable +;; (olivetti-mode 1) ;; Centers text in the buffer +;; (flyspell-mode 1) ;; Catch Spelling mistakes +;; (typo-mode 1) ;; Good for symbols like em-dash +;; (blink-cursor-mode 0) ;; Reduce visual noise +;; (linum-mode 0) ;; No line numbers for prose +;; +;; - And prettier org mode bullets: +;; (setq org-bullets-bullet-list +;; '("◉" "○")) +;; (org-bullets 1) + +;;; Code: + +(defvar poet--monospace-height + (face-attribute 'fixed-pitch :height nil 'default) + "The original height stored as a defvar to stay constant across reloads.") + +(defgroup poet-theme nil + "Customizations to change the behavior of poet") + +(defcustom poet-variable-headers t + "Use varying sizes for headers in org and markdown" + :group 'poet-theme + :type 'boolean) + +(defun poet--height (multiplier) + "Returns the height as MULTIPLIER * monospace-height." + (if poet-variable-headers + (truncate (* poet--monospace-height multiplier)) + poet--monospace-height)) +(deftheme poet-dark + "A prose friendly dark theme.") + +(let ((fg "#EDE7dd") + (bg "#181008") + (emph "#eeeeee") + (sep "#444444") + (hlt "#000000") + (bg-hlt "#012c32") + (muted "#aaaaaa") + (meta "#ede7dd") + (link "#ffdba5") + (link-underline "#ffdba5") + (vlink-underline "#ffffff") + (header "#ceb39e") + (button "#aaaaaa") + (glyph "#f7ffd1") + (cursor "#FFD5BE") + (paren-match-bg "#ff1744") + (paren-match-fg "#ffffff") + (search-fg "#ffffff") + (search-bg "#fb6542") + (search-fail-bg "#f8bbd0") + (tooltip-fg "#111111") + (tooltip-bg "#fff176") + (shadow "#999999") + (secondary-bg "#000000") + (trailing-bg "#ff8a65") + (fci "#dedede") + (lazy-hlt-fg "#000000") + (lazy-hlt-bg "#ffffff") + (evil-rep-fg "#ffffff") + (evil-rep-bg "#4e342e") + (mode-line-fg "#edd3c4") + (header-line-bg "#111111") + (mode-line-hlt "#000000") + (mode-line-inactive "#888888") + (error "#df5286") + (builtin "#b85750") + (string "#dddddd") + (function-name "#80bd9e") + (keyword "#c1caa1") + (constant "#90afc5") + (type "#cfa6a8") + (variable "#ffa575") + (org-meta "#c6b6ad") + (org-document-info "#c6b6ad") + (org-table "#171716") + (org-quote-fg "#e6e6fa") + (org-quote-bg "#171716") + (org-date "#c6b6ad") + (org-title "#ee7e38") + (org-title-underline "#ee7e38") + (org-checkbox "#999999") + (org-scheduled "#dddddd") + (org-scheduled-today "#ffffff") + (org-done "#5EE300") + (org-todo "#FF3D00") + (org-tag "#aaaaaa") + (org-block-line "#070706") + (org-block-bg "#171716") + (org-agenda-structure-fg "#aaaaaa") + (org-agenda-structure-bg "#111111") + (org-agenda-today-fg "#dddddd") + (org-agenda-today-bg "#000000") + (org-special-keyword "#777777") + (org-sched-prev "#ffb6c1") + (org-agenda-done "#b9ccb2") + (hl-line "#3d0000") + (linum-hlt "#bbbbbb") + (linum "#555555") + (markdown-markup "#8D6E63") + (markdown-metadata "#777777") + (markdown-language "#BE8CD4") + (markdown-list "#ffffff") + (markdown-code-bg "#171716") + (markdown-pre-bg "#171716") + (markdown-header-delimiter "#8D6E63") + (imenu "#ceb39e")) + (custom-theme-set-faces 'poet-dark + `(variable-pitch ((t (:family ,(face-attribute 'variable-pitch :family) :height (lambda (_x) (poet--height 1.23)))))) + `(default ((t (:background ,bg :foreground ,fg)))) + `(italic ((t (:foreground ,emph :slant italic)))) + `(highlight ((t (:background ,hlt :overline nil)))) + `(region ((t (:background ,bg-hlt)))) + `(fringe ((t (:background ,bg)))) + `(button ((t (:inherit default :foreground ,button)))) + `(escape-glyph ((t (:foreground ,glyph)))) + `(link ((t (:underline (:color ,link-underline :style line) :foreground ,link)))) + `(link-visited ((t (:inherit link :foreground ,link :underline (:color ,vlink-underline :style line))))) + `(cursor ((t (:background ,cursor)))) + `(show-paren-match ((t (:background ,paren-match-fg :foreground ,paren-match-bg)))) + `(isearch ((t (:foreground ,search-fg :background ,search-bg)))) + `(isearch-fail ((t (:background ,search-fail-bg)))) + `(query-replace ((t (:inherit isearch)))) + `(tooltip ((t (:inherit default :foreground ,tooltip-fg :background ,tooltip-bg)))) + `(shadow ((t (:foreground ,shadow)))) + `(secondary-selection ((t (:background ,secondary-bg)))) + `(trailing-whitespace ((t (:background ,trailing-bg)))) + `(lazy-highlight ((t (:foreground ,lazy-hlt-fg :background ,lazy-hlt-bg)))) + `(next-error ((t (:inherit region)))) + `(window-divider ((t (:background ,sep :foreground ,sep)))) + `(vertical-border ((t (:background ,sep :foreground ,sep)))) + `(evil-ex-substitute-replacement ((t (:foreground ,evil-rep-fg :background ,evil-rep-bg :underline nil)))) + `(minibuffer-prompt ((t (:inherit fixed-pitch :weight bold :foreground ,meta)))) + `(mode-line ((t (:inherit fixed-pitch :foreground ,mode-line-fg :background ,bg :overline ,sep :box (:line-width 3 :color ,bg))))) + `(header-line ((t (:overline nil :background ,header-line-bg :box (:line-width 3 :color ,header-line-bg) :underline ,sep :inherit mode-line)))) + `(mode-line-buffer-id ((t (:weight bold)))) + `(mode-line-emphasis ((t (:weight bold)))) + `(mode-line-highlight ((t (:background ,mode-line-hlt)))) + `(mode-line-inactive ((t (:inherit mode-line :background ,bg :foreground ,mode-line-inactive :box (:color ,bg :line-width 3))))) + `(error ((t (:foreground ,error :inherit fixed-pitch)))) + `(font-lock-comment-face ((t (:foreground ,muted :inherit fixed-pitch)))) + `(font-lock-builtin-face ((t (:foreground ,builtin :inherit fixed-pitch)))) + `(font-lock-string-face ((t (:inherit fixed-pitch :foreground ,string)))) + `(font-lock-function-name-face ((t (:inherit fixed-pitch :foreground ,function-name)))) + `(font-lock-keyword-face ((t (:inherit fixed-pitch :foreground ,keyword)))) + `(font-lock-comment-delimiter-face ((t (:inherit fixed-pitch :inherit font-lock-comment-face)))) + `(font-lock-constant-face ((t (:inherit fixed-pitch :foreground ,constant)))) + `(font-lock-doc-face ((t (:inherit fixed-pitch :inherit font-lock-string-face)))) + `(font-lock-preprocessor-face ((t (:inherit fixed-pitch :inherit font-lock-builtin-face)))) + `(font-lock-regexp-grouping-backslash ((t (:inherit fixed-pitch :inherit bold)))) + `(font-lock-regexp-grouping-construct ((t (:inherit fixed-pitch :inherit bold)))) + `(font-lock-type-face ((t (:foreground ,type :inherit fixed-pitch)))) + `(font-lock-variable-name-face ((t (:inherit fixed-pitch :foreground ,variable)))) + `(font-lock-warning-face ((t (:inherit error)))) + `(org-level-1 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.5)))))) + `(org-level-2 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.4)))))) + `(org-level-3 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.3)))))) + `(org-level-4 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-level-5 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-level-6 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-level-7 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-level-8 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-meta-line ((t (:inherit fixed-pitch :foreground ,org-meta)))) + `(org-document-info-keyword ((t (:inherit fixed-pitch :foreground ,org-document-info)))) + `(org-document-info ((t (:inherit default :foreground ,org-document-info)))) + `(org-verbatim ((t (:inherit fixed-pitch)))) + `(org-code ((t (:inherit fixed-pitch)))) + `(org-table ((t (:inherit fixed-pitch :background ,org-table)))) + `(org-formula ((t (:inherit org-table :height (lambda (_x) (poet--height 1)))))) + `(org-verse ((t (:inherit default :foreground ,org-quote-fg :background ,org-quote-bg)))) + `(org-quote ((t (:inherit default :foreground ,org-quote-fg :background ,org-quote-bg)))) + `(org-hide ((t (:inherit fixed-pitch :foreground ,bg)))) + `(org-indent ((t (:inherit org-hide)))) + `(org-date ((t (:inherit fixed-pitch :foreground ,org-date :underline nil)))) + `(org-document-title ((t (:inherit default :foreground ,org-title :height (lambda (_x) (poet--height 1.8)) :underline (:color ,org-title-underline))))) + `(org-checkbox ((t (:inherit fixed-pitch :weight bold :foreground ,org-checkbox)))) + `(org-done ((t (:inherit fixed-pitch :foreground ,org-done)))) + `(org-todo ((t (:inherit fixed-pitch :foreground ,org-todo)))) + `(org-tag ((t (:inherit fixed-pitch :height (lambda (_x) (poet--height 1)) :foreground ,org-tag)))) + `(org-block-begin-line ((t (:inherit fixed-pitch :background ,org-block-line)))) + `(org-block-end-line ((t (:inherit fixed-pitch :background ,org-block-line)))) + `(org-block ((t (:background ,org-block-bg :inherit fixed-pitch)))) + `(org-priority ((t (:inherit fixed-pitch :weight normal)))) + `(org-agenda-structure ((t (:foreground ,org-agenda-structure-fg :background ,bg :box (:line-width 3 :color ,bg) :underline ,org-agenda-structure-bg)))) + `(org-scheduled ((t (:foreground ,org-scheduled)))) + `(org-scheduled-today ((t (:foreground ,org-scheduled-today)))) + `(org-agenda-date-weekend ((t (:inherit org-agenda-structure)))) + `(org-agenda-date-today ((t (:box (:line-width 3 :color ,org-agenda-today-bg) :foreground ,org-agenda-today-fg :background ,org-agenda-today-bg)))) + `(org-special-keyword ((t (:inherit fixed-pitch :foreground ,org-special-keyword)))) + `(org-scheduled-previously ((t (:foreground ,org-sched-prev)))) + `(org-agenda-done ((t (:foreground ,org-agenda-done)))) + `(org-footnote ((t (:foreground ,link)))) + `(hl-line ((t (:background ,hl-line)))) + `(linum-highlight-face ((t (:inherit fixed-pitch :foreground ,linum-hlt)))) + `(linum ((t (:inherit fixed-pitch :foreground ,linum)))) + `(line-number ((t (:inherit fixed-pitch :foreground ,linum)))) + `(line-number-current-line ((t (:inherit fixed-pitch :foreground ,linum-hlt)))) + `(markdown-header-face-1 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.5)))))) + `(markdown-header-face-2 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.4)))))) + `(markdown-header-face-3 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.3)))))) + `(markdown-header-face-4 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-header-face-5 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-header-face-6 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-header-face-7 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-header-face-8 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-markup-face ((t (:inherit fixed-pitch :foreground ,markdown-markup)))) + `(markdown-inline-code-face ((t (:inherit fixed-pitch)))) + `(markdown-metadata-key-face ((t (:inherit fixed-pitch :height (lambda (_x) (poet--height 1)) :foreground ,markdown-metadata)))) + `(markdown-metadata-value-face ((t (:inherit fixed-pitch :height (lambda (_x) (poet--height 1)) :foreground ,fg)))) + `(markdown-language-keyword-face ((t (:foreground ,markdown-language)))) + `(markdown-list-face ((t (:inherit fixed-pitch :foreground ,markdown-list)))) + `(markdown-code-face ((t (:inherit fixed-pitch :foreground ,fg :background ,markdown-code-bg)))) + `(markdown-pre-face ((t (:inherit fixed-pitch :color ,fg :background ,markdown-pre-bg)))) + `(markdown-header-delimiter-face ((t (:inherit fixed-pitch :foreground ,markdown-header-delimiter)))) + `(markdown-header-rule-face ((t (:inherit fixed-pitch :foreground ,markdown-header-delimiter)))) + `(markdown-url-face ((t (:inherit fixed-pitch :foreground ,link)))) + `(imenu-list-entry-face-0 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-1 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-2 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-3 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-4 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-5 ((t (:foreground ,imenu)))) + `(helm-source-header ((t (:height (lambda (_x) (poet--height 1))))))) + (custom-theme-set-variables 'poet-dark + '(line-spacing .2) + `(fci-rule-color ,fci))) + +;;;###autoload +(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)))) + +(provide-theme 'poet-dark) +;;; poet-dark-theme.el ends here diff --git a/elpa/poet-theme-20191103.1948/poet-dark-theme.elc b/elpa/poet-theme-20191103.1948/poet-dark-theme.elc new file mode 100644 index 0000000000000000000000000000000000000000..73549d1e2b62fc7a3043f289f9221d4acb13aa19 GIT binary patch literal 11842 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 d!tt`KaKmNJ-c}#>)pSTy7p2dI=iT4E^Zz;@A +;; URL: https://github.com/kunalb/poet/ +;; Version: 2.0 + +;;; Commentary: + +;; Emacs has very good support for multiple fonts in a single +;; file. Poet uses this support to make it much more convenient to +;; write prose within Emacs, with particular attention paid to +;; org-mode and markdown-mode. Code blocks, tables, etc are +;; formatted in monospace text with the appropriate backgrounds. + +;; Theme Customizations +;; - `poet-variable-headers` +;; Enable / disable different text heights for different faces. + +;; Recommended customizations for using this theme +;; +;; - Set up the base fonts you'd like to use in Emacs before loading Poet +;; (set-face-attribute 'default nil :family "Iosevka" :height 130) +;; (set-face-attribute 'fixed-pitch nil :family "Iosevka") +;; (set-face-attribute 'variable-pitch nil :family "Baskerville") +;; On loading this theme captures the default and treats that for fixed-pitch +;; rendering. +;; +;; - Enable variable pitch mode for editing text +;; (add-hook 'text-mode-hook +;; (lambda () +;; (variable-pitch-mode 1)) +;; +;; - Some other modes I like to enable/disable +;; (olivetti-mode 1) ;; Centers text in the buffer +;; (flyspell-mode 1) ;; Catch Spelling mistakes +;; (typo-mode 1) ;; Good for symbols like em-dash +;; (blink-cursor-mode 0) ;; Reduce visual noise +;; (linum-mode 0) ;; No line numbers for prose +;; +;; - And prettier org mode bullets: +;; (setq org-bullets-bullet-list +;; '("◉" "○")) +;; (org-bullets 1) + +;;; Code: + +(defvar poet--monospace-height + (face-attribute 'fixed-pitch :height nil 'default) + "The original height stored as a defvar to stay constant across reloads.") + +(defgroup poet-theme nil + "Customizations to change the behavior of poet") + +(defcustom poet-variable-headers t + "Use varying sizes for headers in org and markdown" + :group 'poet-theme + :type 'boolean) + +(defun poet--height (multiplier) + "Returns the height as MULTIPLIER * monospace-height." + (if poet-variable-headers + (truncate (* poet--monospace-height multiplier)) + poet--monospace-height)) +(deftheme poet-monochrome + "A monochrome prose friendly theme.") + +(let ((fg "#434343") + (bg "#d0d0d0") + (emph "#212121") + (sep "#ededed") + (hlt "#eeeeee") + (bg-hlt "#efefef") + (muted "#606060") + (meta "#3d3d3d") + (link "#676767") + (link-underline "#969696") + (vlink-underline "#4b4b4b") + (header "#404040") + (button "#606060") + (glyph "#787878") + (cursor "#323232") + (paren-match-bg "#8a8a8a") + (paren-match-fg "#fefefe") + (search-fg "#6c6c6c") + (search-bg "#fefefe") + (search-fail-bg "#d8d8d8") + (tooltip-fg "#101010") + (tooltip-bg "#b9b9b9") + (shadow "#989898") + (secondary-bg "#cdcdcd") + (trailing-bg "#b1b1b1") + (fci "#dddddd") + (lazy-hlt-fg "#000000") + (lazy-hlt-bg "#fefefe") + (evil-rep-fg "#fefefe") + (evil-rep-bg "#3d3d3d") + (mode-line-fg "#101010") + (header-line-bg "#dfdfdf") + (mode-line-hlt "#fefefe") + (mode-line-inactive "#878787") + (error "#979797") + (builtin "#606060") + (string "#585858") + (function-name "#626262") + (keyword "#656565") + (constant "#696969") + (type "#797979") + (variable "#545454") + (org-meta "#777777") + (org-document-info "#606060") + (org-table "#dfdfdf") + (org-quote-fg "#4f4f4f") + (org-quote-bg "#dfdfdf") + (org-date "#434343") + (org-title "#696969") + (org-title-underline "#a9a9a9") + (org-checkbox "#a9a9a9") + (org-scheduled "#323232") + (org-scheduled-today "#101010") + (org-done "#626262") + (org-todo "#656565") + (org-tag "#767676") + (org-block-line "#c6c6c6") + (org-block-bg "#dfdfdf") + (org-agenda-structure-fg "#545454") + (org-agenda-structure-bg "#dfdfdf") + (org-agenda-today-fg "#000000") + (org-agenda-today-bg "#ededed") + (org-special-keyword "#767676") + (org-sched-prev "#1f1f1f") + (org-agenda-done "#767676") + (hl-line "#eeeeee") + (linum-hlt "#545454") + (linum "#a9a9a9") + (markdown-markup "#777777") + (markdown-metadata "#767676") + (markdown-language "#606060") + (markdown-list "#000000") + (markdown-code-bg "#dfdfdf") + (markdown-pre-bg "#dfdfdf") + (markdown-header-delimiter "#777777") + (imenu "#3d3d3d")) + (custom-theme-set-faces 'poet-monochrome + `(variable-pitch ((t (:family ,(face-attribute 'variable-pitch :family) :height (lambda (_x) (poet--height 1.23)))))) + `(default ((t (:background ,bg :foreground ,fg)))) + `(italic ((t (:foreground ,emph :slant italic)))) + `(highlight ((t (:background ,hlt :overline nil)))) + `(region ((t (:background ,bg-hlt)))) + `(fringe ((t (:background ,bg)))) + `(button ((t (:inherit default :foreground ,button)))) + `(escape-glyph ((t (:foreground ,glyph)))) + `(link ((t (:underline (:color ,link-underline :style line) :foreground ,link)))) + `(link-visited ((t (:inherit link :foreground ,link :underline (:color ,vlink-underline :style line))))) + `(cursor ((t (:background ,cursor)))) + `(show-paren-match ((t (:background ,paren-match-fg :foreground ,paren-match-bg)))) + `(isearch ((t (:foreground ,search-fg :background ,search-bg)))) + `(isearch-fail ((t (:background ,search-fail-bg)))) + `(query-replace ((t (:inherit isearch)))) + `(tooltip ((t (:inherit default :foreground ,tooltip-fg :background ,tooltip-bg)))) + `(shadow ((t (:foreground ,shadow)))) + `(secondary-selection ((t (:background ,secondary-bg)))) + `(trailing-whitespace ((t (:background ,trailing-bg)))) + `(lazy-highlight ((t (:foreground ,lazy-hlt-fg :background ,lazy-hlt-bg)))) + `(next-error ((t (:inherit region)))) + `(window-divider ((t (:background ,sep :foreground ,sep)))) + `(vertical-border ((t (:background ,sep :foreground ,sep)))) + `(evil-ex-substitute-replacement ((t (:foreground ,evil-rep-fg :background ,evil-rep-bg :underline nil)))) + `(minibuffer-prompt ((t (:inherit fixed-pitch :weight bold :foreground ,meta)))) + `(mode-line ((t (:inherit fixed-pitch :foreground ,mode-line-fg :background ,bg :overline ,sep :box (:line-width 3 :color ,bg))))) + `(header-line ((t (:overline nil :background ,header-line-bg :box (:line-width 3 :color ,header-line-bg) :underline ,sep :inherit mode-line)))) + `(mode-line-buffer-id ((t (:weight bold)))) + `(mode-line-emphasis ((t (:weight bold)))) + `(mode-line-highlight ((t (:background ,mode-line-hlt)))) + `(mode-line-inactive ((t (:inherit mode-line :background ,bg :foreground ,mode-line-inactive :box (:color ,bg :line-width 3))))) + `(error ((t (:foreground ,error :inherit fixed-pitch)))) + `(font-lock-comment-face ((t (:foreground ,muted :inherit fixed-pitch)))) + `(font-lock-builtin-face ((t (:foreground ,builtin :inherit fixed-pitch)))) + `(font-lock-string-face ((t (:inherit fixed-pitch :foreground ,string)))) + `(font-lock-function-name-face ((t (:inherit fixed-pitch :foreground ,function-name)))) + `(font-lock-keyword-face ((t (:inherit fixed-pitch :foreground ,keyword)))) + `(font-lock-comment-delimiter-face ((t (:inherit fixed-pitch :inherit font-lock-comment-face)))) + `(font-lock-constant-face ((t (:inherit fixed-pitch :foreground ,constant)))) + `(font-lock-doc-face ((t (:inherit fixed-pitch :inherit font-lock-string-face)))) + `(font-lock-preprocessor-face ((t (:inherit fixed-pitch :inherit font-lock-builtin-face)))) + `(font-lock-regexp-grouping-backslash ((t (:inherit fixed-pitch :inherit bold)))) + `(font-lock-regexp-grouping-construct ((t (:inherit fixed-pitch :inherit bold)))) + `(font-lock-type-face ((t (:foreground ,type :inherit fixed-pitch)))) + `(font-lock-variable-name-face ((t (:inherit fixed-pitch :foreground ,variable)))) + `(font-lock-warning-face ((t (:inherit error)))) + `(org-level-1 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.5)))))) + `(org-level-2 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.4)))))) + `(org-level-3 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.3)))))) + `(org-level-4 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-level-5 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-level-6 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-level-7 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-level-8 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-meta-line ((t (:inherit fixed-pitch :foreground ,org-meta)))) + `(org-document-info-keyword ((t (:inherit fixed-pitch :foreground ,org-document-info)))) + `(org-document-info ((t (:inherit default :foreground ,org-document-info)))) + `(org-verbatim ((t (:inherit fixed-pitch)))) + `(org-code ((t (:inherit fixed-pitch)))) + `(org-table ((t (:inherit fixed-pitch :background ,org-table)))) + `(org-formula ((t (:inherit org-table :height (lambda (_x) (poet--height 1)))))) + `(org-verse ((t (:inherit default :foreground ,org-quote-fg :background ,org-quote-bg)))) + `(org-quote ((t (:inherit default :foreground ,org-quote-fg :background ,org-quote-bg)))) + `(org-hide ((t (:inherit fixed-pitch :foreground ,bg)))) + `(org-indent ((t (:inherit org-hide)))) + `(org-date ((t (:inherit fixed-pitch :foreground ,org-date :underline nil)))) + `(org-document-title ((t (:inherit default :foreground ,org-title :height (lambda (_x) (poet--height 1.8)) :underline (:color ,org-title-underline))))) + `(org-checkbox ((t (:inherit fixed-pitch :weight bold :foreground ,org-checkbox)))) + `(org-done ((t (:inherit fixed-pitch :foreground ,org-done)))) + `(org-todo ((t (:inherit fixed-pitch :foreground ,org-todo)))) + `(org-tag ((t (:inherit fixed-pitch :height (lambda (_x) (poet--height 1)) :foreground ,org-tag)))) + `(org-block-begin-line ((t (:inherit fixed-pitch :background ,org-block-line)))) + `(org-block-end-line ((t (:inherit fixed-pitch :background ,org-block-line)))) + `(org-block ((t (:background ,org-block-bg :inherit fixed-pitch)))) + `(org-priority ((t (:inherit fixed-pitch :weight normal)))) + `(org-agenda-structure ((t (:foreground ,org-agenda-structure-fg :background ,bg :box (:line-width 3 :color ,bg) :underline ,org-agenda-structure-bg)))) + `(org-scheduled ((t (:foreground ,org-scheduled)))) + `(org-scheduled-today ((t (:foreground ,org-scheduled-today)))) + `(org-agenda-date-weekend ((t (:inherit org-agenda-structure)))) + `(org-agenda-date-today ((t (:box (:line-width 3 :color ,org-agenda-today-bg) :foreground ,org-agenda-today-fg :background ,org-agenda-today-bg)))) + `(org-special-keyword ((t (:inherit fixed-pitch :foreground ,org-special-keyword)))) + `(org-scheduled-previously ((t (:foreground ,org-sched-prev)))) + `(org-agenda-done ((t (:foreground ,org-agenda-done)))) + `(org-footnote ((t (:foreground ,link)))) + `(hl-line ((t (:background ,hl-line)))) + `(linum-highlight-face ((t (:inherit fixed-pitch :foreground ,linum-hlt)))) + `(linum ((t (:inherit fixed-pitch :foreground ,linum)))) + `(line-number ((t (:inherit fixed-pitch :foreground ,linum)))) + `(line-number-current-line ((t (:inherit fixed-pitch :foreground ,linum-hlt)))) + `(markdown-header-face-1 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.5)))))) + `(markdown-header-face-2 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.4)))))) + `(markdown-header-face-3 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.3)))))) + `(markdown-header-face-4 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-header-face-5 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-header-face-6 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-header-face-7 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-header-face-8 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-markup-face ((t (:inherit fixed-pitch :foreground ,markdown-markup)))) + `(markdown-inline-code-face ((t (:inherit fixed-pitch)))) + `(markdown-metadata-key-face ((t (:inherit fixed-pitch :height (lambda (_x) (poet--height 1)) :foreground ,markdown-metadata)))) + `(markdown-metadata-value-face ((t (:inherit fixed-pitch :height (lambda (_x) (poet--height 1)) :foreground ,fg)))) + `(markdown-language-keyword-face ((t (:foreground ,markdown-language)))) + `(markdown-list-face ((t (:inherit fixed-pitch :foreground ,markdown-list)))) + `(markdown-code-face ((t (:inherit fixed-pitch :foreground ,fg :background ,markdown-code-bg)))) + `(markdown-pre-face ((t (:inherit fixed-pitch :color ,fg :background ,markdown-pre-bg)))) + `(markdown-header-delimiter-face ((t (:inherit fixed-pitch :foreground ,markdown-header-delimiter)))) + `(markdown-header-rule-face ((t (:inherit fixed-pitch :foreground ,markdown-header-delimiter)))) + `(markdown-url-face ((t (:inherit fixed-pitch :foreground ,link)))) + `(imenu-list-entry-face-0 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-1 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-2 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-3 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-4 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-5 ((t (:foreground ,imenu)))) + `(helm-source-header ((t (:height (lambda (_x) (poet--height 1))))))) + (custom-theme-set-variables 'poet-monochrome + '(line-spacing .2) + `(fci-rule-color ,fci))) + +;;;###autoload +(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)))) + +(provide-theme 'poet-monochrome) +;;; poet-monochrome-theme.el ends here diff --git a/elpa/poet-theme-20191103.1948/poet-monochrome-theme.elc b/elpa/poet-theme-20191103.1948/poet-monochrome-theme.elc new file mode 100644 index 0000000000000000000000000000000000000000..dce60183273e18278f8bfd088b966066d6d45d18 GIT binary patch literal 11231 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 RtLc!a3!RUp>t5cx_ +;; URL: https://github.com/kunalb/poet/ +;; Version: 2.0 + +;;; Commentary: + +;; Emacs has very good support for multiple fonts in a single +;; file. Poet uses this support to make it much more convenient to +;; write prose within Emacs, with particular attention paid to +;; org-mode and markdown-mode. Code blocks, tables, etc are +;; formatted in monospace text with the appropriate backgrounds. + +;; Theme Customizations +;; - `poet-variable-headers` +;; Enable / disable different text heights for different faces. + +;; Recommended customizations for using this theme +;; +;; - Set up the base fonts you'd like to use in Emacs before loading Poet +;; (set-face-attribute 'default nil :family "Iosevka" :height 130) +;; (set-face-attribute 'fixed-pitch nil :family "Iosevka") +;; (set-face-attribute 'variable-pitch nil :family "Baskerville") +;; On loading this theme captures the default and treats that for fixed-pitch +;; rendering. +;; +;; - Enable variable pitch mode for editing text +;; (add-hook 'text-mode-hook +;; (lambda () +;; (variable-pitch-mode 1)) +;; +;; - Some other modes I like to enable/disable +;; (olivetti-mode 1) ;; Centers text in the buffer +;; (flyspell-mode 1) ;; Catch Spelling mistakes +;; (typo-mode 1) ;; Good for symbols like em-dash +;; (blink-cursor-mode 0) ;; Reduce visual noise +;; (linum-mode 0) ;; No line numbers for prose +;; +;; - And prettier org mode bullets: +;; (setq org-bullets-bullet-list +;; '("◉" "○")) +;; (org-bullets 1) + +;;; Code: + +(defvar poet--monospace-height + (face-attribute 'fixed-pitch :height nil 'default) + "The original height stored as a defvar to stay constant across reloads.") + +(defgroup poet-theme nil + "Customizations to change the behavior of poet") + +(defcustom poet-variable-headers t + "Use varying sizes for headers in org and markdown" + :group 'poet-theme + :type 'boolean) + +(defun poet--height (multiplier) + "Returns the height as MULTIPLIER * monospace-height." + (if poet-variable-headers + (truncate (* poet--monospace-height multiplier)) + poet--monospace-height)) +(deftheme poet + "A prose friendly theme.") + +(let ((fg "#444444") + (bg "#e1d9c2") + (emph "#222222") + (sep "#eeeeee") + (hlt "#efefef") + (bg-hlt "#fff8e1") + (muted "#795548") + (meta "#4e342e") + (link "#303f9f") + (link-underline "#304ffe") + (vlink-underline "#1a237e") + (header "#770b0b") + (button "#616161") + (glyph "#673AB7") + (cursor "#333333") + (paren-match-bg "#ff1744") + (paren-match-fg "#ffffff") + (search-fg "#c2185b") + (search-bg "#ffffff") + (search-fail-bg "#f8bbd0") + (tooltip-fg "#111111") + (tooltip-bg "#fff176") + (shadow "#999999") + (secondary-bg "#fff59d") + (trailing-bg "#ff8a65") + (fci "#dedede") + (lazy-hlt-fg "#000000") + (lazy-hlt-bg "#ffffff") + (evil-rep-fg "#ffffff") + (evil-rep-bg "#4e342e") + (mode-line-fg "#111111") + (header-line-bg "#e0e0e0") + (mode-line-hlt "#ffffff") + (mode-line-inactive "#888888") + (error "#df5286") + (builtin "#795548") + (string "#6C3082") + (function-name "#388E3C") + (keyword "#bf360c") + (constant "#0288D1") + (type "#3f51b5") + (variable "#455A64") + (org-meta "#8D6E63") + (org-document-info "#795548") + (org-table "#e0e0e0") + (org-quote-fg "#4A148C") + (org-quote-bg "#e0e0e0") + (org-date "#444444") + (org-title "#B71C1C") + (org-title-underline "#aaaaaa") + (org-checkbox "#aaaaaa") + (org-scheduled "#333333") + (org-scheduled-today "#111111") + (org-done "#388E3C") + (org-todo "#BF360C") + (org-tag "#777777") + (org-block-line "#c7c7c7") + (org-block-bg "#e0e0e0") + (org-agenda-structure-fg "#555555") + (org-agenda-structure-bg "#e0e0e0") + (org-agenda-today-fg "#000000") + (org-agenda-today-bg "#eeeeee") + (org-special-keyword "#777777") + (org-sched-prev "#3f0000") + (org-agenda-done "#777777") + (hl-line "#efefef") + (linum-hlt "#555555") + (linum "#aaaaaa") + (markdown-markup "#8D6E63") + (markdown-metadata "#777777") + (markdown-language "#7b1fa2") + (markdown-list "#000000") + (markdown-code-bg "#e0e0e0") + (markdown-pre-bg "#e0e0e0") + (markdown-header-delimiter "#8D6E63") + (imenu "#4e342e")) + (custom-theme-set-faces 'poet + `(variable-pitch ((t (:family ,(face-attribute 'variable-pitch :family) :height (lambda (_x) (poet--height 1.23)))))) + `(default ((t (:background ,bg :foreground ,fg)))) + `(italic ((t (:foreground ,emph :slant italic)))) + `(highlight ((t (:background ,hlt :overline nil)))) + `(region ((t (:background ,bg-hlt)))) + `(fringe ((t (:background ,bg)))) + `(button ((t (:inherit default :foreground ,button)))) + `(escape-glyph ((t (:foreground ,glyph)))) + `(link ((t (:underline (:color ,link-underline :style line) :foreground ,link)))) + `(link-visited ((t (:inherit link :foreground ,link :underline (:color ,vlink-underline :style line))))) + `(cursor ((t (:background ,cursor)))) + `(show-paren-match ((t (:background ,paren-match-fg :foreground ,paren-match-bg)))) + `(isearch ((t (:foreground ,search-fg :background ,search-bg)))) + `(isearch-fail ((t (:background ,search-fail-bg)))) + `(query-replace ((t (:inherit isearch)))) + `(tooltip ((t (:inherit default :foreground ,tooltip-fg :background ,tooltip-bg)))) + `(shadow ((t (:foreground ,shadow)))) + `(secondary-selection ((t (:background ,secondary-bg)))) + `(trailing-whitespace ((t (:background ,trailing-bg)))) + `(lazy-highlight ((t (:foreground ,lazy-hlt-fg :background ,lazy-hlt-bg)))) + `(next-error ((t (:inherit region)))) + `(window-divider ((t (:background ,sep :foreground ,sep)))) + `(vertical-border ((t (:background ,sep :foreground ,sep)))) + `(evil-ex-substitute-replacement ((t (:foreground ,evil-rep-fg :background ,evil-rep-bg :underline nil)))) + `(minibuffer-prompt ((t (:inherit fixed-pitch :weight bold :foreground ,meta)))) + `(mode-line ((t (:inherit fixed-pitch :foreground ,mode-line-fg :background ,bg :overline ,sep :box (:line-width 3 :color ,bg))))) + `(header-line ((t (:overline nil :background ,header-line-bg :box (:line-width 3 :color ,header-line-bg) :underline ,sep :inherit mode-line)))) + `(mode-line-buffer-id ((t (:weight bold)))) + `(mode-line-emphasis ((t (:weight bold)))) + `(mode-line-highlight ((t (:background ,mode-line-hlt)))) + `(mode-line-inactive ((t (:inherit mode-line :background ,bg :foreground ,mode-line-inactive :box (:color ,bg :line-width 3))))) + `(error ((t (:foreground ,error :inherit fixed-pitch)))) + `(font-lock-comment-face ((t (:foreground ,muted :inherit fixed-pitch)))) + `(font-lock-builtin-face ((t (:foreground ,builtin :inherit fixed-pitch)))) + `(font-lock-string-face ((t (:inherit fixed-pitch :foreground ,string)))) + `(font-lock-function-name-face ((t (:inherit fixed-pitch :foreground ,function-name)))) + `(font-lock-keyword-face ((t (:inherit fixed-pitch :foreground ,keyword)))) + `(font-lock-comment-delimiter-face ((t (:inherit fixed-pitch :inherit font-lock-comment-face)))) + `(font-lock-constant-face ((t (:inherit fixed-pitch :foreground ,constant)))) + `(font-lock-doc-face ((t (:inherit fixed-pitch :inherit font-lock-string-face)))) + `(font-lock-preprocessor-face ((t (:inherit fixed-pitch :inherit font-lock-builtin-face)))) + `(font-lock-regexp-grouping-backslash ((t (:inherit fixed-pitch :inherit bold)))) + `(font-lock-regexp-grouping-construct ((t (:inherit fixed-pitch :inherit bold)))) + `(font-lock-type-face ((t (:foreground ,type :inherit fixed-pitch)))) + `(font-lock-variable-name-face ((t (:inherit fixed-pitch :foreground ,variable)))) + `(font-lock-warning-face ((t (:inherit error)))) + `(org-level-1 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.5)))))) + `(org-level-2 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.4)))))) + `(org-level-3 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.3)))))) + `(org-level-4 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-level-5 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-level-6 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-level-7 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-level-8 ((t (:inherit default :foreground ,header :height (lambda (_x) (poet--height 1.23)))))) + `(org-meta-line ((t (:inherit fixed-pitch :foreground ,org-meta)))) + `(org-document-info-keyword ((t (:inherit fixed-pitch :foreground ,org-document-info)))) + `(org-document-info ((t (:inherit default :foreground ,org-document-info)))) + `(org-verbatim ((t (:inherit fixed-pitch)))) + `(org-code ((t (:inherit fixed-pitch)))) + `(org-table ((t (:inherit fixed-pitch :background ,org-table)))) + `(org-formula ((t (:inherit org-table :height (lambda (_x) (poet--height 1)))))) + `(org-verse ((t (:inherit default :foreground ,org-quote-fg :background ,org-quote-bg)))) + `(org-quote ((t (:inherit default :foreground ,org-quote-fg :background ,org-quote-bg)))) + `(org-hide ((t (:inherit fixed-pitch :foreground ,bg)))) + `(org-indent ((t (:inherit org-hide)))) + `(org-date ((t (:inherit fixed-pitch :foreground ,org-date :underline nil)))) + `(org-document-title ((t (:inherit default :foreground ,org-title :height (lambda (_x) (poet--height 1.8)) :underline (:color ,org-title-underline))))) + `(org-checkbox ((t (:inherit fixed-pitch :weight bold :foreground ,org-checkbox)))) + `(org-done ((t (:inherit fixed-pitch :foreground ,org-done)))) + `(org-todo ((t (:inherit fixed-pitch :foreground ,org-todo)))) + `(org-tag ((t (:inherit fixed-pitch :height (lambda (_x) (poet--height 1)) :foreground ,org-tag)))) + `(org-block-begin-line ((t (:inherit fixed-pitch :background ,org-block-line)))) + `(org-block-end-line ((t (:inherit fixed-pitch :background ,org-block-line)))) + `(org-block ((t (:background ,org-block-bg :inherit fixed-pitch)))) + `(org-priority ((t (:inherit fixed-pitch :weight normal)))) + `(org-agenda-structure ((t (:foreground ,org-agenda-structure-fg :background ,bg :box (:line-width 3 :color ,bg) :underline ,org-agenda-structure-bg)))) + `(org-scheduled ((t (:foreground ,org-scheduled)))) + `(org-scheduled-today ((t (:foreground ,org-scheduled-today)))) + `(org-agenda-date-weekend ((t (:inherit org-agenda-structure)))) + `(org-agenda-date-today ((t (:box (:line-width 3 :color ,org-agenda-today-bg) :foreground ,org-agenda-today-fg :background ,org-agenda-today-bg)))) + `(org-special-keyword ((t (:inherit fixed-pitch :foreground ,org-special-keyword)))) + `(org-scheduled-previously ((t (:foreground ,org-sched-prev)))) + `(org-agenda-done ((t (:foreground ,org-agenda-done)))) + `(org-footnote ((t (:foreground ,link)))) + `(hl-line ((t (:background ,hl-line)))) + `(linum-highlight-face ((t (:inherit fixed-pitch :foreground ,linum-hlt)))) + `(linum ((t (:inherit fixed-pitch :foreground ,linum)))) + `(line-number ((t (:inherit fixed-pitch :foreground ,linum)))) + `(line-number-current-line ((t (:inherit fixed-pitch :foreground ,linum-hlt)))) + `(markdown-header-face-1 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.5)))))) + `(markdown-header-face-2 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.4)))))) + `(markdown-header-face-3 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.3)))))) + `(markdown-header-face-4 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-header-face-5 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-header-face-6 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-header-face-7 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-header-face-8 ((t (:foreground ,header :inherit default :height (lambda (_x) (poet--height 1.23)))))) + `(markdown-markup-face ((t (:inherit fixed-pitch :foreground ,markdown-markup)))) + `(markdown-inline-code-face ((t (:inherit fixed-pitch)))) + `(markdown-metadata-key-face ((t (:inherit fixed-pitch :height (lambda (_x) (poet--height 1)) :foreground ,markdown-metadata)))) + `(markdown-metadata-value-face ((t (:inherit fixed-pitch :height (lambda (_x) (poet--height 1)) :foreground ,fg)))) + `(markdown-language-keyword-face ((t (:foreground ,markdown-language)))) + `(markdown-list-face ((t (:inherit fixed-pitch :foreground ,markdown-list)))) + `(markdown-code-face ((t (:inherit fixed-pitch :foreground ,fg :background ,markdown-code-bg)))) + `(markdown-pre-face ((t (:inherit fixed-pitch :color ,fg :background ,markdown-pre-bg)))) + `(markdown-header-delimiter-face ((t (:inherit fixed-pitch :foreground ,markdown-header-delimiter)))) + `(markdown-header-rule-face ((t (:inherit fixed-pitch :foreground ,markdown-header-delimiter)))) + `(markdown-url-face ((t (:inherit fixed-pitch :foreground ,link)))) + `(imenu-list-entry-face-0 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-1 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-2 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-3 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-4 ((t (:foreground ,imenu)))) + `(imenu-list-entry-face-5 ((t (:foreground ,imenu)))) + `(helm-source-header ((t (:height (lambda (_x) (poet--height 1))))))) + (custom-theme-set-variables 'poet + '(line-spacing .2) + `(fci-rule-color ,fci))) + +;;;###autoload +(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)))) + +(provide-theme 'poet) +;;; poet-theme.el ends here diff --git a/elpa/poet-theme-20191103.1948/poet-theme.elc b/elpa/poet-theme-20191103.1948/poet-theme.elc new file mode 100644 index 0000000000000000000000000000000000000000..a63d06cfc0d81f30a753e6c6795af9602b957a8e GIT binary patch literal 11258 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 literal 0 HcmV?d00001 diff --git a/elpa/polymode-20190714.2017/poly-lock.el b/elpa/polymode-20191208.1239/poly-lock.el similarity index 100% rename from elpa/polymode-20190714.2017/poly-lock.el rename to elpa/polymode-20191208.1239/poly-lock.el diff --git a/elpa/polymode-20190714.2017/poly-lock.elc b/elpa/polymode-20191208.1239/poly-lock.elc similarity index 99% rename from elpa/polymode-20190714.2017/poly-lock.elc rename to elpa/polymode-20191208.1239/poly-lock.elc index 2e2dfbb5fc80a1eae23dec8cb4ab548309e8ac00..5065e8862398a8c14548d7d6e545b99ce9f27bb7 100644 GIT binary patch delta 12 TcmZ1wvLIxF9;5L_{g0XeAb$ka delta 12 TcmZ1wvLIxF9;4Al{g0XeAbJGU diff --git a/elpa/polymode-20190714.2017/polymode-autoloads.el b/elpa/polymode-20191208.1239/polymode-autoloads.el similarity index 100% rename from elpa/polymode-20190714.2017/polymode-autoloads.el rename to elpa/polymode-20191208.1239/polymode-autoloads.el diff --git a/elpa/polymode-20190714.2017/polymode-base.el b/elpa/polymode-20191208.1239/polymode-base.el similarity index 100% rename from elpa/polymode-20190714.2017/polymode-base.el rename to elpa/polymode-20191208.1239/polymode-base.el diff --git a/elpa/polymode-20190714.2017/polymode-base.elc b/elpa/polymode-20191208.1239/polymode-base.elc similarity index 99% rename from elpa/polymode-20190714.2017/polymode-base.elc rename to elpa/polymode-20191208.1239/polymode-base.elc index bd992a04678965dc6c5e135596ccfba07ac88374..394727d590b97cfc1731f35827e6d37ef9a63d3a 100644 GIT binary patch delta 12 TcmaFh_P}j|9;5L_eM4mcBVhz{ delta 12 TcmaFh_P}j|9;4AleM4mcBU}V> diff --git a/elpa/polymode-20190714.2017/polymode-classes.el b/elpa/polymode-20191208.1239/polymode-classes.el similarity index 98% rename from elpa/polymode-20190714.2017/polymode-classes.el rename to elpa/polymode-20191208.1239/polymode-classes.el index e229034b..f2cee274 100644 --- a/elpa/polymode-20190714.2017/polymode-classes.el +++ b/elpa/polymode-20191208.1239/polymode-classes.el @@ -31,11 +31,6 @@ (require 'eieio-base) (require 'eieio-custom) -;; FIXME: fix emacs eieo-named bug #22840 where they wrongly set name of the -;; parent object in clone method - -(setq eieio-backward-compatibility nil) - (defvar pm--object-counter 0) (defun pm--filter-slots (slots) @@ -489,7 +484,5 @@ called at the beginning of the head span.")) body span. The body mode is determined dynamically by retrieving the name with the :mode-matcher.") -(setq eieio-backward-compatibility t) - (provide 'polymode-classes) ;;; polymode-classes.el ends here diff --git a/elpa/polymode-20190714.2017/polymode-classes.elc b/elpa/polymode-20191208.1239/polymode-classes.elc similarity index 96% rename from elpa/polymode-20190714.2017/polymode-classes.elc rename to elpa/polymode-20191208.1239/polymode-classes.elc index 32c746e80d7c2b6ff8c7df9db1e11c1189d77240..05e14d0eb6d11be4970105e2af4fea0d44443cdb 100644 GIT binary patch delta 291 zcmX>;m+{6N#tC|i#vApE87J%WvMMRY7#SMG7#o1F5i-XZ$T2WiQiz`XnNgKFR>5eq zJd-*jld;LzNvvwd z4JH>zD}t>yHCN_mHaE8fYnbk)g<{&|CBCAQb7U1ZPxlCAVKM>PVzXJx*OF1$+|ocZ jR+CGkpeVmAGbL3)y&ylQGB-aZRW~^&vA8(3Sd$9?M`lsf delta 369 zcmcaHhw=Da#tC|iMjQ2u83PStj17zwV~h+9fD91F7@1=NL|{D94ck=fGFZ1Mv(h0X39*O-{h4L8ekpJ8OOG?={KaQ@~V-mSb$W`;m{ zo6YsoB8*IiCSY+BSz}?KTCn(114%|EQ_IZ<3>}!6O^i*zg7&5wj7%oxVB6TumHC-1 zj7%pV@NwFl@1}w<#iNUb$dnQWcay!5{z%6lhow j_Hl_qK~a8LCQx%heokdB&=lR|oW$bd)Z$nLBTX& diff --git a/elpa/polymode-20190714.2017/polymode-compat.el b/elpa/polymode-20191208.1239/polymode-compat.el similarity index 97% rename from elpa/polymode-20190714.2017/polymode-compat.el rename to elpa/polymode-20191208.1239/polymode-compat.el index edf0cc27..c5fc82d4 100644 --- a/elpa/polymode-20190714.2017/polymode-compat.el +++ b/elpa/polymode-20191208.1239/polymode-compat.el @@ -370,4 +370,18 @@ This is done by modifying `uniquify-buffer-base-name' to `pm--core-buffer-name'. (add-hook 'yas-after-exit-snippet-hook #'polymode-enable-post-command)) (provide 'polymode-compat) + + +;;; Multiple cursors + +(defun polymode-disable-post-command-with-multiple-cursors (orig-fun &rest args) + (unless mc--executing-command-for-fake-cursor + (polymode-disable-post-command) + (apply orig-fun args) + (polymode-enable-post-command))) + +(with-eval-after-load "multiple-cursors-core" + (advice-add #'mc/execute-this-command-for-all-cursors :around + #'polymode-disable-post-command-with-multiple-cursors)) + ;;; polymode-compat.el ends here diff --git a/elpa/polymode-20190714.2017/polymode-compat.elc b/elpa/polymode-20191208.1239/polymode-compat.elc similarity index 94% rename from elpa/polymode-20190714.2017/polymode-compat.elc rename to elpa/polymode-20191208.1239/polymode-compat.elc index 6e959dfa3309d2dffad97e258b2f0885a0c3defe..a731445517a6203017720d2f2bbad9f49226eeb5 100644 GIT binary patch delta 366 zcmbR3aMyW)9;5L_{WtQg$__>r3X=l_HR|(oDs%HwQgu@@ixZP_QgsXRi%WEq^K)|( z^HOxnGfOgbb4zndG7ErG$)!cb`9;MF%F)IarV2_N_Ay2Vru+;s#s-E8F-C?4K!y<$ zQ;ZUnZ44ANFjrED&P~?UO|3{xE-lH-ONX1CmS3csmZ+NzGgqMipHmbP3kq^7C*PHq zH#b$#P*zdUQ?M{HGSQ6H2I;Mfs(9Dfr!lJ$PajOn{C805DR0i~s-t delta 12 TcmccXJlkP{9;4Al{WtOeA)y4= diff --git a/elpa/polymode-20190714.2017/polymode-core.el b/elpa/polymode-20191208.1239/polymode-core.el similarity index 99% rename from elpa/polymode-20190714.2017/polymode-core.el rename to elpa/polymode-20191208.1239/polymode-core.el index d4accb24..fa98c6bf 100644 --- a/elpa/polymode-20190714.2017/polymode-core.el +++ b/elpa/polymode-20191208.1239/polymode-core.el @@ -953,7 +953,11 @@ Parents' hooks are run first." text-scale-mode-amount truncate-lines truncate-partial-width-windows - word-wrap) + word-wrap + ;; multiple-cursors stores here a command in a pre-command-hook + ;; and executes it for all cursors in a post-command-hook so we + ;; need to transfer in case the buffer was switched. + mc--this-command) "Variables transferred from old buffer on buffer switch.") (defvar polymode-move-these-minor-modes-from-base-buffer nil @@ -962,7 +966,8 @@ Parents' hooks are run first." '(linum-mode visual-line-mode visual-fill-column-mode - writeroom-mode) + writeroom-mode + multiple-cursors-mode) "List of minor modes to move from the old buffer.") (defun pm-own-buffer-p (&optional buffer) diff --git a/elpa/polymode-20190714.2017/polymode-core.elc b/elpa/polymode-20191208.1239/polymode-core.elc similarity index 90% rename from elpa/polymode-20190714.2017/polymode-core.elc rename to elpa/polymode-20191208.1239/polymode-core.elc index 01acd0aefd8d749edab7b8239311d7c8b9c39b05..e5e037f1b7787c83ba16094f96ad64c31b31dfb7 100644 GIT binary patch delta 1751 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 diff --git a/elpa/polymode-20190714.2017/polymode-export.el b/elpa/polymode-20191208.1239/polymode-export.el similarity index 100% rename from elpa/polymode-20190714.2017/polymode-export.el rename to elpa/polymode-20191208.1239/polymode-export.el diff --git a/elpa/polymode-20190714.2017/polymode-export.elc b/elpa/polymode-20191208.1239/polymode-export.elc similarity index 99% rename from elpa/polymode-20190714.2017/polymode-export.elc rename to elpa/polymode-20191208.1239/polymode-export.elc index e06d8e0fbfe93669e1d634845e053553a5130733..85b5066212ccb9041d7bd4ebf556557a51fc746f 100644 GIT binary patch delta 14 WcmX>yk@3hx#tC|i#vApgdH?_`*achw delta 14 WcmX>yk@3hx#tC|iMjQ2~dH?_`(*;`q diff --git a/elpa/polymode-20190714.2017/polymode-methods.el b/elpa/polymode-20191208.1239/polymode-methods.el similarity index 100% rename from elpa/polymode-20190714.2017/polymode-methods.el rename to elpa/polymode-20191208.1239/polymode-methods.el diff --git a/elpa/polymode-20190714.2017/polymode-methods.elc b/elpa/polymode-20191208.1239/polymode-methods.elc similarity index 84% rename from elpa/polymode-20190714.2017/polymode-methods.elc rename to elpa/polymode-20191208.1239/polymode-methods.elc index b058e14b7faaed7eb4af23c4b70f38e6fdc908bf..31032ad42dc809372a5b317b24f0a86e771cec82 100644 GIT binary patch delta 1493 zcmZ`(Nlz3(6rP$IhZu~8h{L!r3j;c}jp%Mfo0jCraQ+BLcg9k@dQ;^)q z1dLL6Wit>*1;!A>sh7*)TEHYj;8FvX<@McqWp!t5Uq3JO7B<&c)+(dsKDzpNV`Kec z<4FLn`*aF64`8f?7r!o!o~E5QsJ(v5HLnEXfk3a;7Kw`(hh}ENg;qI zdHc$>yz5X;l+RRcF%Zz|<3wWcMUsHM@(|E_S1yVF5lh$OLL}io%az8FK*u!TN;N^L z`o}>)r$Wkcy3IjYz@ENaXaoZYK1sVf~W^WDR@vI~pSuw+v`8ihy@9hw}Mk zX5G;kV-v8oCdXr;Lrc3Yx$2OskxJ$wciJK&`S;r#z>*Q#$=pKTv&RwS5Uu0`?uj)2 z00wkK0%;|HE>%nC0aGdwB4!QeITnJbRv{o7c%|lM#=}*kH7n<=J!^a>xH%~uM-M&2 zm{UHJ-s@~OhayH7;@=8gt%ctc z4h|liz#dWh6Zwm|kl|-45tf99zgQ2-F`r63J~gDTi1(QKTz?l|uplyg>)|Z+d_O!? z(+E?lAmh_;)&JIoIg_EB%p>ecKOCPri|`m1;qvsR!HtDqZ!aM%#;9o_d^IzImhFVQ s;kO}X0RnroYLz?u(K_mHdfl3p)uthaN6~KUnvH0f>+RX9elffF58#6z=4vsbUeN#Fo}3lcbddYMj@d8%3m5u?xjb6`_vct+^$!p{Y#-tBZ7} z8?`dOpv&%*>()QuMku(gEB}Ej7vj0kCQYi~A|Z1g-#OnoC*SKG^!+{BDI@mr;>37| zQK~p0ib+c`!ls7cMHBGFRNgbFd~D%;7SU}nAxV0f)^M(%I3*|t0DNvpc{Kpa0whWe z1Clsp$)r(GtRoo$pOwcC3aw(zZq+Wd?UjauTlE(X=D6*&+Sqy8z?+Wm^v$$vM(=iQ z(`nV3jVdPP3S}nVc(&<0Zf&9SSP0-#-QU`9$M?9`olQ@=WU zTJPm^t~qg#NJ#Fcr+%TNMTn`#rgzUt0^LzM?^ED}M`KdlB>KzrBog|^^m%0J(aeOB z$RnRptH4XjL~6tv2-qkYV56bUr_UaFqhavjFtcDJOfi!Lv*SeQ?My}-Tc8&Vn&mN` z-p>@S^dtrq6%#TJii*aSB~%U@(lk2@H1B6KlRYrq1gU%A;a1%di&Hr?qV z72==thBC-8*5`l&E`Sm>%e|k4=SfJMvXzkTjGrNAq4!FV1JzVIlZ-t!DiU@ z(d+P{fm3AG%lWy^-_#-!hyN4{CIYo!6%xn=uL#f!Uq}KuS+8rIUzsWTqOx9Zlinj0_o8 z9=SP(I7jyd4 G;@v-l^rHp< diff --git a/elpa/polymode-20190714.2017/polymode-pkg.el b/elpa/polymode-20191208.1239/polymode-pkg.el similarity index 80% rename from elpa/polymode-20190714.2017/polymode-pkg.el rename to elpa/polymode-20191208.1239/polymode-pkg.el index 0e6e43ba..42b02382 100644 --- a/elpa/polymode-20190714.2017/polymode-pkg.el +++ b/elpa/polymode-20191208.1239/polymode-pkg.el @@ -1,4 +1,4 @@ -(define-package "polymode" "20190714.2017" "Extensible framework for multiple major modes" +(define-package "polymode" "20191208.1239" "Extensible framework for multiple major modes" '((emacs "25")) :keywords '("languages" "multi-modes" "processes") diff --git a/elpa/polymode-20190714.2017/polymode-tangle.el b/elpa/polymode-20191208.1239/polymode-tangle.el similarity index 100% rename from elpa/polymode-20190714.2017/polymode-tangle.el rename to elpa/polymode-20191208.1239/polymode-tangle.el diff --git a/elpa/polymode-20190714.2017/polymode-tangle.elc b/elpa/polymode-20191208.1239/polymode-tangle.elc similarity index 95% rename from elpa/polymode-20190714.2017/polymode-tangle.elc rename to elpa/polymode-20191208.1239/polymode-tangle.elc index 3f275859627232d2a2e8d87b2f02f09305923340..fa0307108d7ae0470d1c7d5662a04814abdfac03 100644 GIT binary patch delta 12 TcmZ3+vW#Vd9;5L_{qKwb8m9yw delta 12 TcmZ3+vW#Vd9;4Al{qKwb8lnUq diff --git a/elpa/polymode-20190714.2017/polymode-test-utils.el b/elpa/polymode-20191208.1239/polymode-test-utils.el similarity index 99% rename from elpa/polymode-20190714.2017/polymode-test-utils.el rename to elpa/polymode-20191208.1239/polymode-test-utils.el index 85b4c2b5..0a3464ad 100644 --- a/elpa/polymode-20190714.2017/polymode-test-utils.el +++ b/elpa/polymode-20191208.1239/polymode-test-utils.el @@ -30,8 +30,6 @@ ;; ;;; Code: -(setq eieio-backward-compatibility nil) - (require 'ert) (require 'polymode) (eval-when-compile diff --git a/elpa/polymode-20190714.2017/polymode-test-utils.elc b/elpa/polymode-20191208.1239/polymode-test-utils.elc similarity index 94% rename from elpa/polymode-20190714.2017/polymode-test-utils.elc rename to elpa/polymode-20191208.1239/polymode-test-utils.elc index dd9a5c147a116fa8f60c7fe0286b329ea7d44daf..15aa0f6adcef010f8bb39bf27318f7efb851cd9a 100644 GIT binary patch delta 207 zcmaEzeKdQ59;5L_{bELS!x&=&BgGgaLjxcK#4(0(Oa#CpMh50e3el5aGb(NtVCrLH zGBDq~fMpgFld0)u8+Kb}CL@!{_UitdPjT&GW-+kPjGbIBqO^GpA3r0rxrOQGef)b^ z7!4-dsRwL6Ez-@(Y;0z}IZ~>gk;%|}^DXI{%uEJGo43jbFftohSZwA{T+PH}3=~lA xU}iEj-fXX)%f@VIX}Wp6t^y;onVH$BY_xW17jdIQH(J%G=OqUVH`6-pome7k%76ALUd|oYG%G} zQetv;d16tDZgPHZL1IZ}Qf5wONu|Q%lZ=YYd6_wzUo!SHF`1Zdu40+R#AIo_S&ZG5 znaRv(vZT8I<|SNvm|0BBG-D^rs4H!56Ff*ANZkANf pWn(rnHs0K+tH8)?ZeX%`jow0LCQGx;{zm@H%$7#xlNXw*003_gN(KM` diff --git a/elpa/polymode-20190714.2017/polymode-weave.el b/elpa/polymode-20191208.1239/polymode-weave.el similarity index 100% rename from elpa/polymode-20190714.2017/polymode-weave.el rename to elpa/polymode-20191208.1239/polymode-weave.el diff --git a/elpa/polymode-20190714.2017/polymode-weave.elc b/elpa/polymode-20191208.1239/polymode-weave.elc similarity index 99% rename from elpa/polymode-20190714.2017/polymode-weave.elc rename to elpa/polymode-20191208.1239/polymode-weave.elc index b1aa9861c9259d0dc1fef9f244dedac9f93093f1..6fccb70d39f325b11aeefc67910a01f6f0656a84 100644 GIT binary patch delta 12 TcmZ3Mv@B_Y9;5L_{qF_9Vaac zRPu=f7eLwz7gTZL3R?BTwdH^+BrY6~_#diD969j&##WWIhnes7`=0adKKvv6_fh!W zVyJ#O_v_KaHgHmiI$ch2wd5pMoxEK6VQ8f{L7RB3la>czgOD{sIcdbmd5?FcVzt}39`|o8Y;*>L-scP3y@joQXCvP3tgRR4j~^*TCRN2p)4#Jw zq`Zjd?}z2IDpm3K$p>Mij4tk-`Y9|4oo}w3$-jQ{Q1R92`%xsT)ne)FTj9|6IYY@M z6%eJq&FbC>pY`@qqyFJutMT3@@B@GkrsS010MSsC5Pia%Ea*d^_`Kxiz~YHW6uNu` z0Kv&$T@41MO)r%jb*hE2G@3s{W4jwn5@IWu+-(|JCf)%}?jpHJa7;e4xU%05P5L3l zS9{lY@_!b8j$~qsZ_m9FMqHWv9{)a4Jk4w3QKXH^C*^OEG1cNvdAd}VDY*ai!!XiP z6c5b#mn&GofVqtZwKj#`B=^04kxw^gUnN?m%5UJT+G6k-4}02{+*Tg_$a%vd(# zl;zYi)k;u{DlAb<21{j7r}ZtstJQ>n33<;qz?&>vZi8Ci046dGK~a8uk6hFPR-rY* z(IKleJqih6YGAW07M6<)9|adpf4BVIhRx82EtUgzis*$P%UbO=u@?gt6MZ+hOyoUS zMuzvnxjCfBPO=jYTloUnFCiADSZT2-h4>A+?#Wom~f2IBPq6h@gr}T-b|KZ|l$`-r6oG zAmJl7RB0~=i9;(PuAmhcPDr$essf3>qX#%3aYOuO?3A|j28a20-|zk2%=_c6d+TTS zdes%*z4F8C8Scb_^Saq$$z&{a5DO-7itMl1uSQxq?uL=BgAK7S#|95Em9oqS^`!p~ z3zjMtLOY&ul$;xT;_xJykEKiFkYb$7g>9%Y@D+`-v-2|-nNb9RoZPXd4F1JZ`aVmK zl}r^r(s;xc6+OxdWcKB}8Z8Z0y6r)?GHh?}CUmg#aY6+hCW9eOuF`&DWtPjU{vkc= z_LD)kx7(qt8gk*&^jbf;*h>%SkapU`HeKl^?G6<+I&AOk(ps>(O4Gf{e!JiAeN-9t zDucAWPZLo6{I~fN1uxKkURbz8JXD+iQvTj8))@2i&tCk=^_0^2*77%Qp{BDNTdVov z${o*>A_Iq^X{(YgrM}S#Ka@>GzFao8>skpp}3wk9q zRzOZRo3WG(q0GrAr--5mB(Q}_e97u4T)=~=@g?=NbtMCGikvuS`%yxk6C1c4fl%aR zEEPVW!bng^L&2qjIg@0rgsVv;Ad5}%3?kZ~3VA)K5j?Dc>`i!|k>?N}Is2SEi+xg} z55MH}5*P~ceV@!?*QmvZAB{vb646lBl9ZZ_O;edx$^LbyThbUISc9fmE>Trol-6YU2k6kyVC9Tu23!&oi)PU z9n3(kw3%I#@s@wR`QcPiG0F19w@0p5lRUq%^+{n0nd1wU&VMlDshY|^f4_dz3u|Hi IYiG&*8#SV?$^ZZW diff --git a/elpa/typescript-mode-20191120.346/typescript-mode-autoloads.el b/elpa/typescript-mode-20191209.1107/typescript-mode-autoloads.el similarity index 100% rename from elpa/typescript-mode-20191120.346/typescript-mode-autoloads.el rename to elpa/typescript-mode-20191209.1107/typescript-mode-autoloads.el diff --git a/elpa/typescript-mode-20191120.346/typescript-mode-pkg.el b/elpa/typescript-mode-20191209.1107/typescript-mode-pkg.el similarity index 66% rename from elpa/typescript-mode-20191120.346/typescript-mode-pkg.el rename to elpa/typescript-mode-20191209.1107/typescript-mode-pkg.el index 258f647c..aab7b495 100644 --- a/elpa/typescript-mode-20191120.346/typescript-mode-pkg.el +++ b/elpa/typescript-mode-20191209.1107/typescript-mode-pkg.el @@ -1,4 +1,4 @@ -(define-package "typescript-mode" "20191120.346" "Major mode for editing typescript" +(define-package "typescript-mode" "20191209.1107" "Major mode for editing typescript" '((emacs "24.3")) :keywords '("typescript" "languages") diff --git a/elpa/typescript-mode-20191120.346/typescript-mode-test-utilities.el b/elpa/typescript-mode-20191209.1107/typescript-mode-test-utilities.el similarity index 100% rename from elpa/typescript-mode-20191120.346/typescript-mode-test-utilities.el rename to elpa/typescript-mode-20191209.1107/typescript-mode-test-utilities.el diff --git a/elpa/typescript-mode-20191120.346/typescript-mode-test-utilities.elc b/elpa/typescript-mode-20191209.1107/typescript-mode-test-utilities.elc similarity index 99% rename from elpa/typescript-mode-20191120.346/typescript-mode-test-utilities.elc rename to elpa/typescript-mode-20191209.1107/typescript-mode-test-utilities.elc index a7320df70a3dad62d7ec570b356da4510f068111..b76f7023554e7658577106ad20f1bdd770c67577 100644 GIT binary patch delta 12 TcmZ23yN9;5L_{R&N9;4Al{R&\\)?\s*(" +(defconst typescript--function-call-re "\\(\\(?:\\w\\|\\s_\\)+\\)\\(<.+>\\)?\s*(" "Regular expression matching function calls.") (defconst typescript--font-lock-keywords-1 @@ -372,7 +372,7 @@ Match group 1 is MUMBLE.") ;; (The exception for b-end and its caveats is described below.) ;; -(defstruct (typescript--pitem (:type list)) +(cl-defstruct (typescript--pitem (:type list)) ;; IMPORTANT: Do not alter the position of fields within the list. ;; Various bits of code depend on their positions, particularly ;; anything that manipulates the list of children. @@ -806,7 +806,7 @@ comment." (make-variable-buffer-local 'typescript--state-at-last-parse-pos) (defun typescript--flatten-list (list) - (loop for item in list + (cl-loop for item in list nconc (cond ((consp item) (typescript--flatten-list item)) (item (list item))))) @@ -1020,10 +1020,10 @@ one at the end of the line with \"let a\"." "Move forward over a whole typescript expression. This function doesn't move over expressions continued across lines." - (loop + (cl-loop do (progn (forward-comment most-positive-fixnum) - (loop until (or (eolp) + (cl-loop until (or (eolp) (progn (forward-comment most-positive-fixnum) (memq (char-after) '(?\, ?\; ?\] ?\) ?\})))) @@ -1040,7 +1040,7 @@ This puts point at the 'function' keyword. If this is a syntactically-correct non-expression function, return the name of the function, or t if the name could not be determined. Otherwise, return nil." - (assert (looking-at "\\_")) + (cl-assert (looking-at "\\_")) (let ((name t)) (forward-word) (forward-comment most-positive-fixnum) @@ -1099,11 +1099,11 @@ anything." "Helper function for `typescript--beginning-of-defun-nested'. If PSTATE represents a non-empty top-level defun, return the top-most pitem. Otherwise, return nil." - (loop for pitem in pstate + (cl-loop for pitem in pstate with func-depth = 0 with func-pitem if (eq 'function (typescript--pitem-type pitem)) - do (incf func-depth) + do (cl-incf func-depth) and do (setq func-pitem pitem) finally return (if (eq func-depth 1) func-pitem))) @@ -1112,7 +1112,7 @@ top-most pitem. Otherwise, return nil." Return the pitem of the function we went to the beginning of." (or ;; Look for the smallest function that encloses point... - (loop for pitem in (typescript--parse-state-at-point) + (cl-loop for pitem in (typescript--parse-state-at-point) if (and (eq 'function (typescript--pitem-type pitem)) (typescript--inside-pitem-p pitem)) do (goto-char (typescript--pitem-h-begin pitem)) @@ -1120,7 +1120,7 @@ Return the pitem of the function we went to the beginning of." ;; ...and if that isn't found, look for the previous top-level ;; defun - (loop for pstate = (typescript--backward-pstate) + (cl-loop for pstate = (typescript--backward-pstate) while pstate if (typescript--pstate-is-toplevel-defun pstate) do (goto-char (typescript--pitem-h-begin it)) @@ -1136,7 +1136,7 @@ Return the pitem of the function we went to the beginning of." "Value of `beginning-of-defun-function' for `typescript-mode'." (setq arg (or arg 1)) (while (and (not (eobp)) (< arg 0)) - (incf arg) + (cl-incf arg) (when (and (not typescript-flat-functions) (or (eq (typescript-syntactic-context) 'function) (typescript--function-prologue-beginning))) @@ -1148,7 +1148,7 @@ Return the pitem of the function we went to the beginning of." (goto-char (point-max)))) (while (> arg 0) - (decf arg) + (cl-decf arg) ;; If we're just past the end of a function, the user probably wants ;; to go to the beginning of *that* function (when (eq (char-before) ?}) @@ -1177,14 +1177,14 @@ BEG defaults to `point-min', meaning to flush the entire cache." (defun typescript--ensure-cache--pop-if-ended (open-items paren-depth) (let ((top-item (car open-items))) (when (<= paren-depth (typescript--pitem-paren-depth top-item)) - (assert (not (get-text-property (1- (point)) 'typescript-pend))) + (cl-assert (not (get-text-property (1- (point)) 'typescript-pend))) (put-text-property (1- (point)) (point) 'typescript--pend top-item) (setf (typescript--pitem-b-end top-item) (point)) (setq open-items ;; open-items must contain at least two items for this to ;; work, but because we push a dummy item to start with, ;; that assumption holds. - (cons (typescript--pitem-add-child (second open-items) top-item) + (cons (typescript--pitem-add-child (cl-second open-items) top-item) (cddr open-items))))) open-items) @@ -1202,7 +1202,7 @@ the body of `typescript--ensure-cache'." ;; Make sure parse-partial-sexp doesn't stop because we *entered* ;; the given depth -- i.e., make sure we're deeper than the target ;; depth. - (assert (> (nth 0 parse) + (cl-assert (> (nth 0 parse) (typescript--pitem-paren-depth (car open-items)))) (setq parse (parse-partial-sexp prev-parse-point goal-point @@ -1302,7 +1302,7 @@ LIMIT defaults to point." ;; Figure out which class styles we need to look for (setq filtered-class-styles - (loop for style in typescript--class-styles + (cl-loop for style in typescript--class-styles if (memq (plist-get style :framework) typescript-enabled-frameworks) collect style)) @@ -1324,7 +1324,7 @@ LIMIT defaults to point." (unless (bobp) (setq open-items (get-text-property (1- (point)) 'typescript--pstate)) - (assert open-items)))) + (cl-assert open-items)))) (unless open-items ;; Make a placeholder for the top-level definition @@ -1337,7 +1337,7 @@ LIMIT defaults to point." (narrow-to-region (point-min) limit) - (loop while (re-search-forward typescript--quick-match-re-func nil t) + (cl-loop while (re-search-forward typescript--quick-match-re-func nil t) for orig-match-start = (goto-char (match-beginning 0)) for orig-match-end = (match-end 0) do (typescript--ensure-cache--update-parse) @@ -1367,7 +1367,7 @@ LIMIT defaults to point." (setq name t))) - (assert (eq (char-after) ?{)) + (cl-assert (eq (char-after) ?{)) (forward-char) (make-typescript--pitem :paren-depth orig-depth @@ -1392,7 +1392,7 @@ LIMIT defaults to point." (list (match-string-no-properties 2)))))) ;; Class definition - ((loop with syntactic-context = + ((cl-loop with syntactic-context = (typescript--syntactic-context-from-pstate open-items) for class-style in filtered-class-styles if (and (memq syntactic-context @@ -1418,12 +1418,11 @@ LIMIT defaults to point." (typescript--ensure-cache--update-parse) (setq typescript--cache-end limit) (setq typescript--last-parse-pos limit) - (setq typescript--state-at-last-parse-pos open-items) - ))))) + (setq typescript--state-at-last-parse-pos open-items)))))) (defun typescript--end-of-defun-flat () "Helper function for `typescript-end-of-defun'." - (loop while (typescript--re-search-forward "}" nil t) + (cl-loop while (typescript--re-search-forward "}" nil t) do (typescript--ensure-cache) if (get-text-property (1- (point)) 'typescript--pend) if (eq 'function (typescript--pitem-type it)) @@ -1460,14 +1459,14 @@ LIMIT defaults to point." "Value of `end-of-defun-function' for `typescript-mode'." (setq arg (or arg 1)) (while (and (not (bobp)) (< arg 0)) - (incf arg) + (cl-incf arg) (typescript-beginning-of-defun) (typescript-beginning-of-defun) (unless (bobp) (typescript-end-of-defun))) (while (> arg 0) - (decf arg) + (cl-decf arg) ;; look for function backward. if we're inside it, go to that ;; function's end. otherwise, search for the next function's end and ;; go there @@ -1578,7 +1577,7 @@ end of the string was not found." (point) ;; We just search forward and then check if the hit we get has a ;; string-start equal to ours. - (loop while (re-search-forward + (cl-loop while (re-search-forward (concat "\\(?:[^\\]\\|^\\)\\(" (string str-terminator) "\\)") nil t) if (eq string-start @@ -1612,7 +1611,7 @@ REGEXPS, but only if FRAMEWORK is in `typescript-enabled-frameworks'." If FUNC is supplied, call it with no arguments before every variable name in the spec. Return true iff this was actually a spec. FUNC must preserve the match data." - (case (char-after) + (cl-case (char-after) (?\[ (forward-char) (while @@ -1713,7 +1712,7 @@ point of view of font-lock. It applies highlighting directly with (defun typescript--documentation-font-lock-helper (re limit) "This is a helper macro that determines whether jsdoc highlighting is to be applied, and searches for the next token to be highlighted." - (loop while (re-search-forward re limit t) + (cl-loop while (re-search-forward re limit t) if (typescript--in-documentation-comment-p) return (point))) @@ -1743,7 +1742,7 @@ and searches for the next token to be highlighted." (defun typescript--tslint-flag-matcher (limit) "Font-lock mode matcher that finds tslint flags in comments." - (loop while (re-search-forward typescript-tslint-flag-regexp limit t) + (cl-loop while (re-search-forward typescript-tslint-flag-regexp limit t) if (nth 4 (syntax-ppss (match-beginning 1))) return (point))) @@ -1925,8 +1924,8 @@ and searches for the next token to be highlighted." (defun typescript--inside-pitem-p (pitem) "Return whether point is inside the given pitem's header or body." (typescript--ensure-cache) - (assert (typescript--pitem-h-begin pitem)) - (assert (typescript--pitem-paren-depth pitem)) + (cl-assert (typescript--pitem-h-begin pitem)) + (cl-assert (typescript--pitem-paren-depth pitem)) (and (> (point) (typescript--pitem-h-begin pitem)) (or (null (typescript--pitem-b-end pitem)) @@ -1948,7 +1947,7 @@ will be returned." ;; Loop until we either hit a pitem at BOB or pitem ends after ;; point (or at point if we're at eob) - (loop for pitem = (car pstate) + (cl-loop for pitem = (car pstate) until (or (eq (typescript--pitem-type pitem) 'toplevel) (typescript--inside-pitem-p pitem)) @@ -1981,11 +1980,11 @@ context." (defun typescript--class-decl-matcher (limit) "Font lock function used by `typescript-mode'. This performs fontification according to `typescript--class-styles'." - (loop initially (typescript--ensure-cache limit) + (cl-loop initially (typescript--ensure-cache limit) while (re-search-forward typescript--quick-match-re limit t) for orig-end = (match-end 0) do (goto-char (match-beginning 0)) - if (loop for style in typescript--class-styles + if (cl-loop for style in typescript--class-styles for decl-re = (plist-get style :class-decl) if (and (memq (plist-get style :framework) typescript-enabled-frameworks) @@ -2028,8 +2027,7 @@ This performs fontification according to `typescript--class-styles'." ;; arrow function ("\\(=>\\)" - (1 font-lock-keyword-face)) - ) + (1 font-lock-keyword-face))) "Level four font lock for `typescript-mode'.") (defconst typescript--font-lock-keywords @@ -2167,7 +2165,7 @@ brackets, and decreases when we cross opening brackets." ;; If we cross over a reserved start keyword, we abandon hope of finding ;; a matching angle bracket. This prevents extreme recursion depths. (typescript--re-search-backward (concat "[<>]\\|" typescript--reserved-start-keywords-re) nil t) - (case (char-after) + (cl-case (char-after) (?< (typescript--search-backward-matching-angle-bracket-inner (- depth 1))) (?> (typescript--search-backward-matching-angle-bracket-inner (+ depth 1))))))) @@ -2259,8 +2257,7 @@ Searches specifically for any of \"=\", \"}\", and \"type\"." (typescript--backward-syntactic-ws) ;; We might misindent some expressions that would ;; return NaN anyway. Shouldn't be a problem. - (memq (char-before) '(?, ?} ?{ ?\;))))))) -) + (memq (char-before) '(?, ?} ?{ ?\;)))))))) (defun typescript--continued-expression-p () @@ -2352,7 +2349,7 @@ Returns nil on failure, or the position to which the point was moved on success." (when (eq (char-after) ?>) (let ((depth 1)) - (loop named search-loop + (cl-loop named search-loop while (> depth 0) do (progn (unless (re-search-backward "[<>]" nil t) @@ -2384,7 +2381,7 @@ moved on success." (or ;; This handles the case of a function with return type annotation. (save-excursion - (loop named search-loop + (cl-loop named search-loop do (typescript--backward-syntactic-ws) ;; Check whether we are at "):". @@ -2620,8 +2617,8 @@ the broken-down class name of the item to insert." name-parts (mapcar #'typescript--pitem-name items)) - (assert (stringp top-name)) - (assert (> (length top-name) 0)) + (cl-assert (stringp top-name)) + (cl-assert (> (length top-name) 0)) ;; If top-name isn't found in items, then we build a copy of items ;; and throw it away. But that's okay, since most of the time, we @@ -2686,13 +2683,13 @@ the broken-down class name of the item to insert." (defun typescript--pitem-add-child (pitem child) "Copy `typescript--pitem' PITEM, and push CHILD onto its list of children." - (assert (integerp (typescript--pitem-h-begin child))) - (assert (if (consp (typescript--pitem-name child)) - (loop for part in (typescript--pitem-name child) + (cl-assert (integerp (typescript--pitem-h-begin child))) + (cl-assert (if (consp (typescript--pitem-name child)) + (cl-loop for part in (typescript--pitem-name child) always (stringp part)) t)) - ;; This trick works because we know (based on our defstructs) that + ;; This trick works because we know (based on our cl-defstructs) that ;; the child list is always the first element, and so the second ;; element and beyond can be shared when we make our "copy". (cons @@ -2711,7 +2708,7 @@ the broken-down class name of the item to insert." ;; name is a list here because down in ;; `typescript--ensure-cache', we made sure to only add ;; class entries with lists for :name - (assert (consp name)) + (cl-assert (consp name)) (typescript--splice-into-items (car pitem) child name)) (t @@ -2787,8 +2784,7 @@ the broken-down class name of the item to insert." "\\([[:digit:]]+\\)" "\\]: " ;; message - ".*$" - ) + ".*$") "Regexp to match reports generated by tslint.") (dolist diff --git a/elpa/typescript-mode-20191120.346/typescript-mode.elc b/elpa/typescript-mode-20191209.1107/typescript-mode.elc similarity index 92% rename from elpa/typescript-mode-20191120.346/typescript-mode.elc rename to elpa/typescript-mode-20191209.1107/typescript-mode.elc index 4df74891bf37a84b394ff22afc8ec3abe4da072a..985b4a37dd7210de0e5c36badb4df74257d69a0b 100644 GIT binary patch delta 1920 zcmZ`)Yitx%6z1O9w%hH4`e-Q>blWYkOKF+8cb+A+MGYb#5=AX^8lXT$QWts1OJY$0 zg&>yRNK-*Wz(+wbz)2Va4NwJv;Z zqnTo*mMAj%pP(iaEhYJo9zI1RL%Zv1KbQuC!eVO4;>?6PiK!8>if4)C6VD<`MNF^SL=6=m z1I6vCbn(KZDAio+K(X-i9^jvR5lIV^3(9L3VZ}7~F#i3Wk~FEN5PGhvAW4QI!!|9zJF{TlSBc0#gVxPHf@{&}d5P;RxMx4Q(_E~Y;zD^@H#_P+ zO?(Es4ye^^#Q|}4N6&J6jgzf ztpN;gYH;E32qNj43i{E#sXk_5pZ$6ABkFNzXq$$;q=D34j0PM6WoK_nrp{pSxs}LC zg+srVN>stQbD_5+aaD(cOZ`beQB@p0p)$=B>3My`{L7yts4DYXsfVce?E$eH1wZ0S zs!vjJ?v3l*i6cy8T|JIj!j-GoEL?_b*RqkH#YOt{W0G!YaPE2ukxXP4x?zy9g>H#e zS8>Us@n6TE5precIrQpYC;}OEi{g(pNUkRf|MQ;u2fB-xo5wWhS(txJuK4oiYu?T1 zvZ%dfJs8wkWl#-|q&}{Dog1tj@^WXMEIrT_dq|Qfm(<$yrbQ~e3=FI9v zf;3q%lt?gd!00@2rm>fh^+cz+H~A57!n7LdA0-YBS7$_!ti{o!I~PObN$O6ohQfa2 zW2%`At^LS;ALmM>;b=cHyy0|zvPjaH$HZ5MUqZ#HA}S zP35czGDD|^tekR|*OWP1X_=(o8?oIvA5BEhx2Iyi_A#^mp?s=0ce>bE$EMCp{(h-ky?lCnCnX%E^YWkrdC>@^UJ4a7?1 zJvk>aH3n^@oDo8%uiVU~lXW7UAJ3cQLWw^0RYX)Z5+dJ7;5+nV*mS98i*3fOKBCx~ z*qb|+U_}>Qd5>YNP@Y!s0#+>ERIm}NiZG{72NsqkmfV+*FlD0S{vgJxDpDS-B3M)S zx<~5y@}ki^t2dS>=}{tgMtmapi-(@tim}GTg{MCTKU=gHItUwnc)R zx#$kpgP$qNs#ajP#}{h$0~J%WJvYOLO;z;PHX--DVd*K*YofGnIl)vBKfkmKxk0x6hITfHAxWD65+M`h?ugW5REWwT@K1JpV>D~ zY;U+oe3~r>8%Iq=W5mukrjuyh)<6&HWRcjsJpl;tIjuqdXnm5H@UH1qaZc-X1eLMH zoVHrGYvSwoq7hb2ar%89ic;u+|BapXV6TeRyTT}%S}v{&%jcf+iInz-eQ}m+8kb%` zZC=zmR;<|5g`y1C&f~+EeUm6^_m-i$0HZWHpejay8D@YfEWkAL77*x*L8ZWl89Sl> zOD_qiRJj+d)KoB`G!O=r!lrrlu9D@s%E`n0-H0Wwu^R8%s`Ho*_)+9WT_e`@c;u%r7r$(j3KkS2!`n;RpHtV zBn6%K|~NDl^IYD7B_dGx=^RtUVczUru>(b`KJAW;`C~N zSy6RaR!z~o@{m-$pf)5isU}oiBZZzVm#RXZ(i78cec)VERu!r)t0*s)lx&MKU8-DM z6`EgB`Jz-K6&KYMNq(D3wnUjKnWii^bUc~jO5iNRLk~)-e`so#HS$y+ny+ngM+MfS&~;*L2peqrBx8X_j6;&SJ~1RvZ@T{z!2V-Ixp>4gZ}OdR|n7X-S= zub;h2Y-WqA=UxLeDpsA(C)m=(ksrqsqES`+^h+j+gKICl^PyXOZ@T~3B94TT^5^GjmFl4$uW4-p$Uo#{2v zOxf+C<_=Ko&!VFje1}~>JDt_Utx<|&VfYqL^Nj9xotFB4{oZnH5nNQ`mH$KCfL4D9bMQglv7jm${oDb5_M(7-MW~HMCaAWf%^fs)_M*D7bh-jwOh%(VpVwi?= XJQHC=EQ>j({Ky(fbdV*PXgT@^Xv%8q diff --git a/init.el b/init.el index 008fb616..a077e96c 100755 --- a/init.el +++ b/init.el @@ -29,7 +29,7 @@ There are two things you can do about this warning: (when (eq system-type 'gnu/linux) (load-theme 'nord)) (unless (eq system-type 'gnu/linux) - (load-theme 'nord)) + (load-theme 'leuven)) ;; Load my custom bundles (add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle")) From 2bb2db0638ad481da76a726683d09bfc9e365d36 Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcus-kammer@users.noreply.gitlab.com> Date: Thu, 12 Dec 2019 17:30:29 +0100 Subject: [PATCH 3/4] Update packages --- bundle/custom.el | 4 +- elpa/archives/gnu/archive-contents | 2 +- elpa/dashboard-20191210.1041/banners/1.txt | 8 + elpa/dashboard-20191210.1041/banners/2.txt | 6 + elpa/dashboard-20191210.1041/banners/3.txt | 8 + .../dashboard-20191210.1041/banners/emacs.png | Bin 0 -> 43759 bytes elpa/dashboard-20191210.1041/banners/logo.png | Bin 0 -> 32305 bytes .../dashboard-autoloads.el | 41 ++ elpa/dashboard-20191210.1041/dashboard-pkg.el | 13 + .../dashboard-widgets.el | 675 ++++++++++++++++++ .../dashboard-widgets.elc | Bin 0 -> 26001 bytes elpa/dashboard-20191210.1041/dashboard.el | 254 +++++++ elpa/dashboard-20191210.1041/dashboard.elc | Bin 0 -> 7636 bytes elpa/dashboard-readme.txt | 2 + .../leuven-dark-theme.el | 0 .../leuven-theme-autoloads.el | 0 .../leuven-theme-pkg.el | 2 +- .../leuven-theme.el | 5 +- .../page-break-lines-autoloads.el | 89 +++ .../page-break-lines-pkg.el | 2 + .../page-break-lines.el | 185 +++++ .../page-break-lines.elc | Bin 0 -> 9964 bytes elpa/request-20191127.1554/request-pkg.el | 2 - .../request-autoloads.el | 0 elpa/request-20191211.2051/request-pkg.el | 2 + .../request.el | 58 +- .../request.elc | Bin 67257 -> 68379 bytes init.el | 2 +- 28 files changed, 1327 insertions(+), 33 deletions(-) create mode 100644 elpa/dashboard-20191210.1041/banners/1.txt create mode 100644 elpa/dashboard-20191210.1041/banners/2.txt create mode 100644 elpa/dashboard-20191210.1041/banners/3.txt create mode 100644 elpa/dashboard-20191210.1041/banners/emacs.png create mode 100644 elpa/dashboard-20191210.1041/banners/logo.png create mode 100644 elpa/dashboard-20191210.1041/dashboard-autoloads.el create mode 100644 elpa/dashboard-20191210.1041/dashboard-pkg.el create mode 100644 elpa/dashboard-20191210.1041/dashboard-widgets.el create mode 100644 elpa/dashboard-20191210.1041/dashboard-widgets.elc create mode 100644 elpa/dashboard-20191210.1041/dashboard.el create mode 100644 elpa/dashboard-20191210.1041/dashboard.elc create mode 100644 elpa/dashboard-readme.txt rename elpa/{leuven-theme-20190831.1008 => leuven-theme-20191211.1608}/leuven-dark-theme.el (100%) rename elpa/{leuven-theme-20190831.1008 => leuven-theme-20191211.1608}/leuven-theme-autoloads.el (100%) rename elpa/{leuven-theme-20190831.1008 => leuven-theme-20191211.1608}/leuven-theme-pkg.el (84%) rename elpa/{leuven-theme-20190831.1008 => leuven-theme-20191211.1608}/leuven-theme.el (99%) create mode 100644 elpa/page-break-lines-20190519.2238/page-break-lines-autoloads.el create mode 100644 elpa/page-break-lines-20190519.2238/page-break-lines-pkg.el create mode 100644 elpa/page-break-lines-20190519.2238/page-break-lines.el create mode 100644 elpa/page-break-lines-20190519.2238/page-break-lines.elc delete mode 100644 elpa/request-20191127.1554/request-pkg.el rename elpa/{request-20191127.1554 => request-20191211.2051}/request-autoloads.el (100%) create mode 100644 elpa/request-20191211.2051/request-pkg.el rename elpa/{request-20191127.1554 => request-20191211.2051}/request.el (96%) rename elpa/{request-20191127.1554 => request-20191211.2051}/request.elc (82%) diff --git a/bundle/custom.el b/bundle/custom.el index 1276ba31..7e4db48b 100644 --- a/bundle/custom.el +++ b/bundle/custom.el @@ -9,7 +9,7 @@ '(column-number-mode t) '(custom-safe-themes (quote - ("64d8237b42b3b01f1487a908836574a5e531ea5efab54b9afa19fb8fda471ab3" "4bdc0dfc53ae06323e031baf691f414babf13c9c9c35014dd07bb42c4db27c24" "d6c5b8dc6049f2e9dabdfcafa9ef2079352640e80dffe3e6cc07c0f89cbf9748" "fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" "fa2af0c40576f3bde32290d7f4e7aa865eb6bf7ebe31eb9e37c32aa6f4ae8d10" "e396098fd5bef4f0dd6cedd01ea48df1ecb0554d8be0d8a924fb1d926f02f90f" "acfac6b14461a344f97fad30e2362c26a3fe56a9f095653832d8fc029cb9d05c" "85d1dbf2fc0e5d30f236712b831fb24faf6052f3114964fdeadede8e1b329832" "4639288d273cbd3dc880992e6032f9c817f17c4a91f00f3872009a099f5b3f84" "14c848e2c4a0a11fcd118e2519078aa50bb6020f89035423b40fff421fb24fbd" "cdb4ffdecc682978da78700a461cdc77456c3a6df1c1803ae2dd55c59fa703e3" "9e31aff9afe3c20a33dd966b4c54c6a5151f07659362e4b06bde38ded5370dae" "24fc62afe2e5f0609e436aa2427b396adf9a958a8fa660edbaab5fb13c08aae6" "82358261c32ebedfee2ca0f87299f74008a2e5ba5c502bde7aaa15db20ee3731" "4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default))) + ("bffa9739ce0752a37d9b1eee78fc00ba159748f50dc328af4be661484848e476" "64d8237b42b3b01f1487a908836574a5e531ea5efab54b9afa19fb8fda471ab3" "4bdc0dfc53ae06323e031baf691f414babf13c9c9c35014dd07bb42c4db27c24" "d6c5b8dc6049f2e9dabdfcafa9ef2079352640e80dffe3e6cc07c0f89cbf9748" "fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" "fa2af0c40576f3bde32290d7f4e7aa865eb6bf7ebe31eb9e37c32aa6f4ae8d10" "e396098fd5bef4f0dd6cedd01ea48df1ecb0554d8be0d8a924fb1d926f02f90f" "acfac6b14461a344f97fad30e2362c26a3fe56a9f095653832d8fc029cb9d05c" "85d1dbf2fc0e5d30f236712b831fb24faf6052f3114964fdeadede8e1b329832" "4639288d273cbd3dc880992e6032f9c817f17c4a91f00f3872009a099f5b3f84" "14c848e2c4a0a11fcd118e2519078aa50bb6020f89035423b40fff421fb24fbd" "cdb4ffdecc682978da78700a461cdc77456c3a6df1c1803ae2dd55c59fa703e3" "9e31aff9afe3c20a33dd966b4c54c6a5151f07659362e4b06bde38ded5370dae" "24fc62afe2e5f0609e436aa2427b396adf9a958a8fa660edbaab5fb13c08aae6" "82358261c32ebedfee2ca0f87299f74008a2e5ba5c502bde7aaa15db20ee3731" "4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default))) '(default-frame-alist (quote ((fullscreen . maximized) @@ -84,7 +84,7 @@ '(package-enable-at-startup t) '(package-selected-packages (quote - (pickle poet-theme flymake-eslint json-mode elpy darkroom dockerfile-mode ein spacemacs-theme flucui-themes leuven-theme htmlize scss-mode berrys-theme web-mode python-docstring sphinx-doc sphinx-frontend sphinx-mode ox-nikola racket-mode slime gherkin-mode powershell typescript-mode ob-http ob-ipython ob-restclient nord-theme restclient request restclient-test yaml-mode magit))) + (dashboard pickle poet-theme flymake-eslint json-mode elpy darkroom dockerfile-mode ein spacemacs-theme flucui-themes leuven-theme htmlize scss-mode berrys-theme web-mode python-docstring sphinx-doc sphinx-frontend sphinx-mode ox-nikola racket-mode slime gherkin-mode powershell typescript-mode ob-http ob-ipython ob-restclient nord-theme restclient request restclient-test yaml-mode magit))) '(python-shell-interpreter "python3" t) '(register-preview-delay 2) '(register-separator 43) diff --git a/elpa/archives/gnu/archive-contents b/elpa/archives/gnu/archive-contents index b4dea52f..d8aaefff 100644 --- a/elpa/archives/gnu/archive-contents +++ b/elpa/archives/gnu/archive-contents @@ -1509,7 +1509,7 @@ ("Phillip Lord" . "phillip.lord@russet.org.uk")) (:url . "http://elpa.gnu.org/packages/persist.html"))]) (phps-mode . - [(0 3 21) + [(0 3 23) ((emacs (26))) "Major mode for PHP with Semantic integration" tar diff --git a/elpa/dashboard-20191210.1041/banners/1.txt b/elpa/dashboard-20191210.1041/banners/1.txt new file mode 100644 index 00000000..8bd71a72 --- /dev/null +++ b/elpa/dashboard-20191210.1041/banners/1.txt @@ -0,0 +1,8 @@ + +######## ## ## ### ###### ###### +## ### ### ## ## ## ## ## ## +## #### #### ## ## ## ## +###### ## ### ## ## ## ## ###### +## ## ## ######### ## ## +## ## ## ## ## ## ## ## ## +######## ## ## ## ## ###### ###### diff --git a/elpa/dashboard-20191210.1041/banners/2.txt b/elpa/dashboard-20191210.1041/banners/2.txt new file mode 100644 index 00000000..73b761ba --- /dev/null +++ b/elpa/dashboard-20191210.1041/banners/2.txt @@ -0,0 +1,6 @@ + _______ .___ ___. ___ ______ _______. +| ____|| \/ | / \ / | / | +| |__ | \ / | / ^ \ | ,----' | (----` +| __| | |\/| | / /_\ \ | | \ \ +| |____ | | | | / _____ \ | `----.----) | +|_______||__| |__| /__/ \__\ \______|_______/ diff --git a/elpa/dashboard-20191210.1041/banners/3.txt b/elpa/dashboard-20191210.1041/banners/3.txt new file mode 100644 index 00000000..3abfd824 --- /dev/null +++ b/elpa/dashboard-20191210.1041/banners/3.txt @@ -0,0 +1,8 @@ + _______ _____ ______ ________ ________ ________ +|\ ___ \ |\ _ \ _ \|\ __ \|\ ____\|\ ____\ +\ \ __/|\ \ \\\__\ \ \ \ \|\ \ \ \___|\ \ \___|_ + \ \ \_|/_\ \ \\|__| \ \ \ __ \ \ \ \ \_____ \ + \ \ \_|\ \ \ \ \ \ \ \ \ \ \ \ \____\|____|\ \ + \ \_______\ \__\ \ \__\ \__\ \__\ \_______\____\_\ \ + \|_______|\|__| \|__|\|__|\|__|\|_______|\_________\ + \|_________| diff --git a/elpa/dashboard-20191210.1041/banners/emacs.png b/elpa/dashboard-20191210.1041/banners/emacs.png new file mode 100644 index 0000000000000000000000000000000000000000..718b071189247cffc3dd1482d388dcbe35783196 GIT binary patch literal 43759 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 R@xcH9002ovPDHLkV1oEFC}RKs literal 0 HcmV?d00001 diff --git a/elpa/dashboard-20191210.1041/banners/logo.png b/elpa/dashboard-20191210.1041/banners/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..c9de00c705e2f4f16d2dc36ba7a7952d88c865ab GIT binary patch literal 32305 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 Q_y7O^07*qoM6N<$f@+AI_y7O^ literal 0 HcmV?d00001 diff --git a/elpa/dashboard-20191210.1041/dashboard-autoloads.el b/elpa/dashboard-20191210.1041/dashboard-autoloads.el new file mode 100644 index 00000000..cc682f5d --- /dev/null +++ b/elpa/dashboard-20191210.1041/dashboard-autoloads.el @@ -0,0 +1,41 @@ +;;; dashboard-autoloads.el --- automatically extracted autoloads +;; +;;; Code: + +(add-to-list 'load-path (directory-file-name + (or (file-name-directory #$) (car load-path)))) + + +;;;### (autoloads nil "dashboard" "dashboard.el" (0 0 0 0)) +;;; Generated autoloads from dashboard.el + +(autoload 'dashboard-setup-startup-hook "dashboard" "\ +Setup post initialization hooks. +If a command line argument is provided, +assume a filename and skip displaying Dashboard. + +\(fn)" nil nil) + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "dashboard" '("dashboard-"))) + +;;;*** + +;;;### (autoloads nil "dashboard-widgets" "dashboard-widgets.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from dashboard-widgets.el + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "dashboard-widgets" '("dashboard-" "recentf-list"))) + +;;;*** + +;;;### (autoloads nil nil ("dashboard-pkg.el") (0 0 0 0)) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; coding: utf-8 +;; End: +;;; dashboard-autoloads.el ends here diff --git a/elpa/dashboard-20191210.1041/dashboard-pkg.el b/elpa/dashboard-20191210.1041/dashboard-pkg.el new file mode 100644 index 00000000..a6f14a62 --- /dev/null +++ b/elpa/dashboard-20191210.1041/dashboard-pkg.el @@ -0,0 +1,13 @@ +(define-package "dashboard" "20191210.1041" "A startup screen extracted from Spacemacs" + '((emacs "25.3") + (page-break-lines "0.11")) + :keywords + '("startup" "screen" "tools" "dashboard") + :authors + '(("Rakan Al-Hneiti")) + :maintainer + '("Rakan Al-Hneiti") + :url "https://github.com/emacs-dashboard/emacs-dashboard") +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/dashboard-20191210.1041/dashboard-widgets.el b/elpa/dashboard-20191210.1041/dashboard-widgets.el new file mode 100644 index 00000000..016b743a --- /dev/null +++ b/elpa/dashboard-20191210.1041/dashboard-widgets.el @@ -0,0 +1,675 @@ +;;; dashboard-widgets.el --- A startup screen extracted from Spacemacs -*- lexical-binding: t -*- + +;; Copyright (c) 2016-2019 Rakan Al-Hneiti & Contributors +;; +;; Author: Rakan Al-Hneiti +;; URL: https://github.com/emacs-dashboard/emacs-dashboard +;; +;; This file is not part of GNU Emacs. +;; +;;; License: GPLv3 +;; +;; Created: October 05, 2016 +;; Package-Version: 1.7.0-SNAPSHOT +;; Keywords: startup, screen, tools, dashboard +;; Package-Requires: ((emacs "25.3") (page-break-lines "0.11")) +;;; Commentary: + +;; An extensible Emacs dashboard, with sections for +;; bookmarks, projectile projects, org-agenda and more. + +;;; Code: + +;; Compiler pacifier +(declare-function all-the-icons-icon-for-dir "ext:all-the-icons.el") +(declare-function all-the-icons-icon-for-file "ext:all-the-icons.el") +(declare-function bookmark-get-filename "ext:bookmark.el") +(declare-function bookmark-all-names "ext:bookmark.el") +(declare-function calendar-date-compare "ext:calendar.el") +(declare-function projectile-cleanup-known-projects "ext:projectile.el") +(declare-function projectile-load-known-projects "ext:projectile.el") +(declare-function projectile-mode "ext:projectile.el") +(declare-function projectile-relevant-known-projects "ext:projectile.el") +(declare-function org-agenda-format-item "ext:org-agenda.el") +(declare-function org-compile-prefix-format "ext:org-agenda.el") +(declare-function org-entry-is-done-p "ext:org.el") +(declare-function org-get-category "ext:org.el") +(declare-function org-get-deadline-time "ext:org.el") +(declare-function org-get-heading "ext:org.el") +(declare-function org-get-scheduled-time "ext:org.el") +(declare-function org-get-tags "ext:org.el") +(declare-function org-map-entries "ext:org.el") +(declare-function org-outline-level "ext:org.el") +(defvar all-the-icons-dir-icon-alist) +(defvar package-activated-list) + +(defcustom dashboard-page-separator "\n\f\n" + "Separator to use between the different pages." + :type 'string + :group 'dashboard) + +(defcustom dashboard-image-banner-max-height 0 + "Maximum height of banner image. + +This setting applies only if Emacs is compiled with Imagemagick +support. When value is non-zero the image banner will be resized +to the specified height, with aspect ratio preserved." + :type 'integer + :group 'dashboard) + +(defcustom dashboard-image-banner-max-width 0 + "Maximum width of banner image. + +This setting applies if Emacs is compiled with Imagemagick +support. When value is non-zero the image banner will be resized +to the specified width, with aspect ratio preserved." + :type 'integer + :group 'dashboard) + +(defcustom dashboard-set-heading-icons nil + "When non nil, heading sections will have icons." + :type 'boolean + :group 'dashboard) + +(defcustom dashboard-set-file-icons nil + "When non nil, file lists will have icons." + :type 'boolean + :group 'dashboard) + +(defcustom dashboard-set-navigator nil + "When non nil, a navigator will be displayed under the banner." + :type 'boolean + :group 'dashboard) + +(defcustom dashboard-set-init-info t + "When non nil, init info will be displayed under the banner." + :type 'boolean + :group 'dashboard) + +(defcustom dashboard-set-footer t + "When non nil, a footer will be displayed at the bottom." + :type 'boolean + :group 'dashboard) + +(defcustom dashboard-show-shortcuts t + "Whether to show shortcut keys for each section." + :type 'boolean + :group 'dashboard) + +(defcustom dashboard-org-agenda-categories nil + "Specify the Categories to consider when using agenda in dashboard. +Example: +'(\"Tasks\" \"Habits\")" + :type 'list + :group 'dashboard) + +(defconst dashboard-banners-directory + (concat (file-name-directory + (locate-library "dashboard")) + "/banners/")) + +(defconst dashboard-banner-official-png + (expand-file-name (concat dashboard-banners-directory "emacs.png")) + "Emacs banner image.") + +(defconst dashboard-banner-logo-png + (expand-file-name (concat dashboard-banners-directory "logo.png")) + "Emacs banner image.") + +(defconst dashboard-banner-length 75 + "Width of a banner.") + +(defvar dashboard-banner-logo-title "Welcome to Emacs!" + "Specify the startup banner.") + +(defvar 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 \"[\" \"]\"))") + +(defvar 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" + (length package-activated-list) (emacs-init-time)) + (if (and (boundp 'straight--profile-cache) (hash-table-p straight--profile-cache)) + (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.") + +(defvar 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" + "Richard Stallman is proud of you" + "Happy coding!" + "Vi Vi Vi, the editor of the beast" + "Welcome to the church of Emacs" + "While any text editor can save your files,\ + only Emacs can save your soul" + "I showed you my source code, pls respond" + ))) + (nth (random (1- (1+ (length list)))) list)) + "A footer with some short message.") + +(defvar dashboard-footer-icon + (if (and (display-graphic-p) + (or (fboundp 'all-the-icons-fileicon) + (require 'all-the-icons nil 'noerror))) + (all-the-icons-fileicon "emacs" + :height 1.1 + :v-adjust -0.05 + :face 'font-lock-keyword-face) + (propertize ">" 'face 'dashboard-footer)) + "Footer's icon.") + +(defvar 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.") + +(defvar dashboard-buffer-last-width nil + "Previous width of dashboard-buffer.") + +(defvar dashboard-item-generators '((recents . dashboard-insert-recents) + (bookmarks . dashboard-insert-bookmarks) + (projects . dashboard-insert-projects) + (agenda . dashboard-insert-agenda) + (registers . dashboard-insert-registers))) + +(defvar 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)`. +If nil it is disabled. Possible values for list-type are: +`recents' `bookmarks' `projects' `agenda' `registers'") + +(defvar dashboard-items-default-length 20 + "Length used for startup lists with otherwise unspecified bounds. +Set to nil for unbounded.") + +(defvar 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'") + +(defvar recentf-list nil) + +;; +;; Faces +;; +(defface dashboard-text-banner + '((t (:inherit font-lock-keyword-face))) + "Face used for text banners." + :group 'dashboard) + +(defface dashboard-banner-logo-title + '((t :inherit default)) + "Face used for the banner title." + :group 'dashboard) + +(defface dashboard-navigator + '((t (:inherit font-lock-keyword-face))) + "Face used for the navigator." + :group 'dashboard) + +(defface dashboard-heading + '((t (:inherit font-lock-keyword-face))) + "Face used for widget headings." + :group 'dashboard) + +(defface dashboard-footer + '((t (:inherit font-lock-doc-face))) + "Face used for widget headings." + :group 'dashboard) + +(define-obsolete-face-alias + 'dashboard-text-banner-face 'dashboard-text-banner "1.2.6") +(define-obsolete-face-alias + 'dashboard-banner-logo-title-face 'dashboard-banner-logo-title "1.2.6") +(define-obsolete-face-alias + 'dashboard-heading-face 'dashboard-heading "1.2.6") + +;; +;; Generic widget helpers +;; +(defun dashboard-subseq (seq start end) + "Return the subsequence of SEQ from START to END.. +Uses `cl-subseq`, but accounts for end points greater than the size of the +list. +Return entire list if `END' is omitted." + (let ((len (length seq))) + (cl-subseq seq start (and (number-or-marker-p end) + (min len end))))) + +(defmacro dashboard-insert-shortcut (shortcut-char + search-label + &optional no-next-line) + "Insert a shortcut SHORTCUT-CHAR for a given SEARCH-LABEL. +Optionally, provide NO-NEXT-LINE to move the cursor forward a line." + `(progn + (eval-when-compile (defvar dashboard-mode-map)) + (let ((sym (make-symbol (format "Jump to \"%s\"" ,search-label)))) + (fset sym (lambda () + (interactive) + (unless (search-forward ,search-label (point-max) t) + (search-backward ,search-label (point-min) t)) + ,@(unless no-next-line + '((forward-line 1))) + (back-to-indentation))) + (eval-after-load 'dashboard + (define-key dashboard-mode-map ,shortcut-char sym))))) + +(defun dashboard-append (msg &optional _messagebuf) + "Append MSG to dashboard buffer. +If MESSAGEBUF is not nil then MSG is also written in message buffer." + (with-current-buffer (get-buffer-create "*dashboard*") + (goto-char (point-max)) + (let ((buffer-read-only nil)) + (insert msg)))) + +(defun dashboard-modify-heading-icons (alist) + "Append ALIST items to dashboard-heading-icons to modify icons." + (dolist (icon alist) + (add-to-list 'dashboard-heading-icons icon))) + +(defun dashboard-insert-page-break () + "Insert a page break line in dashboard buffer." + (dashboard-append dashboard-page-separator)) + +(defun dashboard-insert-heading (heading &optional shortcut) + "Insert a widget HEADING in dashboard buffer, adding SHORTCUT if provided." + (when (and (display-graphic-p) + dashboard-set-heading-icons) + ;; Try loading `all-the-icons' + (unless (require 'all-the-icons nil 'noerror) + (error "Package `all-the-icons' isn't installed")) + + (insert (cond + ((string-equal heading "Recent Files:") + (all-the-icons-octicon (cdr (assoc 'recents dashboard-heading-icons)) + :height 1.2 :v-adjust 0.0 :face 'dashboard-heading)) + ((string-equal heading "Bookmarks:") + (all-the-icons-octicon (cdr (assoc 'bookmarks dashboard-heading-icons)) + :height 1.2 :v-adjust 0.0 :face 'dashboard-heading)) + ((or (string-equal heading "Agenda for today:") + (string-equal heading "Agenda for the coming week:")) + (all-the-icons-octicon (cdr (assoc 'agenda dashboard-heading-icons)) + :height 1.2 :v-adjust 0.0 :face 'dashboard-heading)) + ((string-equal heading "Registers:") + (all-the-icons-octicon (cdr (assoc 'registers dashboard-heading-icons)) + :height 1.2 :v-adjust 0.0 :face 'dashboard-heading)) + ((string-equal heading "Projects:") + (all-the-icons-octicon (cdr (assoc 'projects dashboard-heading-icons)) + :height 1.2 :v-adjust 0.0 :face 'dashboard-heading)) + (t " "))) + (insert " ")) + + (insert (propertize heading 'face 'dashboard-heading)) + (if shortcut (insert (format " (%s)" shortcut)))) + +(defun dashboard-center-line (string) + "Center a STRING accoring to it's size." + (insert (make-string (max 0 (floor (/ (- dashboard-banner-length + (+ (length string) 1)) 2))) ?\ ))) + +;; +;; BANNER +;; +(defun dashboard-insert-ascii-banner-centered (file) + "Insert banner from FILE." + (let ((ascii-banner + (with-temp-buffer + (insert-file-contents file) + (let ((banner-width 0)) + (while (not (eobp)) + (let ((line-length (- (line-end-position) (line-beginning-position)))) + (if (< banner-width line-length) + (setq banner-width line-length))) + (forward-line 1)) + (goto-char 0) + (let ((margin + (max 0 (floor (/ (- dashboard-banner-length banner-width) 2))))) + (while (not (eobp)) + (insert (make-string margin ?\ )) + (forward-line 1)))) + (buffer-string)))) + (put-text-property 0 (length ascii-banner) 'face 'dashboard-text-banner ascii-banner) + (insert ascii-banner))) + +(defun dashboard-insert-image-banner (banner) + "Display an image BANNER." + (when (file-exists-p banner) + (let* ((title dashboard-banner-logo-title) + (spec + (if (image-type-available-p 'imagemagick) + (apply 'create-image banner 'imagemagick nil + (append (when (> dashboard-image-banner-max-width 0) + (list :max-width dashboard-image-banner-max-width)) + (when (> dashboard-image-banner-max-height 0) + (list :max-height dashboard-image-banner-max-height)))) + (create-image banner))) + (size (image-size spec)) + (width (car size)) + (left-margin (max 0 (floor (- dashboard-banner-length width) 2)))) + (goto-char (point-min)) + (insert "\n") + (insert (make-string left-margin ?\ )) + (insert-image spec) + (insert "\n\n") + (when title + (dashboard-center-line title) + (insert (format "%s\n\n" (propertize title 'face 'dashboard-banner-logo-title))))))) + +;; +;; INIT INFO +;; +(defun dashboard-insert-init-info () + "Insert init info when dashboard-set-init-info is t." + (when dashboard-set-init-info + (dashboard-center-line dashboard-init-info) + (insert + (propertize dashboard-init-info 'face 'font-lock-comment-face)))) + +(defun dashboard-get-banner-path (index) + "Return the full path to banner with index INDEX." + (concat dashboard-banners-directory (format "%d.txt" index))) + +(defun dashboard-choose-banner () + "Return the full path of a banner based on the dotfile value." + (when dashboard-startup-banner + (cond ((eq 'official dashboard-startup-banner) + (if (and (display-graphic-p) (image-type-available-p 'png)) + dashboard-banner-official-png + (dashboard-get-banner-path 1))) + ((eq 'logo dashboard-startup-banner) + (if (and (display-graphic-p) (image-type-available-p 'png)) + dashboard-banner-logo-png + (dashboard-get-banner-path 1))) + ((integerp dashboard-startup-banner) + (dashboard-get-banner-path dashboard-startup-banner)) + ((and dashboard-startup-banner + (image-type-available-p (intern (file-name-extension + dashboard-startup-banner))) + (display-graphic-p)) + (if (file-exists-p dashboard-startup-banner) + dashboard-startup-banner + (message (format "could not find banner %s" + dashboard-startup-banner)) + (dashboard-get-banner-path 1))) + (t (dashboard-get-banner-path 1))))) + +(defun dashboard-insert-banner () + "Insert Banner at the top of the dashboard." + (goto-char (point-max)) + (let ((banner (dashboard-choose-banner)) + (buffer-read-only nil)) + (progn + (when banner + (if (image-type-available-p (intern (file-name-extension banner))) + (dashboard-insert-image-banner banner) + (dashboard-insert-ascii-banner-centered banner)) + (dashboard-insert-navigator) + (dashboard-insert-init-info))))) + +(defun dashboard-insert-navigator () + "Insert Navigator of the dashboard." + (when (and dashboard-set-navigator dashboard-navigator-buttons) + (dolist (line dashboard-navigator-buttons) + (dolist (btn line) + (let* ((icon (car btn)) + (title (cadr btn)) + (help (or (cadr (cdr btn)) "")) + (action (or (cadr (cddr btn)) #'ignore)) + (face (or (cadr (cddr (cdr btn))) 'dashboard-navigator)) + (prefix (or (cadr (cddr (cddr btn))) (propertize "[" 'face face))) + (suffix (or (cadr (cddr (cddr (cdr btn)))) (propertize "]" 'face face)))) + (widget-create 'item + :tag (concat + (when icon + (propertize icon 'face `(:inherit + ,(get-text-property 0 'face icon) + :inherit + ,face))) + (when (and icon title + (not (string-equal icon "")) + (not (string-equal title ""))) + (propertize " " 'face 'variable-pitch)) + (when title (propertize title 'face face))) + :help-echo help + :action action + :button-face `(:underline nil) + :mouse-face 'highlight + :button-prefix prefix + :button-suffix suffix + :format "%[%t%]") + (insert " "))) + (let* ((width (current-column))) + (beginning-of-line) + (dashboard-center-line (make-string width ?\s)) + (end-of-line)) + (insert "\n")) + (insert "\n"))) + +(defmacro dashboard-insert-section (section-name list list-size shortcut action &rest widget-params) + "Add a section with SECTION-NAME and LIST of LIST-SIZE items to the dashboard. +SHORTCUT is the keyboard shortcut used to access the section. +ACTION is theaction taken when the user activates the widget button. +WIDGET-PARAMS are passed to the \"widget-create\" function." + `(progn + (dashboard-insert-heading ,section-name + (if (and ,list dashboard-show-shortcuts) ,shortcut)) + (if ,list + (when (dashboard-insert-section-list + ,section-name + (dashboard-subseq ,list 0 ,list-size) + ,action + ,@widget-params) + (dashboard-insert-shortcut ,shortcut ,section-name)) + (insert "\n --- No items ---")))) + +;; +;; Section list +;; +(defmacro dashboard-insert-section-list (section-name list action &rest rest) + "Insert into SECTION-NAME a LIST of items, expanding ACTION and passing REST to widget creation." + `(when (car ,list) + (mapc + (lambda (el) + (let ((tag ,@rest)) + (insert "\n ") + + (when (and (display-graphic-p) + dashboard-set-file-icons + (featurep 'all-the-icons)) + (let* ((path (car (last (split-string ,@rest " - ")))) + (icon (if (and (not (file-remote-p path)) + (file-directory-p path)) + (all-the-icons-icon-for-dir path nil "") + (cond + ((string-equal ,section-name "Agenda for today:") + (all-the-icons-octicon "primitive-dot" :height 1.0 :v-adjust 0.01)) + ((file-remote-p path) + (all-the-icons-octicon "radio-tower" :height 1.1 :v-adjust 0.01)) + (t (all-the-icons-icon-for-file (file-name-nondirectory path))))))) + (setq tag (concat icon " " ,@rest)))) + + (widget-create 'item + :tag tag + :action ,action + :button-face `(:underline nil) + :mouse-face 'highlight + :button-prefix "" + :button-suffix "" + :format "%[%t%]"))) + ,list))) + +;; Footer +(defun dashboard-insert-footer () + "Insert footer of dashboard." + (when dashboard-set-footer + (insert "\n") + (dashboard-center-line dashboard-footer) + (insert dashboard-footer-icon) + (insert " ") + (insert (propertize dashboard-footer 'face 'dashboard-footer)) + (insert "\n"))) + +;; +;; Recentf +;; +(defun dashboard-insert-recents (list-size) + "Add the list of LIST-SIZE items from recently edited files." + (recentf-mode) + (dashboard-insert-section + "Recent Files:" + recentf-list + list-size + "r" + `(lambda (&rest ignore) (find-file-existing ,el)) + (abbreviate-file-name el))) + +;; +;; Bookmarks +;; +(defun dashboard-insert-bookmarks (list-size) + "Add the list of LIST-SIZE items of bookmarks." + (require 'bookmark) + (dashboard-insert-section + "Bookmarks:" + (dashboard-subseq (bookmark-all-names) + 0 list-size) + list-size + "m" + `(lambda (&rest ignore) (bookmark-jump ,el)) + (let ((file (bookmark-get-filename el))) + (if file + (format "%s - %s" el (abbreviate-file-name file)) + el)))) + +;; +;; Projectile +;; +(defun dashboard-insert-projects (list-size) + "Add the list of LIST-SIZE items of projects." + (require 'projectile) + (projectile-cleanup-known-projects) + (projectile-load-known-projects) + (dashboard-insert-section + "Projects:" + (dashboard-subseq (projectile-relevant-known-projects) + 0 list-size) + list-size + "p" + `(lambda (&rest ignore) (projectile-switch-project-by-name ,el)) + (abbreviate-file-name el))) + +;; +;; Org Agenda +;; +(defun dashboard-timestamp-to-gregorian-date (timestamp) + "Convert TIMESTAMP to a gregorian date. + +The result can be used with functions like +`calendar-date-compare'." + (let ((decoded-timestamp (decode-time timestamp))) + (list (nth 4 decoded-timestamp) + (nth 3 decoded-timestamp) + (nth 5 decoded-timestamp)))) + +(defun dashboard-date-due-p (timestamp &optional due-date) + "Check if TIMESTAMP is today or in the past. + +If DUE-DATE is nil, compare TIMESTAMP to today; otherwise, +compare to the date in DUE-DATE. + +The time part of both TIMESTAMP and DUE-DATE is ignored, only the +date part is considered." + (unless due-date + (setq due-date (current-time))) + (setq due-date (time-add due-date 86400)) + (let* ((gregorian-date (dashboard-timestamp-to-gregorian-date timestamp)) + (gregorian-due-date (dashboard-timestamp-to-gregorian-date due-date))) + (calendar-date-compare (list gregorian-date) + (list gregorian-due-date)))) + +(defun dashboard-get-agenda () + "Get agenda items for today or for a week from now." + (org-compile-prefix-format 'agenda) + (let ((due-date nil)) + (if (and (boundp 'show-week-agenda-p) show-week-agenda-p) + (setq due-date (time-add (current-time) (* 86400 7))) + (setq due-date nil) + ) + (let* ((filtered-entries nil)) + (org-map-entries + (lambda () + (let* ((schedule-time (org-get-scheduled-time (point))) + (deadline-time (org-get-deadline-time (point))) + (item (org-agenda-format-item + (format-time-string "%Y-%m-%d" schedule-time) + (org-get-heading t t) + (org-outline-level) + (org-get-category) + (org-get-tags) + t)) + (loc (point)) + (file (buffer-file-name))) + (if (or (equal dashboard-org-agenda-categories nil) + (member (org-get-category) dashboard-org-agenda-categories)) + (when (and (not (org-entry-is-done-p)) + (or (and schedule-time (dashboard-date-due-p schedule-time due-date)) + (and deadline-time (dashboard-date-due-p deadline-time due-date)))) + (setq filtered-entries + (append filtered-entries + (list (list item schedule-time deadline-time loc file)))))))) + nil + 'agenda) + filtered-entries))) + +(defun dashboard-insert-agenda (list-size) + "Add the list of LIST-SIZE items of agenda." + (require 'org-agenda) + (require 'calendar) + (let ((agenda (dashboard-get-agenda))) + (dashboard-insert-section + (or (and (boundp 'show-week-agenda-p) show-week-agenda-p "Agenda for the coming week:") + "Agenda for today:") + agenda + list-size + "a" + `(lambda (&rest ignore) + (let ((buffer (find-file-other-window (nth 4 ',el)))) + (with-current-buffer buffer + (goto-char (nth 3 ',el))) + (switch-to-buffer buffer))) + (format "%s" (nth 0 el))))) + +;; +;; Registers +;; +(defun dashboard-insert-registers (list-size) + "Add the list of LIST-SIZE items of registers." + (require 'register) + (dashboard-insert-section + "Registers:" + register-alist + list-size + "e" + (lambda (&rest _ignore) (jump-to-register (car el))) + (format "%c - %s" (car el) (register-describe-oneline (car el))))) + +(provide 'dashboard-widgets) +;;; dashboard-widgets.el ends here diff --git a/elpa/dashboard-20191210.1041/dashboard-widgets.elc b/elpa/dashboard-20191210.1041/dashboard-widgets.elc new file mode 100644 index 0000000000000000000000000000000000000000..acf40eaf6ef1fd1efa3cb8f75a78d00ef65245af GIT binary patch literal 26001 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 literal 0 HcmV?d00001 diff --git a/elpa/dashboard-20191210.1041/dashboard.el b/elpa/dashboard-20191210.1041/dashboard.el new file mode 100644 index 00000000..b55f0ea2 --- /dev/null +++ b/elpa/dashboard-20191210.1041/dashboard.el @@ -0,0 +1,254 @@ +;;; dashboard.el --- A startup screen extracted from Spacemacs -*- lexical-binding: t -*- + +;; Copyright (c) 2016-2019 Rakan Al-Hneiti & Contributors +;; +;; Author: Rakan Al-Hneiti +;; URL: https://github.com/emacs-dashboard/emacs-dashboard +;; +;; This file is not part of GNU Emacs. +;; +;;; License: GPLv3 +;; +;; Created: October 05, 2016 +;; Package-Version: 1.7.0-SNAPSHOT +;; Keywords: startup, screen, tools, dashboard +;; Package-Requires: ((emacs "25.3") (page-break-lines "0.11")) +;;; Commentary: + +;; An extensible Emacs dashboard, with sections for +;; bookmarks, projectile projects, org-agenda and more. + +;;; Code: + +(require 'seq) +(require 'page-break-lines) +(require 'recentf) + +(require 'dashboard-widgets) + +;; Custom splash screen +(defvar dashboard-mode-map + (let ((map (make-sparse-keymap))) + (define-key map (kbd "C-p") 'dashboard-previous-line) + (define-key map (kbd "C-n") 'dashboard-next-line) + (define-key map (kbd "") 'dashboard-previous-line) + (define-key map (kbd "") 'dashboard-next-line) + (define-key map (kbd "k") 'dashboard-previous-line) + (define-key map (kbd "j") 'dashboard-next-line) + (define-key map [tab] 'widget-forward) + (define-key map (kbd "C-i") 'widget-forward) + (define-key map [backtab] 'widget-backward) + (define-key map (kbd "RET") 'dashboard-return) + (define-key map [down-mouse-1] 'widget-button-click) + (define-key map (kbd "g") #'dashboard-refresh-buffer) + (define-key map (kbd "}") #'dashboard-next-section) + (define-key map (kbd "{") #'dashboard-previous-section) + map) + "Keymap for dashboard mode.") + +(define-derived-mode dashboard-mode special-mode "Dashboard" + "Dashboard major mode for startup screen. +\\ +" + :group 'dashboard + :syntax-table nil + :abbrev-table nil + (whitespace-mode -1) + (linum-mode -1) + (page-break-lines-mode 1) + (setq inhibit-startup-screen t) + (setq buffer-read-only t + truncate-lines t)) + +(defgroup dashboard nil + "Extensible startup screen." + :group 'applications) + +(defcustom dashboard-center-content nil + "Whether to center content within the window." + :type 'boolean + :group 'dashboard) + +(defconst dashboard-buffer-name "*dashboard*" + "Dashboard's buffer name.") + +(defvar dashboard--section-starts nil + "List of section starting positions.") + +(defun dashboard-previous-section () + "Navigate back to previous section." + (interactive) + (let ((current-section-start nil) + (current-position (point)) + (previous-section-start nil)) + (dolist (elt dashboard--section-starts) + (when (and current-section-start + (not previous-section-start)) + (setq previous-section-start elt)) + (when (and (not current-section-start) + (< elt current-position)) + (setq current-section-start elt))) + (goto-char (if (eq current-position current-section-start) + previous-section-start + current-section-start)))) + +(defun dashboard-next-section () + "Navigate forward to next section." + (interactive) + (let ((current-position (point)) + (next-section-start nil) + (section-starts (reverse dashboard--section-starts))) + (dolist (elt section-starts) + (when (and (not next-section-start) + (> elt current-position)) + (setq next-section-start elt))) + (when next-section-start + (goto-char next-section-start)))) + +(defun dashboard-previous-line (arg) + "Move point up and position it at that line’s item. +Optional prefix ARG says how many lines to move; default is one line." + (interactive "^p") + (dashboard-next-line (- arg))) + +(defun dashboard-next-line (arg) + "Move point down and position it at that line’s item. +Optional prefix ARG says how many lines to move; default is one line." + ;; code heavily inspired by `dired-next-line' + (interactive "^p") + (let ((line-move-visual nil) + (goal-column nil)) + (line-move arg t)) + ;; We never want to move point into an invisible line. Dashboard doesn’t + ;; use invisible text currently but when it does we’re ready! + (while (and (invisible-p (point)) + (not (if (and arg (< arg 0)) (bobp) (eobp)))) + (forward-char (if (and arg (< arg 0)) -1 1))) + (beginning-of-line-text)) + +(defun dashboard-return () + "Hit return key in dashboard buffer." + (interactive) + (let ((start-ln (line-number-at-pos)) + (fd-cnt 0) + (diff-line nil) + (entry-pt nil)) + (save-excursion + (while (and (not diff-line) + (not (= (point) (point-min))) + (not (get-char-property (point) 'button)) + (not (= (point) (point-max)))) + (forward-char 1) + (setq fd-cnt (1+ fd-cnt)) + (unless (= start-ln (line-number-at-pos)) + (setq diff-line t))) + (unless (= (point) (point-max)) + (setq entry-pt (point)))) + (when (= fd-cnt 1) + (setq entry-pt (1- (point)))) + (if entry-pt + (widget-button-press entry-pt) + (call-interactively #'widget-button-press)))) + +(defun dashboard-maximum-section-length () + "For the just-inserted section, calculate the length of the longest line." + (let ((max-line-length 0)) + (save-excursion + (dashboard-previous-section) + (while (not (eobp)) + (setq max-line-length + (max max-line-length + (- (line-end-position) (line-beginning-position)))) + (forward-line))) + max-line-length)) + +(defun dashboard-insert-startupify-lists () + "Insert the list of widgets into the buffer." + (interactive) + (let ((buffer-exists (buffer-live-p (get-buffer dashboard-buffer-name))) + (recentf-is-on (recentf-enabled-p)) + (origial-recentf-list recentf-list) + (dashboard-num-recents (or (cdr (assoc 'recents dashboard-items)) 0)) + (max-line-length 0)) + ;; disable recentf mode, + ;; so we don't flood the recent files list with org mode files + ;; do this by making a copy of the part of the list we'll use + ;; let dashboard widgets change that + ;; then restore the orginal list afterwards + ;; (this avoids many saves/loads that would result from + ;; disabling/enabling recentf-mode) + (if recentf-is-on + (setq recentf-list (seq-take recentf-list dashboard-num-recents))) + (when (or (not (eq dashboard-buffer-last-width (window-width))) + (not buffer-exists)) + (setq dashboard-banner-length (window-width) + dashboard-buffer-last-width dashboard-banner-length) + (with-current-buffer (get-buffer-create dashboard-buffer-name) + (let ((buffer-read-only nil)) + (erase-buffer) + (dashboard-insert-banner) + (dashboard-insert-page-break) + (setq dashboard--section-starts nil) + (mapc (lambda (els) + (let* ((el (or (car-safe els) els)) + (list-size + (or (cdr-safe els) + dashboard-items-default-length)) + (item-generator + (cdr-safe (assoc el dashboard-item-generators)))) + (add-to-list 'dashboard--section-starts (point)) + (funcall item-generator list-size) + (setq max-line-length + (max max-line-length (dashboard-maximum-section-length))) + (dashboard-insert-page-break))) + dashboard-items) + (when dashboard-center-content + (goto-char (car (last dashboard--section-starts))) + (let ((margin (floor (/ (max (- (window-width) max-line-length) 0) 2)))) + (while (not (eobp)) + (and (not (eq ? (char-after))) + (insert (make-string margin ?\ ))) + (forward-line 1)))) + (dashboard-insert-footer)) + (dashboard-mode) + (goto-char (point-min)))) + (if recentf-is-on + (setq recentf-list origial-recentf-list)))) + +(add-hook 'window-setup-hook + (lambda () + (add-hook 'window-size-change-functions 'dashboard-resize-on-hook) + (dashboard-resize-on-hook))) + +(defun dashboard-refresh-buffer () + "Refresh buffer." + (interactive) + (kill-buffer dashboard-buffer-name) + (dashboard-insert-startupify-lists) + (switch-to-buffer dashboard-buffer-name)) + +(defun dashboard-resize-on-hook (&optional _) + "Re-render dashboard on window size change." + (let ((space-win (get-buffer-window dashboard-buffer-name)) + (frame-win (frame-selected-window))) + (when (and space-win + (not (window-minibuffer-p frame-win))) + (with-selected-window space-win + (dashboard-insert-startupify-lists))))) + +;;;###autoload +(defun dashboard-setup-startup-hook () + "Setup post initialization hooks. +If a command line argument is provided, +assume a filename and skip displaying Dashboard." + (when (< (length command-line-args) 2 ) + (add-hook 'after-init-hook (lambda () + ;; Display useful lists of items + (dashboard-insert-startupify-lists))) + (add-hook 'emacs-startup-hook '(lambda () + (switch-to-buffer "*dashboard*") + (goto-char (point-min)) + (redisplay))))) + +(provide 'dashboard) +;;; dashboard.el ends here diff --git a/elpa/dashboard-20191210.1041/dashboard.elc b/elpa/dashboard-20191210.1041/dashboard.elc new file mode 100644 index 0000000000000000000000000000000000000000..2e551e64245f117261302a2f6a2f99831184714f GIT binary patch literal 7636 zcmd5>d2bun5vSy%4viYA8>bG6CZknsk*-(Ri=-2$iCo)BjHU??rwtHOt(N2?xfZ#* z-d##of&l#*{d)Z*{ms0$2X)l>vjQmYzGL3JIev5S;nS}k|E|?)wI4owNRN|c8ZFdB zUZR+uF2iw7M=HysBqp!F>&wh>RLm({EGS8fXc_$&7MRX=+cNpxJj!VbDl|^wB8=jk zR>jnQKyeb=kDfn%_Ke2!Fbl^8$ljMNVLYKcp>Y_;NkJn;izJ+=2}N;{7#=*2l8jWC zEh3fewmZC~GfGzRB&8k2Y}$s+Zkzb8^9gmrOigKRk~*$UorQ{LxWU>?x7(%99+jK( zB8%dgy-<0cuCF7@^R053$}(_e9o)%x=s3)AV=X_LVpt2$^O^BQh}&AU{b9E&Qi8BA z_-nV@ozY35>~S(tWDR}C!N=VidM-ck$7{a$&6fZ#&cLDN~GDW$1MQJ!w_9#=~ zp}mM=l~bn1DlVop3G?|V3A2fP98G4b$oI+Xwzv1Z2lN+pvJ6wXMzxBT;Ar=Qc4wld zM`703&J#ATKg~HY>l@56KK{13gNy_i>8*|Q&#W1oULzt{qvN_~*5E96eGSe!HPXXK zzj?ZgvplCc;(@Z~t&R8?3D!nH$6KT0fsSwJcwkPeV;LSQJ5R$bSN5S6ErbYV@Ecig zTMc2RnL3J+RW8aR>qc`fR<8>^{$iEx(~C)R9Pg8LXp!|2S}(%UK51Rru)t%emaMlh zF$%|r%}IXOv%hYV&s4F>Volawf(K>06~WP}DB!{4MKnGnYqq{`nyGwlk5<#Ef!;>abyYLHPrWX6wm+m@>iGd&W&98aY+Me8?MLBgq3lUAUM=BC0)LdQ3bMXr z&azcZ;S>%}m{bfT^rUn(?L@=)>x9xQ0hJ~DW4>Ax6iumM>@4XMo&^sX<#vbhK{%NR z2Rjt5ie!mn#{l6I8b$FWr>NKk>IwQ{W09?txG%%>8r%79*CK@5?EOr^Ovg|lq zs)k{*1okPoP%8oeXDyx8c#)QFlnSVn1SJGpr50FyXH;Vb846q%D+TY)xkxF-bJUcs z0D(yg&uie^!8(nd-KM4T-65JRI#LsD3UFp9nNsm?d-zGUUDJewKSg|a2J@OsL`Q@G8OA4~VK#vr zXfJ#T(Ss&;JG6{u^MdB#kzy0Q-xh0=g?NR@%$2s3Q4A#PhNehq_41YR%kDqlM!7`BDS)Zrv7mh?ec1fpX$DJ z_+_;9K-ue6++ex;&Mn4_cW-w&3g9!~133In)FM35I%D6gofLb~t*`-CR z!o;X@WW37Qrfhv4yE#XO`t5ig6$;U9j3j{l#C8dZ#!5TFne;=iaoGf$5?W_hBP~EI z9>ctJ-m*`96CB)+oPL)B!2bEz0A>OC2!=q@%NW`fPOQ6gx%Hs^} zGk{aBE03wb$30+MxW<0Y;L>gJ)81u%zSY{qS8z*)hF;&h#KXbRl7Y+L^BVKQvsX4A z;j52Pk3W}rm9uf_PrNKJG#szj+8kj-;G=X^yX2~I`F$Fc_xA>F=?0K+uNFd?{6P+! ze!WQsYblzTm)srq_pUMEK>%6^B;4*@0-wQq@_gm*d<*@|cfGuR*Q@%jSkv2SZTzD9 zAsymM4yi_U&z|qq_jLV${+b|$r3vaoLcHW!u(Tn>Kne?3I{tCB^PhkHo8zKd?zX={ zv6^t~g371SYkKtU7nFx5IfC9X02NVGmq!rV67(N(Dilg$mQxa=CbE3 zx$EA35BB48@dw9Xi@%4*-T@22@0V8ZzptN=ev8+<-%2p=eb8FsE2x(_>&x(pz{@LL zj^@sa>GSI_=69Fy%#Jim5Fp3NVzrD#eF!*5%07zn70iHvgq0+Nh@Mf52?laIC5MBU zi&n%eiev5sBvT1Ob^&)n5^R(eH~@xPSpc~&VSlEK;?fSFTY;j1(~E$}?5fb6a76?u z#td;lZ-YhRwhq+a^aJMn1N;;5%FLvm>4``-zY}!2gjEj7Bpi}U9e653n0K{xpf`Qo zI^e;L?k47Yywrc%I(RN)ngPfEhW8FOScBfTc;C8GWau`4WWI3%RVGDc^? z=8lhzf+tm3fr3R!NywKY6L%gEN2Iuf^B^bTaA(7}6*q~HaW774EC>R>fq8>~K1U|X zaqT5?Z*0nO06Iq|X5435;}v&bWRYq7APDi6MH0^xVv;!a1@62IUq?%%GG!1l6e=x2 zHk@j(#kr0cEs9E37!*hN=hF}ST8L282`^&lU1@b?k+xE&wh_q4RR3j^6tSv!!UEMP zzl_wDS&d5`P+8^!$LR`!1U-5tV$pXtLD+PBbc>CJp;OF@j8hA?OiQEb3A`akwNc7J zisx%vTWl0>eL9TU3Gwl+53NVIaQ`No3nyCsV-6nvANV~O#+QcH&EXW!J(6(PY3WGn zxjkOdW3jro-pTOXzqa*C6rx=lgfSBX7I0!;GJul!y!*y@s zbv-XI1%XuPhY{RG_cEo>H|;&qP{Xn~2s|m?jG<6&-9^G*4z>DW)uMEq>l^W)r(rvq7~a@ z8l}M3r|p@7GD2)@s;@#MNuzUA=Pdbp=LNu3FEDbg<;NgvK@2fxI8VQNjy4e+2Td0V zc=pKkv~YEAoP3Nl&NJkuNy3e<`WUGQjRn>9YdwGZ9`($69fT66Op$udM^!%9DVt)n zqbnQGLk~sQk0m;>Ds(7?ibXMu6yj3V_HuXhBU4`UX&BB3r!Nmz9hwbZ@x3! z(dqpWn2CgO>$B=5*xUm0*DXL`FJ$DpS2)gi4B@W-Av6kbcY}>R{O@Tj$5Wr~ndIev z2(bY~TK_c7Q0&5n7VuQG`pl>?jwM=K#*|ZzoGL>(VcR2xdP`w#F+a0Y8Z|W>>An`* zBKNh_?7B8`wiDooC!BO zc)Gc`+kQ5skbmJqsWg$CiNb6q4RG#MBe^?@@T1-RHjoITSj#^GN`#W%_YNbpL!&%J zXKbw_eo@My{kUv|Nn{gux%LI5=W?~sdz&qW(=XlWshk@lx^0XR(Z1nYr|{r9hX5")) diff --git a/elpa/leuven-theme-20190831.1008/leuven-theme.el b/elpa/leuven-theme-20191211.1608/leuven-theme.el similarity index 99% rename from elpa/leuven-theme-20190831.1008/leuven-theme.el rename to elpa/leuven-theme-20191211.1608/leuven-theme.el index 2d1f7460..be04efef 100644 --- a/elpa/leuven-theme-20190831.1008/leuven-theme.el +++ b/elpa/leuven-theme-20191211.1608/leuven-theme.el @@ -4,7 +4,7 @@ ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")> ;; URL: https://github.com/fniessen/emacs-leuven-theme -;; Version: 20190831.1207 +;; Version: 20191211.1707 ;; Keywords: color theme ;; This file is part of GNU Emacs. @@ -364,10 +364,11 @@ more...") `(bbdb-field-name ((,class (:weight bold :foreground "steel blue")))) `(bbdb-field-value ((,class (:foreground "steel blue")))) `(bbdb-name ((,class (:underline t :foreground "#FF6633")))) - `(bmkp-light-fringe-autonamed ((,class (:foreground "#5A5A5A" :background "#D4D4D4")))) `(bmkp-light-autonamed ((,class (:background "#F0F0F0")))) + `(bmkp-light-fringe-autonamed ((,class (:foreground "#5A5A5A" :background "#D4D4D4")))) `(bmkp-light-fringe-non-autonamed ((,class (:foreground "#FFFFCC" :background "#01FFFB")))) ; default `(bmkp-light-non-autonamed ((,class (:background "#BFFFFE")))) + `(bmkp-no-local ((,class (:background "pink")))) `(browse-kill-ring-separator-face ((,class (:foreground "red")))) `(calendar-month-header ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC")))) `(calendar-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFFCC")))) diff --git a/elpa/page-break-lines-20190519.2238/page-break-lines-autoloads.el b/elpa/page-break-lines-20190519.2238/page-break-lines-autoloads.el new file mode 100644 index 00000000..49e25534 --- /dev/null +++ b/elpa/page-break-lines-20190519.2238/page-break-lines-autoloads.el @@ -0,0 +1,89 @@ +;;; page-break-lines-autoloads.el --- automatically extracted autoloads +;; +;;; Code: + +(add-to-list 'load-path (directory-file-name + (or (file-name-directory #$) (car load-path)))) + + +;;;### (autoloads nil "page-break-lines" "page-break-lines.el" (0 +;;;;;; 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. + +In Page Break mode, page breaks (^L characters) are displayed as a +horizontal line of `page-break-lines-char' characters. + +\(fn &optional ARG)" t nil) + +(define-obsolete-function-alias 'turn-on-page-break-lines-mode 'page-break-lines-mode) + +(autoload 'page-break-lines-mode-maybe "page-break-lines" "\ +Enable `page-break-lines-mode' in the current buffer if desired. +When `major-mode' is listed in `page-break-lines-modes', then +`page-break-lines-mode' will be enabled. + +\(fn)" nil nil) + +(defvar global-page-break-lines-mode nil "\ +Non-nil if Global Page-Break-Lines mode is enabled. +See the `global-page-break-lines-mode' command +for a description of this minor mode. +Setting this variable directly does not take effect; +either customize it (see the info node `Easy Customization') +or call the function `global-page-break-lines-mode'.") + +(custom-autoload 'global-page-break-lines-mode "page-break-lines" nil) + +(autoload 'global-page-break-lines-mode "page-break-lines" "\ +Toggle Page-Break-Lines mode in all buffers. +With prefix ARG, enable Global Page-Break-Lines mode if ARG is positive; +otherwise, disable it. If called from Lisp, enable the mode if +ARG is omitted or nil. + +Page-Break-Lines mode is enabled in all buffers where +`page-break-lines-mode-maybe' would do it. +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"))) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; coding: utf-8 +;; End: +;;; page-break-lines-autoloads.el ends here 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 new file mode 100644 index 00000000..8d71ac4f --- /dev/null +++ b/elpa/page-break-lines-20190519.2238/page-break-lines-pkg.el @@ -0,0 +1,2 @@ +;;; -*- 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.el b/elpa/page-break-lines-20190519.2238/page-break-lines.el new file mode 100644 index 00000000..c096a7ef --- /dev/null +++ b/elpa/page-break-lines-20190519.2238/page-break-lines.el @@ -0,0 +1,185 @@ +;;; page-break-lines.el --- Display ^L page breaks as tidy horizontal lines + +;; Copyright (C) 2012-2015 Steve Purcell + +;; Author: Steve Purcell +;; URL: https://github.com/purcell/page-break-lines +;; Package-Version: 20190519.2238 +;; Package-X-Original-Version: 0 +;; Package-Requires: ((emacs "24.4")) +;; Keywords: convenience, faces + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Commentary: + +;; This library provides a global mode which displays form feed +;; characters as horizontal rules. + +;; Install from Melpa or Marmalade, or add to `load-path' and use +;; (require 'page-break-lines). + +;; Use `page-break-lines-mode' to enable the mode in specific buffers, +;; or customize `page-break-lines-modes' and enable the mode globally with +;; `global-page-break-lines-mode'. + +;; Issues and limitations: + +;; If `page-break-lines-char' is displayed at a different width to +;; regular characters, the rule may be either too short or too long: +;; rules may then wrap if `truncate-lines' is nil. On some systems, +;; Emacs may erroneously choose a different font for the page break +;; symbol, which choice can be overridden using code such as: + +;; (set-fontset-font "fontset-default" +;; (cons page-break-lines-char page-break-lines-char) +;; (face-attribute 'default :family)) + +;; Use `describe-char' on a page break char to determine whether this +;; is the case. + +;; Additionally, the use of `text-scale-increase' or +;; `text-scale-decrease' will cause the rule width to be incorrect, +;; because the reported window width (in characters) will continue to +;; be the width in the frame's default font, not the scaled font used to +;; display the rule. + +;; Adapted from code http://www.emacswiki.org/emacs/PageBreaks + +;;; Code: + +(defgroup page-break-lines nil + "Display ugly ^L page breaks as tidy horizontal lines." + :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. +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 'page-break-lines) + + + +;;;###autoload +(define-minor-mode page-break-lines-mode + "Toggle Page Break Lines mode. + +In Page Break mode, page breaks (^L characters) are displayed as a +horizontal line of `page-break-lines-char' characters." + :lighter page-break-lines-lighter + :group 'page-break-lines + (page-break-lines--update-display-tables)) + +;;;###autoload +(define-obsolete-function-alias 'turn-on-page-break-lines-mode 'page-break-lines-mode) + +(dolist (hook '(window-configuration-change-hook + window-size-change-functions + after-setting-font-hook + display-line-numbers-mode-hook)) + (add-hook hook 'page-break-lines--update-display-tables)) + + + +(defun page-break-lines--update-display-table (window) + "Modify a display-table that displays page-breaks prettily. +If the buffer inside WINDOW has `page-break-lines-mode' enabled, +its display table will be modified as necessary." + (with-current-buffer (window-buffer window) + (with-selected-window window + (if page-break-lines-mode + (progn + (unless buffer-display-table + (setq buffer-display-table (make-display-table))) + (let ((default-height (face-attribute 'default :height nil 'default))) + (set-face-attribute 'page-break-lines nil :height default-height) + (let* ((cwidth (char-width page-break-lines-char)) + (wwidth-pix (- (window-width nil t) + (if (bound-and-true-p display-line-numbers) + (line-number-display-width t) + 0))) + (width (- (/ wwidth-pix (frame-char-width) cwidth) + (if (display-graphic-p) 0 1))) + (width (if page-break-lines-max-width + (min width page-break-lines-max-width) + width)) + (glyph (make-glyph-code page-break-lines-char 'page-break-lines)) + (new-display-entry (vconcat (make-list width glyph)))) + (unless (equal new-display-entry (elt buffer-display-table ?\^L)) + (aset buffer-display-table ?\^L new-display-entry))))) + (when (and (apply 'derived-mode-p page-break-lines-modes) + buffer-display-table) + (aset buffer-display-table ?\^L nil)))))) + +(defun page-break-lines--update-display-tables (&optional frame) + "Function called for updating display table in windows of FRAME." + (unless (minibufferp) + (mapc 'page-break-lines--update-display-table (window-list frame 'no-minibuffer)))) + + + +;;;###autoload +(defun page-break-lines-mode-maybe () + "Enable `page-break-lines-mode' in the current buffer if desired. +When `major-mode' is listed in `page-break-lines-modes', then +`page-break-lines-mode' will be enabled." + (if (and (not (minibufferp)) + (apply 'derived-mode-p page-break-lines-modes)) + (page-break-lines-mode 1))) + +;;;###autoload +(define-global-minor-mode global-page-break-lines-mode + page-break-lines-mode page-break-lines-mode-maybe + :require 'page-break-lines + :group 'page-break-lines) + + +(provide 'page-break-lines) + +;; Local Variables: +;; coding: utf-8 +;; checkdoc-minor-mode: t +;; End: + +;;; page-break-lines.el ends here diff --git a/elpa/page-break-lines-20190519.2238/page-break-lines.elc b/elpa/page-break-lines-20190519.2238/page-break-lines.elc new file mode 100644 index 0000000000000000000000000000000000000000..91fa9716b4a86dfd5146b6a6fbbe819b068635ea GIT binary patch literal 9964 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 EFN7Ycp8x;= literal 0 HcmV?d00001 diff --git a/elpa/request-20191127.1554/request-pkg.el b/elpa/request-20191127.1554/request-pkg.el deleted file mode 100644 index 47f03166..00000000 --- a/elpa/request-20191127.1554/request-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "request" "20191127.1554" "Compatible layer for URL request in Emacs" '((emacs "24.4")) :commit "7eff9e7cc2809f41be4d6b9f732e2b06adb42628" :authors '(("Takafumi Arakaki ")) :maintainer '("Takafumi Arakaki ") :url "https://github.com/tkf/emacs-request") diff --git a/elpa/request-20191127.1554/request-autoloads.el b/elpa/request-20191211.2051/request-autoloads.el similarity index 100% rename from elpa/request-20191127.1554/request-autoloads.el rename to elpa/request-20191211.2051/request-autoloads.el diff --git a/elpa/request-20191211.2051/request-pkg.el b/elpa/request-20191211.2051/request-pkg.el new file mode 100644 index 00000000..73508a3a --- /dev/null +++ b/elpa/request-20191211.2051/request-pkg.el @@ -0,0 +1,2 @@ +;;; -*- 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-20191127.1554/request.el b/elpa/request-20191211.2051/request.el similarity index 96% rename from elpa/request-20191127.1554/request.el rename to elpa/request-20191211.2051/request.el index 4149dc4f..2a27d8af 100644 --- a/elpa/request-20191127.1554/request.el +++ b/elpa/request-20191211.2051/request.el @@ -6,7 +6,7 @@ ;; Author: Takafumi Arakaki ;; URL: https://github.com/tkf/emacs-request -;; Package-Version: 20191127.1554 +;; Package-Version: 20191211.2051 ;; Package-Requires: ((emacs "24.4")) ;; Version: 0.3.2 @@ -632,6 +632,12 @@ then send to PARSER." (setf (request-response-data response) (if parser (funcall parser) (buffer-string)))))))) +(defsubst request-url-file-p (url) + "Return non-nil if URL looks like a file URL." + (let ((scheme (and (stringp url) (url-type (url-generic-parse-url url))))) + (and (stringp scheme) + (not (string-match-p "^http" scheme))))) + (cl-defun request--callback (buffer &key parser success error complete @@ -653,12 +659,8 @@ then send to PARSER." (data (request-response-data response)) (done-p (request-response-done-p response))) (let* ((response-url (request-response-url response)) - (scheme (and (stringp response-url) - (url-type (url-generic-parse-url response-url)))) - (curl-file-p (and (stringp scheme) - (not (string-match-p "^http" scheme)) - (eq (request-response--backend response) 'curl)))) - ;; curl does not add a header for say file:///foo/bar + (curl-file-p (and (eq (request-response--backend response) 'curl) + (request-url-file-p response-url)))) (unless curl-file-p (request--clean-header response) (request--cut-header response))) @@ -902,15 +904,15 @@ Currently it is used only for testing.") (cl-defun request--curl-command (url &key type data headers response files* unix-socket encoding &allow-other-keys - &aux - (cookie-jar (convert-standard-filename - (expand-file-name (request--curl-cookie-jar))))) + &aux (cookie-jar (convert-standard-filename + (expand-file-name (request--curl-cookie-jar))))) "BUG: Simultaneous requests are a known cause of cookie-jar corruption." (append - (list request-curl "--silent" "--include" - "--location" - "--cookie" cookie-jar "--cookie-jar" cookie-jar - "--write-out" request--curl-write-out-template) + (list request-curl + "--silent" "--location" + "--cookie" cookie-jar "--cookie-jar" cookie-jar) + (unless (request-url-file-p url) + (list "--include" "--write-out" request--curl-write-out-template)) request-curl-options (when (plist-get (request--curl-capabilities) :compression) (list "--compressed")) (when unix-socket (list "--unix-socket" unix-socket)) @@ -1058,11 +1060,12 @@ removed from the buffer before it is shown to the parser function. (process-put proc :request-response response) (set-process-coding-system proc 'no-conversion 'no-conversion) (set-process-query-on-exit-flag proc nil) - (set-process-sentinel proc 'request--curl-callback) - (when semaphore - (set-process-sentinel proc (lambda (&rest args) - (apply #'request--curl-callback args) - (apply semaphore args)))))) + (let ((callback-2 (apply-partially #'request--curl-callback url))) + (if semaphore + (set-process-sentinel proc (lambda (&rest args) + (apply callback-2 args) + (apply semaphore args))) + (set-process-sentinel proc callback-2))))) (defun request--curl-read-and-delete-tail-info () "Read a sexp at the end of buffer and remove it and preceding character. @@ -1104,11 +1107,13 @@ See \"set-cookie-av\" in http://www.ietf.org/rfc/rfc2965.txt") (when (looking-at-p "HTTP/1\\.[0-1] 200 Connection established") (delete-region (point) (progn (request--goto-next-body) (point))))) -(defun request--curl-preprocess () +(defun request--curl-preprocess (&optional url) "Pre-process current buffer before showing it to user." (let (history) (cl-destructuring-bind (&key num-redirects url-effective) - (request--curl-read-and-delete-tail-info) + (if (request-url-file-p url) + `(:num-redirects 0 :url-effective ,url) + (request--curl-read-and-delete-tail-info)) (goto-char (point-min)) (request--consume-100-continue) (request--consume-200-connection-established) @@ -1151,7 +1156,7 @@ START-URL is the URL requested." for response in (cdr history) do (setf (request-response-url response) url))) -(defun request--curl-callback (proc event) +(defun request--curl-callback (url proc event) (let* ((buffer (process-buffer proc)) (response (process-get proc :request-response)) (settings (request-response-settings response))) @@ -1168,7 +1173,7 @@ START-URL is the URL requested." (cl-destructuring-bind (&key code history error url-effective &allow-other-keys) (condition-case err (with-current-buffer buffer - (request--curl-preprocess)) + (request--curl-preprocess url)) ((debug error) (list :error err))) (request--curl-absolutify-location-history (plist-get settings :url) @@ -1205,7 +1210,12 @@ START-URL is the URL requested." settings) (let ((proc (get-buffer-process (request-response--buffer response)))) (auto-revert-set-timer) - (when auto-revert-use-notify (request-auto-revert-notify-rm-watch)) + (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))) (with-local-quit (cl-loop with iter = 0 until (or (>= iter 10) finished) diff --git a/elpa/request-20191127.1554/request.elc b/elpa/request-20191211.2051/request.elc similarity index 82% rename from elpa/request-20191127.1554/request.elc rename to elpa/request-20191211.2051/request.elc index cbb4554a219f7c991b475d3789287da9a6174a7a..aa6f3a7be324d34c82d79c344d3086bbfa3e65f7 100644 GIT binary patch delta 4120 zcmai1Yiu0V72bJxYyu_@PV6{N>{&aIIMF6E_s+eu8%l6uCr!#L4J1&qK^S`+R#~sj z?m8j-z(S&`grJ39M4UKEi}(R8Nei7qR0Ng!kVq)>AzG07kOHmL2xyyN3%k@Tche^x#X6{OPNxk=oUuZZCkH(i{s~VJt7c-S=d2+a#A$zJryDF~w{QZkBquH*g6qO6ZnTertCCaFiUtG2d%dYSC z+;(TRI??0OjjJx+FO+s=#)hiHckXm^?(*KH?kbmuIi`NGq*b1G&t-S)t45jeiE3f2 za8Fcrllk!Y*aZ2ZP%0KmQ6{>3VyH9{cRae>oX5Ga()m&C0J?rk88hwMgJ4sh2jVJn zRi1}oN_(O1ygU~^t{+J99~VZtx%PSxV3|w<rb#T_`+t-(zi4!iUoYgN)zRkI{u* zOWenj1HIs4k`C-N<{n0(HiDFisq{N(KQv9}qF#i`V^z%0yV44p)(!F+2J@Q?xONeFY8=haq2P6s&oQvHa% zYRkdpMyU23?6LySRKJ-PHWS>`w!L?-)sSDES#2=o%`j8=YGg*3hDDxI&&{-~oNGCa z6oPq{le(?Q1255~osR25=cW`c90upk*qlo1 z0}u;d7e;yrX7%d&?zOC2$aFX+pwp!pggCyt)v(UNfd>OTe!Z>!I@7grgFVZ`IP!BT zzav@1OQBe*wl&oN4+sjq2pgS?DJ~jfcK{2Rh6olK>5DW(Y$tp` zRd5soXS4Bv^9vxhM8bhCJq+X`Ji-egmcZf~WS6eeyCEMydEj5XAwP&fHp)a&TYWrvyBN*TPNfH9X!Cv;XVoh0~~QViLIzxsm(Hz8bc4IzFUJ1e}KG)Y)Nk!B)=KXTyoED zLK1&4<+Kbsm)4cj0oEF9aQKrc_a}?-3L(q+k;B5ql-1B%TeEaDsHWKjbj}Jz;Is~0 zkuNFFncw;;eO#S<%T?_!OLh8Ni`0>qA5iO$Fa4C>zViR|cDE;k9z9%~9EsG(@ga5M zctQ1aU#51QXz93Pa&$B*Cwyjje1!NwWnZNljj25+{-UmXd8LY88EE!v+(39d$i>gS z@}>;{&&l}VpUpR{EYHPH{`^_f4tzfs=U@M=X=QyszVeNVVG9w+_&aYdYq$lmp-AR? z8pw~!kZ_@oJo;}wU`zp&5F)_FFw~h&LDoULTu<4`_z4*s1ROTPs>>=Ucs2jLy!oV}K$;aeZo=!f=3%E^ALG0(+=C^c=VY$byBVF8H3k}#Ne5FFsw6?Yhrox2TU-NGA z3W_nhLzg7*+^r2lJs^wZc2Y)N7W#b77ilNmm{=tl*(twJ6JcaPT}K_qJWjB?cxoas zhX^&NAoDAzu0hX}Bhd6U24hOi`0Yf zG^_NxUFuiw98>S#zfe8(?v6|9RVzKD?%enG8nz#ZFn-`qqh{Jie@}9iarfN!jk{&* z4Fm3m?HjJYi9U6Zsg0`tgGL7*I$`L?;pqVry%)F%gcg2-E=a(y)N9OdHp*rVzXf-k zbe|?gm#J^QKVl53xo3oN8=l=NI7dDE<+(l4h53((d(p;YsH`sWLa=;3S1QAfO%6GLl8cq zP8RrePze}VHzbF&9XC;`8FXAShr-$wF`)NR+DIrc2K*%PL{Npgsw4nu9f?u>*PJ#@ zb0@J(0aC#eMuL5$Jee)PjhGOm7o@7jR+-d91qTQm@B&-~$U%+QGH=PZP@F)9(-Fzv&!3(8o zR2~|x7WPDH?^&rH`EI*f{OwkC>g-FG)LK-rP^r4=)eo1(C;r`UDE75p)%o!PE69b4 zfBX$w29n1oKi+QHQgU%@jb%(5b{ORNu{UhvxX}rwsS|!V8p56efPYyzx@$73RQu-q E2d2GFg#Z8m delta 3192 zcmZ`*X>47^753b@zK-K2n8dLYo7nH!S?q)tX1R06CL}m^KnYtxENbC8oBd4OxG%}G zO+*W|TJ;Y<+CNj{Cb8W}C}JrB!j(uXprxonVF{E*B2`IgD`+dFB8!S*wNa{mGxxnT z=_2c0pV`hibIy0ZIR~HgfBHTDrKLYePE0KG#s%kVW5HA`1+R!@7?Nx(r6SpR>oFb1 zl82a<5q=uWif)WsW5F4I9OGzHEFwYdsH8?Kt45PpDuzS6xf>Fvl(uzXYXqh8=G36w zISyNXHXbY))9gxPEC@>0D0GNT_{eq6Fg&Za7Q)J`b4Dsvl3>Daj`$M0u01cPZiBN- z6fu^HmTk4$VHBHz>4gmpmtf(>t2eA8X6tml>E7Su-D}0hdgu0@t9K2RcLnCz{c9-G z#H=}3Z_e$XLt4z=_h+@Tkr0T4K)52rGg1(kEX^VyGD2Xb3Tn!(#X@s)&w&mi%r_6T zc#@bcQ_9Dkh}k>2oK%?H!GcNhjz(Uzs4!5-6-zrUM>AZ{!WjkZ0ZmOLqvu>){lacA0>h!n=4;$;WMa#cKjr)Wi zBG_O~O*If^zL*kTs7?E{s)Pk?msYNxM}sPxrfX;r08UIUq4@Hi3Ojk7lY1-N!ei#h zbPE|VA5PcR--2AjUu?XkBA64mx=i0?E>1Ul4^xCKBt>)g%uVoe%k<(!K&u}M8Eq(G z2scvNYV$3U&F^L!w79Hrb4Au^L$Y`}DFyDO7;STqZ=>`p)=ykjSW}9kI$*42A)%K` zguxz@clhSjndV!2Vdje9!s**8ctbjg!R;l3&E;+X%bND>t-K!J+%wZ`?mUDj#Xca{ zXufl()!XM=%qFiLdeAd16ZIy1s>S2N%$#M(<4;{6zU~q%*>`v|^*JQ7@32lTKC_be zLPsiD@!WBba%{Np{5j&wPT7^5exa693E|R_&nmGNnbR*kl05j6$oHd2>d7Z5S(|+D zS|c=fN^L%WeTMQ*X})K5~hHgA(9uuh+@I~5{CsfPLU%+EbvV|o2^Eaml6P(%0iIW z;RBMee5_OoBbZSZ3eXm@EOtefNpK_r_EJUx_en6xcq{(tWiS&Jt*yQIAfOsQs~&@( zW>HYvZ>5f_c0i+4_6V>C0qU3AO{>ZdI+wiEAJDkd3J)wNgq&vY-e|)`mId=|U{=9n z9R}BI4Ca;9TGjMMEXw=M$zw~`ORcWTl#Xa+TWN;6*xSMpHxPU9ir9z2g5DL?h6Q!z z_%G(0AAh{S9C$l2=iXbrWXIUxV7{0e92(B&`gacu6&}uwJUTL(|GN3$?ZZ_=h5q5O zfxOxMPKWvDJ6maCXxPN>e$Bl3bZAb#d#&-_J7b!T_s(OP_O@l2HJPxhi}7UF@smDE zg^A?WU)K@JLzVQMIO6%hj!G7MbPDytb#neUBg79ol}L8}c4g%TdwZ6K%3eZcFcH~T zKqJb!6g7>AYRCB!Y>B*Sz>Dz>70ct+ zd&lx4qq$uFSaCSlzkPUk$M*hRlQ$8vxYj-^;P3Qx25Fh+K5f1J|D5Q{gqfkj&Y>Mc zqq$;!`#^4YVfaz=$4}d+5S>ZYXFCbikxq(#T2DMClb8Q|AEljACDo^MWUk<{qpxFb zTemXZf7RyYH=4{R|EL*ndx&Ll5$60rS-3Y29YpJfZaVpl-0QZN?zcUOn+81dJ5rExktqq%3CIEu zAF$fSp^dA>4q*4D9!2)`h>4p?YZHfN=crQk(4W2;xIG>m)4c8aiDyW|#QW%rx}Uh#eB%%E z&DK|{&8e3bPUZ-C-5k5P>}aD$y2<1&N>)+(RX^PMXSfsUsxgHrB$Y)lT7^`FMzW}q Date: Thu, 12 Dec 2019 21:32:28 +0100 Subject: [PATCH 4/4] Update display --- bundle/display.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bundle/display.el b/bundle/display.el index bcf4813b..7488b161 100644 --- a/bundle/display.el +++ b/bundle/display.el @@ -16,9 +16,7 @@ (when (eq system-type 'windows-nt) (add-to-list 'default-frame-alist '(undecorated . nil)) - (add-to-list 'default-frame-alist '(font . "Iosevka Term Slab-12")) - (when (string= (system-name) "XPS-8930") - (add-to-list 'default-frame-alist '(font . "Iosevka Term-10")))) + (add-to-list 'default-frame-alist '(font . "Iosevka Term Slab-12"))) (when (eq system-type 'gnu/linux) (when (display-graphic-p)