From 45cdfb1258422d80c3cb6918bd95d9d9f9a0d4a1 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 29 Apr 2020 23:09:46 -0400 Subject: [PATCH] Bump :core spudlyo/clipetty@7ee3f9c -> spudlyo/clipetty@01b3904 bbatsov/projectile@eec569d -> bbatsov/projectile@5cd261d noctuid/general.el@14ad4c8 -> noctuid/general.el@42e3803 We're also transitioning from abbreviated SHA1 hashes to full ones, because underlying git machinery in future updates of straight will require it (e.g. to obtain shallow clones of pinned packages). --- core/packages.el | 38 ++++++++++++++--------------- modules/lang/emacs-lisp/autoload.el | 13 ++++++++++ modules/lang/emacs-lisp/config.el | 4 ++- modules/lang/rust/packages.el | 2 +- 4 files changed, 36 insertions(+), 21 deletions(-) diff --git a/core/packages.el b/core/packages.el index 6e22d9c1e..f74bc0f1b 100644 --- a/core/packages.el +++ b/core/packages.el @@ -2,47 +2,47 @@ ;;; core/packages.el ;; core.el -(package! auto-minor-mode :pin "17cfa1b548") -(package! gcmh :pin "b1bde50891") +(package! auto-minor-mode :pin "17cfa1b54800fdef2975c0c0531dad34846a5065") +(package! gcmh :pin "b1bde5089169a74f62033d027e06e98cbeedd43f") ;; core-ui.el -(package! all-the-icons :pin "0b74fc3618") -(package! hide-mode-line :pin "88888825b5") -(package! highlight-numbers :pin "8b4744c7f4") +(package! all-the-icons :pin "0b74fc361817e885580c3f3408079f949f5830e1") +(package! hide-mode-line :pin "88888825b5b27b300683e662fa3be88d954b1cea") +(package! highlight-numbers :pin "8b4744c7f46c72b1d3d599d4fb75ef8183dee307") (package! rainbow-delimiters :pin "5125f4e476") -(package! restart-emacs :pin "9aa90d3df9") +(package! restart-emacs :pin "9aa90d3df9e08bc420e1c9845ee3ff568e911bd9") ;; core-editor.el -(package! better-jumper :pin "6d240032ca") -(package! dtrt-indent :pin "9163cd990f") -(package! helpful :pin "c54e9ddbd6") +(package! better-jumper :pin "6d240032ca213ccb3347e25f26c29b6822bf03a7") +(package! dtrt-indent :pin "9163cd990fb1f43dafed3948c6e406c13a45a6be") +(package! helpful :pin "c54e9ddbd6a77858048c1a4c4b549de98af8f88e") (when IS-MAC - (package! ns-auto-titlebar :pin "1efc30d385")) -(package! pcre2el :pin "0b5b2a2c17") -(package! smartparens :pin "555626a43f") + (package! ns-auto-titlebar :pin "1efc30d38509647b417f05587fd7003457719256")) +(package! pcre2el :pin "0b5b2a2c173aab3fd14aac6cf5e90ad3bf58fa7d") +(package! smartparens :pin "555626a43f9bb1985aa9a0eb675f2b88b29702c8") (package! so-long :built-in 'prefer ; included in Emacs 27+ ;; REVIEW so-long is slated to be published to ELPA eventually, but until then ;; I've created my own mirror for it because git.savannah.gnu.org runs ;; on a potato. :recipe (:host github :repo "hlissner/emacs-so-long") - :pin "ed666b0716") + :pin "ed666b0716f60e8988c455804de24b55919e71ca") (package! ws-butler ;; Use my fork of ws-butler, which has a few choice improvements and ;; optimizations (the original has been abandoned). :recipe (:host github :repo "hlissner/ws-butler") - :pin "2bb49d3ee7") + :pin "2bb49d3ee7d2cba133bc7e9cdac416cd1c5e4fe0") (unless IS-WINDOWS (package! clipetty :recipe (:host github :repo "spudlyo/clipetty") - :pin "7ee3f9c52f")) + :pin "01b39044b9b65fa4ea7d3166f8b1ffab6f740362")) ;; core-projects.el -(package! projectile :pin "eec569dc32") +(package! projectile :pin "5cd261dd75f4d711c0016617621349e2a98b43aa") ;; core-keybinds.el -(package! general :pin "14ad4c888b") -(package! which-key :pin "8b49ae978c") +(package! general :pin "42e38034cd2305fa7432866323c923979d8f9b06") +(package! which-key :pin "8b49ae978cceca65967f3544c236f32964ddbed0") ;; autoload/cache.el -(package! persistent-soft :pin "a1e0ddf2a1") +(package! persistent-soft :pin "a1e0ddf2a12a6f18cab565dee250f070384cbe02") diff --git a/modules/lang/emacs-lisp/autoload.el b/modules/lang/emacs-lisp/autoload.el index 228a3a8ef..1aaaf8058 100644 --- a/modules/lang/emacs-lisp/autoload.el +++ b/modules/lang/emacs-lisp/autoload.el @@ -221,6 +221,19 @@ verbosity when editing a file in `doom-private-dir' or `doom-emacs-dir'." (default-value 'flycheck-emacs-lisp-check-form) ")")))) +;;;###autoload +(defun +emacs-lisp-truncate-pin () + "Truncates long SHA1 hashes in `package!' :pin's." + (save-excursion + (goto-char (match-beginning 0)) + (and (stringp (plist-get (sexp-at-point) :pin)) + (search-forward ":pin" nil t) + (put-text-property (re-search-forward "\"[^\"]\\{10\\}" nil t) + (progn (re-search-forward "\"" nil t) + (match-beginning 0)) + 'display "..."))) + nil) + ;;;###autoload (defun +emacs-lisp/edebug-instrument-defun-on () "Toggle on instrumentalisation for the function under `defun'." diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el index 7d4bf782d..521f4192c 100644 --- a/modules/lang/emacs-lisp/config.el +++ b/modules/lang/emacs-lisp/config.el @@ -75,7 +75,9 @@ This marks a foldable marker for `outline-minor-mode' in elisp buffers.") ("^;;;###\\(autodef\\|if\\|package\\)[ \n]" (1 font-lock-warning-face t))) ;; highlight defined, special variables & functions (when +emacs-lisp-enable-extra-fontification - `((+emacs-lisp-highlight-vars-and-faces . +emacs-lisp--face))))) + `((+emacs-lisp-highlight-vars-and-faces . +emacs-lisp--face))) + + `(("(package!\\_>" (0 (+emacs-lisp-truncate-pin)))))) ;; Recenter window after following definition (advice-add #'elisp-def :after #'doom-recenter-a) diff --git a/modules/lang/rust/packages.el b/modules/lang/rust/packages.el index 1c2945cc6..22d5d3f0f 100644 --- a/modules/lang/rust/packages.el +++ b/modules/lang/rust/packages.el @@ -1,6 +1,6 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/rust/packages.el -(package! rustic :pin "61032eacf0") +(package! rustic :pin "32a962ab2d") (unless (featurep! +lsp) (package! racer :pin "a0bdf778f0"))