From 6eaebaa27883a013a7b948e2b6e14dd8617dede5 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Fri, 22 Apr 1994 23:59:24 +0000 Subject: [PATCH] Pass operation to find-file-name-handler. --- lisp/dired-aux.el | 2 +- lisp/dired.el | 2 +- lisp/files.el | 10 +++++----- lisp/ls-lisp.el | 2 +- lisp/textmodes/ispell4.el | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 16b829d9489..6cfcbc67599 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -497,7 +497,7 @@ and use this command with a prefix argument (the value does not matter)." ;; Compress or uncompress FILE. ;; Return the name of the compressed or uncompressed file. ;; Return nil if no change in files. - (let ((handler (find-file-name-handler file))) + (let ((handler (find-file-name-handler file 'dired-compress-file))) (cond (handler (funcall handler 'dired-compress-file file)) ((file-symlink-p file) diff --git a/lisp/dired.el b/lisp/dired.el index fbb0ac563c4..a7a9dfa525e 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -646,7 +646,7 @@ If DIRNAME is already in a dired buffer, that buffer is used without refresh." ;; Remove directory DIR from any directory cache. (defun dired-uncache (dir) - (let ((handler (find-file-name-handler dir))) + (let ((handler (find-file-name-handler dir 'dired-uncache))) (if handler (funcall handler 'dired-uncache dir)))) diff --git a/lisp/files.el b/lisp/files.el index 389139b8f8d..518515a7b79 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -321,7 +321,7 @@ This is an interface to the function `load'." "Copy the file FILE into a temporary file on this machine. Returns the name of the local copy, or nil, if FILE is directly accessible." - (let ((handler (find-file-name-handler file))) + (let ((handler (find-file-name-handler file 'file-local-copy))) (if handler (funcall handler 'file-local-copy file) nil))) @@ -338,7 +338,7 @@ containing it, until no links are left at any level." (setq filename (expand-file-name filename)) (if (string= filename "") (setq filename "/")))) - (let ((handler (find-file-name-handler filename))) + (let ((handler (find-file-name-handler filename 'file-truename))) ;; For file name that has a special handler, call handler. ;; This is so that ange-ftp can save time by doing a no-op. (if handler @@ -1326,7 +1326,7 @@ This is a separate procedure so your site-init or startup file can redefine it. If the optional argument KEEP-BACKUP-VERSION is non-nil, we do not remove backup version numbers, only true file version numbers." - (let ((handler (find-file-name-handler name))) + (let ((handler (find-file-name-handler name 'file-name-sans-versions))) (if handler (funcall handler 'file-name-sans-versions name keep-backup-version) (substring name 0 @@ -1735,7 +1735,7 @@ to create parent directories if they don't exist." (list (read-file-name "Make directory: " default-directory default-directory nil nil) t)) - (let ((handler (find-file-name-handler dir))) + (let ((handler (find-file-name-handler dir 'make-directory))) (if handler (funcall handler 'make-directory dir parents) (if (not parents) @@ -2000,7 +2000,7 @@ switches do not contain `d', so that a full listing is expected. This works by running a directory listing program whose name is in the variable `insert-directory-program'. If WILDCARD, it also runs the shell specified by `shell-file-name'." - (let ((handler (find-file-name-handler file))) + (let ((handler (find-file-name-handler file 'insert-directory))) (if handler (funcall handler 'insert-directory file switches wildcard full-directory-p) diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 38a68cdc10a..0a5a5942347 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -62,7 +62,7 @@ It does not support ordinary shell wildcards; instead, it allows regular expressions to match file names. The switches that work are: A a c i r S s t u" - (let ((handler (find-file-name-handler file))) + (let ((handler (find-file-name-handler file 'insert-directory))) (if handler (funcall handler 'insert-directory file switches wildcard full-directory-p) diff --git a/lisp/textmodes/ispell4.el b/lisp/textmodes/ispell4.el index c47db01a230..147e3ea12b0 100644 --- a/lisp/textmodes/ispell4.el +++ b/lisp/textmodes/ispell4.el @@ -283,7 +283,7 @@ q, \\[keyboard-quit] Leave the command loop. You can come back later with \\[is (unwind-protect (progn (cond ((or (null filename) - (find-file-name-handler buffer-file-name)) + (find-file-name-handler buffer-file-name nil)) (setq filename (make-temp-name "/usr/tmp/ispell")) (setq delete-temp t) (write-region (point-min) (point-max) filename)) -- 2.39.5