Merge from origin/emacs-30

a6c78ccf5f2 ; * src/w32fns.c (Fw32_notification_close): Fix typo (bug...
febafe37884 * test/lisp/wdired-tests.el (wdired-test-bug34915): Fix f...
846b79b6d02 Fix 'wdired-test-unfinished-edit-01'
bc154cba130 ; * src/search.c (Fre_search_forward): Clarify doc string...
53291e3d46e Fontify destructor in c++-ts-mode
d77f8a34750 Fix invalid defcustom type for erc-buffers option
d68a4ea3ec6 ; Fix 'ibuffer-do-isearch{-regexp}'
8b1a0f8695a Fix infloop in 'shell-resync-dirs'
ce13eee5ab7 ; * src/image.c (free_image_cache): Add assertion.  (Bug#...

1 files changed, 12 insertions, 6 deletions

diff --git a/test/lisp/wdired-tests.el b/test/lisp/wdired-tests.el
index f7bff743058..7c7026354b8 100644
--- a/test/lisp/wdired-tests.el
+++ b/test/lisp/wdired-tests.el
@@ -114,7 +114,7 @@ wdired-mode."
     (setq test-dir (file-truename test-dir))
     (let* ((test-file (concat (file-name-as-directory test-dir) "foo.c"))
            (replace "bar")
-           (new-file (string-replace "foo" replace test-file)))
+           (new-file (string-replace "/foo" (concat "/" replace) test-file)))
       (write-region "" nil test-file nil 'silent)
       (let ((buf (find-file-noselect test-dir)))
         (unwind-protect
@@ -141,21 +141,27 @@ wdired-get-filename before and after editing."
   ;; FIXME: Add a test for a door (indicator ">") only under Solaris?
   (ert-with-temp-directory test-dir
     (let* ((dired-listing-switches "-Fl")
-           (dired-ls-F-marks-symlinks (eq system-type 'darwin))
+           (dired-ls-F-marks-symlinks
+            (or (eq system-type 'darwin)
+                (featurep 'ls-lisp)))
            (buf (find-file-noselect test-dir))
            proc)
       (unwind-protect
           (progn
             (with-current-buffer buf
-              (dired-create-empty-file "foo")
-              (set-file-modes "foo" (file-modes-symbolic-to-number "+x"))
+              ;; Create a .bat file so that MS-Windows, where the 'x'
+              ;; bit is not recorded in the filesystem, considers it an
+              ;; executable.
+              (dired-create-empty-file "foo.bat")
+              (set-file-modes "foo.bat" (file-modes-symbolic-to-number "+x"))
               (skip-unless
                ;; This check is for wdired, not symbolic links, so skip
                ;; it when make-symbolic-link fails for any reason (like
                ;; insufficient privileges).
-               (ignore-errors (make-symbolic-link "foo" "bar") t))
+               (ignore-errors (make-symbolic-link "foo.bat" "bar") t))
               (make-directory "foodir")
-              (dired-smart-shell-command "mkfifo foopipe")
+              (unless (memq system-type '(windows-nt ms-dos))
+                (dired-smart-shell-command "mkfifo foopipe"))
               (when (featurep 'make-network-process '(:family local))
                 (setq proc (make-network-process
                             :name "foo"