Skip to content

Commit

Permalink
Fix benchmark-init loading issue on emacs 28.x
Browse files Browse the repository at this point in the history 
Ref: dholm/benchmark-init-el#15
  • Loading branch information
@kaushalmodi @yuravg
kaushalmodi authored and yuravg committed Jun 9, 2021
1 parent 6cbae99 commit 7e12876
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 28 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,6 @@
[submodule "elisp/manually-synced/iy-go-to-char"]
path = elisp/manually-synced/iy-go-to-char
url = https://github.com/doitian/iy-go-to-char
[submodule "elisp/manually-synced/benchmark-init-el"]
path = elisp/manually-synced/benchmark-init-el
url = https://github.com/kekeimiku/benchmark-init-el
48 changes: 25 additions & 23 deletions elisp/manually-synced/README.org
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
#+title: Sources of manually synced packages

|-------------------------+----------------------------------------------------------------------+------------------------------------------|
| Package | Source | Why is this manually synced? |
|-------------------------+----------------------------------------------------------------------+------------------------------------------|
| csv-nav | https://www.emacswiki.org/emacs/download/csv-nav.el | https://github.com/melpa/melpa/pull/5008 |
| dired+ | https://www.emacswiki.org/emacs/download/dired%2b.el | https://github.com/melpa/melpa/pull/5008 |
| etags-select | https://www.emacswiki.org/emacs/download/etags-select.el | https://github.com/melpa/melpa/pull/5008 |
| etags-table | https://www.emacswiki.org/emacs/download/etags-table.el | https://github.com/melpa/melpa/pull/5008 |
| flycheck-google-cpplint | https://github.com/flycheck/flycheck-google-cpplint/ | Not available on GNU Elpa or Melpa |
| google-c-style | https://github.com/google/styleguide/blob/gh-pages/google-c-style.el | Not available on GNU Elpa or Melpa |
| header2 | https://www.emacswiki.org/emacs/download/header2.el | https://github.com/melpa/melpa/pull/5008 |
| help-fns+ | https://www.emacswiki.org/emacs/download/help-fns%2b.el | https://github.com/melpa/melpa/pull/5008 |
| hideshowvis | https://github.com/sheijk/hideshowvis | Not available on GNU Elpa or Melpa |
| highlight | https://www.emacswiki.org/emacs/download/highlight.el | Not available on GNU Elpa or Melpa |
| hl-line+ | https://www.emacswiki.org/emacs/download/hl-line%2b.el | https://github.com/melpa/melpa/pull/5008 |
| idle-highlight | https://github.com/nonsequitur/idle-highlight-mode | Not available on GNU Elpa or Melpa |
| info+ | https://www.emacswiki.org/emacs/download/info%2b.el | https://github.com/melpa/melpa/pull/5008 |
| intel-hex | https://github.com/yuravg/intel-hex-mode.git | Not available on GNU Elpa or Melpa |
| ivy-describe-modes | https://github.com/jcs-elpa/ivy-describe-modes | Not available on GNU Elpa or Melpa |
| iy-go-to-char | https://github.com/doitian/iy-go-to-char | Not available on Melpa |
| pod-mode | https://github.com/renormalist/emacs-pod-mode | Not available on GNU Elpa or Melpa |
| psvn | http://www.xsteve.at/prg/emacs/psvn.el | Not available on GNU Elpa or Melpa |
| spice-mode | Not known | Not available on GNU Elpa or Melpa |
|-------------------------+----------------------------------------------------------------------+------------------------------------------|
|-------------------------+----------------------------------------------------------------------+--------------------------------------------------------------------------------------------------|
| Package | Source | Why is this manually synced? |
|-------------------------+----------------------------------------------------------------------+--------------------------------------------------------------------------------------------------|
| benchmark-init | https://github.com/kekeimiku/benchmark-init-el | The main package fails compilation on emacs 28.x and the package author isn't merging the fix PR |
| | | https://github.com/dholm/benchmark-init-el/pull/16 |
| csv-nav | https://www.emacswiki.org/emacs/download/csv-nav.el | https://github.com/melpa/melpa/pull/5008 |
| dired+ | https://www.emacswiki.org/emacs/download/dired%2b.el | https://github.com/melpa/melpa/pull/5008 |
| etags-select | https://www.emacswiki.org/emacs/download/etags-select.el | https://github.com/melpa/melpa/pull/5008 |
| etags-table | https://www.emacswiki.org/emacs/download/etags-table.el | https://github.com/melpa/melpa/pull/5008 |
| flycheck-google-cpplint | https://github.com/flycheck/flycheck-google-cpplint/ | Not available on GNU Elpa or Melpa |
| google-c-style | https://github.com/google/styleguide/blob/gh-pages/google-c-style.el | Not available on GNU Elpa or Melpa |
| header2 | https://www.emacswiki.org/emacs/download/header2.el | https://github.com/melpa/melpa/pull/5008 |
| help-fns+ | https://www.emacswiki.org/emacs/download/help-fns%2b.el | https://github.com/melpa/melpa/pull/5008 |
| hideshowvis | https://github.com/sheijk/hideshowvis | Not available on GNU Elpa or Melpa |
| highlight | https://www.emacswiki.org/emacs/download/highlight.el | Not available on GNU Elpa or Melpa |
| hl-line+ | https://www.emacswiki.org/emacs/download/hl-line%2b.el | https://github.com/melpa/melpa/pull/5008 |
| idle-highlight | https://github.com/nonsequitur/idle-highlight-mode | Not available on GNU Elpa or Melpa |
| info+ | https://www.emacswiki.org/emacs/download/info%2b.el | https://github.com/melpa/melpa/pull/5008 |
| intel-hex | https://github.com/yuravg/intel-hex-mode.git | Not available on GNU Elpa or Melpa |
| ivy-describe-modes | https://github.com/jcs-elpa/ivy-describe-modes | Not available on GNU Elpa or Melpa |
| iy-go-to-char | https://github.com/doitian/iy-go-to-char | Not available on Melpa |
| pod-mode | https://github.com/renormalist/emacs-pod-mode | Not available on GNU Elpa or Melpa |
| psvn | http://www.xsteve.at/prg/emacs/psvn.el | Not available on GNU Elpa or Melpa |
| spice-mode | Not known | Not available on GNU Elpa or Melpa |
|-------------------------+----------------------------------------------------------------------+--------------------------------------------------------------------------------------------------|
1 change: 1 addition & 0 deletions elisp/manually-synced/benchmark-init-el
Submodule benchmark-init-el added at 8e7cb0
15 changes: 10 additions & 5 deletions init.el
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
;; Time-stamp: <2021-04-23 16:34:39 kmodi>
;; Time-stamp: <2021-06-04 15:30:25 kmodi>
;; Author: Kaushal Modi

;; Global variables
Expand Down Expand Up @@ -62,7 +62,6 @@ need Org version to be at least 9.x.")
autopair
avy ; > ace-jump-mode
beacon ; visual flash to show the cursor position
benchmark-init
bitbake
bm ; visual bookmarks
buffer-move
Expand Down Expand Up @@ -213,14 +212,20 @@ need Org version to be at least 9.x.")
;; I call this function in setup-packages.el and so am keeping the
;; commented out version here so that package.el does not add it again.

;; Start `benchmark-init' as soon as possible
(require 'benchmark-init)

(eval-when-compile
(require 'use-package) ;Auto-requires `bind-key' too
(setq use-package-always-ensure nil))
(require 'use-package-chords)

(use-package benchmark-init
:demand t
:load-path "elisp/manually-synced/benchmark-init-el"
:config
(progn
;; https://github.com/dholm/benchmark-init-el/issues/15#issuecomment-766010566
(require 'benchmark-init-modes) ;Explicitly required
(add-hook 'after-init-hook #'benchmark-init/deactivate)))

;; Enable `modi-mode' unless `disable-pkg-modi-mode' is set to `t' in
;; `setup-var-overrides.el'.
(when (not (bound-and-true-p disable-pkg-modi-mode))
Expand Down

0 comments on commit 7e12876

Please sign in to comment.