daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

update packages

Browse Source
This commit is contained in:
Daniel Weschke
2021-01-08 19:32:30 +01:00
parent ce8f24d28a
commit f5649dceab
467 changed files with 26642 additions and 22487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lisp/treemacs-magit.el
View File

@@ -4,8 +4,8 @@
;; Author: Alexander Miller <alexanderm@web.de>
;; Package-Requires: ((emacs "25.2") (treemacs "0.0") (pfuture "1.3" ) (magit "2.90.0"))
;; Package-Version: 20200421.1426
;; Package-Commit: 1ce0bd487f0b9178744e19bbc48b6692c55c590c
;; Package-Version: 20201025.957
;; Package-Commit: 6b045fd585421ab3c9e1185c2508d34af700490b
;; Version: 0
;; Homepage: https://github.com/Alexander-Miller/treemacs
@@ -47,9 +47,9 @@
(defun treemacs-magit--schedule-update ()
"Schedule an update to potentially run after 3 seconds of idle time.
In order for the update to fully run several conditions must be met:
* A timer for an update for the given dir must not already exist
* A timer for an update for the given directory must not already exist
(see `treemacs-magit--timers')
* The dir must be part of a treemacs workspace, and
* The directory must be part of a treemacs workspace, and
* The project must not be set for refresh already."
(when treemacs-git-mode
(let ((magit-root (treemacs--canonical-path (magit-toplevel))))
@@ -76,7 +76,10 @@ filewatch-mode's mechanics to update the entire project."
(dom-node (treemacs-find-in-dom project-root)))
(when (and dom-node
(null (treemacs-dom-node->refresh-flag dom-node)))
(treemacs--set-refresh-flags project-root 'magit-refresh project-root))))))
;; adding a number of change events is the easiest way to cause a full directory
;; refresh without touching treemacs proper
(dotimes (_ 8)
(treemacs--set-refresh-flags project-root 'magit-refresh project-root)))))))
(defun treemacs-magit--extended-git-mode-update (magit-root)
"Update the project at the given MAGIT-ROOT.
@@ -119,6 +122,8 @@ Will update nodes under MAGIT-ROOT with output in PFUTURE-BUFFER."
(treemacs-workspace->projects (treemacs-current-workspace)))))
(treemacs-find-in-dom (treemacs-project->path project))))))
(when (and dom-node
(treemacs-dom-node->position dom-node)
(treemacs-is-node-expanded? (treemacs-dom-node->position dom-node))
(null (treemacs-dom-node->refresh-flag dom-node)))
(save-excursion
(goto-char (treemacs-dom-node->position dom-node))