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 23a38356..7b38e0e1 100644 Binary files a/elpa/ein-20191201.1831/ein-completer.elc and b/elpa/ein-20191208.33/ein-completer.elc differ diff --git a/elpa/ein-20191201.1831/ein-connect.el b/elpa/ein-20191208.33/ein-connect.el similarity index 100% rename from elpa/ein-20191201.1831/ein-connect.el rename to elpa/ein-20191208.33/ein-connect.el diff --git a/elpa/ein-20191201.1831/ein-connect.elc b/elpa/ein-20191208.33/ein-connect.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-connect.elc rename to elpa/ein-20191208.33/ein-connect.elc diff --git a/elpa/ein-20191201.1831/ein-console.el b/elpa/ein-20191208.33/ein-console.el similarity index 100% rename from elpa/ein-20191201.1831/ein-console.el rename to elpa/ein-20191208.33/ein-console.el diff --git a/elpa/ein-20191201.1831/ein-console.elc b/elpa/ein-20191208.33/ein-console.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-console.elc rename to elpa/ein-20191208.33/ein-console.elc diff --git a/elpa/ein-20191201.1831/ein-contents-api.el b/elpa/ein-20191208.33/ein-contents-api.el similarity index 100% rename from elpa/ein-20191201.1831/ein-contents-api.el rename to elpa/ein-20191208.33/ein-contents-api.el diff --git a/elpa/ein-20191201.1831/ein-contents-api.elc b/elpa/ein-20191208.33/ein-contents-api.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-contents-api.elc rename to elpa/ein-20191208.33/ein-contents-api.elc diff --git a/elpa/ein-20191201.1831/ein-core.el b/elpa/ein-20191208.33/ein-core.el similarity index 100% rename from elpa/ein-20191201.1831/ein-core.el rename to elpa/ein-20191208.33/ein-core.el diff --git a/elpa/ein-20191201.1831/ein-core.elc b/elpa/ein-20191208.33/ein-core.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-core.elc rename to elpa/ein-20191208.33/ein-core.elc diff --git a/elpa/ein-20191201.1831/ein-dev.el b/elpa/ein-20191208.33/ein-dev.el similarity index 100% rename from elpa/ein-20191201.1831/ein-dev.el rename to elpa/ein-20191208.33/ein-dev.el diff --git a/elpa/ein-20191201.1831/ein-dev.elc b/elpa/ein-20191208.33/ein-dev.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-dev.elc rename to elpa/ein-20191208.33/ein-dev.elc diff --git a/elpa/ein-20191201.1831/ein-events.el b/elpa/ein-20191208.33/ein-events.el similarity index 100% rename from elpa/ein-20191201.1831/ein-events.el rename to elpa/ein-20191208.33/ein-events.el diff --git a/elpa/ein-20191201.1831/ein-events.elc b/elpa/ein-20191208.33/ein-events.elc similarity index 100% rename from elpa/ein-20191201.1831/ein-events.elc rename to elpa/ein-20191208.33/ein-events.elc diff --git a/elpa/ein-20191201.1831/ein-file.el b/elpa/ein-20191208.33/ein-file.el similarity index 100% rename from elpa/ein-20191201.1831/ein-file.el rename to elpa/ein-20191208.33/ein-file.el diff --git a/elpa/ein-20191201.1831/ein-file.elc b/elpa/ein-20191208.33/ein-file.elc similarity index 75% rename from elpa/ein-20191201.1831/ein-file.elc rename to elpa/ein-20191208.33/ein-file.elc index 28b07177..f7106e58 100644 Binary files a/elpa/ein-20191201.1831/ein-file.elc and b/elpa/ein-20191208.33/ein-file.elc differ 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 af9c4cbf..25dcedf2 100644 Binary files a/elpa/ein-20191201.1831/ein-pytools.elc and b/elpa/ein-20191208.33/ein-pytools.elc differ 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 ee0f5368..77c5cb7a 100644 Binary files a/elpa/ein-20191201.1831/ein-skewer.elc and b/elpa/ein-20191208.33/ein-skewer.elc differ 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 95c72276..8d8d88c4 100644 Binary files a/elpa/ein-20191201.1831/ein-worksheet.elc and b/elpa/ein-20191208.33/ein-worksheet.elc differ diff --git a/elpa/ein-20191201.1831/ein.el b/elpa/ein-20191208.33/ein.el similarity index 100% rename from elpa/ein-20191201.1831/ein.el rename to elpa/ein-20191208.33/ein.el diff --git a/elpa/ein-20191201.1831/ein.elc b/elpa/ein-20191208.33/ein.elc similarity index 100% rename from elpa/ein-20191201.1831/ein.elc rename to elpa/ein-20191208.33/ein.elc diff --git a/elpa/ein-20191201.1831/ein_inspector.py b/elpa/ein-20191208.33/ein_inspector.py similarity index 100% rename from elpa/ein-20191201.1831/ein_inspector.py rename to elpa/ein-20191208.33/ein_inspector.py diff --git a/elpa/ein-20191201.1831/ein_remote_safe.py b/elpa/ein-20191208.33/ein_remote_safe.py similarity index 100% rename from elpa/ein-20191201.1831/ein_remote_safe.py rename to elpa/ein-20191208.33/ein_remote_safe.py diff --git a/elpa/ein-20191201.1831/ob-ein.el b/elpa/ein-20191208.33/ob-ein.el similarity index 100% rename from elpa/ein-20191201.1831/ob-ein.el rename to elpa/ein-20191208.33/ob-ein.el diff --git a/elpa/ein-20191201.1831/ob-ein.elc b/elpa/ein-20191208.33/ob-ein.elc similarity index 100% rename from elpa/ein-20191201.1831/ob-ein.elc rename to elpa/ein-20191208.33/ob-ein.elc diff --git a/elpa/ein-20191201.1831/poly-ein.el b/elpa/ein-20191208.33/poly-ein.el similarity index 100% rename from elpa/ein-20191201.1831/poly-ein.el rename to elpa/ein-20191208.33/poly-ein.el diff --git a/elpa/ein-20191201.1831/poly-ein.elc b/elpa/ein-20191208.33/poly-ein.elc similarity index 100% rename from elpa/ein-20191201.1831/poly-ein.elc rename to elpa/ein-20191208.33/poly-ein.elc diff --git a/elpa/magit-20191128.1802/AUTHORS.md b/elpa/magit-20191210.1617/AUTHORS.md similarity index 100% rename from elpa/magit-20191128.1802/AUTHORS.md rename to elpa/magit-20191210.1617/AUTHORS.md diff --git a/elpa/magit-20191128.1802/LICENSE b/elpa/magit-20191210.1617/LICENSE similarity index 100% rename from elpa/magit-20191128.1802/LICENSE rename to elpa/magit-20191210.1617/LICENSE diff --git a/elpa/magit-20191128.1802/dir b/elpa/magit-20191210.1617/dir similarity index 100% rename from elpa/magit-20191128.1802/dir rename to elpa/magit-20191210.1617/dir diff --git a/elpa/magit-20191128.1802/git-rebase.el b/elpa/magit-20191210.1617/git-rebase.el similarity index 100% rename from elpa/magit-20191128.1802/git-rebase.el rename to elpa/magit-20191210.1617/git-rebase.el diff --git a/elpa/magit-20191128.1802/git-rebase.elc b/elpa/magit-20191210.1617/git-rebase.elc similarity index 97% rename from elpa/magit-20191128.1802/git-rebase.elc rename to elpa/magit-20191210.1617/git-rebase.elc index 5051e4d2..2b80d774 100644 Binary files a/elpa/magit-20191128.1802/git-rebase.elc and b/elpa/magit-20191210.1617/git-rebase.elc differ diff --git a/elpa/magit-20191128.1802/magit-apply.el b/elpa/magit-20191210.1617/magit-apply.el similarity index 100% rename from elpa/magit-20191128.1802/magit-apply.el rename to elpa/magit-20191210.1617/magit-apply.el diff --git a/elpa/magit-20191128.1802/magit-apply.elc b/elpa/magit-20191210.1617/magit-apply.elc similarity index 55% rename from elpa/magit-20191128.1802/magit-apply.elc rename to elpa/magit-20191210.1617/magit-apply.elc index 40e1d2c2..8b68625c 100644 Binary files a/elpa/magit-20191128.1802/magit-apply.elc and b/elpa/magit-20191210.1617/magit-apply.elc differ 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 b47c64ce..af423ffe 100644 Binary files a/elpa/magit-20191128.1802/magit-autorevert.elc and b/elpa/magit-20191210.1617/magit-autorevert.elc differ 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 f8283177..cd55c53a 100644 Binary files a/elpa/magit-20191128.1802/magit-bisect.elc and b/elpa/magit-20191210.1617/magit-bisect.elc differ 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 d14ebb66..c419d5a9 100644 Binary files a/elpa/magit-20191128.1802/magit-blame.elc and b/elpa/magit-20191210.1617/magit-blame.elc differ 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 ab012386..da2deb49 100644 Binary files a/elpa/magit-20191128.1802/magit-bookmark.elc and b/elpa/magit-20191210.1617/magit-bookmark.elc differ 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 d589df55..2fb16cce 100644 Binary files a/elpa/magit-20191128.1802/magit-branch.elc and b/elpa/magit-20191210.1617/magit-branch.elc differ 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 769973d5..b4383bed 100644 Binary files a/elpa/magit-20191128.1802/magit-clone.elc and b/elpa/magit-20191210.1617/magit-clone.elc differ 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 eedf01db..2b75604e 100644 Binary files a/elpa/magit-20191128.1802/magit-commit.elc and b/elpa/magit-20191210.1617/magit-commit.elc differ 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 68430c74..177de0eb 100644 Binary files a/elpa/magit-20191128.1802/magit-core.elc and b/elpa/magit-20191210.1617/magit-core.elc differ 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 e54b1056..7938d823 100644 Binary files a/elpa/magit-20191128.1802/magit-diff.elc and b/elpa/magit-20191210.1617/magit-diff.elc differ 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 6226afe9..11d7108f 100644 Binary files a/elpa/magit-20191128.1802/magit-ediff.elc and b/elpa/magit-20191210.1617/magit-ediff.elc differ diff --git a/elpa/magit-20191128.1802/magit-extras.el b/elpa/magit-20191210.1617/magit-extras.el similarity index 100% rename from elpa/magit-20191128.1802/magit-extras.el rename to elpa/magit-20191210.1617/magit-extras.el diff --git a/elpa/magit-20191128.1802/magit-extras.elc b/elpa/magit-20191210.1617/magit-extras.elc similarity index 92% rename from elpa/magit-20191128.1802/magit-extras.elc rename to elpa/magit-20191210.1617/magit-extras.elc index b2b841dc..108e72c1 100644 Binary files a/elpa/magit-20191128.1802/magit-extras.elc and b/elpa/magit-20191210.1617/magit-extras.elc differ diff --git a/elpa/magit-20191128.1802/magit-fetch.el b/elpa/magit-20191210.1617/magit-fetch.el similarity index 100% rename from elpa/magit-20191128.1802/magit-fetch.el rename to elpa/magit-20191210.1617/magit-fetch.el diff --git a/elpa/magit-20191128.1802/magit-fetch.elc b/elpa/magit-20191210.1617/magit-fetch.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-fetch.elc rename to elpa/magit-20191210.1617/magit-fetch.elc index dac6c214..f097d5af 100644 Binary files a/elpa/magit-20191128.1802/magit-fetch.elc and b/elpa/magit-20191210.1617/magit-fetch.elc differ diff --git a/elpa/magit-20191128.1802/magit-files.el b/elpa/magit-20191210.1617/magit-files.el similarity index 100% rename from elpa/magit-20191128.1802/magit-files.el rename to elpa/magit-20191210.1617/magit-files.el diff --git a/elpa/magit-20191128.1802/magit-files.elc b/elpa/magit-20191210.1617/magit-files.elc similarity index 98% rename from elpa/magit-20191128.1802/magit-files.elc rename to elpa/magit-20191210.1617/magit-files.elc index b53c4a49..647b637c 100644 Binary files a/elpa/magit-20191128.1802/magit-files.elc and b/elpa/magit-20191210.1617/magit-files.elc differ diff --git a/elpa/magit-20191128.1802/magit-git.el b/elpa/magit-20191210.1617/magit-git.el similarity index 100% rename from elpa/magit-20191128.1802/magit-git.el rename to elpa/magit-20191210.1617/magit-git.el diff --git a/elpa/magit-20191128.1802/magit-git.elc b/elpa/magit-20191210.1617/magit-git.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-git.elc rename to elpa/magit-20191210.1617/magit-git.elc index d826f509..00fd06d4 100644 Binary files a/elpa/magit-20191128.1802/magit-git.elc and b/elpa/magit-20191210.1617/magit-git.elc differ 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 56c7e850..75e57b3f 100644 Binary files a/elpa/magit-20191128.1802/magit-gitignore.elc and b/elpa/magit-20191210.1617/magit-gitignore.elc differ 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 424915fd..3b6d7f02 100644 Binary files a/elpa/magit-20191128.1802/magit-imenu.elc and b/elpa/magit-20191210.1617/magit-imenu.elc differ 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 9e95021f..e17e7a88 100644 Binary files a/elpa/magit-20191128.1802/magit-log.elc and b/elpa/magit-20191210.1617/magit-log.elc differ 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 540eee21..f6ed55f6 100644 Binary files a/elpa/magit-20191128.1802/magit-margin.elc and b/elpa/magit-20191210.1617/magit-margin.elc differ diff --git a/elpa/magit-20191128.1802/magit-merge.el b/elpa/magit-20191210.1617/magit-merge.el similarity index 100% rename from elpa/magit-20191128.1802/magit-merge.el rename to elpa/magit-20191210.1617/magit-merge.el diff --git a/elpa/magit-20191128.1802/magit-merge.elc b/elpa/magit-20191210.1617/magit-merge.elc similarity index 88% rename from elpa/magit-20191128.1802/magit-merge.elc rename to elpa/magit-20191210.1617/magit-merge.elc index 723a8abf..b2dcb3d4 100644 Binary files a/elpa/magit-20191128.1802/magit-merge.elc and b/elpa/magit-20191210.1617/magit-merge.elc differ 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 e9705b1f..c1e12e8a 100644 Binary files a/elpa/magit-20191128.1802/magit-mode.elc and b/elpa/magit-20191210.1617/magit-mode.elc differ 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 c0648b52..bbbefeef 100644 Binary files a/elpa/magit-20191128.1802/magit-notes.elc and b/elpa/magit-20191210.1617/magit-notes.elc differ 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 07691736..3eb98fe8 100644 Binary files a/elpa/magit-20191128.1802/magit-obsolete.elc and b/elpa/magit-20191210.1617/magit-obsolete.elc differ 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 27a1b687..8f9d0a76 100644 Binary files a/elpa/magit-20191128.1802/magit-patch.elc and b/elpa/magit-20191210.1617/magit-patch.elc differ 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 123983d3..4899a05b 100644 Binary files a/elpa/magit-20191128.1802/magit-process.elc and b/elpa/magit-20191210.1617/magit-process.elc differ diff --git a/elpa/magit-20191128.1802/magit-pull.el b/elpa/magit-20191210.1617/magit-pull.el similarity index 100% rename from elpa/magit-20191128.1802/magit-pull.el rename to elpa/magit-20191210.1617/magit-pull.el diff --git a/elpa/magit-20191128.1802/magit-pull.elc b/elpa/magit-20191210.1617/magit-pull.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-pull.elc rename to elpa/magit-20191210.1617/magit-pull.elc index bc4ac81c..a71d10fe 100644 Binary files a/elpa/magit-20191128.1802/magit-pull.elc and b/elpa/magit-20191210.1617/magit-pull.elc differ diff --git a/elpa/magit-20191128.1802/magit-push.el b/elpa/magit-20191210.1617/magit-push.el similarity index 100% rename from elpa/magit-20191128.1802/magit-push.el rename to elpa/magit-20191210.1617/magit-push.el diff --git a/elpa/magit-20191128.1802/magit-push.elc b/elpa/magit-20191210.1617/magit-push.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-push.elc rename to elpa/magit-20191210.1617/magit-push.elc index 5e1ee8ea..6368192f 100644 Binary files a/elpa/magit-20191128.1802/magit-push.elc and b/elpa/magit-20191210.1617/magit-push.elc differ diff --git a/elpa/magit-20191128.1802/magit-reflog.el b/elpa/magit-20191210.1617/magit-reflog.el similarity index 100% rename from elpa/magit-20191128.1802/magit-reflog.el rename to elpa/magit-20191210.1617/magit-reflog.el diff --git a/elpa/magit-20191128.1802/magit-reflog.elc b/elpa/magit-20191210.1617/magit-reflog.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-reflog.elc rename to elpa/magit-20191210.1617/magit-reflog.elc index 5d66b4b7..d5724725 100644 Binary files a/elpa/magit-20191128.1802/magit-reflog.elc and b/elpa/magit-20191210.1617/magit-reflog.elc differ 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 902ab96e..0f4f09b4 100644 Binary files a/elpa/magit-20191128.1802/magit-refs.elc and b/elpa/magit-20191210.1617/magit-refs.elc differ 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 af91a315..5610244a 100644 Binary files a/elpa/magit-20191128.1802/magit-remote.elc and b/elpa/magit-20191210.1617/magit-remote.elc differ 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 8cbe2b67..52d30892 100644 Binary files a/elpa/magit-20191128.1802/magit-repos.elc and b/elpa/magit-20191210.1617/magit-repos.elc differ 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 cfde1a9f..bcf61ab8 100644 Binary files a/elpa/magit-20191128.1802/magit-reset.elc and b/elpa/magit-20191210.1617/magit-reset.elc differ 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 6cab6aca..b515fda5 100644 Binary files a/elpa/magit-20191128.1802/magit-section.elc and b/elpa/magit-20191210.1617/magit-section.elc differ 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 f210bfe5..2f2a5b79 100644 Binary files a/elpa/magit-20191128.1802/magit-sequence.elc and b/elpa/magit-20191210.1617/magit-sequence.elc differ 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 4b430e04..38c33acd 100644 Binary files a/elpa/magit-20191128.1802/magit-stash.elc and b/elpa/magit-20191210.1617/magit-stash.elc differ 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 2993f5cd..e1627b81 100644 Binary files a/elpa/magit-20191128.1802/magit-status.elc and b/elpa/magit-20191210.1617/magit-status.elc differ diff --git a/elpa/magit-20191128.1802/magit-submodule.el b/elpa/magit-20191210.1617/magit-submodule.el similarity index 100% rename from elpa/magit-20191128.1802/magit-submodule.el rename to elpa/magit-20191210.1617/magit-submodule.el diff --git a/elpa/magit-20191128.1802/magit-submodule.elc b/elpa/magit-20191210.1617/magit-submodule.elc similarity index 97% rename from elpa/magit-20191128.1802/magit-submodule.elc rename to elpa/magit-20191210.1617/magit-submodule.elc index 648112cd..420b2cea 100644 Binary files a/elpa/magit-20191128.1802/magit-submodule.elc and b/elpa/magit-20191210.1617/magit-submodule.elc differ diff --git a/elpa/magit-20191128.1802/magit-subtree.el b/elpa/magit-20191210.1617/magit-subtree.el similarity index 100% rename from elpa/magit-20191128.1802/magit-subtree.el rename to elpa/magit-20191210.1617/magit-subtree.el diff --git a/elpa/magit-20191128.1802/magit-subtree.elc b/elpa/magit-20191210.1617/magit-subtree.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-subtree.elc rename to elpa/magit-20191210.1617/magit-subtree.elc index 206a17e7..f9555aff 100644 Binary files a/elpa/magit-20191128.1802/magit-subtree.elc and b/elpa/magit-20191210.1617/magit-subtree.elc differ diff --git a/elpa/magit-20191128.1802/magit-tag.el b/elpa/magit-20191210.1617/magit-tag.el similarity index 100% rename from elpa/magit-20191128.1802/magit-tag.el rename to elpa/magit-20191210.1617/magit-tag.el diff --git a/elpa/magit-20191128.1802/magit-tag.elc b/elpa/magit-20191210.1617/magit-tag.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-tag.elc rename to elpa/magit-20191210.1617/magit-tag.elc index 2c797822..430ef41a 100644 Binary files a/elpa/magit-20191128.1802/magit-tag.elc and b/elpa/magit-20191210.1617/magit-tag.elc differ diff --git a/elpa/magit-20191128.1802/magit-transient.el b/elpa/magit-20191210.1617/magit-transient.el similarity index 100% rename from elpa/magit-20191128.1802/magit-transient.el rename to elpa/magit-20191210.1617/magit-transient.el diff --git a/elpa/magit-20191128.1802/magit-transient.elc b/elpa/magit-20191210.1617/magit-transient.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-transient.elc rename to elpa/magit-20191210.1617/magit-transient.elc index 422e4522..29254b5f 100644 Binary files a/elpa/magit-20191128.1802/magit-transient.elc and b/elpa/magit-20191210.1617/magit-transient.elc differ 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 eb03df2f..049cf1d4 100644 Binary files a/elpa/magit-20191128.1802/magit-utils.elc and b/elpa/magit-20191210.1617/magit-utils.elc differ diff --git a/elpa/magit-20191128.1802/magit-wip.el b/elpa/magit-20191210.1617/magit-wip.el similarity index 100% rename from elpa/magit-20191128.1802/magit-wip.el rename to elpa/magit-20191210.1617/magit-wip.el diff --git a/elpa/magit-20191128.1802/magit-wip.elc b/elpa/magit-20191210.1617/magit-wip.elc similarity index 99% rename from elpa/magit-20191128.1802/magit-wip.elc rename to elpa/magit-20191210.1617/magit-wip.elc index c15e296a..47e37903 100644 Binary files a/elpa/magit-20191128.1802/magit-wip.elc and b/elpa/magit-20191210.1617/magit-wip.elc differ 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 06dfbde9..e71b21d6 100644 Binary files a/elpa/magit-20191128.1802/magit-worktree.elc and b/elpa/magit-20191210.1617/magit-worktree.elc differ 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 6ed985a0..8096f689 100644 Binary files a/elpa/magit-20191128.1802/magit.elc and b/elpa/magit-20191210.1617/magit.elc differ 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 00000000..8fe56a88 Binary files /dev/null and b/elpa/pickle-20190923.354/pickle.elc differ 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 00000000..4407166a Binary files /dev/null and b/elpa/poet-theme-20191103.1948/poet-dark-monochrome-theme.elc differ 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 00000000..73549d1e Binary files /dev/null and b/elpa/poet-theme-20191103.1948/poet-dark-theme.elc differ diff --git a/elpa/poet-theme-20191103.1948/poet-monochrome-theme.el b/elpa/poet-theme-20191103.1948/poet-monochrome-theme.el new file mode 100644 index 00000000..011b6839 --- /dev/null +++ b/elpa/poet-theme-20191103.1948/poet-monochrome-theme.el @@ -0,0 +1,273 @@ +;;; poet-monochrome-theme.el --- A 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-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 00000000..dce60183 Binary files /dev/null and b/elpa/poet-theme-20191103.1948/poet-monochrome-theme.elc differ diff --git a/elpa/poet-theme-20191103.1948/poet-theme-autoloads.el b/elpa/poet-theme-20191103.1948/poet-theme-autoloads.el new file mode 100644 index 00000000..4539424b --- /dev/null +++ b/elpa/poet-theme-20191103.1948/poet-theme-autoloads.el @@ -0,0 +1,58 @@ +;;; poet-theme-autoloads.el --- automatically extracted autoloads +;; +;;; Code: + +(add-to-list 'load-path (directory-file-name + (or (file-name-directory #$) (car load-path)))) + + +;;;### (autoloads nil "poet-dark-monochrome-theme" "poet-dark-monochrome-theme.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from poet-dark-monochrome-theme.el + +(when (and (boundp 'custom-theme-load-path) load-file-name) (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name)))) + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "poet-dark-monochrome-theme" '("poet-"))) + +;;;*** + +;;;### (autoloads nil "poet-dark-theme" "poet-dark-theme.el" (0 0 +;;;;;; 0 0)) +;;; Generated autoloads from poet-dark-theme.el + +(when (and (boundp 'custom-theme-load-path) load-file-name) (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name)))) + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "poet-dark-theme" '("poet-"))) + +;;;*** + +;;;### (autoloads nil "poet-monochrome-theme" "poet-monochrome-theme.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from poet-monochrome-theme.el + +(when (and (boundp 'custom-theme-load-path) load-file-name) (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name)))) + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "poet-monochrome-theme" '("poet-"))) + +;;;*** + +;;;### (autoloads nil "poet-theme" "poet-theme.el" (0 0 0 0)) +;;; Generated autoloads from poet-theme.el + +(when (and (boundp 'custom-theme-load-path) load-file-name) (add-to-list 'custom-theme-load-path (file-name-as-directory (file-name-directory load-file-name)))) + +(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "poet-theme" '("poet"))) + +;;;*** + +;;;### (autoloads nil nil ("poet-theme-pkg.el") (0 0 0 0)) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; coding: utf-8 +;; End: +;;; poet-theme-autoloads.el ends here diff --git a/elpa/poet-theme-20191103.1948/poet-theme-pkg.el b/elpa/poet-theme-20191103.1948/poet-theme-pkg.el new file mode 100644 index 00000000..ccdf7b19 --- /dev/null +++ b/elpa/poet-theme-20191103.1948/poet-theme-pkg.el @@ -0,0 +1,8 @@ +(define-package "poet-theme" "20191103.1948" "A theme for prose." 'nil :authors + '(("Kunal Bhalla" . "bhalla.kunal@gmail.com")) + :maintainer + '("Kunal Bhalla" . "bhalla.kunal@gmail.com") + :url "https://github.com/kunalb/poet/") +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/poet-theme-20191103.1948/poet-theme.el b/elpa/poet-theme-20191103.1948/poet-theme.el new file mode 100644 index 00000000..aea2307a --- /dev/null +++ b/elpa/poet-theme-20191103.1948/poet-theme.el @@ -0,0 +1,273 @@ +;;; poet-theme.el --- A 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 + "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 00000000..a63d06cf Binary files /dev/null and b/elpa/poet-theme-20191103.1948/poet-theme.elc differ 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 2e2dfbb5..5065e886 100644 Binary files a/elpa/polymode-20190714.2017/poly-lock.elc and b/elpa/polymode-20191208.1239/poly-lock.elc differ 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 bd992a04..394727d5 100644 Binary files a/elpa/polymode-20190714.2017/polymode-base.elc and b/elpa/polymode-20191208.1239/polymode-base.elc differ 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 32c746e8..05e14d0e 100644 Binary files a/elpa/polymode-20190714.2017/polymode-classes.elc and b/elpa/polymode-20191208.1239/polymode-classes.elc differ 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 6e959dfa..a7314455 100644 Binary files a/elpa/polymode-20190714.2017/polymode-compat.elc and b/elpa/polymode-20191208.1239/polymode-compat.elc differ 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 01acd0ae..e5e037f1 100644 Binary files a/elpa/polymode-20190714.2017/polymode-core.elc and b/elpa/polymode-20191208.1239/polymode-core.elc differ diff --git a/elpa/polymode-20190714.2017/polymode-debug.el b/elpa/polymode-20191208.1239/polymode-debug.el similarity index 100% rename from elpa/polymode-20190714.2017/polymode-debug.el rename to elpa/polymode-20191208.1239/polymode-debug.el diff --git a/elpa/polymode-20190714.2017/polymode-debug.elc b/elpa/polymode-20191208.1239/polymode-debug.elc similarity index 95% rename from elpa/polymode-20190714.2017/polymode-debug.elc rename to elpa/polymode-20191208.1239/polymode-debug.elc index be80d749..ce83d5b8 100644 Binary files a/elpa/polymode-20190714.2017/polymode-debug.elc and b/elpa/polymode-20191208.1239/polymode-debug.elc differ 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 e06d8e0f..85b50662 100644 Binary files a/elpa/polymode-20190714.2017/polymode-export.elc and b/elpa/polymode-20191208.1239/polymode-export.elc differ 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 b058e14b..31032ad4 100644 Binary files a/elpa/polymode-20190714.2017/polymode-methods.elc and b/elpa/polymode-20191208.1239/polymode-methods.elc differ 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 3f275859..fa030710 100644 Binary files a/elpa/polymode-20190714.2017/polymode-tangle.elc and b/elpa/polymode-20191208.1239/polymode-tangle.elc differ 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 dd9a5c14..15aa0f6a 100644 Binary files a/elpa/polymode-20190714.2017/polymode-test-utils.elc and b/elpa/polymode-20191208.1239/polymode-test-utils.elc differ 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 b1aa9861..6fccb70d 100644 Binary files a/elpa/polymode-20190714.2017/polymode-weave.elc and b/elpa/polymode-20191208.1239/polymode-weave.elc differ diff --git a/elpa/polymode-20190714.2017/polymode.el b/elpa/polymode-20191208.1239/polymode.el similarity index 100% rename from elpa/polymode-20190714.2017/polymode.el rename to elpa/polymode-20191208.1239/polymode.el diff --git a/elpa/polymode-20190714.2017/polymode.elc b/elpa/polymode-20191208.1239/polymode.elc similarity index 82% rename from elpa/polymode-20190714.2017/polymode.elc rename to elpa/polymode-20191208.1239/polymode.elc index be3bfea5..a4a7a9c0 100644 Binary files a/elpa/polymode-20190714.2017/polymode.elc and b/elpa/polymode-20191208.1239/polymode.elc differ 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 a7320df7..b76f7023 100644 Binary files a/elpa/typescript-mode-20191120.346/typescript-mode-test-utilities.elc and b/elpa/typescript-mode-20191209.1107/typescript-mode-test-utilities.elc differ diff --git a/elpa/typescript-mode-20191120.346/typescript-mode.el b/elpa/typescript-mode-20191209.1107/typescript-mode.el similarity index 98% rename from elpa/typescript-mode-20191120.346/typescript-mode.el rename to elpa/typescript-mode-20191209.1107/typescript-mode.el index 1ae5ebc5..633aac1e 100644 --- a/elpa/typescript-mode-20191120.346/typescript-mode.el +++ b/elpa/typescript-mode-20191209.1107/typescript-mode.el @@ -59,7 +59,7 @@ (require 'newcomment)) (eval-when-compile - (require 'cl)) + (require 'cl-lib)) ;;; Constants @@ -228,7 +228,7 @@ If :strip-prototype is present and non-nil, then if the class name as matched contains") (defconst typescript--available-frameworks - (loop with available-frameworks + (cl-loop with available-frameworks for style in typescript--class-styles for framework = (plist-get style :framework) unless (memq framework available-frameworks) @@ -297,7 +297,7 @@ Match group 1 is MUMBLE.") '("console")) "Regular expression matching builtins.") -(defconst typescript--function-call-re "\\(\\w+\\)\\(<.+>\\)?\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 4df74891..985b4a37 100644 Binary files a/elpa/typescript-mode-20191120.346/typescript-mode.elc and b/elpa/typescript-mode-20191209.1107/typescript-mode.elc differ 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"))