From: Stefan Kangas <stefan@marxist.se>
Date: Mon, 16 May 2022 04:30:38 +0000 (+0200)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~1910^2~654
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1fc1d8b88994303ac7c1aac673cb3fead5ff4d9e;p=emacs.git

Merge from origin/emacs-28

f928330fa8 Update to Org 9.5.3-6-gef41f3
007bf9a34c Hide temporary FUSE files in Tramp
5dbaddc729 ; Fix some typos
---

1fc1d8b88994303ac7c1aac673cb3fead5ff4d9e
diff --cc lisp/net/tramp-fuse.el
index 2a73d5aa02b,54e7999e7a3..596c08f04c1
--- a/lisp/net/tramp-fuse.el
+++ b/lisp/net/tramp-fuse.el
@@@ -92,21 -99,28 +99,22 @@@
  
  (defun tramp-fuse-handle-file-name-all-completions (filename directory)
    "Like `file-name-all-completions' for Tramp files."
-   (all-completions
-    filename
-    (delete-dups
-     (append
-      (file-name-all-completions
-       filename (tramp-fuse-local-file-name directory))
-      ;; Some storage systems do not return "." and "..".
-      (let (result)
-        (dolist (item '(".." ".") result)
- 	 (when (string-prefix-p filename item)
- 	   (catch 'match
- 	     (dolist (elt completion-regexp-list)
- 	       (unless (string-match-p elt item) (throw 'match nil)))
- 	     (setq result (cons (concat item "/") result))))))))))
+   (tramp-fuse-remove-hidden-files
+    (all-completions
+     filename
+     (delete-dups
+      (append
+       (file-name-all-completions
+        filename (tramp-fuse-local-file-name directory))
+       ;; Some storage systems do not return "." and "..".
+       (let (result)
+ 	(dolist (item '(".." ".") result)
+ 	  (when (string-prefix-p filename item)
+ 	    (catch 'match
+ 	      (dolist (elt completion-regexp-list)
+ 		(unless (string-match-p elt item) (throw 'match nil)))
+ 	      (setq result (cons (concat item "/") result)))))))))))
  
 -(defun tramp-fuse-handle-file-readable-p (filename)
 -  "Like `file-readable-p' for Tramp files."
 -  (with-parsed-tramp-file-name (expand-file-name filename) nil
 -    (with-tramp-file-property v localname "file-readable-p"
 -      (file-readable-p (tramp-fuse-local-file-name filename)))))
 -
  ;; This function isn't used.
  (defun tramp-fuse-handle-insert-directory
      (filename switches &optional wildcard full-directory-p)