Avoid cl-caaar etc. compatibility aliases in Tramp

* lisp/net/tramp-gvfs.el (tramp-gvfs-handler-askquestion):
(tramp-gvfs-handler-mounted-unmounted):
(tramp-gvfs-connection-mounted-p):
* lisp/net/tramp-sh.el (tramp-sh-gio-monitor-process-filter):
(tramp-sh-inotifywait-process-filter): Don't use cl-caaar
etc. compatibility aliases.  (Bug#76249)

(cherry picked from commit d06606ff42b14d725c487ddc57005bc7a2eec1ba)

diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index e0099e9cd6cad6d844c2cdbd1f3da4e10f058613..14b7069c03179919c99127668c0cfbbeff61586a 100644 (file)
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -1888,7 +1888,7 @@ a downcased host name only."
 
        ;; When the choice is "no", we set a dummy fuse-mountpoint in
        ;; order to leave the timeout.
-       (unless (zerop (cl-caddr result))
+       (unless (zerop (caddr result))
          (tramp-set-file-property v "/" "fuse-mountpoint" "/"))
 
        result))))
@@ -1905,10 +1905,10 @@ Their full names are \"org.gtk.vfs.MountTracker.mounted\" and
       ;; elements.
       (while (stringp (car elt)) (setq elt (cdr elt)))
       (let* ((fuse-mountpoint (tramp-gvfs-dbus-byte-array-to-string (cadr elt)))
-            (mount-spec (cl-caddr elt))
+            (mount-spec (caddr elt))
             (prefix (tramp-gvfs-dbus-byte-array-to-string (car mount-spec)))
             (default-location (tramp-gvfs-dbus-byte-array-to-string
-                               (cl-cadddr elt)))
+                               (cadddr elt)))
             (method (tramp-gvfs-dbus-byte-array-to-string
                      (cadr (assoc "type" (cadr mount-spec)))))
             (user (tramp-gvfs-dbus-byte-array-to-string
@@ -2001,10 +2001,10 @@ Their full names are \"org.gtk.vfs.MountTracker.mounted\" and
        (while (stringp (car elt)) (setq elt (cdr elt)))
        (let* ((fuse-mountpoint (tramp-gvfs-dbus-byte-array-to-string
                                (cadr elt)))
-             (mount-spec (cl-caddr elt))
+             (mount-spec (caddr elt))
              (prefix (tramp-gvfs-dbus-byte-array-to-string (car mount-spec)))
              (default-location (tramp-gvfs-dbus-byte-array-to-string
-                                (cl-cadddr elt)))
+                                (cadddr elt)))
              (method (tramp-gvfs-dbus-byte-array-to-string
                       (cadr (assoc "type" (cadr mount-spec)))))
              (user (tramp-gvfs-dbus-byte-array-to-string

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 3f5cb90a752efc51f880746cfba1bb6a55085f27..805e23440e6efa6fddcde82f9368c76a740410fb 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3908,7 +3908,7 @@ Fall back to normal file name handler if no Tramp handler exists."
          (setq string (replace-match "" nil nil string))
           ;; Add an Emacs event now.
          ;; `insert-special-event' exists since Emacs 31.
-         (when (member (cl-caadr object) events)
+         (when (member (caadr object) events)
            (tramp-compat-funcall
                 (if (fboundp 'insert-special-event)
                     'insert-special-event
@@ -3945,7 +3945,7 @@ Fall back to normal file name handler if no Tramp handler exists."
                   (process-get proc 'tramp-watch-name))))))
         ;; Add an Emacs event now.
        ;; `insert-special-event' exists since Emacs 31.
-       (when (member (cl-caadr object) events)
+       (when (member (caadr object) events)
          (tramp-compat-funcall
               (if (fboundp 'insert-special-event)
                   'insert-special-event