summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorProtesilaos Stavrou <info@protesilaos.com>2024-03-17 18:46:15 +0200
committerProtesilaos Stavrou <info@protesilaos.com>2024-03-17 18:46:15 +0200
commit67b0c1c09eab65c302eb02b20d87900be6367565 (patch)
treee558c0b82d8bceead2e42c9f619e5daa1ec5d052 /test
parent21828f288ef57422d12860d71e3d4cd8b8cc97b4 (diff)
downloademacs-67b0c1c09eab65c302eb02b20d87900be6367565.tar.gz
Update modus-themes to their 4.4.0 version
* doc/misc/modus-themes.org: Update the manual to better document existing functionality and cover the new features. * etc/themes/modus-operandi-deuteranopia-theme.el: * etc/themes/modus-operandi-theme.el: * etc/themes/modus-operandi-tinted-theme.el: * etc/themes/modus-operandi-tritanopia-theme.el: * etc/themes/modus-vivendi-deuteranopia-theme.el: * etc/themes/modus-vivendi-theme.el: * etc/themes/modus-vivendi-tinted-theme.el: * etc/themes/modus-vivendi-tritanopia-theme.el: Update the palette of each theme. * etc/themes/modus-themes.el (require): Remove call to cl-lib and do not use relevant functions. (modus-themes-operandi-colors, modus-themes-vivendi-colors) (modus-themes-version, modus-themes-report-bug): Remove old calls to 'make-obsolete' and related. (modus-themes--annotate-theme): Tweak the completion annotation function. (modus-themes--org-block): Deprecate the user option 'modus-themes-org-blocks'. (modus-themes-faces): Update faces. (modus-themes-custom-variables): Update the list of custom variables. Detailed release notes are available here: <https://protesilaos.com/codelog/2024-03-17-modus-themes-4-4-0/>.
Diffstat (limited to 'test')
-rw-r--r--test/lisp/vc/vc-git-tests.el40
1 files changed, 0 insertions, 40 deletions
diff --git a/test/lisp/vc/vc-git-tests.el b/test/lisp/vc/vc-git-tests.el
index fd3e8ccd602..c52cd9c5875 100644
--- a/test/lisp/vc/vc-git-tests.el
+++ b/test/lisp/vc/vc-git-tests.el
@@ -24,8 +24,6 @@
;;; Code:
-(require 'ert-x)
-(require 'vc)
(require 'vc-git)
(ert-deftest vc-git-test-program-version-general ()
@@ -83,42 +81,4 @@
(should-not (vc-git-annotate-time))
(should-not (vc-git-annotate-time))))
-(defmacro vc-git-test--with-repo (name &rest body)
- "Initialize a repository in a temporary directory and evaluate BODY.
-
-The current directory will be set to the top of that repository; NAME
-will be bound to that directory's file name. Once BODY exits, the
-directory will be deleted."
- (declare (indent 1))
- `(ert-with-temp-directory ,name
- (let ((default-directory ,name))
- (vc-create-repo 'Git)
- ,@body)))
-
-(defun vc-git-test--run (&rest args)
- "Run git ARGSā€¦, check for non-zero status, and return output."
- (with-temp-buffer
- (apply 'vc-git-command t 0 nil args)
- (buffer-string)))
-
-(ert-deftest vc-git-test-dir-track-local-branch ()
- "Test that `vc-dir' works when tracking local branches. Bug#68183."
- (skip-unless (executable-find vc-git-program))
- (vc-git-test--with-repo repo
- ;; Create an initial commit to get a branch started.
- (write-region "hello" nil "README")
- (vc-git-test--run "add" "README")
- (vc-git-test--run "commit" "-mFirst")
- ;; Get current branch name lazily, to remain agnostic of
- ;; init.defaultbranch.
- (let ((upstream-branch
- (string-trim (vc-git-test--run "branch" "--show-current"))))
- (vc-git-test--run "checkout" "--track" "-b" "hack" upstream-branch)
- (vc-dir default-directory)
- (pcase-dolist (`(,header ,value)
- `(("Branch" "hack")
- ("Tracking" ,upstream-branch)))
- (goto-char (point-min))
- (re-search-forward (format "^%s *: %s$" header value))))))
-
;;; vc-git-tests.el ends here