[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/indent-bars 85fcf55464 210/431: Merge branch 'main' int
From: |
ELPA Syncer |
Subject: |
[elpa] externals/indent-bars 85fcf55464 210/431: Merge branch 'main' into treesit-scope |
Date: |
Mon, 16 Sep 2024 12:59:30 -0400 (EDT) |
branch: externals/indent-bars
commit 85fcf55464dddd27b8ae94df64162d8fa8f2eb3b
Merge: ce84791086 09dd1d6f75
Author: JD Smith <93749+jdtsmith@users.noreply.github.com>
Commit: JD Smith <93749+jdtsmith@users.noreply.github.com>
Merge branch 'main' into treesit-scope
---
indent-bars.el | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/indent-bars.el b/indent-bars.el
index 7f669d6b62..5195ef7a32 100644
--- a/indent-bars.el
+++ b/indent-bars.el
@@ -1376,10 +1376,11 @@ Adapted from `highlight-indentation-mode'."
(indent-bars-teardown)
(indent-bars-setup))
-(defun indent-bars-setup-and-remove ()
- "Setup indent bars and remove from `after-make-frame-functions'."
- (remove-hook 'after-make-frame-functions #'indent-bars-setup-and-remove)
- (indent-bars-setup))
+(defun indent-bars-setup-and-remove (frame)
+ "Setup indent bars for FRAME and remove from `after-make-frame-functions'."
+ (when (display-graphic-p frame)
+ (remove-hook 'after-make-frame-functions #'indent-bars-setup-and-remove)
+ (indent-bars-setup)))
(defvar indent-bars-mode)
;;;###autoload
@@ -1389,11 +1390,8 @@ Adapted from `highlight-indentation-mode'."
:group 'indent-bars
(if indent-bars-mode
(if (and (daemonp) (not (frame-parameter nil 'client)))
- (let ((buf (current-buffer))) ;careful with frameless daemon emacs
- (add-hook 'after-make-frame-functions
- (lambda () (with-current-buffer buf
- (indent-bars-setup-and-remove)))
- nil t))
+ (add-hook 'after-make-frame-functions
+ #'indent-bars-setup-and-remove nil t)
(indent-bars-setup))
(indent-bars-teardown)))
- [elpa] externals/indent-bars e2a0274e8b 164/431: Make no-descend-string a local symbol for configuring string type, (continued)
- [elpa] externals/indent-bars e2a0274e8b 164/431: Make no-descend-string a local symbol for configuring string type, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars dca608724d 183/431: README: mention new depth highlight timer and config, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars a618015bb5 145/431: Add treesit before/after images, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars 581a51d3ae 150/431: README: improve features list and add blank/string treesit config, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars ce7fb0641c 189/431: refactoring treesitter to new file: initial stage, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars 6df95da4b1 157/431: README.md: Use current defaults for first image, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars 2d30dc37cc 206/431: indent-bars-ts: comment improvements, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars d5f393ac4c 207/431: Add PCH for scope update, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars 29b7bdc8f9 204/431: Return nil from font-lock face expression functions, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars a282e1bbb8 238/431: use BEG+END for drawing rather than match boundaries, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars 85fcf55464 210/431: Merge branch 'main' into treesit-scope,
ELPA Syncer <=
- [elpa] externals/indent-bars 2a8cf5a2fa 243/431: Major refactor for STYLE stipple face & support, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars 13cebfa12f 229/431: Merge pull request #37 from gekoke/gekoke/nixlang-indentation, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars 6116ab7468 263/431: Correctly remove remaps from plists, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars 1f575f2404 211/431: Remove unused ts--scope-query, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars b0c138ce17 256/431: teardown whr win-param but not global faces, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars ac949f347e 260/431: Remove unnecessary cleanup on update-all-stipples, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars 916dc89ce9 261/431: Do not trust indent-bars-whr window parameter absolutely, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars 7e0493f157 280/431: Store and check bol not point; no scope recompute on same line, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars 75498edc35 281/431: docstrings: custom vars, ELPA Syncer, 2024/09/16
- [elpa] externals/indent-bars 1439cc08d1 285/431: create-stipples -> create-stipple-remaps, ELPA Syncer, 2024/09/16