martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid cl-caaar etc. compatibility aliases in Tramp

Browse Source 
* 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)
This commit is contained in:
Stefan Kangas
2025-02-13 07:48:07 +01:00
parent 2dad63cac3
commit d06606ff42
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/net/tramp-gvfs.el
View File

@@ -1891,7 +1891,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))))
@@ -1908,10 +1908,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
@@ -2004,10 +2004,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

4
lisp/net/tramp-sh.el
View File

@@ -3900,7 +3900,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
@@ -3937,7 +3937,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