]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-28
authorStefan Kangas <stefan@marxist.se>
Mon, 16 May 2022 04:30:38 +0000 (06:30 +0200)
committerStefan Kangas <stefan@marxist.se>
Mon, 16 May 2022 04:30:38 +0000 (06:30 +0200)
f928330fa8 Update to Org 9.5.3-6-gef41f3
007bf9a34c Hide temporary FUSE files in Tramp
5dbaddc729 ; Fix some typos

1  2 
ChangeLog.3
lisp/net/tramp-fuse.el
lisp/org/org.el
src/emacs.c

diff --cc ChangeLog.3
Simple merge
index 2a73d5aa02bc84045befc3becd0cbacd5cb16eb1,54e7999e7a37cfc28c1fb3b7881e6ae83f7af881..596c08f04c11af5a2da21504f528d261aac69423
  
  (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)
diff --cc lisp/org/org.el
Simple merge
diff --cc src/emacs.c
Simple merge