master 1fc1d8b889 3/3: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 1fc1d8b88994303ac7c1aac673cb3fead5ff4d9e
Merge: 0651bc6d17 f928330fa8
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    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
---
 ChangeLog.3             |  2 +-
 doc/misc/transient.texi |  2 +-
 lisp/net/tramp-fuse.el  | 38 +++++++++++++++++++++++---------------
 lisp/org/org-version.el |  2 +-
 lisp/org/org.el         |  7 ++++---
 src/emacs.c             |  2 +-
 6 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/ChangeLog.3 b/ChangeLog.3
index be1a9bfe26..f0297fd1f0 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -1293,7 +1293,7 @@
 
        Don't bug out on certain empty elements with ids
 
-       * lisp/net/shr.el (shr-descend): Fix empty-element #id targetting
+       * lisp/net/shr.el (shr-descend): Fix empty-element #id targeting
        (bug#52391).
 
 2021-12-09  Paul Eggert  <eggert@cs.ucla.edu>
diff --git a/doc/misc/transient.texi b/doc/misc/transient.texi
index 191fe8cd85..d634ad5197 100644
--- a/doc/misc/transient.texi
+++ b/doc/misc/transient.texi
@@ -2025,7 +2025,7 @@ They are defined here anyway to allow sharing certain 
methods.
 @code{value} The value.  Should not be accessed directly.
 
 @item
-@code{init-value} Function that is responsable for setting the object's
+@code{init-value} Function that is responsible for setting the object's
 value.  If bound, then this is called with the object as the only
 argument.  Usually this is not bound, in which case the object's
 primary @code{transient-init-value} method is called instead.
diff --git a/lisp/net/tramp-fuse.el b/lisp/net/tramp-fuse.el
index 2a73d5aa02..596c08f04c 100644
--- a/lisp/net/tramp-fuse.el
+++ b/lisp/net/tramp-fuse.el
@@ -44,6 +44,12 @@
     (delete-file (tramp-fuse-local-file-name filename) trash)
     (tramp-flush-file-properties v localname)))
 
+(defsubst tramp-fuse-remove-hidden-files (files)
+  "Remove hidden files from FILES."
+  (cl-remove-if
+   (lambda (x) (and (stringp x) (string-match-p "\\.fuse_hidden" x)))
+   files))
+
 (defun tramp-fuse-handle-directory-files
     (directory &optional full match nosort count)
   "Like `directory-files' for Tramp files."
@@ -75,7 +81,8 @@
                              result)))
            (setq result (cons item result))))
        ;; Return result.
-       (if nosort result (sort result #'string<))))))
+       (tramp-fuse-remove-hidden-files
+        (if nosort result (sort result #'string<)))))))
 
 (defun tramp-fuse-handle-file-attributes (filename &optional id-format)
   "Like `file-attributes' for Tramp files."
@@ -92,20 +99,21 @@
 
 (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)))))))))))
 
 ;; This function isn't used.
 (defun tramp-fuse-handle-insert-directory
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index dc689662b7..6bafb6fc37 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made."
 (defun org-git-version ()
   "The Git version of Org mode.
 Inserted by installing Org or when a release is made."
-   (let ((org-git-version "release_9.5.3-3-gd54104"))
+   (let ((org-git-version "release_9.5.3-6-gef41f3"))
      org-git-version))
 
 (provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 778f06aa64..8294e57732 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -247,7 +247,7 @@ byte-compiled before it is loaded."
     (if compile
        (progn
          (byte-compile-file tangled-file)
-         (load tangled-file)
+         (load-file (byte-compile-dest-file tangled-file))
          (message "Compiled and loaded %s" tangled-file))
       (load-file tangled-file)
       (message "Loaded %s" tangled-file))))
@@ -15026,8 +15026,9 @@ When matching, the match groups are the following:
   (let* ((regexp
           (if extended
               (if (eq extended 'agenda)
-                  (rx (or (regexp org-ts-regexp3)
-                          (regexp org-element--timestamp-regexp)))
+                  (rx-to-string
+                   `(or (regexp ,org-ts-regexp3)
+                        (regexp ,org-element--timestamp-regexp)))
                org-ts-regexp3)
             org-ts-regexp2))
         (pos (point))
diff --git a/src/emacs.c b/src/emacs.c
index fe138366f3..056cebb04d 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1405,7 +1405,7 @@ main (int argc, char **argv)
      related to the GUI system, like -font, -geometry, and -title, and
      then processes the rest of arguments whose priority is below
      those that are related to the GUI system.  The arguments
-     porcessed by 'command-line' are removed from 'command-line-args';
+     processed by 'command-line' are removed from 'command-line-args';
      the arguments processed by 'command-line-1' aren't, they are only
      removed from 'command-line-args-left'.