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

30
lisp/treemacs/treemacs.el
View File

@@ -1,9 +1,9 @@
;;; treemacs.el --- A tree style file explorer package -*- lexical-binding: t -*-
;; Copyright (C) 2020 Alexander Miller
;; Copyright (C) 2021 Alexander Miller
;; Author: Alexander Miller <alexanderm@web.de>
;; Package-Requires: ((emacs "25.2") (cl-lib "0.5") (dash "2.11.0") (s "1.12.0") (f "0.11.0") (ace-window "0.9.0") (pfuture "1.7") (hydra "0.13.2") (ht "2.2"))
;; Package-Requires: ((emacs "26.1") (cl-lib "0.5") (dash "2.11.0") (s "1.12.0") (f "0.11.0") (ace-window "0.9.0") (pfuture "1.7") (hydra "0.13.2") (ht "2.2") (cfrs "1.3.2"))
;; Homepage: https://github.com/Alexander-Miller/treemacs
;; Version: 2.8
@@ -41,10 +41,7 @@
(require 'treemacs-filewatch-mode)
(require 'treemacs-mode)
(require 'treemacs-interface)
(require 'treemacs-mouse-interface)
(require 'treemacs-persistence)
(require 'treemacs-tags)
(require 'treemacs-tag-follow-mode)
(require 'treemacs-async)
(require 'treemacs-compatibility)
(require 'treemacs-workspaces)
@@ -52,15 +49,16 @@
(require 'treemacs-header-line)
(require 'treemacs-extensions)
(eval-when-compile
(require 'treemacs-macros))
(defconst treemacs-version
(eval-when-compile
(format "v2.8 (installed %s) @ Emacs %s"
(format-time-string "%Y.%m.%d" (current-time))
emacs-version)))
(treemacs-import-functions-from "treemacs-tag-follow-mode"
treemacs--flatten&sort-imenu-index
treemacs--do-follow-tag)
;;;###autoload
(defun treemacs-version ()
"Return the `treemacs-version'."
@@ -71,7 +69,7 @@
;;;###autoload
(defun treemacs ()
"Initialize or toggle treemacs.
"Initialise or toggle treemacs.
* If the treemacs window is visible hide it.
* If a treemacs buffer exists, but is not visible show it.
* If no treemacs buffer exists for the current frame create and show it.
@@ -97,7 +95,7 @@ For the most part only useful when `treemacs-follow-mode' is not active."
(setq manually-entered t
path (->> (--if-let (treemacs-current-button) (treemacs--nearest-path it))
(read-file-name "File to find: ")
(treemacs--canonical-path))))
(treemacs-canonical-path))))
(treemacs-unless-let (project (treemacs--find-project-for-path path))
(treemacs-pulse-on-failure (format "%s does not fall under any project in the workspace."
(propertize path 'face 'font-lock-string-face)))
@@ -112,7 +110,7 @@ For the most part only useful when `treemacs-follow-mode' is not active."
;;;###autoload
(defun treemacs-find-tag ()
"Find and move point to the tag at point in the treemacs view.
Most likley to be useful when `treemacs-tag-follow-mode' is not active.
Most likely to be useful when `treemacs-tag-follow-mode' is not active.
Will ask to change the treemacs root if the file to find is not under the
root. If no treemacs buffer exists it will be created with the current file's
@@ -129,6 +127,8 @@ visiting a file or Emacs cannot find any tags for the current file."
"Current buffer is not visiting a file.")
(treemacs-error-return-if (null index)
"Current buffer has no tags.")
(treemacs-error-return-if (eq index 'unsupported)
"Treemacs does not support following tags in this major mode.")
(treemacs-error-return-if (null project)
"%s does not fall under any project in the workspace."
(propertize buffer-file 'face 'font-lock-string-face))
@@ -144,7 +144,7 @@ visiting a file or Emacs cannot find any tags for the current file."
(defun treemacs-select-window ()
"Select the treemacs window if it is visible.
Bring it to the foreground if it is not visible.
Initialize a new treemacs buffer as calling `treemacs' would if there is no
Initialise a new treemacs buffer as calling `treemacs' would if there is no
treemacs buffer for this frame."
(interactive)
(pcase (treemacs-current-visibility)
@@ -186,7 +186,7 @@ treemacs buffer for this frame."
(defun treemacs-display-current-project-exclusively ()
"Display the current project, and *only* the current project.
Like `treemacs-add-and-display-current-project' this will add the current
project to treemacs based on either projectile or the built projectl.el.
project to treemacs based on either projectile or the built-in project.el.
However the 'exclusive' part means that it will make the current project the
only project, all other projects *will be removed* from the current workspace."
(interactive)
@@ -194,7 +194,7 @@ only project, all other projects *will be removed* from the current workspace."
(treemacs-unless-let (root (treemacs--find-current-user-project))
(treemacs-error-return-if (null root)
"Not in a project.")
(let* ((path (treemacs--canonical-path root))
(let* ((path (treemacs-canonical-path root))
(name (treemacs--filename path))
(ws (treemacs-current-workspace)))
(treemacs-return-if (and (= 1 (length (treemacs-workspace->projects ws)))
@@ -232,7 +232,7 @@ An error message is displayed if the current buffer is not part of any project."
(treemacs-unless-let (root (treemacs--find-current-user-project))
(treemacs-error-return-if (null root)
"Not in a project.")
(let* ((path (treemacs--canonical-path root))
(let* ((path (treemacs-canonical-path root))
(name (treemacs--filename path)))
(unless (treemacs-current-workspace)
(treemacs--find-workspace))