[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 346a47f1511 1/3: Merge from origin/emacs-30
From: |
Eli Zaretskii |
Subject: |
master 346a47f1511 1/3: Merge from origin/emacs-30 |
Date: |
Sat, 17 Aug 2024 02:50:07 -0400 (EDT) |
branch: master
commit 346a47f15115812ed4259acdead02420c12f6656
Merge: 2c505c68b28 4589f51c21d
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
Merge from origin/emacs-30
4589f51c21d (project-find-regexp): Fix the temporary value of DEFAULT...
616a93d185a Tag test in typescript-ts-mode-tests.el as unstable
e9e7e3908ab ; * lisp/files.el (require-with-check): Fix last change.
---
lisp/files.el | 3 ++-
lisp/progmodes/project.el | 2 +-
test/lisp/progmodes/typescript-ts-mode-tests.el | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lisp/files.el b/lisp/files.el
index dc796fffaa1..eadb4a9d0b1 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1275,7 +1275,8 @@ NOERROR is equal to `reload'), or otherwise emit a
warning."
((assoc fn load-history) nil) ;We loaded the right file.
((eq noerror 'reload) (load fn nil 'nomessage))
(t (funcall (if noerror #'warn #'error)
- "Feature `%S' is now provided by a different file %s"
fn)))))
+ "Feature `%S' is now provided by a different file %s"
+ feature fn)))))
res))
(defun file-remote-p (file &optional identification connected)
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 3d0f742c51d..983242628f0 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -1001,7 +1001,7 @@ requires quoting, e.g. `\\[quoted-insert]<space>'."
(project-files pr)
(let* ((dir (read-directory-name "Base directory: "
caller-dir nil t)))
- (setq default-directory dir)
+ (setq default-directory (file-name-as-directory dir))
(project--files-in-directory dir
nil
(grep-read-files regexp))))))
diff --git a/test/lisp/progmodes/typescript-ts-mode-tests.el
b/test/lisp/progmodes/typescript-ts-mode-tests.el
index effd9551fb0..4771bee5f27 100644
--- a/test/lisp/progmodes/typescript-ts-mode-tests.el
+++ b/test/lisp/progmodes/typescript-ts-mode-tests.el
@@ -24,6 +24,7 @@
(require 'treesit)
(ert-deftest typescript-ts-mode-test-indentation ()
+ :tags (if (getenv "EMACS_EMBA_CI") '(:unstable))
(skip-unless (and (treesit-ready-p 'typescript)
(treesit-ready-p 'tsx)))
(ert-test-erts-file (ert-resource-file "indent.erts")))