diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/bundle/bundles.el b/bundle/bundles.el new file mode 100644 index 00000000..3953551b --- /dev/null +++ b/bundle/bundles.el @@ -0,0 +1,18 @@ +;; Load my custom bundles + +(require 'os) +(require 'display) +(require 'fill-column-indicator) +(require 'calendar-settings) +(require 'org-mode-settings) +(require 'sbcl-settings) +(require 'hooks) + +(provide 'bundles) + +;; Local Variables: +;; mode: emacs-lisp +;; coding: utf-8 +;; fill-column: 79 +;; lisp-indent-offset: 2 +;; End: diff --git a/elpa/archives/gnu/archive-contents b/elpa/archives/gnu/archive-contents index 93513efe..81973052 100644 --- a/elpa/archives/gnu/archive-contents +++ b/elpa/archives/gnu/archive-contents @@ -677,7 +677,7 @@ ("William Xu" . "william.xwl@gmail.com")) (:maintainer "William Xu" . "william.xwl@gmail.com"))]) (elisp-benchmarks . - [(1 1) + [(1 2) nil "elisp benchamrks collection" tar ((:maintainer "Andrea Corallo" . "akrl@sdf.org") (:authors diff --git a/elpa/dashboard-20200217.1153/banners/1.txt b/elpa/dashboard-20200221.759/banners/1.txt similarity index 100% rename from elpa/dashboard-20200217.1153/banners/1.txt rename to elpa/dashboard-20200221.759/banners/1.txt diff --git a/elpa/dashboard-20200217.1153/banners/2.txt b/elpa/dashboard-20200221.759/banners/2.txt similarity index 100% rename from elpa/dashboard-20200217.1153/banners/2.txt rename to elpa/dashboard-20200221.759/banners/2.txt diff --git a/elpa/dashboard-20200217.1153/banners/3.txt b/elpa/dashboard-20200221.759/banners/3.txt similarity index 100% rename from elpa/dashboard-20200217.1153/banners/3.txt rename to elpa/dashboard-20200221.759/banners/3.txt diff --git a/elpa/dashboard-20200217.1153/banners/emacs.png b/elpa/dashboard-20200221.759/banners/emacs.png similarity index 100% rename from elpa/dashboard-20200217.1153/banners/emacs.png rename to elpa/dashboard-20200221.759/banners/emacs.png diff --git a/elpa/dashboard-20200217.1153/banners/logo.png b/elpa/dashboard-20200221.759/banners/logo.png similarity index 100% rename from elpa/dashboard-20200217.1153/banners/logo.png rename to elpa/dashboard-20200221.759/banners/logo.png diff --git a/elpa/dashboard-20200217.1153/dashboard-autoloads.el b/elpa/dashboard-20200221.759/dashboard-autoloads.el similarity index 100% rename from elpa/dashboard-20200217.1153/dashboard-autoloads.el rename to elpa/dashboard-20200221.759/dashboard-autoloads.el diff --git a/elpa/dashboard-20200217.1153/dashboard-pkg.el b/elpa/dashboard-20200221.759/dashboard-pkg.el similarity index 76% rename from elpa/dashboard-20200217.1153/dashboard-pkg.el rename to elpa/dashboard-20200221.759/dashboard-pkg.el index 7d736d69..db65cb81 100644 --- a/elpa/dashboard-20200217.1153/dashboard-pkg.el +++ b/elpa/dashboard-20200221.759/dashboard-pkg.el @@ -1,4 +1,4 @@ -(define-package "dashboard" "20200217.1153" "A startup screen extracted from Spacemacs" +(define-package "dashboard" "20200221.759" "A startup screen extracted from Spacemacs" '((emacs "25.3") (page-break-lines "0.11")) :keywords diff --git a/elpa/dashboard-20200217.1153/dashboard-widgets.el b/elpa/dashboard-20200221.759/dashboard-widgets.el similarity index 99% rename from elpa/dashboard-20200217.1153/dashboard-widgets.el rename to elpa/dashboard-20200221.759/dashboard-widgets.el index d2c7dc7a..06084896 100644 --- a/elpa/dashboard-20200217.1153/dashboard-widgets.el +++ b/elpa/dashboard-20200221.759/dashboard-widgets.el @@ -1,6 +1,6 @@ ;;; dashboard-widgets.el --- A startup screen extracted from Spacemacs -*- lexical-binding: t -*- -;; Copyright (c) 2016-2019 Rakan Al-Hneiti & Contributors +;; Copyright (c) 2016-2020 Rakan Al-Hneiti & Contributors ;; ;; Author: Rakan Al-Hneiti ;; URL: https://github.com/emacs-dashboard/emacs-dashboard @@ -10,7 +10,7 @@ ;;; License: GPLv3 ;; ;; Created: October 05, 2016 -;; Package-Version: 1.7.0-SNAPSHOT +;; Package-Version: 1.8.0-SNAPSHOT ;; Keywords: startup, screen, tools, dashboard ;; Package-Requires: ((emacs "25.3") (page-break-lines "0.11")) ;;; Commentary: @@ -324,7 +324,7 @@ If MESSAGEBUF is not nil then MSG is also written in message buffer." (insert msg)))) (defun dashboard-modify-heading-icons (alist) - "Append ALIST items to dashboard-heading-icons to modify icons." + "Append ALIST items to `dashboard-heading-icons' to modify icons." (dolist (icon alist) (add-to-list 'dashboard-heading-icons icon))) @@ -421,7 +421,7 @@ If MESSAGEBUF is not nil then MSG is also written in message buffer." ;; INIT INFO ;; (defun dashboard-insert-init-info () - "Insert init info when dashboard-set-init-info is t." + "Insert init info when `dashboard-set-init-info' is t." (when dashboard-set-init-info (dashboard-center-line dashboard-init-info) (insert diff --git a/elpa/dashboard-20200217.1153/dashboard-widgets.elc b/elpa/dashboard-20200221.759/dashboard-widgets.elc similarity index 96% rename from elpa/dashboard-20200217.1153/dashboard-widgets.elc rename to elpa/dashboard-20200221.759/dashboard-widgets.elc index f3c58123..97eef90d 100644 Binary files a/elpa/dashboard-20200217.1153/dashboard-widgets.elc and b/elpa/dashboard-20200221.759/dashboard-widgets.elc differ diff --git a/elpa/dashboard-20200217.1153/dashboard.el b/elpa/dashboard-20200221.759/dashboard.el similarity index 99% rename from elpa/dashboard-20200217.1153/dashboard.el rename to elpa/dashboard-20200221.759/dashboard.el index e80d404a..0df6f82d 100644 --- a/elpa/dashboard-20200217.1153/dashboard.el +++ b/elpa/dashboard-20200221.759/dashboard.el @@ -1,6 +1,6 @@ ;;; dashboard.el --- A startup screen extracted from Spacemacs -*- lexical-binding: t -*- -;; Copyright (c) 2016-2019 Rakan Al-Hneiti & Contributors +;; Copyright (c) 2016-2020 Rakan Al-Hneiti & Contributors ;; ;; Author: Rakan Al-Hneiti ;; URL: https://github.com/emacs-dashboard/emacs-dashboard @@ -10,7 +10,7 @@ ;;; License: GPLv3 ;; ;; Created: October 05, 2016 -;; Package-Version: 1.7.0-SNAPSHOT +;; Package-Version: 1.8.0-SNAPSHOT ;; Keywords: startup, screen, tools, dashboard ;; Package-Requires: ((emacs "25.3") (page-break-lines "0.11")) ;;; Commentary: diff --git a/elpa/dashboard-20200217.1153/dashboard.elc b/elpa/dashboard-20200221.759/dashboard.elc similarity index 100% rename from elpa/dashboard-20200217.1153/dashboard.elc rename to elpa/dashboard-20200221.759/dashboard.elc diff --git a/elpa/elm-mode-20200126.2223/elm-font-lock.el b/elpa/elm-mode-20200221.1951/elm-font-lock.el similarity index 100% rename from elpa/elm-mode-20200126.2223/elm-font-lock.el rename to elpa/elm-mode-20200221.1951/elm-font-lock.el diff --git a/elpa/elm-mode-20200126.2223/elm-font-lock.elc b/elpa/elm-mode-20200221.1951/elm-font-lock.elc similarity index 100% rename from elpa/elm-mode-20200126.2223/elm-font-lock.elc rename to elpa/elm-mode-20200221.1951/elm-font-lock.elc diff --git a/elpa/elm-mode-20200126.2223/elm-format.el b/elpa/elm-mode-20200221.1951/elm-format.el similarity index 100% rename from elpa/elm-mode-20200126.2223/elm-format.el rename to elpa/elm-mode-20200221.1951/elm-format.el diff --git a/elpa/elm-mode-20200126.2223/elm-format.elc b/elpa/elm-mode-20200221.1951/elm-format.elc similarity index 100% rename from elpa/elm-mode-20200126.2223/elm-format.elc rename to elpa/elm-mode-20200221.1951/elm-format.elc diff --git a/elpa/elm-mode-20200126.2223/elm-imenu.el b/elpa/elm-mode-20200221.1951/elm-imenu.el similarity index 100% rename from elpa/elm-mode-20200126.2223/elm-imenu.el rename to elpa/elm-mode-20200221.1951/elm-imenu.el diff --git a/elpa/elm-mode-20200126.2223/elm-imenu.elc b/elpa/elm-mode-20200221.1951/elm-imenu.elc similarity index 100% rename from elpa/elm-mode-20200126.2223/elm-imenu.elc rename to elpa/elm-mode-20200221.1951/elm-imenu.elc diff --git a/elpa/elm-mode-20200126.2223/elm-indent.el b/elpa/elm-mode-20200221.1951/elm-indent.el similarity index 100% rename from elpa/elm-mode-20200126.2223/elm-indent.el rename to elpa/elm-mode-20200221.1951/elm-indent.el diff --git a/elpa/elm-mode-20200126.2223/elm-indent.elc b/elpa/elm-mode-20200221.1951/elm-indent.elc similarity index 100% rename from elpa/elm-mode-20200126.2223/elm-indent.elc rename to elpa/elm-mode-20200221.1951/elm-indent.elc diff --git a/elpa/elm-mode-20200126.2223/elm-interactive.el b/elpa/elm-mode-20200221.1951/elm-interactive.el similarity index 100% rename from elpa/elm-mode-20200126.2223/elm-interactive.el rename to elpa/elm-mode-20200221.1951/elm-interactive.el diff --git a/elpa/elm-mode-20200126.2223/elm-interactive.elc b/elpa/elm-mode-20200221.1951/elm-interactive.elc similarity index 100% rename from elpa/elm-mode-20200126.2223/elm-interactive.elc rename to elpa/elm-mode-20200221.1951/elm-interactive.elc diff --git a/elpa/elm-mode-20200126.2223/elm-mode-autoloads.el b/elpa/elm-mode-20200221.1951/elm-mode-autoloads.el similarity index 100% rename from elpa/elm-mode-20200126.2223/elm-mode-autoloads.el rename to elpa/elm-mode-20200221.1951/elm-mode-autoloads.el diff --git a/elpa/elm-mode-20200126.2223/elm-mode-pkg.el b/elpa/elm-mode-20200221.1951/elm-mode-pkg.el similarity index 80% rename from elpa/elm-mode-20200126.2223/elm-mode-pkg.el rename to elpa/elm-mode-20200221.1951/elm-mode-pkg.el index 0492d8da..9e49ae02 100644 --- a/elpa/elm-mode-20200126.2223/elm-mode-pkg.el +++ b/elpa/elm-mode-20200221.1951/elm-mode-pkg.el @@ -1,4 +1,4 @@ -(define-package "elm-mode" "20200126.2223" "Major mode for Elm" +(define-package "elm-mode" "20200221.1951" "Major mode for Elm" '((f "0.17") (s "1.7.0") (emacs "25.1") diff --git a/elpa/elm-mode-20200126.2223/elm-mode.el b/elpa/elm-mode-20200221.1951/elm-mode.el similarity index 97% rename from elpa/elm-mode-20200126.2223/elm-mode.el rename to elpa/elm-mode-20200221.1951/elm-mode.el index c0ee1bbe..ecd7125b 100644 --- a/elpa/elm-mode-20200126.2223/elm-mode.el +++ b/elpa/elm-mode-20200221.1951/elm-mode.el @@ -157,7 +157,8 @@ Find the roots of this function in the c-awk-mode." (setq-local comment-start "--") (setq-local comment-end "") (setq-local imenu-create-index-function #'elm-imenu-create-index) - (setq-local paragraph-separate "\\(\r\t\n\\|-}\\)$") + (setq-local paragraph-start (concat " *{-\\| *-- |\\|" page-delimiter)) + (setq-local paragraph-separate (concat " *$\\| *\\({-\\|-}\\) *$\\|" page-delimiter)) (setq-local beginning-of-defun-function #'elm-beginning-of-defun) (setq-local end-of-defun-function #'elm-end-of-defun) diff --git a/elpa/elm-mode-20200126.2223/elm-mode.elc b/elpa/elm-mode-20200221.1951/elm-mode.elc similarity index 78% rename from elpa/elm-mode-20200126.2223/elm-mode.elc rename to elpa/elm-mode-20200221.1951/elm-mode.elc index ca12c7d7..82f7a546 100644 Binary files a/elpa/elm-mode-20200126.2223/elm-mode.elc and b/elpa/elm-mode-20200221.1951/elm-mode.elc differ diff --git a/elpa/elm-mode-20200126.2223/elm-tags.el b/elpa/elm-mode-20200221.1951/elm-tags.el similarity index 100% rename from elpa/elm-mode-20200126.2223/elm-tags.el rename to elpa/elm-mode-20200221.1951/elm-tags.el diff --git a/elpa/elm-mode-20200126.2223/elm-tags.elc b/elpa/elm-mode-20200221.1951/elm-tags.elc similarity index 100% rename from elpa/elm-mode-20200126.2223/elm-tags.elc rename to elpa/elm-mode-20200221.1951/elm-tags.elc diff --git a/elpa/elm-mode-20200126.2223/elm-util.el b/elpa/elm-mode-20200221.1951/elm-util.el similarity index 100% rename from elpa/elm-mode-20200126.2223/elm-util.el rename to elpa/elm-mode-20200221.1951/elm-util.el diff --git a/elpa/elm-mode-20200126.2223/elm-util.elc b/elpa/elm-mode-20200221.1951/elm-util.elc similarity index 100% rename from elpa/elm-mode-20200126.2223/elm-util.elc rename to elpa/elm-mode-20200221.1951/elm-util.elc diff --git a/elpa/elm-mode-20200126.2223/elm.tags b/elpa/elm-mode-20200221.1951/elm.tags similarity index 100% rename from elpa/elm-mode-20200126.2223/elm.tags rename to elpa/elm-mode-20200221.1951/elm.tags diff --git a/elpa/magit-20200220.308/AUTHORS.md b/elpa/magit-20200222.41/AUTHORS.md similarity index 100% rename from elpa/magit-20200220.308/AUTHORS.md rename to elpa/magit-20200222.41/AUTHORS.md diff --git a/elpa/magit-20200220.308/LICENSE b/elpa/magit-20200222.41/LICENSE similarity index 100% rename from elpa/magit-20200220.308/LICENSE rename to elpa/magit-20200222.41/LICENSE diff --git a/elpa/magit-20200220.308/dir b/elpa/magit-20200222.41/dir similarity index 100% rename from elpa/magit-20200220.308/dir rename to elpa/magit-20200222.41/dir diff --git a/elpa/magit-20200220.308/git-rebase.el b/elpa/magit-20200222.41/git-rebase.el similarity index 100% rename from elpa/magit-20200220.308/git-rebase.el rename to elpa/magit-20200222.41/git-rebase.el diff --git a/elpa/magit-20200220.308/git-rebase.elc b/elpa/magit-20200222.41/git-rebase.elc similarity index 97% rename from elpa/magit-20200220.308/git-rebase.elc rename to elpa/magit-20200222.41/git-rebase.elc index 8bfdc078..de6f1586 100644 Binary files a/elpa/magit-20200220.308/git-rebase.elc and b/elpa/magit-20200222.41/git-rebase.elc differ diff --git a/elpa/magit-20200220.308/magit-apply.el b/elpa/magit-20200222.41/magit-apply.el similarity index 100% rename from elpa/magit-20200220.308/magit-apply.el rename to elpa/magit-20200222.41/magit-apply.el diff --git a/elpa/magit-20200220.308/magit-apply.elc b/elpa/magit-20200222.41/magit-apply.elc similarity index 55% rename from elpa/magit-20200220.308/magit-apply.elc rename to elpa/magit-20200222.41/magit-apply.elc index 40e1d2c2..8b68625c 100644 Binary files a/elpa/magit-20200220.308/magit-apply.elc and b/elpa/magit-20200222.41/magit-apply.elc differ diff --git a/elpa/magit-20200220.308/magit-autoloads.el b/elpa/magit-20200222.41/magit-autoloads.el similarity index 100% rename from elpa/magit-20200220.308/magit-autoloads.el rename to elpa/magit-20200222.41/magit-autoloads.el diff --git a/elpa/magit-20200220.308/magit-autorevert.el b/elpa/magit-20200222.41/magit-autorevert.el similarity index 100% rename from elpa/magit-20200220.308/magit-autorevert.el rename to elpa/magit-20200222.41/magit-autorevert.el diff --git a/elpa/magit-20200220.308/magit-autorevert.elc b/elpa/magit-20200222.41/magit-autorevert.elc similarity index 99% rename from elpa/magit-20200220.308/magit-autorevert.elc rename to elpa/magit-20200222.41/magit-autorevert.elc index 3b33e160..d7c467fd 100644 Binary files a/elpa/magit-20200220.308/magit-autorevert.elc and b/elpa/magit-20200222.41/magit-autorevert.elc differ diff --git a/elpa/magit-20200220.308/magit-bisect.el b/elpa/magit-20200222.41/magit-bisect.el similarity index 100% rename from elpa/magit-20200220.308/magit-bisect.el rename to elpa/magit-20200222.41/magit-bisect.el diff --git a/elpa/magit-20200220.308/magit-bisect.elc b/elpa/magit-20200222.41/magit-bisect.elc similarity index 99% rename from elpa/magit-20200220.308/magit-bisect.elc rename to elpa/magit-20200222.41/magit-bisect.elc index f8283177..cd55c53a 100644 Binary files a/elpa/magit-20200220.308/magit-bisect.elc and b/elpa/magit-20200222.41/magit-bisect.elc differ diff --git a/elpa/magit-20200220.308/magit-blame.el b/elpa/magit-20200222.41/magit-blame.el similarity index 100% rename from elpa/magit-20200220.308/magit-blame.el rename to elpa/magit-20200222.41/magit-blame.el diff --git a/elpa/magit-20200220.308/magit-blame.elc b/elpa/magit-20200222.41/magit-blame.elc similarity index 99% rename from elpa/magit-20200220.308/magit-blame.elc rename to elpa/magit-20200222.41/magit-blame.elc index c677e80b..78b00d59 100644 Binary files a/elpa/magit-20200220.308/magit-blame.elc and b/elpa/magit-20200222.41/magit-blame.elc differ diff --git a/elpa/magit-20200220.308/magit-bookmark.el b/elpa/magit-20200222.41/magit-bookmark.el similarity index 100% rename from elpa/magit-20200220.308/magit-bookmark.el rename to elpa/magit-20200222.41/magit-bookmark.el diff --git a/elpa/magit-20200220.308/magit-bookmark.elc b/elpa/magit-20200222.41/magit-bookmark.elc similarity index 63% rename from elpa/magit-20200220.308/magit-bookmark.elc rename to elpa/magit-20200222.41/magit-bookmark.elc index ab012386..da2deb49 100644 Binary files a/elpa/magit-20200220.308/magit-bookmark.elc and b/elpa/magit-20200222.41/magit-bookmark.elc differ diff --git a/elpa/magit-20200220.308/magit-branch.el b/elpa/magit-20200222.41/magit-branch.el similarity index 100% rename from elpa/magit-20200220.308/magit-branch.el rename to elpa/magit-20200222.41/magit-branch.el diff --git a/elpa/magit-20200220.308/magit-branch.elc b/elpa/magit-20200222.41/magit-branch.elc similarity index 91% rename from elpa/magit-20200220.308/magit-branch.elc rename to elpa/magit-20200222.41/magit-branch.elc index d589df55..2fb16cce 100644 Binary files a/elpa/magit-20200220.308/magit-branch.elc and b/elpa/magit-20200222.41/magit-branch.elc differ diff --git a/elpa/magit-20200220.308/magit-clone.el b/elpa/magit-20200222.41/magit-clone.el similarity index 100% rename from elpa/magit-20200220.308/magit-clone.el rename to elpa/magit-20200222.41/magit-clone.el diff --git a/elpa/magit-20200220.308/magit-clone.elc b/elpa/magit-20200222.41/magit-clone.elc similarity index 94% rename from elpa/magit-20200220.308/magit-clone.elc rename to elpa/magit-20200222.41/magit-clone.elc index 33da926a..565fd7e8 100644 Binary files a/elpa/magit-20200220.308/magit-clone.elc and b/elpa/magit-20200222.41/magit-clone.elc differ diff --git a/elpa/magit-20200220.308/magit-commit.el b/elpa/magit-20200222.41/magit-commit.el similarity index 100% rename from elpa/magit-20200220.308/magit-commit.el rename to elpa/magit-20200222.41/magit-commit.el diff --git a/elpa/magit-20200220.308/magit-commit.elc b/elpa/magit-20200222.41/magit-commit.elc similarity index 90% rename from elpa/magit-20200220.308/magit-commit.elc rename to elpa/magit-20200222.41/magit-commit.elc index eedf01db..2b75604e 100644 Binary files a/elpa/magit-20200220.308/magit-commit.elc and b/elpa/magit-20200222.41/magit-commit.elc differ diff --git a/elpa/magit-20200220.308/magit-core.el b/elpa/magit-20200222.41/magit-core.el similarity index 100% rename from elpa/magit-20200220.308/magit-core.el rename to elpa/magit-20200222.41/magit-core.el diff --git a/elpa/magit-20200220.308/magit-core.elc b/elpa/magit-20200222.41/magit-core.elc similarity index 99% rename from elpa/magit-20200220.308/magit-core.elc rename to elpa/magit-20200222.41/magit-core.elc index a61d8b14..53d77f1d 100644 Binary files a/elpa/magit-20200220.308/magit-core.elc and b/elpa/magit-20200222.41/magit-core.elc differ diff --git a/elpa/magit-20200220.308/magit-diff.el b/elpa/magit-20200222.41/magit-diff.el similarity index 100% rename from elpa/magit-20200220.308/magit-diff.el rename to elpa/magit-20200222.41/magit-diff.el diff --git a/elpa/magit-20200220.308/magit-diff.elc b/elpa/magit-20200222.41/magit-diff.elc similarity index 83% rename from elpa/magit-20200220.308/magit-diff.elc rename to elpa/magit-20200222.41/magit-diff.elc index e1a50ad2..72106405 100644 Binary files a/elpa/magit-20200220.308/magit-diff.elc and b/elpa/magit-20200222.41/magit-diff.elc differ diff --git a/elpa/magit-20200220.308/magit-ediff.el b/elpa/magit-20200222.41/magit-ediff.el similarity index 100% rename from elpa/magit-20200220.308/magit-ediff.el rename to elpa/magit-20200222.41/magit-ediff.el diff --git a/elpa/magit-20200220.308/magit-ediff.elc b/elpa/magit-20200222.41/magit-ediff.elc similarity index 80% rename from elpa/magit-20200220.308/magit-ediff.elc rename to elpa/magit-20200222.41/magit-ediff.elc index 6226afe9..11d7108f 100644 Binary files a/elpa/magit-20200220.308/magit-ediff.elc and b/elpa/magit-20200222.41/magit-ediff.elc differ diff --git a/elpa/magit-20200220.308/magit-extras.el b/elpa/magit-20200222.41/magit-extras.el similarity index 100% rename from elpa/magit-20200220.308/magit-extras.el rename to elpa/magit-20200222.41/magit-extras.el diff --git a/elpa/magit-20200220.308/magit-extras.elc b/elpa/magit-20200222.41/magit-extras.elc similarity index 92% rename from elpa/magit-20200220.308/magit-extras.elc rename to elpa/magit-20200222.41/magit-extras.elc index 44278c36..c2e142b6 100644 Binary files a/elpa/magit-20200220.308/magit-extras.elc and b/elpa/magit-20200222.41/magit-extras.elc differ diff --git a/elpa/magit-20200220.308/magit-fetch.el b/elpa/magit-20200222.41/magit-fetch.el similarity index 100% rename from elpa/magit-20200220.308/magit-fetch.el rename to elpa/magit-20200222.41/magit-fetch.el diff --git a/elpa/magit-20200220.308/magit-fetch.elc b/elpa/magit-20200222.41/magit-fetch.elc similarity index 99% rename from elpa/magit-20200220.308/magit-fetch.elc rename to elpa/magit-20200222.41/magit-fetch.elc index 959e2b8e..78416596 100644 Binary files a/elpa/magit-20200220.308/magit-fetch.elc and b/elpa/magit-20200222.41/magit-fetch.elc differ diff --git a/elpa/magit-20200220.308/magit-files.el b/elpa/magit-20200222.41/magit-files.el similarity index 100% rename from elpa/magit-20200220.308/magit-files.el rename to elpa/magit-20200222.41/magit-files.el diff --git a/elpa/magit-20200220.308/magit-files.elc b/elpa/magit-20200222.41/magit-files.elc similarity index 98% rename from elpa/magit-20200220.308/magit-files.elc rename to elpa/magit-20200222.41/magit-files.elc index 8e418d2d..0717d0ed 100644 Binary files a/elpa/magit-20200220.308/magit-files.elc and b/elpa/magit-20200222.41/magit-files.elc differ diff --git a/elpa/magit-20200220.308/magit-git.el b/elpa/magit-20200222.41/magit-git.el similarity index 100% rename from elpa/magit-20200220.308/magit-git.el rename to elpa/magit-20200222.41/magit-git.el diff --git a/elpa/magit-20200220.308/magit-git.elc b/elpa/magit-20200222.41/magit-git.elc similarity index 99% rename from elpa/magit-20200220.308/magit-git.elc rename to elpa/magit-20200222.41/magit-git.elc index 4b8c4a87..5dbe6e1a 100644 Binary files a/elpa/magit-20200220.308/magit-git.elc and b/elpa/magit-20200222.41/magit-git.elc differ diff --git a/elpa/magit-20200220.308/magit-gitignore.el b/elpa/magit-20200222.41/magit-gitignore.el similarity index 100% rename from elpa/magit-20200220.308/magit-gitignore.el rename to elpa/magit-20200222.41/magit-gitignore.el diff --git a/elpa/magit-20200220.308/magit-gitignore.elc b/elpa/magit-20200222.41/magit-gitignore.elc similarity index 99% rename from elpa/magit-20200220.308/magit-gitignore.elc rename to elpa/magit-20200222.41/magit-gitignore.elc index 56c7e850..75e57b3f 100644 Binary files a/elpa/magit-20200220.308/magit-gitignore.elc and b/elpa/magit-20200222.41/magit-gitignore.elc differ diff --git a/elpa/magit-20200220.308/magit-imenu.el b/elpa/magit-20200222.41/magit-imenu.el similarity index 100% rename from elpa/magit-20200220.308/magit-imenu.el rename to elpa/magit-20200222.41/magit-imenu.el diff --git a/elpa/magit-20200220.308/magit-imenu.elc b/elpa/magit-20200222.41/magit-imenu.elc similarity index 99% rename from elpa/magit-20200220.308/magit-imenu.elc rename to elpa/magit-20200222.41/magit-imenu.elc index 424915fd..3b6d7f02 100644 Binary files a/elpa/magit-20200220.308/magit-imenu.elc and b/elpa/magit-20200222.41/magit-imenu.elc differ diff --git a/elpa/magit-20200220.308/magit-log.el b/elpa/magit-20200222.41/magit-log.el similarity index 99% rename from elpa/magit-20200220.308/magit-log.el rename to elpa/magit-20200222.41/magit-log.el index c3c25e44..b4a8c71f 100644 --- a/elpa/magit-20200220.308/magit-log.el +++ b/elpa/magit-20200222.41/magit-log.el @@ -719,7 +719,8 @@ restrict the log to the lines that the region touches." "Show log for the definition at point." (interactive (list (or (magit-file-relative-name) (user-error "Buffer isn't visiting a file")) - (funcall magit-log-trace-definition-function) + (or (funcall magit-log-trace-definition-function) + (user-error "No function at point found")) (or magit-buffer-refname (magit-get-current-branch) "HEAD"))) @@ -727,7 +728,7 @@ restrict the log to the lines that the region touches." (magit-log-setup-buffer (list rev) (cons (format "-L:%s%s:%s" - (regexp-quote fn) + (replace-regexp-in-string ":" "\\:" (regexp-quote fn) nil t) (if (derived-mode-p 'lisp-mode 'emacs-lisp-mode) ;; Git doesn't treat "-" the same way as ;; "_", leading to false-positives such as diff --git a/elpa/magit-20200220.308/magit-log.elc b/elpa/magit-20200222.41/magit-log.elc similarity index 89% rename from elpa/magit-20200220.308/magit-log.elc rename to elpa/magit-20200222.41/magit-log.elc index 50d399bf..7148eb26 100644 Binary files a/elpa/magit-20200220.308/magit-log.elc and b/elpa/magit-20200222.41/magit-log.elc differ diff --git a/elpa/magit-20200220.308/magit-margin.el b/elpa/magit-20200222.41/magit-margin.el similarity index 100% rename from elpa/magit-20200220.308/magit-margin.el rename to elpa/magit-20200222.41/magit-margin.el diff --git a/elpa/magit-20200220.308/magit-margin.elc b/elpa/magit-20200222.41/magit-margin.elc similarity index 91% rename from elpa/magit-20200220.308/magit-margin.elc rename to elpa/magit-20200222.41/magit-margin.elc index 540eee21..f6ed55f6 100644 Binary files a/elpa/magit-20200220.308/magit-margin.elc and b/elpa/magit-20200222.41/magit-margin.elc differ diff --git a/elpa/magit-20200220.308/magit-merge.el b/elpa/magit-20200222.41/magit-merge.el similarity index 100% rename from elpa/magit-20200220.308/magit-merge.el rename to elpa/magit-20200222.41/magit-merge.el diff --git a/elpa/magit-20200220.308/magit-merge.elc b/elpa/magit-20200222.41/magit-merge.elc similarity index 88% rename from elpa/magit-20200220.308/magit-merge.elc rename to elpa/magit-20200222.41/magit-merge.elc index 723a8abf..b2dcb3d4 100644 Binary files a/elpa/magit-20200220.308/magit-merge.elc and b/elpa/magit-20200222.41/magit-merge.elc differ diff --git a/elpa/magit-20200220.308/magit-mode.el b/elpa/magit-20200222.41/magit-mode.el similarity index 100% rename from elpa/magit-20200220.308/magit-mode.el rename to elpa/magit-20200222.41/magit-mode.el diff --git a/elpa/magit-20200220.308/magit-mode.elc b/elpa/magit-20200222.41/magit-mode.elc similarity index 99% rename from elpa/magit-20200220.308/magit-mode.elc rename to elpa/magit-20200222.41/magit-mode.elc index a5644a88..56014afb 100644 Binary files a/elpa/magit-20200220.308/magit-mode.elc and b/elpa/magit-20200222.41/magit-mode.elc differ diff --git a/elpa/magit-20200220.308/magit-notes.el b/elpa/magit-20200222.41/magit-notes.el similarity index 100% rename from elpa/magit-20200220.308/magit-notes.el rename to elpa/magit-20200222.41/magit-notes.el diff --git a/elpa/magit-20200220.308/magit-notes.elc b/elpa/magit-20200222.41/magit-notes.elc similarity index 99% rename from elpa/magit-20200220.308/magit-notes.elc rename to elpa/magit-20200222.41/magit-notes.elc index c0648b52..bbbefeef 100644 Binary files a/elpa/magit-20200220.308/magit-notes.elc and b/elpa/magit-20200222.41/magit-notes.elc differ diff --git a/elpa/magit-20200220.308/magit-obsolete.el b/elpa/magit-20200222.41/magit-obsolete.el similarity index 100% rename from elpa/magit-20200220.308/magit-obsolete.el rename to elpa/magit-20200222.41/magit-obsolete.el diff --git a/elpa/magit-20200220.308/magit-obsolete.elc b/elpa/magit-20200222.41/magit-obsolete.elc similarity index 99% rename from elpa/magit-20200220.308/magit-obsolete.elc rename to elpa/magit-20200222.41/magit-obsolete.elc index bea6f585..ca174f6c 100644 Binary files a/elpa/magit-20200220.308/magit-obsolete.elc and b/elpa/magit-20200222.41/magit-obsolete.elc differ diff --git a/elpa/magit-20200220.308/magit-patch.el b/elpa/magit-20200222.41/magit-patch.el similarity index 100% rename from elpa/magit-20200220.308/magit-patch.el rename to elpa/magit-20200222.41/magit-patch.el diff --git a/elpa/magit-20200220.308/magit-patch.elc b/elpa/magit-20200222.41/magit-patch.elc similarity index 99% rename from elpa/magit-20200220.308/magit-patch.elc rename to elpa/magit-20200222.41/magit-patch.elc index 27a1b687..8f9d0a76 100644 Binary files a/elpa/magit-20200220.308/magit-patch.elc and b/elpa/magit-20200222.41/magit-patch.elc differ diff --git a/elpa/magit-20200220.308/magit-pkg.el b/elpa/magit-20200222.41/magit-pkg.el similarity index 76% rename from elpa/magit-20200220.308/magit-pkg.el rename to elpa/magit-20200222.41/magit-pkg.el index 23e1b6ad..ab3aa46b 100644 --- a/elpa/magit-20200220.308/magit-pkg.el +++ b/elpa/magit-20200222.41/magit-pkg.el @@ -1,4 +1,4 @@ -(define-package "magit" "20200220.308" "A Git porcelain inside Emacs." +(define-package "magit" "20200222.41" "A Git porcelain inside Emacs." '((emacs "25.1") (async "20180527") (dash "20180910") diff --git a/elpa/magit-20200220.308/magit-process.el b/elpa/magit-20200222.41/magit-process.el similarity index 100% rename from elpa/magit-20200220.308/magit-process.el rename to elpa/magit-20200222.41/magit-process.el diff --git a/elpa/magit-20200220.308/magit-process.elc b/elpa/magit-20200222.41/magit-process.elc similarity index 99% rename from elpa/magit-20200220.308/magit-process.elc rename to elpa/magit-20200222.41/magit-process.elc index e6606383..18c4d6b0 100644 Binary files a/elpa/magit-20200220.308/magit-process.elc and b/elpa/magit-20200222.41/magit-process.elc differ diff --git a/elpa/magit-20200220.308/magit-pull.el b/elpa/magit-20200222.41/magit-pull.el similarity index 100% rename from elpa/magit-20200220.308/magit-pull.el rename to elpa/magit-20200222.41/magit-pull.el diff --git a/elpa/magit-20200220.308/magit-pull.elc b/elpa/magit-20200222.41/magit-pull.elc similarity index 99% rename from elpa/magit-20200220.308/magit-pull.elc rename to elpa/magit-20200222.41/magit-pull.elc index d34d92c1..42663d63 100644 Binary files a/elpa/magit-20200220.308/magit-pull.elc and b/elpa/magit-20200222.41/magit-pull.elc differ diff --git a/elpa/magit-20200220.308/magit-push.el b/elpa/magit-20200222.41/magit-push.el similarity index 100% rename from elpa/magit-20200220.308/magit-push.el rename to elpa/magit-20200222.41/magit-push.el diff --git a/elpa/magit-20200220.308/magit-push.elc b/elpa/magit-20200222.41/magit-push.elc similarity index 99% rename from elpa/magit-20200220.308/magit-push.elc rename to elpa/magit-20200222.41/magit-push.elc index e7baadbf..a1b60bae 100644 Binary files a/elpa/magit-20200220.308/magit-push.elc and b/elpa/magit-20200222.41/magit-push.elc differ diff --git a/elpa/magit-20200220.308/magit-reflog.el b/elpa/magit-20200222.41/magit-reflog.el similarity index 100% rename from elpa/magit-20200220.308/magit-reflog.el rename to elpa/magit-20200222.41/magit-reflog.el diff --git a/elpa/magit-20200220.308/magit-reflog.elc b/elpa/magit-20200222.41/magit-reflog.elc similarity index 99% rename from elpa/magit-20200220.308/magit-reflog.elc rename to elpa/magit-20200222.41/magit-reflog.elc index 4e9db48c..e65752fb 100644 Binary files a/elpa/magit-20200220.308/magit-reflog.elc and b/elpa/magit-20200222.41/magit-reflog.elc differ diff --git a/elpa/magit-20200220.308/magit-refs.el b/elpa/magit-20200222.41/magit-refs.el similarity index 100% rename from elpa/magit-20200220.308/magit-refs.el rename to elpa/magit-20200222.41/magit-refs.el diff --git a/elpa/magit-20200220.308/magit-refs.elc b/elpa/magit-20200222.41/magit-refs.elc similarity index 94% rename from elpa/magit-20200220.308/magit-refs.elc rename to elpa/magit-20200222.41/magit-refs.elc index cc3e515e..63ddf833 100644 Binary files a/elpa/magit-20200220.308/magit-refs.elc and b/elpa/magit-20200222.41/magit-refs.elc differ diff --git a/elpa/magit-20200220.308/magit-remote.el b/elpa/magit-20200222.41/magit-remote.el similarity index 100% rename from elpa/magit-20200220.308/magit-remote.el rename to elpa/magit-20200222.41/magit-remote.el diff --git a/elpa/magit-20200220.308/magit-remote.elc b/elpa/magit-20200222.41/magit-remote.elc similarity index 85% rename from elpa/magit-20200220.308/magit-remote.elc rename to elpa/magit-20200222.41/magit-remote.elc index 53726078..dad6c58a 100644 Binary files a/elpa/magit-20200220.308/magit-remote.elc and b/elpa/magit-20200222.41/magit-remote.elc differ diff --git a/elpa/magit-20200220.308/magit-repos.el b/elpa/magit-20200222.41/magit-repos.el similarity index 100% rename from elpa/magit-20200220.308/magit-repos.el rename to elpa/magit-20200222.41/magit-repos.el diff --git a/elpa/magit-20200220.308/magit-repos.elc b/elpa/magit-20200222.41/magit-repos.elc similarity index 99% rename from elpa/magit-20200220.308/magit-repos.elc rename to elpa/magit-20200222.41/magit-repos.elc index e8f45905..d699fec9 100644 Binary files a/elpa/magit-20200220.308/magit-repos.elc and b/elpa/magit-20200222.41/magit-repos.elc differ diff --git a/elpa/magit-20200220.308/magit-reset.el b/elpa/magit-20200222.41/magit-reset.el similarity index 100% rename from elpa/magit-20200220.308/magit-reset.el rename to elpa/magit-20200222.41/magit-reset.el diff --git a/elpa/magit-20200220.308/magit-reset.elc b/elpa/magit-20200222.41/magit-reset.elc similarity index 99% rename from elpa/magit-20200220.308/magit-reset.elc rename to elpa/magit-20200222.41/magit-reset.elc index cfde1a9f..bcf61ab8 100644 Binary files a/elpa/magit-20200220.308/magit-reset.elc and b/elpa/magit-20200222.41/magit-reset.elc differ diff --git a/elpa/magit-20200220.308/magit-section.el b/elpa/magit-20200222.41/magit-section.el similarity index 100% rename from elpa/magit-20200220.308/magit-section.el rename to elpa/magit-20200222.41/magit-section.el diff --git a/elpa/magit-20200220.308/magit-section.elc b/elpa/magit-20200222.41/magit-section.elc similarity index 97% rename from elpa/magit-20200220.308/magit-section.elc rename to elpa/magit-20200222.41/magit-section.elc index f9f4a4fc..48c150e7 100644 Binary files a/elpa/magit-20200220.308/magit-section.elc and b/elpa/magit-20200222.41/magit-section.elc differ diff --git a/elpa/magit-20200220.308/magit-sequence.el b/elpa/magit-20200222.41/magit-sequence.el similarity index 100% rename from elpa/magit-20200220.308/magit-sequence.el rename to elpa/magit-20200222.41/magit-sequence.el diff --git a/elpa/magit-20200220.308/magit-sequence.elc b/elpa/magit-20200222.41/magit-sequence.elc similarity index 94% rename from elpa/magit-20200220.308/magit-sequence.elc rename to elpa/magit-20200222.41/magit-sequence.elc index ab692e5a..c667482c 100644 Binary files a/elpa/magit-20200220.308/magit-sequence.elc and b/elpa/magit-20200222.41/magit-sequence.elc differ diff --git a/elpa/magit-20200220.308/magit-stash.el b/elpa/magit-20200222.41/magit-stash.el similarity index 100% rename from elpa/magit-20200220.308/magit-stash.el rename to elpa/magit-20200222.41/magit-stash.el diff --git a/elpa/magit-20200220.308/magit-stash.elc b/elpa/magit-20200222.41/magit-stash.elc similarity index 99% rename from elpa/magit-20200220.308/magit-stash.elc rename to elpa/magit-20200222.41/magit-stash.elc index 4b430e04..38c33acd 100644 Binary files a/elpa/magit-20200220.308/magit-stash.elc and b/elpa/magit-20200222.41/magit-stash.elc differ diff --git a/elpa/magit-20200220.308/magit-status.el b/elpa/magit-20200222.41/magit-status.el similarity index 100% rename from elpa/magit-20200220.308/magit-status.el rename to elpa/magit-20200222.41/magit-status.el diff --git a/elpa/magit-20200220.308/magit-status.elc b/elpa/magit-20200222.41/magit-status.elc similarity index 97% rename from elpa/magit-20200220.308/magit-status.elc rename to elpa/magit-20200222.41/magit-status.elc index c6464b0b..1c2ebae4 100644 Binary files a/elpa/magit-20200220.308/magit-status.elc and b/elpa/magit-20200222.41/magit-status.elc differ diff --git a/elpa/magit-20200220.308/magit-submodule.el b/elpa/magit-20200222.41/magit-submodule.el similarity index 100% rename from elpa/magit-20200220.308/magit-submodule.el rename to elpa/magit-20200222.41/magit-submodule.el diff --git a/elpa/magit-20200220.308/magit-submodule.elc b/elpa/magit-20200222.41/magit-submodule.elc similarity index 97% rename from elpa/magit-20200220.308/magit-submodule.elc rename to elpa/magit-20200222.41/magit-submodule.elc index 80edc0ed..e8561810 100644 Binary files a/elpa/magit-20200220.308/magit-submodule.elc and b/elpa/magit-20200222.41/magit-submodule.elc differ diff --git a/elpa/magit-20200220.308/magit-subtree.el b/elpa/magit-20200222.41/magit-subtree.el similarity index 100% rename from elpa/magit-20200220.308/magit-subtree.el rename to elpa/magit-20200222.41/magit-subtree.el diff --git a/elpa/magit-20200220.308/magit-subtree.elc b/elpa/magit-20200222.41/magit-subtree.elc similarity index 99% rename from elpa/magit-20200220.308/magit-subtree.elc rename to elpa/magit-20200222.41/magit-subtree.elc index 206a17e7..f9555aff 100644 Binary files a/elpa/magit-20200220.308/magit-subtree.elc and b/elpa/magit-20200222.41/magit-subtree.elc differ diff --git a/elpa/magit-20200220.308/magit-tag.el b/elpa/magit-20200222.41/magit-tag.el similarity index 100% rename from elpa/magit-20200220.308/magit-tag.el rename to elpa/magit-20200222.41/magit-tag.el diff --git a/elpa/magit-20200220.308/magit-tag.elc b/elpa/magit-20200222.41/magit-tag.elc similarity index 99% rename from elpa/magit-20200220.308/magit-tag.elc rename to elpa/magit-20200222.41/magit-tag.elc index 2c797822..430ef41a 100644 Binary files a/elpa/magit-20200220.308/magit-tag.elc and b/elpa/magit-20200222.41/magit-tag.elc differ diff --git a/elpa/magit-20200220.308/magit-transient.el b/elpa/magit-20200222.41/magit-transient.el similarity index 100% rename from elpa/magit-20200220.308/magit-transient.el rename to elpa/magit-20200222.41/magit-transient.el diff --git a/elpa/magit-20200220.308/magit-transient.elc b/elpa/magit-20200222.41/magit-transient.elc similarity index 99% rename from elpa/magit-20200220.308/magit-transient.elc rename to elpa/magit-20200222.41/magit-transient.elc index 422e4522..29254b5f 100644 Binary files a/elpa/magit-20200220.308/magit-transient.elc and b/elpa/magit-20200222.41/magit-transient.elc differ diff --git a/elpa/magit-20200220.308/magit-utils.el b/elpa/magit-20200222.41/magit-utils.el similarity index 100% rename from elpa/magit-20200220.308/magit-utils.el rename to elpa/magit-20200222.41/magit-utils.el diff --git a/elpa/magit-20200220.308/magit-utils.elc b/elpa/magit-20200222.41/magit-utils.elc similarity index 98% rename from elpa/magit-20200220.308/magit-utils.elc rename to elpa/magit-20200222.41/magit-utils.elc index f9981748..547ec65d 100644 Binary files a/elpa/magit-20200220.308/magit-utils.elc and b/elpa/magit-20200222.41/magit-utils.elc differ diff --git a/elpa/magit-20200220.308/magit-wip.el b/elpa/magit-20200222.41/magit-wip.el similarity index 100% rename from elpa/magit-20200220.308/magit-wip.el rename to elpa/magit-20200222.41/magit-wip.el diff --git a/elpa/magit-20200220.308/magit-wip.elc b/elpa/magit-20200222.41/magit-wip.elc similarity index 99% rename from elpa/magit-20200220.308/magit-wip.elc rename to elpa/magit-20200222.41/magit-wip.elc index e5790932..0ac84088 100644 Binary files a/elpa/magit-20200220.308/magit-wip.elc and b/elpa/magit-20200222.41/magit-wip.elc differ diff --git a/elpa/magit-20200220.308/magit-worktree.el b/elpa/magit-20200222.41/magit-worktree.el similarity index 100% rename from elpa/magit-20200220.308/magit-worktree.el rename to elpa/magit-20200222.41/magit-worktree.el diff --git a/elpa/magit-20200220.308/magit-worktree.elc b/elpa/magit-20200222.41/magit-worktree.elc similarity index 99% rename from elpa/magit-20200220.308/magit-worktree.elc rename to elpa/magit-20200222.41/magit-worktree.elc index 21c4fae4..3ec7d5b0 100644 Binary files a/elpa/magit-20200220.308/magit-worktree.elc and b/elpa/magit-20200222.41/magit-worktree.elc differ diff --git a/elpa/magit-20200220.308/magit.el b/elpa/magit-20200222.41/magit.el similarity index 100% rename from elpa/magit-20200220.308/magit.el rename to elpa/magit-20200222.41/magit.el diff --git a/elpa/magit-20200220.308/magit.elc b/elpa/magit-20200222.41/magit.elc similarity index 99% rename from elpa/magit-20200220.308/magit.elc rename to elpa/magit-20200222.41/magit.elc index 6ed985a0..8096f689 100644 Binary files a/elpa/magit-20200220.308/magit.elc and b/elpa/magit-20200222.41/magit.elc differ diff --git a/elpa/magit-20200220.308/magit.info b/elpa/magit-20200222.41/magit.info similarity index 100% rename from elpa/magit-20200220.308/magit.info rename to elpa/magit-20200222.41/magit.info diff --git a/elpa/magit-20200220.308/magit.info-1 b/elpa/magit-20200222.41/magit.info-1 similarity index 100% rename from elpa/magit-20200220.308/magit.info-1 rename to elpa/magit-20200222.41/magit.info-1 diff --git a/elpa/magit-20200220.308/magit.info-2 b/elpa/magit-20200222.41/magit.info-2 similarity index 100% rename from elpa/magit-20200220.308/magit.info-2 rename to elpa/magit-20200222.41/magit.info-2 diff --git a/elpa/package-lint-20191220.419/data/stdlib-changes b/elpa/package-lint-20200221.2122/data/stdlib-changes similarity index 100% rename from elpa/package-lint-20191220.419/data/stdlib-changes rename to elpa/package-lint-20200221.2122/data/stdlib-changes diff --git a/elpa/package-lint-20191220.419/package-lint-autoloads.el b/elpa/package-lint-20200221.2122/package-lint-autoloads.el similarity index 100% rename from elpa/package-lint-20191220.419/package-lint-autoloads.el rename to elpa/package-lint-20200221.2122/package-lint-autoloads.el diff --git a/elpa/package-lint-20191220.419/package-lint-pkg.el b/elpa/package-lint-20200221.2122/package-lint-pkg.el similarity index 79% rename from elpa/package-lint-20191220.419/package-lint-pkg.el rename to elpa/package-lint-20200221.2122/package-lint-pkg.el index 53a7d295..2da9206a 100644 --- a/elpa/package-lint-20191220.419/package-lint-pkg.el +++ b/elpa/package-lint-20200221.2122/package-lint-pkg.el @@ -1,4 +1,4 @@ -(define-package "package-lint" "20191220.419" "A linting library for elisp package authors" +(define-package "package-lint" "20200221.2122" "A linting library for elisp package authors" '((cl-lib "0.5") (emacs "24.1") (let-alist "1.0.6")) diff --git a/elpa/package-lint-20191220.419/package-lint.el b/elpa/package-lint-20200221.2122/package-lint.el similarity index 99% rename from elpa/package-lint-20191220.419/package-lint.el rename to elpa/package-lint-20200221.2122/package-lint.el index ef2c3d9e..19a6ccd3 100644 --- a/elpa/package-lint-20191220.419/package-lint.el +++ b/elpa/package-lint-20200221.2122/package-lint.el @@ -204,7 +204,7 @@ POS defaults to `point'." (save-excursion (when pos (goto-char pos)) - (package-lint--error (line-number-at-pos) (current-column) type message))) + (package-lint--error (line-number-at-pos) (- (point) (line-beginning-position)) type message))) (defun package-lint--error-at-bol (type message) "Construct a datum for error at the beginning of the current line with TYPE and MESSAGE." diff --git a/elpa/package-lint-20191220.419/package-lint.elc b/elpa/package-lint-20200221.2122/package-lint.elc similarity index 93% rename from elpa/package-lint-20191220.419/package-lint.elc rename to elpa/package-lint-20200221.2122/package-lint.elc index e2b75622..df01d80a 100644 Binary files a/elpa/package-lint-20191220.419/package-lint.elc and b/elpa/package-lint-20200221.2122/package-lint.elc differ diff --git a/elpa/racket-mode-20200115.2148/dir b/elpa/racket-mode-20200218.1623/dir similarity index 100% rename from elpa/racket-mode-20200115.2148/dir rename to elpa/racket-mode-20200218.1623/dir diff --git a/elpa/racket-mode-20200115.2148/racket-bug-report.el b/elpa/racket-mode-20200218.1623/racket-bug-report.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-bug-report.el rename to elpa/racket-mode-20200218.1623/racket-bug-report.el diff --git a/elpa/racket-mode-20200115.2148/racket-bug-report.elc b/elpa/racket-mode-20200218.1623/racket-bug-report.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-bug-report.elc rename to elpa/racket-mode-20200218.1623/racket-bug-report.elc diff --git a/elpa/racket-mode-20200115.2148/racket-collection.el b/elpa/racket-mode-20200218.1623/racket-collection.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-collection.el rename to elpa/racket-mode-20200218.1623/racket-collection.el diff --git a/elpa/racket-mode-20200115.2148/racket-collection.elc b/elpa/racket-mode-20200218.1623/racket-collection.elc similarity index 84% rename from elpa/racket-mode-20200115.2148/racket-collection.elc rename to elpa/racket-mode-20200218.1623/racket-collection.elc index 935409eb..229de3d7 100644 Binary files a/elpa/racket-mode-20200115.2148/racket-collection.elc and b/elpa/racket-mode-20200218.1623/racket-collection.elc differ diff --git a/elpa/racket-mode-20200115.2148/racket-common.el b/elpa/racket-mode-20200218.1623/racket-common.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-common.el rename to elpa/racket-mode-20200218.1623/racket-common.el diff --git a/elpa/racket-mode-20200115.2148/racket-common.elc b/elpa/racket-mode-20200218.1623/racket-common.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-common.elc rename to elpa/racket-mode-20200218.1623/racket-common.elc diff --git a/elpa/racket-mode-20200115.2148/racket-complete.el b/elpa/racket-mode-20200218.1623/racket-complete.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-complete.el rename to elpa/racket-mode-20200218.1623/racket-complete.el diff --git a/elpa/racket-mode-20200115.2148/racket-complete.elc b/elpa/racket-mode-20200218.1623/racket-complete.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-complete.elc rename to elpa/racket-mode-20200218.1623/racket-complete.elc diff --git a/elpa/racket-mode-20200115.2148/racket-custom.el b/elpa/racket-mode-20200218.1623/racket-custom.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-custom.el rename to elpa/racket-mode-20200218.1623/racket-custom.el diff --git a/elpa/racket-mode-20200115.2148/racket-custom.elc b/elpa/racket-mode-20200218.1623/racket-custom.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-custom.elc rename to elpa/racket-mode-20200218.1623/racket-custom.elc diff --git a/elpa/racket-mode-20200115.2148/racket-debug.el b/elpa/racket-mode-20200218.1623/racket-debug.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-debug.el rename to elpa/racket-mode-20200218.1623/racket-debug.el diff --git a/elpa/racket-mode-20200115.2148/racket-debug.elc b/elpa/racket-mode-20200218.1623/racket-debug.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-debug.elc rename to elpa/racket-mode-20200218.1623/racket-debug.elc diff --git a/elpa/racket-mode-20200115.2148/racket-edit.el b/elpa/racket-mode-20200218.1623/racket-edit.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-edit.el rename to elpa/racket-mode-20200218.1623/racket-edit.el diff --git a/elpa/racket-mode-20200115.2148/racket-edit.elc b/elpa/racket-mode-20200218.1623/racket-edit.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-edit.elc rename to elpa/racket-mode-20200218.1623/racket-edit.elc diff --git a/elpa/racket-mode-20200115.2148/racket-font-lock.el b/elpa/racket-mode-20200218.1623/racket-font-lock.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-font-lock.el rename to elpa/racket-mode-20200218.1623/racket-font-lock.el diff --git a/elpa/racket-mode-20200115.2148/racket-font-lock.elc b/elpa/racket-mode-20200218.1623/racket-font-lock.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-font-lock.elc rename to elpa/racket-mode-20200218.1623/racket-font-lock.elc diff --git a/elpa/racket-mode-20200115.2148/racket-imenu.el b/elpa/racket-mode-20200218.1623/racket-imenu.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-imenu.el rename to elpa/racket-mode-20200218.1623/racket-imenu.el diff --git a/elpa/racket-mode-20200115.2148/racket-imenu.elc b/elpa/racket-mode-20200218.1623/racket-imenu.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-imenu.elc rename to elpa/racket-mode-20200218.1623/racket-imenu.elc diff --git a/elpa/racket-mode-20200115.2148/racket-indent.el b/elpa/racket-mode-20200218.1623/racket-indent.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-indent.el rename to elpa/racket-mode-20200218.1623/racket-indent.el diff --git a/elpa/racket-mode-20200115.2148/racket-indent.elc b/elpa/racket-mode-20200218.1623/racket-indent.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-indent.elc rename to elpa/racket-mode-20200218.1623/racket-indent.elc diff --git a/elpa/racket-mode-20200115.2148/racket-keywords-and-builtins.el b/elpa/racket-mode-20200218.1623/racket-keywords-and-builtins.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-keywords-and-builtins.el rename to elpa/racket-mode-20200218.1623/racket-keywords-and-builtins.el diff --git a/elpa/racket-mode-20200115.2148/racket-keywords-and-builtins.elc b/elpa/racket-mode-20200218.1623/racket-keywords-and-builtins.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-keywords-and-builtins.elc rename to elpa/racket-mode-20200218.1623/racket-keywords-and-builtins.elc diff --git a/elpa/racket-mode-20200115.2148/racket-logger.el b/elpa/racket-mode-20200218.1623/racket-logger.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-logger.el rename to elpa/racket-mode-20200218.1623/racket-logger.el diff --git a/elpa/racket-mode-20200115.2148/racket-logger.elc b/elpa/racket-mode-20200218.1623/racket-logger.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-logger.elc rename to elpa/racket-mode-20200218.1623/racket-logger.elc diff --git a/elpa/racket-mode-20200115.2148/racket-mode-autoloads.el b/elpa/racket-mode-20200218.1623/racket-mode-autoloads.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-mode-autoloads.el rename to elpa/racket-mode-20200218.1623/racket-mode-autoloads.el diff --git a/elpa/racket-mode-20200115.2148/racket-mode-pkg.el b/elpa/racket-mode-20200218.1623/racket-mode-pkg.el similarity index 77% rename from elpa/racket-mode-20200115.2148/racket-mode-pkg.el rename to elpa/racket-mode-20200218.1623/racket-mode-pkg.el index 6bb461fb..59b13b18 100644 --- a/elpa/racket-mode-20200115.2148/racket-mode-pkg.el +++ b/elpa/racket-mode-20200218.1623/racket-mode-pkg.el @@ -1,4 +1,4 @@ -(define-package "racket-mode" "20200115.2148" "Major mode for Racket language." +(define-package "racket-mode" "20200218.1623" "Major mode for Racket language." '((emacs "24.3") (faceup "0.0.2")) :authors diff --git a/elpa/racket-mode-20200115.2148/racket-mode.el b/elpa/racket-mode-20200218.1623/racket-mode.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-mode.el rename to elpa/racket-mode-20200218.1623/racket-mode.el diff --git a/elpa/racket-mode-20200115.2148/racket-mode.elc b/elpa/racket-mode-20200218.1623/racket-mode.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-mode.elc rename to elpa/racket-mode-20200218.1623/racket-mode.elc diff --git a/elpa/racket-mode-20200115.2148/racket-mode.info b/elpa/racket-mode-20200218.1623/racket-mode.info similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-mode.info rename to elpa/racket-mode-20200218.1623/racket-mode.info diff --git a/elpa/racket-mode-20200115.2148/racket-parens.el b/elpa/racket-mode-20200218.1623/racket-parens.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-parens.el rename to elpa/racket-mode-20200218.1623/racket-parens.el diff --git a/elpa/racket-mode-20200115.2148/racket-parens.elc b/elpa/racket-mode-20200218.1623/racket-parens.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-parens.elc rename to elpa/racket-mode-20200218.1623/racket-parens.elc diff --git a/elpa/racket-mode-20200115.2148/racket-ppss.el b/elpa/racket-mode-20200218.1623/racket-ppss.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-ppss.el rename to elpa/racket-mode-20200218.1623/racket-ppss.el diff --git a/elpa/racket-mode-20200115.2148/racket-ppss.elc b/elpa/racket-mode-20200218.1623/racket-ppss.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-ppss.elc rename to elpa/racket-mode-20200218.1623/racket-ppss.elc diff --git a/elpa/racket-mode-20200115.2148/racket-profile.el b/elpa/racket-mode-20200218.1623/racket-profile.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-profile.el rename to elpa/racket-mode-20200218.1623/racket-profile.el diff --git a/elpa/racket-mode-20200115.2148/racket-profile.elc b/elpa/racket-mode-20200218.1623/racket-profile.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-profile.elc rename to elpa/racket-mode-20200218.1623/racket-profile.elc diff --git a/elpa/racket-mode-20200115.2148/racket-repl.el b/elpa/racket-mode-20200218.1623/racket-repl.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-repl.el rename to elpa/racket-mode-20200218.1623/racket-repl.el diff --git a/elpa/racket-mode-20200115.2148/racket-repl.elc b/elpa/racket-mode-20200218.1623/racket-repl.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-repl.elc rename to elpa/racket-mode-20200218.1623/racket-repl.elc diff --git a/elpa/racket-mode-20200115.2148/racket-smart-open.el b/elpa/racket-mode-20200218.1623/racket-smart-open.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-smart-open.el rename to elpa/racket-mode-20200218.1623/racket-smart-open.el diff --git a/elpa/racket-mode-20200115.2148/racket-smart-open.elc b/elpa/racket-mode-20200218.1623/racket-smart-open.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-smart-open.elc rename to elpa/racket-mode-20200218.1623/racket-smart-open.elc diff --git a/elpa/racket-mode-20200115.2148/racket-stepper.el b/elpa/racket-mode-20200218.1623/racket-stepper.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-stepper.el rename to elpa/racket-mode-20200218.1623/racket-stepper.el diff --git a/elpa/racket-mode-20200115.2148/racket-stepper.elc b/elpa/racket-mode-20200218.1623/racket-stepper.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-stepper.elc rename to elpa/racket-mode-20200218.1623/racket-stepper.elc diff --git a/elpa/racket-mode-20200115.2148/racket-unicode-input-method.el b/elpa/racket-mode-20200218.1623/racket-unicode-input-method.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-unicode-input-method.el rename to elpa/racket-mode-20200218.1623/racket-unicode-input-method.el diff --git a/elpa/racket-mode-20200115.2148/racket-unicode-input-method.elc b/elpa/racket-mode-20200218.1623/racket-unicode-input-method.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-unicode-input-method.elc rename to elpa/racket-mode-20200218.1623/racket-unicode-input-method.elc diff --git a/elpa/racket-mode-20200115.2148/racket-util.el b/elpa/racket-mode-20200218.1623/racket-util.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-util.el rename to elpa/racket-mode-20200218.1623/racket-util.el diff --git a/elpa/racket-mode-20200115.2148/racket-util.elc b/elpa/racket-mode-20200218.1623/racket-util.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-util.elc rename to elpa/racket-mode-20200218.1623/racket-util.elc diff --git a/elpa/racket-mode-20200115.2148/racket-wsl.el b/elpa/racket-mode-20200218.1623/racket-wsl.el similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-wsl.el rename to elpa/racket-mode-20200218.1623/racket-wsl.el diff --git a/elpa/racket-mode-20200115.2148/racket-wsl.elc b/elpa/racket-mode-20200218.1623/racket-wsl.elc similarity index 100% rename from elpa/racket-mode-20200115.2148/racket-wsl.elc rename to elpa/racket-mode-20200218.1623/racket-wsl.elc diff --git a/elpa/racket-mode-20200115.2148/racket/channel.rkt b/elpa/racket-mode-20200218.1623/racket/channel.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/channel.rkt rename to elpa/racket-mode-20200218.1623/racket/channel.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/command-server.rkt b/elpa/racket-mode-20200218.1623/racket/command-server.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/command-server.rkt rename to elpa/racket-mode-20200218.1623/racket/command-server.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/commands/check-syntax.rkt b/elpa/racket-mode-20200218.1623/racket/commands/check-syntax.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/commands/check-syntax.rkt rename to elpa/racket-mode-20200218.1623/racket/commands/check-syntax.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/commands/coverage.rkt b/elpa/racket-mode-20200218.1623/racket/commands/coverage.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/commands/coverage.rkt rename to elpa/racket-mode-20200218.1623/racket/commands/coverage.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/commands/describe.rkt b/elpa/racket-mode-20200218.1623/racket/commands/describe.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/commands/describe.rkt rename to elpa/racket-mode-20200218.1623/racket/commands/describe.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/commands/find-module.rkt b/elpa/racket-mode-20200218.1623/racket/commands/find-module.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/commands/find-module.rkt rename to elpa/racket-mode-20200218.1623/racket/commands/find-module.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/commands/help.rkt b/elpa/racket-mode-20200218.1623/racket/commands/help.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/commands/help.rkt rename to elpa/racket-mode-20200218.1623/racket/commands/help.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/commands/macro.rkt b/elpa/racket-mode-20200218.1623/racket/commands/macro.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/commands/macro.rkt rename to elpa/racket-mode-20200218.1623/racket/commands/macro.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/commands/profile.rkt b/elpa/racket-mode-20200218.1623/racket/commands/profile.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/commands/profile.rkt rename to elpa/racket-mode-20200218.1623/racket/commands/profile.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/commands/requires.rkt b/elpa/racket-mode-20200218.1623/racket/commands/requires.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/commands/requires.rkt rename to elpa/racket-mode-20200218.1623/racket/commands/requires.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/debug-annotator.rkt b/elpa/racket-mode-20200218.1623/racket/debug-annotator.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/debug-annotator.rkt rename to elpa/racket-mode-20200218.1623/racket/debug-annotator.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/debug.rkt b/elpa/racket-mode-20200218.1623/racket/debug.rkt similarity index 95% rename from elpa/racket-mode-20200115.2148/racket/debug.rkt rename to elpa/racket-mode-20200218.1623/racket/debug.rkt index 2d17971d..d3a9c4f5 100644 --- a/elpa/racket-mode-20200115.2148/racket/debug.rkt +++ b/elpa/racket-mode-20200218.1623/racket/debug.rkt @@ -59,10 +59,15 @@ (seteq)) annotated) -(define break-when/c (or/c 'all 'none (cons/c path-string? pos/c))) +;; The first contract is suitable for "edge" with Emacs Lisp. Second +;; is important for actual `next-break` value so that `break?` compare +;; of source works; see #425. +(define break-when/c (or/c 'all 'none (cons/c path-string? pos/c))) +(define break-when-strict/c (or/c 'all 'none (cons/c path? pos/c))) + (define/contract next-break - (case-> (-> break-when/c) - (-> break-when/c void)) + (case-> (-> break-when-strict/c) + (-> break-when-strict/c void)) (let ([v 'none]) (case-lambda [() v] [(v!) (set! v v!)]))) @@ -170,7 +175,7 @@ (define/contract (calc-next-break before/after break-when top-mark ccm) (-> (or/c 'before 'after) (or/c break-when/c 'over 'out) mark/c continuation-mark-set? - any) + break-when-strict/c) (define (big-step frames) (define num-marks (length (debug-marks (current-continuation-marks)))) (or (for/or ([frame (in-list frames)] @@ -185,10 +190,14 @@ (cons src right)))) 'all)) (match* [break-when before/after] + [['all _] 'all] [['out _] (big-step (debug-marks ccm))] [['over 'before] (big-step (cons top-mark (debug-marks ccm)))] [['over 'after] 'all] - [[v _] v])) + [[(cons (? path? path) pos) _] + (cons path pos)] + [[(cons (? path-string? path-str) pos) _] + (cons (string->path path-str) pos)])) (define break-id/c nat/c) (define/contract new-break-id diff --git a/elpa/racket-mode-20200115.2148/racket/elisp.rkt b/elpa/racket-mode-20200218.1623/racket/elisp.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/elisp.rkt rename to elpa/racket-mode-20200218.1623/racket/elisp.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/error.rkt b/elpa/racket-mode-20200218.1623/racket/error.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/error.rkt rename to elpa/racket-mode-20200218.1623/racket/error.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/example/example.rkt b/elpa/racket-mode-20200218.1623/racket/example/example.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/example/example.rkt rename to elpa/racket-mode-20200218.1623/racket/example/example.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/example/example.rkt.faceup b/elpa/racket-mode-20200218.1623/racket/example/example.rkt.faceup similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/example/example.rkt.faceup rename to elpa/racket-mode-20200218.1623/racket/example/example.rkt.faceup diff --git a/elpa/racket-mode-20200115.2148/racket/example/indent.rkt b/elpa/racket-mode-20200218.1623/racket/example/indent.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/example/indent.rkt rename to elpa/racket-mode-20200218.1623/racket/example/indent.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/example/indent.rkt.faceup b/elpa/racket-mode-20200218.1623/racket/example/indent.rkt.faceup similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/example/indent.rkt.faceup rename to elpa/racket-mode-20200218.1623/racket/example/indent.rkt.faceup diff --git a/elpa/racket-mode-20200115.2148/racket/find-module-path-completions.rkt b/elpa/racket-mode-20200218.1623/racket/find-module-path-completions.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/find-module-path-completions.rkt rename to elpa/racket-mode-20200218.1623/racket/find-module-path-completions.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/find.rkt b/elpa/racket-mode-20200218.1623/racket/find.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/find.rkt rename to elpa/racket-mode-20200218.1623/racket/find.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/fresh-line.rkt b/elpa/racket-mode-20200218.1623/racket/fresh-line.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/fresh-line.rkt rename to elpa/racket-mode-20200218.1623/racket/fresh-line.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/gui.rkt b/elpa/racket-mode-20200218.1623/racket/gui.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/gui.rkt rename to elpa/racket-mode-20200218.1623/racket/gui.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/image.rkt b/elpa/racket-mode-20200218.1623/racket/image.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/image.rkt rename to elpa/racket-mode-20200218.1623/racket/image.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/instrument.rkt b/elpa/racket-mode-20200218.1623/racket/instrument.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/instrument.rkt rename to elpa/racket-mode-20200218.1623/racket/instrument.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/interactions.rkt b/elpa/racket-mode-20200218.1623/racket/interactions.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/interactions.rkt rename to elpa/racket-mode-20200218.1623/racket/interactions.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/keywords.rkt b/elpa/racket-mode-20200218.1623/racket/keywords.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/keywords.rkt rename to elpa/racket-mode-20200218.1623/racket/keywords.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/logger.rkt b/elpa/racket-mode-20200218.1623/racket/logger.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/logger.rkt rename to elpa/racket-mode-20200218.1623/racket/logger.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/md5.rkt b/elpa/racket-mode-20200218.1623/racket/md5.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/md5.rkt rename to elpa/racket-mode-20200218.1623/racket/md5.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/mod.rkt b/elpa/racket-mode-20200218.1623/racket/mod.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/mod.rkt rename to elpa/racket-mode-20200218.1623/racket/mod.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/namespace.rkt b/elpa/racket-mode-20200218.1623/racket/namespace.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/namespace.rkt rename to elpa/racket-mode-20200218.1623/racket/namespace.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/print.rkt b/elpa/racket-mode-20200218.1623/racket/print.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/print.rkt rename to elpa/racket-mode-20200218.1623/racket/print.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/run.rkt b/elpa/racket-mode-20200218.1623/racket/run.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/run.rkt rename to elpa/racket-mode-20200218.1623/racket/run.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/scribble.rkt b/elpa/racket-mode-20200218.1623/racket/scribble.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/scribble.rkt rename to elpa/racket-mode-20200218.1623/racket/scribble.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/syntax.rkt b/elpa/racket-mode-20200218.1623/racket/syntax.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/syntax.rkt rename to elpa/racket-mode-20200218.1623/racket/syntax.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/test/find-examples.rkt b/elpa/racket-mode-20200218.1623/racket/test/find-examples.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/test/find-examples.rkt rename to elpa/racket-mode-20200218.1623/racket/test/find-examples.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/test/find.rkt b/elpa/racket-mode-20200218.1623/racket/test/find.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/test/find.rkt rename to elpa/racket-mode-20200218.1623/racket/test/find.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/util.rkt b/elpa/racket-mode-20200218.1623/racket/util.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/util.rkt rename to elpa/racket-mode-20200218.1623/racket/util.rkt diff --git a/elpa/racket-mode-20200115.2148/racket/welcome.rkt b/elpa/racket-mode-20200218.1623/racket/welcome.rkt similarity index 100% rename from elpa/racket-mode-20200115.2148/racket/welcome.rkt rename to elpa/racket-mode-20200218.1623/racket/welcome.rkt diff --git a/elpa/typescript-mode-20200217.1108/typescript-mode-autoloads.el b/elpa/typescript-mode-20200221.2312/typescript-mode-autoloads.el similarity index 100% rename from elpa/typescript-mode-20200217.1108/typescript-mode-autoloads.el rename to elpa/typescript-mode-20200221.2312/typescript-mode-autoloads.el diff --git a/elpa/typescript-mode-20200217.1108/typescript-mode-pkg.el b/elpa/typescript-mode-20200221.2312/typescript-mode-pkg.el similarity index 74% rename from elpa/typescript-mode-20200217.1108/typescript-mode-pkg.el rename to elpa/typescript-mode-20200221.2312/typescript-mode-pkg.el index 7cada7e7..95fef0a5 100644 --- a/elpa/typescript-mode-20200217.1108/typescript-mode-pkg.el +++ b/elpa/typescript-mode-20200221.2312/typescript-mode-pkg.el @@ -1,4 +1,4 @@ -(define-package "typescript-mode" "20200217.1108" "Major mode for editing typescript" +(define-package "typescript-mode" "20200221.2312" "Major mode for editing typescript" '((emacs "24.3")) :keywords '("typescript" "languages") diff --git a/elpa/typescript-mode-20200217.1108/typescript-mode-test-utilities.el b/elpa/typescript-mode-20200221.2312/typescript-mode-test-utilities.el similarity index 100% rename from elpa/typescript-mode-20200217.1108/typescript-mode-test-utilities.el rename to elpa/typescript-mode-20200221.2312/typescript-mode-test-utilities.el diff --git a/elpa/typescript-mode-20200217.1108/typescript-mode-test-utilities.elc b/elpa/typescript-mode-20200221.2312/typescript-mode-test-utilities.elc similarity index 78% rename from elpa/typescript-mode-20200217.1108/typescript-mode-test-utilities.elc rename to elpa/typescript-mode-20200221.2312/typescript-mode-test-utilities.elc index 869e16ff..fa9ddb1e 100644 Binary files a/elpa/typescript-mode-20200217.1108/typescript-mode-test-utilities.elc and b/elpa/typescript-mode-20200221.2312/typescript-mode-test-utilities.elc differ diff --git a/elpa/typescript-mode-20200217.1108/typescript-mode.el b/elpa/typescript-mode-20200221.2312/typescript-mode.el similarity index 98% rename from elpa/typescript-mode-20200217.1108/typescript-mode.el rename to elpa/typescript-mode-20200221.2312/typescript-mode.el index 7806053d..ff2f8674 100644 --- a/elpa/typescript-mode-20200217.1108/typescript-mode.el +++ b/elpa/typescript-mode-20200221.2312/typescript-mode.el @@ -2244,19 +2244,31 @@ Searches specifically for any of \"=\", \"}\", and \"type\"." "Return non-nil if the current line continues an expression." (save-excursion (back-to-indentation) - (and - ;; Don't identify the spread syntax or rest operator as a - ;; "continuation". - (not (looking-at "\\.\\.\\.")) - (or (typescript--looking-at-operator-p) - (and (progn - (typescript--backward-syntactic-ws) - (or (bobp) (backward-char)) - (and (> (point) (point-min)) - (save-excursion (backward-char) (not (looking-at "[/*]/"))) - (typescript--looking-at-operator-p) - (and (progn (backward-char) - (not (looking-at "++\\|--\\|/[/*]"))))))))))) + (let ((list-start (nth 1 (syntax-ppss)))) + (and + ;; This not clause is there to eliminate degenerate cases where we have + ;; something that looks like a continued expression but we are in fact at + ;; the beginning of the expression. Example: in `if (a) { .q(1)` when the + ;; point is on the dot, the expression that follows looks like a member + ;; expression but the object on which it is a member is missing. If we + ;; naively treat this as a continued expression, we run into trouble + ;; later. (An infinite loop.) + (not (and list-start + (save-excursion + (typescript--backward-syntactic-ws) + (backward-char) + (eq (point) list-start)))) + ;; Don't identify the spread syntax or rest operator as a "continuation". + (not (looking-at "\\.\\.\\.")) + (or (typescript--looking-at-operator-p) + (and (progn + (typescript--backward-syntactic-ws) + (or (bobp) (backward-char)) + (and (> (point) (point-min)) + (save-excursion (backward-char) (not (looking-at "[/*]/"))) + (typescript--looking-at-operator-p) + (and (progn (backward-char) + (not (looking-at "++\\|--\\|/[/*]")))))))))))) (cl-defun typescript--compute-member-expression-indent () "Determine the indent of a member expression. diff --git a/elpa/typescript-mode-20200217.1108/typescript-mode.elc b/elpa/typescript-mode-20200221.2312/typescript-mode.elc similarity index 98% rename from elpa/typescript-mode-20200217.1108/typescript-mode.elc rename to elpa/typescript-mode-20200221.2312/typescript-mode.elc index 38f64f02..7a8a52e6 100644 Binary files a/elpa/typescript-mode-20200217.1108/typescript-mode.elc and b/elpa/typescript-mode-20200221.2312/typescript-mode.elc differ diff --git a/emacs.service b/emacs.service new file mode 100644 index 00000000..f3d7df9f --- /dev/null +++ b/emacs.service @@ -0,0 +1,13 @@ +[Unit] +Description=Emacs text editor +Documentation=info:emacs man:emacs(1) https://gnu.org/software/emacs/ + +[Service] +Type=simple +ExecStart=/usr/bin/emacs --fg-daemon +ExecStop=/usr/bin/emacsclient --eval "(kill-emacs)" +Environment=SSH_AUTH_SOCK=%t/keyring/ssh +Restart=on-failure + +[Install] +WantedBy=default.target diff --git a/init.el b/init.el index 698aefc3..3da67576 100755 --- a/init.el +++ b/init.el @@ -8,7 +8,7 @@ (global-set-key (kbd "C-x M-g") 'magit-dispatch) (global-set-key (kbd "M-i") 'imenu) (global-set-key (kbd "C-c n") 'newsticker-start) -(global-unset-key "\C-z") +;; (global-unset-key "\C-z") ;; start a server, unless one is already running (require 'server) @@ -46,15 +46,8 @@ There are two things you can do about this warning: (unless (eq system-type 'gnu/linux) (load-theme 'nord)) -;; Load my custom bundles (add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle")) -(require 'os) -(require 'display) -(require 'fill-column-indicator) -(require 'calendar-settings) -(require 'org-mode-settings) -(require 'sbcl-settings) -(require 'hooks) +(require 'bundles) ;; UTF-8 FTW (prefer-coding-system 'utf-8) diff --git a/irssi.conf b/irssi.conf new file mode 100644 index 00000000..1784ec6d --- /dev/null +++ b/irssi.conf @@ -0,0 +1,315 @@ +servers = ( + { + address = "chat.freenode.net"; + chatnet = "freenode"; + port = "6697"; + use_ssl = "yes"; + ssl_cert = "~/.irssi/certs/freenode.pem"; + ssl_verify = "yes"; + autoconnect = "yes"; + } +); + +chatnets = { + freenode = { type = "IRC"; nick = "srji"; username = "srji"; realname = "srji"; } +}; + +channels = ( + { name = "#python"; chatnet = "freenode"; autojoin = "yes"; }, + { name = "#lisp"; chatnet = "freenode"; autojoin = "yes"; } + { name = "#org-mode"; chatnet = "freenode"; autojoin = "yes"; } + { name = "##linux"; chatnet = "freenode"; autojoin = "yes"; } + { name = "#emacs"; chatnet = "freenode"; autojoin = "yes"; }, + { name = "#racket"; chatnet = "freenode"; autojoin = "yes"; } + { name = "#emacs-beginners"; chatnet = "freenode"; autojoin = "yes"; } + { name = "##linux-beginners"; chatnet = "freenode"; autojoin = "yes"; } +); + +aliases = { + ATAG = "WINDOW SERVER"; + ADDALLCHANS = "SCRIPT EXEC foreach my \\$channel (Irssi::channels()) { Irssi::command(\"CHANNEL ADD -auto \\$channel->{name} \\$channel->{server}->{tag} \\$channel->{key}\")\\;}"; + B = "BAN"; + BACK = "AWAY"; + BANS = "BAN"; + BYE = "QUIT"; + C = "CLEAR"; + CALC = "EXEC - if command -v bc >/dev/null 2>&1\\; then printf '%s=' '$*'\\; echo '$*' | bc -l\\; else echo bc was not found\\; fi"; + CHAT = "DCC CHAT"; + CUBES = "SCRIPT EXEC Irssi::active_win->print(\"%_bases\", MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print( do { join '', map { \"%x0\\${_}0\\$_\" } '0'..'9','A'..'F' }, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print(\"%_cubes\", MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print( do { my \\$y = \\$_*6 \\; join '', map { my \\$x = \\$_ \\; map { \"%x\\$x\\$_\\$x\\$_\" } @{['0'..'9','A'..'Z']}[\\$y .. \\$y+5] } 1..6 }, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) for 0..5 \\; Irssi::active_win->print(\"%_grays\", MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print( do { join '', map { \"%x7\\${_}7\\$_\" } 'A'..'X' }, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) \\; Irssi::active_win->print(\"%_mIRC extended colours\", MSGLEVEL_CLIENTCRAP) \\; my \\$x \\; \\$x .= sprintf \"\00399,%02d%02d\",\\$_,\\$_ for 0..15 \\; Irssi::active_win->print(\\$x, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) \\; for my \\$z (0..6) { my \\$x \\; \\$x .= sprintf \"\00399,%02d%02d\",\\$_,\\$_ for 16+(\\$z*12)..16+(\\$z*12)+11 \\; Irssi::active_win->print(\\$x, MSGLEVEL_NEVER | MSGLEVEL_CLIENTCRAP) }"; + DATE = "TIME"; + DEHIGHLIGHT = "DEHILIGHT"; + DESCRIBE = "ACTION"; + DHL = "DEHILIGHT"; + EXEMPTLIST = "MODE $C +e"; + EXIT = "QUIT"; + GOTO = "SCROLLBACK GOTO"; + HIGHLIGHT = "HILIGHT"; + HL = "HILIGHT"; + HOST = "USERHOST"; + INVITELIST = "MODE $C +I"; + J = "JOIN"; + K = "KICK"; + KB = "KICKBAN"; + KN = "KNOCKOUT"; + LAST = "LASTLOG"; + LEAVE = "PART"; + M = "MSG"; + MUB = "UNBAN *"; + N = "NAMES"; + NMSG = "^MSG"; + P = "PART"; + Q = "QUERY"; + RESET = "SET -default"; + RUN = "SCRIPT LOAD"; + SAY = "MSG *"; + SB = "SCROLLBACK"; + SBAR = "STATUSBAR"; + SIGNOFF = "QUIT"; + SV = "MSG * Irssi $J ($V) - http://www.irssi.org"; + T = "TOPIC"; + UB = "UNBAN"; + UMODE = "MODE $N"; + UNSET = "SET -clear"; + W = "WHO"; + WC = "WINDOW CLOSE"; + WG = "WINDOW GOTO"; + WJOIN = "JOIN -window"; + WI = "WHOIS"; + WII = "WHOIS $0 $0"; + WL = "WINDOW LIST"; + WN = "WINDOW NEW HIDDEN"; + WQUERY = "QUERY -window"; + WW = "WHOWAS"; + 1 = "WINDOW GOTO 1"; + 2 = "WINDOW GOTO 2"; + 3 = "WINDOW GOTO 3"; + 4 = "WINDOW GOTO 4"; + 5 = "WINDOW GOTO 5"; + 6 = "WINDOW GOTO 6"; + 7 = "WINDOW GOTO 7"; + 8 = "WINDOW GOTO 8"; + 9 = "WINDOW GOTO 9"; + 10 = "WINDOW GOTO 10"; + 11 = "WINDOW GOTO 11"; + 12 = "WINDOW GOTO 12"; + 13 = "WINDOW GOTO 13"; + 14 = "WINDOW GOTO 14"; + 15 = "WINDOW GOTO 15"; + 16 = "WINDOW GOTO 16"; + 17 = "WINDOW GOTO 17"; + 18 = "WINDOW GOTO 18"; + 19 = "WINDOW GOTO 19"; + 20 = "WINDOW GOTO 20"; + 21 = "WINDOW GOTO 21"; + 22 = "WINDOW GOTO 22"; + 23 = "WINDOW GOTO 23"; + 24 = "WINDOW GOTO 24"; + 25 = "WINDOW GOTO 25"; + 26 = "WINDOW GOTO 26"; + 27 = "WINDOW GOTO 27"; + 28 = "WINDOW GOTO 28"; + 29 = "WINDOW GOTO 29"; + 30 = "WINDOW GOTO 30"; + 31 = "WINDOW GOTO 31"; + 32 = "WINDOW GOTO 32"; + 33 = "WINDOW GOTO 33"; + 34 = "WINDOW GOTO 34"; + 35 = "WINDOW GOTO 35"; + 36 = "WINDOW GOTO 36"; + 37 = "WINDOW GOTO 37"; + 38 = "WINDOW GOTO 38"; + 39 = "WINDOW GOTO 39"; + 40 = "WINDOW GOTO 40"; + 41 = "WINDOW GOTO 41"; + 42 = "WINDOW GOTO 42"; + 43 = "WINDOW GOTO 43"; + 44 = "WINDOW GOTO 44"; + 45 = "WINDOW GOTO 45"; + 46 = "WINDOW GOTO 46"; + 47 = "WINDOW GOTO 47"; + 48 = "WINDOW GOTO 48"; + 49 = "WINDOW GOTO 49"; + 50 = "WINDOW GOTO 50"; + 51 = "WINDOW GOTO 51"; + 52 = "WINDOW GOTO 52"; + 53 = "WINDOW GOTO 53"; + 54 = "WINDOW GOTO 54"; + 55 = "WINDOW GOTO 55"; + 56 = "WINDOW GOTO 56"; + 57 = "WINDOW GOTO 57"; + 58 = "WINDOW GOTO 58"; + 59 = "WINDOW GOTO 59"; + 60 = "WINDOW GOTO 60"; + 61 = "WINDOW GOTO 61"; + 62 = "WINDOW GOTO 62"; + 63 = "WINDOW GOTO 63"; + 64 = "WINDOW GOTO 64"; + 65 = "WINDOW GOTO 65"; + 66 = "WINDOW GOTO 66"; + 67 = "WINDOW GOTO 67"; + 68 = "WINDOW GOTO 68"; + 69 = "WINDOW GOTO 69"; + 70 = "WINDOW GOTO 70"; + 71 = "WINDOW GOTO 71"; + 72 = "WINDOW GOTO 72"; + 73 = "WINDOW GOTO 73"; + 74 = "WINDOW GOTO 74"; + 75 = "WINDOW GOTO 75"; + 76 = "WINDOW GOTO 76"; + 77 = "WINDOW GOTO 77"; + 78 = "WINDOW GOTO 78"; + 79 = "WINDOW GOTO 79"; + 80 = "WINDOW GOTO 80"; + 81 = "WINDOW GOTO 81"; + 82 = "WINDOW GOTO 82"; + 83 = "WINDOW GOTO 83"; + 84 = "WINDOW GOTO 84"; + 85 = "WINDOW GOTO 85"; + 86 = "WINDOW GOTO 86"; + 87 = "WINDOW GOTO 87"; + 88 = "WINDOW GOTO 88"; + 89 = "WINDOW GOTO 89"; + 90 = "WINDOW GOTO 90"; + 91 = "WINDOW GOTO 91"; + 92 = "WINDOW GOTO 92"; + 93 = "WINDOW GOTO 93"; + 94 = "WINDOW GOTO 94"; + 95 = "WINDOW GOTO 95"; + 96 = "WINDOW GOTO 96"; + 97 = "WINDOW GOTO 97"; + 98 = "WINDOW GOTO 98"; + 99 = "WINDOW GOTO 99"; +}; + +statusbar = { + + items = { + + barstart = "{sbstart}"; + barend = "{sbend}"; + + topicbarstart = "{topicsbstart}"; + topicbarend = "{topicsbend}"; + + time = "{sb $Z}"; + user = "{sb {sbnickmode $cumode}$N{sbmode $usermode}{sbaway $A}}"; + + window = "{sb $winref:$tag/$itemname{sbmode $M}}"; + window_empty = "{sb $winref{sbservertag $tag}}"; + + prompt = "{prompt $[.15]itemname}"; + prompt_empty = "{prompt $winname}"; + + topic = " $topic"; + topic_empty = " Irssi v$J - http://www.irssi.org"; + + lag = "{sb Lag: $0-}"; + act = "{sb Act: $0-}"; + more = "-- more --"; + }; + + default = { + + window = { + + disabled = "no"; + type = "window"; + placement = "bottom"; + position = "1"; + visible = "active"; + + items = { + barstart = { priority = "100"; }; + time = { }; + user = { }; + window = { }; + window_empty = { }; + lag = { priority = "-1"; }; + act = { priority = "10"; }; + more = { priority = "-1"; alignment = "right"; }; + barend = { priority = "100"; alignment = "right"; }; + }; + }; + + window_inact = { + + type = "window"; + placement = "bottom"; + position = "1"; + visible = "inactive"; + + items = { + barstart = { priority = "100"; }; + window = { }; + window_empty = { }; + more = { priority = "-1"; alignment = "right"; }; + barend = { priority = "100"; alignment = "right"; }; + }; + }; + + prompt = { + + type = "root"; + placement = "bottom"; + position = "100"; + visible = "always"; + + items = { + prompt = { priority = "-1"; }; + prompt_empty = { priority = "-1"; }; + input = { priority = "10"; }; + }; + }; + + topic = { + + type = "root"; + placement = "top"; + position = "1"; + visible = "always"; + + items = { + topicbarstart = { priority = "100"; }; + topic = { }; + topic_empty = { }; + topicbarend = { priority = "100"; alignment = "right"; }; + }; + }; + awl_0 = { + items = { + barstart = { priority = "100"; }; + awl_0 = { }; + barend = { priority = "100"; alignment = "right"; }; + }; + }; + }; +}; +settings = { + core = { + real_name = "srji"; + user_name = "srji"; + nick = "srji"; + hostname = "srji@localhost"; + }; + "fe-text" = { actlist_sort = "refnum"; }; + "fe-common/core" = { + theme = "simplicity"; + term_charset = "utf-8"; + autolog_path = "~/.irssi/logs/$tag/$0/%Y-%m-%d.log"; + autolog = "yes"; + }; +}; +logs = { }; +ignores = ( + { + level = "JOINS PARTS QUITS NICKS"; + channels = ( "#hackerboard", "#selenium", "#python.de" ); + }, + { level = "JOINS PARTS QUITS NICKS"; }, + { + level = "ACTIONS"; + pattern = "(away|gone|back|playin|weg|wech|returned)"; + regexp = "yes"; + }, + { mask = "pmn"; level = "ALL"; } +); diff --git a/tmux.conf b/tmux.conf new file mode 100644 index 00000000..9b10746c --- /dev/null +++ b/tmux.conf @@ -0,0 +1,90 @@ +# Our .tmux.conf file +# ncurses redraw bug +# set-option -g default-command "reattach-to-user-namespace -l zsh" + +# Setting the prefix from C-b to C-a +# Free the original Ctrl-b prefix keybinding +unbind-key C-b +set-option -g prefix M-z +#setting the delay between prefix and command +set -s escape-time 1 +# Ensure that we can send Ctrl-A to other apps +# bind C-\ send-prefix + +# Set the base index for windows to 1 instead of 0 +set -g base-index 1 + +# Set the base index for panes to 1 instead of 0 +setw -g pane-base-index 1 + +# Reload the file with Prefix r +bind r source-file ~/.tmux.conf \; display "Reloaded!" + +# splitting panes with | and - +bind | split-window -h +bind - split-window -v + +# moving between panes with Prefix h,j,k,l +bind h select-pane -L +bind j select-pane -D +bind k select-pane -U +bind l select-pane -R + +# Quick window selection +bind -r C-h select-window -t :- +bind -r C-l select-window -t :+ + +# Pane resizing panes with Prefix H,J,K,L +bind -r H resize-pane -L 5 +bind -r J resize-pane -D 5 +bind -r K resize-pane -U 5 +bind -r L resize-pane -R 5 +# mouse support - set to on if you want to use the mouse +set -g mouse off + +# Set the default terminal mode to 256color mode +set -g default-terminal "screen-256color" + + +# set the status line's colors +set -g status-style fg=white,bg=black + +# set the color of the window list +setw -g window-status-style fg=white,bg=black + +# set colors for the active window +setw -g window-status-current-style fg=white,bold,bg=red + +# colors for pane borders +setw -g pane-border-style fg=white,bg=black +setw -g pane-active-border-style fg=white,bg=red + +# active pane normal, other shaded out +# setw -g window-style fg=colour240,bg=colour235 + +# Command / message line +set -g message-style fg=white,bold,bg=black + +# Status line left side to show Session:window:pane +set -g status-left-length 40 +set -g status-left "#[fg=white]#H " + +# Status line right side - 31-Oct 13:37 +set -g status-right " #S #[fg=white]#I #[fg=white]#P #[fg=white]%d %b %R" + +# Update the status line every sixty seconds +set -g status-interval 60 + +# Center the window list in the status line +set -g status-justify right + +# enable activity alerts +setw -g monitor-activity on +set -g visual-activity on + +# enable vi keys. +setw -g mode-keys vi + +set-option -g allow-rename off + +#krun-shell "~/.tmux/themes/nord-tmux/nord.tmux"