mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

Merge from origin/emacs-28

Browse Source 
f928330fa8 Update to Org 9.5.3-6-gef41f3
007bf9a34c Hide temporary FUSE files in Tramp
5dbaddc729 ; Fix some typos
This commit is contained in:
Stefan Kangas 2022-05-16 06:30:38 +02:00
commit 1fc1d8b889
6 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.3
View File

@ -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>

2
doc/misc/transient.texi
View File

@ -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.

38
lisp/net/tramp-fuse.el
View File

@ -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

2
lisp/org/org-version.el
View File

@ -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)

7
lisp/org/org.el
View File

@ -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))

2
src/emacs.c
View File

@ -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'.