diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2026-05-23 17:30:21 +0100 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2026-05-23 17:30:21 +0100 |
| commit | a96fc7d5465f97908a9a6d5d2cf3be8cbf6b0ebe (patch) | |
| tree | 05658dde8cf89101ced5862b74e454dac7d99a9a /test | |
| parent | 7fe595465bcca3a7ef59feadfd29b38a75315c65 (diff) | |
| parent | 4f13f52a3aade6e43e42f14f9f94b0c43d6b4b12 (diff) | |
Merge from origin/emacs-31
4f13f52a3aa * build-aux/git-hooks/commit-msg: Replace Markdown-style ...
dd42133315b vc-test--rename-file: Disable part of test for SCCS
eb653865c3a markdown-ts-mode: Don't enable unconditionally by default
# Conflicts:
# etc/NEWS
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/vc/vc-tests/vc-tests.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/lisp/vc/vc-tests/vc-tests.el b/test/lisp/vc/vc-tests/vc-tests.el index 1fb17842478..8e2ae2c4454 100644 --- a/test/lisp/vc/vc-tests/vc-tests.el +++ b/test/lisp/vc/vc-tests/vc-tests.el @@ -592,8 +592,8 @@ This checks also `vc-backend' and `vc-responsible-backend'." 'added)))) ;; Test OK-IF-ALREADY-EXISTS. - ;; RCS and SRC don't support `vc-delete-file'. - (unless (memq backend '(RCS SRC)) + ;; RCS, SRC and SCCS don't support `vc-delete-file'. + (unless (memq backend '(RCS SRC SCCS)) (let ((tmp-name (expand-file-name "qux" default-directory)) (new-name (expand-file-name "quuux" default-directory))) (write-region "qux" nil tmp-name nil 'nomessage) |