emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tweak: update so-long config for Emacs 28+

Browse source 
Emacs 28 introduced the much faster native function
buffer-line-statistics, which makes so-long's job significantly less
expensive, so we can afford a larger threshold there.

Still, we gimp it a little if native-comp isn't present.
This commit is contained in:
Henrik Lissner 2022-02-18 16:48:41 +01:00
parent 89deac190d
commit df5cb2051c
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

39
core/core-editor.el
View file

@ -650,7 +650,25 @@ on."
(use-package! so-long (use-package! so-long
:hook (doom-first-file . global-so-long-mode) :hook (doom-first-file . global-so-long-mode)
:config :config
(setq so-long-threshold 400) ; reduce false positives w/ larger threshold ;; Emacs 29 introduced faster long-line detection, so they can afford a much
;; larger `so-long-threshold' and its default `so-long-predicate'.
(if (fboundp 'buffer-line-statistics)
(unless NATIVECOMP
(setq so-long-threshold 5000))
;; reduce false positives w/ larger threshold
(setq so-long-threshold 400)
(defun doom-buffer-has-long-lines-p ()
(unless (bound-and-true-p visual-line-mode)
(let ((so-long-skip-leading-comments
;; HACK Fix #2183: `so-long-detected-long-line-p' calls
;; `comment-forward' which tries to use comment syntax, which
;; throws an error if comment state isn't initialized, leading
;; to a wrong-type-argument: stringp error.
;; DEPRECATED Fixed in Emacs 28.
(bound-and-true-p comment-use-syntax)))
(so-long-detected-long-line-p))))
(setq so-long-predicate #'doom-buffer-has-long-lines-p))
;; Don't disable syntax highlighting and line numbers, or make the buffer ;; Don't disable syntax highlighting and line numbers, or make the buffer
;; read-only, in `so-long-minor-mode', so we can have a basic editing ;; read-only, in `so-long-minor-mode', so we can have a basic editing
;; experience in them, at least. It will remain off in `so-long-mode', ;; experience in them, at least. It will remain off in `so-long-mode',
@ -665,26 +683,19 @@ on."
;; But disable everything else that may be unnecessary/expensive for large or ;; But disable everything else that may be unnecessary/expensive for large or
;; wide buffers. ;; wide buffers.
(appendq! so-long-minor-modes (appendq! so-long-minor-modes
'(flycheck-mode '(spell-fu-mode
spell-fu-mode
eldoc-mode eldoc-mode
smartparens-mode
highlight-numbers-mode highlight-numbers-mode
better-jumper-local-mode better-jumper-local-mode
ws-butler-mode ws-butler-mode
auto-composition-mode auto-composition-mode
undo-tree-mode undo-tree-mode
highlight-indent-guides-mode highlight-indent-guides-mode
hl-fill-column-mode)) hl-fill-column-mode
(defun doom-buffer-has-long-lines-p () ;; These are redundant on Emacs 29+
(unless (bound-and-true-p visual-line-mode) flycheck-mode
(let ((so-long-skip-leading-comments smartparens-mode
;; HACK Fix #2183: `so-long-detected-long-line-p' tries to parse smartparens-strict-mode)))
;; comment syntax, but comment state may not be initialized,
;; leading to a wrong-type-argument: stringp error.
(bound-and-true-p comment-use-syntax)))
(so-long-detected-long-line-p))))
(setq so-long-predicate #'doom-buffer-has-long-lines-p))
(use-package! ws-butler (use-package! ws-butler