Merge from origin/emacs-28
73f28fbde8
Add a comment for previous browse-url-of-dired-file change9b74e84857
Restore documented Emacs 27.2 behaviour of browse-url-of-d...cd77fd3b85
Update to Org 9.5.2-24-g668205
This commit is contained in:
commit
8b66adfe06
3 changed files with 14 additions and 17 deletions
|
@ -782,7 +782,10 @@ If optional arg TEMP-FILE-NAME is non-nil, delete it instead."
|
|||
(defun browse-url-of-dired-file ()
|
||||
"In Dired, ask a WWW browser to display the file named on this line."
|
||||
(interactive)
|
||||
(let ((tem (dired-get-filename t t)))
|
||||
(let ((tem (dired-get-filename t t))
|
||||
;; Some URL handlers open files in Emacs. We want to always
|
||||
;; open in a browser, so disable those.
|
||||
(browse-url-default-handlers nil))
|
||||
(if tem
|
||||
(browse-url-of-file (expand-file-name tem))
|
||||
(error "No file on this line"))))
|
||||
|
|
|
@ -396,31 +396,25 @@ still has an entry since one of its properties (`:title') does.")
|
|||
"Alist between element types and locations of secondary values.")
|
||||
|
||||
(defconst org-element--pair-round-table
|
||||
(let ((table (make-syntax-table)))
|
||||
(let ((table (make-char-table 'syntax-table '(2))))
|
||||
(modify-syntax-entry ?\( "()" table)
|
||||
(modify-syntax-entry ?\) ")(" table)
|
||||
(dolist (char '(?\{ ?\} ?\[ ?\] ?\< ?\>) table)
|
||||
(modify-syntax-entry char " " table)))
|
||||
"Table used internally to pair only round brackets.
|
||||
Other brackets are treated as spaces.")
|
||||
table)
|
||||
"Table used internally to pair only round brackets.")
|
||||
|
||||
(defconst org-element--pair-square-table
|
||||
(let ((table (make-syntax-table)))
|
||||
(let ((table (make-char-table 'syntax-table '(2))))
|
||||
(modify-syntax-entry ?\[ "(]" table)
|
||||
(modify-syntax-entry ?\] ")[" table)
|
||||
(dolist (char '(?\{ ?\} ?\( ?\) ?\< ?\>) table)
|
||||
(modify-syntax-entry char " " table)))
|
||||
"Table used internally to pair only square brackets.
|
||||
Other brackets are treated as spaces.")
|
||||
table)
|
||||
"Table used internally to pair only square brackets.")
|
||||
|
||||
(defconst org-element--pair-curly-table
|
||||
(let ((table (make-syntax-table)))
|
||||
(let ((table (make-char-table 'syntax-table '(2))))
|
||||
(modify-syntax-entry ?\{ "(}" table)
|
||||
(modify-syntax-entry ?\} "){" table)
|
||||
(dolist (char '(?\[ ?\] ?\( ?\) ?\< ?\>) table)
|
||||
(modify-syntax-entry char " " table)))
|
||||
"Table used internally to pair only curly brackets.
|
||||
Other brackets are treated as spaces.")
|
||||
table)
|
||||
"Table used internally to pair only curly brackets.")
|
||||
|
||||
(defun org-element--parse-paired-brackets (char)
|
||||
"Parse paired brackets at point.
|
||||
|
|
|
@ -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.2-22-g33543d"))
|
||||
(let ((org-git-version "release_9.5.2-24-g668205"))
|
||||
org-git-version))
|
||||
|
||||
(provide 'org-version)
|
||||
|
|
Loading…
Add table
Reference in a new issue