[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master b9b4d8689fa: Merge from origin/emacs-29
From: |
Michael Albinus |
Subject: |
master b9b4d8689fa: Merge from origin/emacs-29 |
Date: |
Mon, 14 Aug 2023 03:46:04 -0400 (EDT) |
branch: master
commit b9b4d8689fa78a5696a5e2d96a08a761fbf3cc82
Merge: 9fb00904f95 fdab7aaadac
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Merge from origin/emacs-29
fdab7aaadac ; * lisp/net/tramp.el (tramp-skeleton-write-region): Fix ...
3eff53b4564 Update to Org 9.6.7-13-g99cc96
---
lisp/net/tramp.el | 2 +-
lisp/org/ol-bibtex.el | 5 ++++-
lisp/org/org-clock.el | 1 +
lisp/org/org-colview.el | 1 +
lisp/org/org-element.el | 7 +++++--
lisp/org/org-num.el | 1 +
lisp/org/org-table.el | 2 ++
lisp/org/org-version.el | 2 +-
lisp/org/org.el | 7 +++++++
lisp/org/ox-publish.el | 3 ++-
lisp/org/ox.el | 7 ++-----
11 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 167df34fc36..a0092a2d706 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3522,7 +3522,7 @@ BODY is the backend specific code."
;; likely that it is needed shortly after `write-region'.
(tramp-set-file-property v localname "file-exists-p" t)
- (let ((need-chown t))
+ (let (last-coding-system-used (need-chown t))
;; Set file modification time.
(when (or (eq ,visit t) (stringp ,visit))
(when-let ((file-attr (file-attributes filename 'integer)))
diff --git a/lisp/org/ol-bibtex.el b/lisp/org/ol-bibtex.el
index fd9517233e0..a16a4b39277 100644
--- a/lisp/org/ol-bibtex.el
+++ b/lisp/org/ol-bibtex.el
@@ -761,7 +761,10 @@ drawer."
"If kill ring holds a bibtex entry yank it as an Org headline."
(interactive)
(let (entry)
- (with-temp-buffer (yank 1) (setf entry (org-bibtex-read)))
+ (with-temp-buffer
+ (yank 1)
+ (bibtex-mode)
+ (setf entry (org-bibtex-read)))
(if entry
(org-bibtex-write)
(error "Yanked text does not appear to contain a BibTeX entry"))))
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index d7fe14cd5e1..b85ce6a6368 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -2069,6 +2069,7 @@ Use `\\[org-clock-remove-overlays]' to remove the subtree
times."
h m))))
(defvar-local org-clock-overlays nil)
+(put 'org-clock-overlays 'permanent-local t)
(defun org-clock-put-overlay (time)
"Put an overlay on the headline at point, displaying TIME.
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index 92a3b473d15..28cfd0d910c 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -116,6 +116,7 @@ in `org-columns-summary-types-default', which see."
(defvar-local org-columns-overlays nil
"Holds the list of current column overlays.")
+(put 'org-columns-overlays 'permanent-local t)
(defvar-local org-columns-current-fmt nil
"Local variable, holds the currently active column format.")
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index df43ebcf0c5..296468eed1a 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -6567,7 +6567,9 @@ If you observe Emacs hangs frequently, please report this
to Org mode mailing li
;; Make sure that we return referenced element in cache
;; that can be altered directly.
(if element
- (setq element (or (org-element--cache-put element)
element))
+ (progn
+ (org-element-put-property element :granularity 'element)
+ (setq element (or (org-element--cache-put element)
element)))
;; Nothing to parse (i.e. empty file).
(throw 'exit parent))
(unless (or (not (org-element--cache-active-p)) parent)
@@ -6942,12 +6944,13 @@ known element in cache (it may start after END)."
(let ((current (org-with-point-at
(org-element-property :begin up)
(org-element-with-disabled-cache
(and (looking-at-p
org-element-headline-re)
-
(org-element-headline-parser))))))
+ (org-element-headline-parser
nil 'fast))))))
(when (eq 'headline (org-element-type current))
(org-element--cache-log-message
"Found non-robust headline that can be updated
individually: %S"
(org-element--format-element current))
(org-element-set-element up current)
+ (org-element-put-property up :granularity
'element)
t)))
;; If UP is org-data, the situation is similar to
;; headline case. We just need to re-parse the
diff --git a/lisp/org/org-num.el b/lisp/org/org-num.el
index cbe5e455ea6..807fa66223b 100644
--- a/lisp/org/org-num.el
+++ b/lisp/org/org-num.el
@@ -156,6 +156,7 @@ control tag inheritance."
(defvar-local org-num--overlays nil
"Ordered list of overlays used for numbering outlines.")
+(put 'org-num--overlays 'permanent-local t)
(defvar-local org-num--skip-level nil
"Level below which headlines from current tree are not numbered.
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 9a72eb5f314..221497f53b7 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -477,6 +477,7 @@ This may be useful when columns have been shrunk."
(format "|%s" (mapconcat #'identity (reverse str) "")))))
(defvar-local org-table-header-overlay nil)
+(put 'org-table-header-overlay 'permanent-local t)
(defun org-table-header-set-header ()
"Display the header of the table at point."
(let ((gcol temporary-goal-column))
@@ -3812,6 +3813,7 @@ FACE, when non-nil, for the highlight."
(defvar-local org-table-coordinate-overlays nil
"Collects the coordinate grid overlays, so that they can be removed.")
+(put 'org-table-coordinate-overlays 'permanent-local t)
(defun org-table-overlay-coordinates ()
"Add overlays to the table at point, to show row/column coordinates."
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 9116e298aa9..57e406b24fc 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.6.7-5-gd1d0c3"))
+ (let ((org-git-version "release_9.6.7-13-g99cc96"))
org-git-version))
(provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index d49bc9645f5..175e095e806 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -5893,6 +5893,8 @@ needs to be inserted at a specific position in the
font-lock sequence.")
(defvar-local org-custom-properties-overlays nil
"List of overlays used for custom properties.")
+;; Preserve when switching modes or when restarting Org.
+(put 'org-custom-properties-overlays 'permanent-local t)
(defun org-toggle-custom-properties-visibility ()
"Display or hide properties in `org-custom-properties'."
@@ -10673,6 +10675,7 @@ D Show deadlines and scheduled items between a
date range."
(defvar-local org-occur-highlights nil
"List of overlays used for occur matches.")
+(put 'org-occur-highlights 'permanent-local t)
(defvar-local org-occur-parameters nil
"Parameters of the active org-occur calls.
This is a list, each call to org-occur pushes as cons cell,
@@ -16159,6 +16162,10 @@ SNIPPETS-P indicates if this is run to create snippet
images for HTML."
;; Image display
(defvar-local org-inline-image-overlays nil)
+;; Preserve when switching modes or when restarting Org.
+;; If we clear the overlay list and later enable Or mode, the existing
+;; image overlays will never be cleared by `org-toggle-inline-images'.
+(put 'org-inline-image-overlays 'permanent-local t)
(defun org--inline-image-overlays (&optional beg end)
"Return image overlays between BEG and END."
diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el
index f9c3877d7df..cff34f05882 100644
--- a/lisp/org/ox-publish.el
+++ b/lisp/org/ox-publish.el
@@ -1183,7 +1183,8 @@ references with `org-export-get-reference'."
(org-link-search search nil t)
(error
(signal 'org-link-broken (cdr err)))))
- (and (org-at-heading-p)
+ (and (derived-mode-p 'org-mode)
+ (org-at-heading-p)
(org-string-nw-p (org-entry-get (point) "CUSTOM_ID"))))))))
((not org-publish-cache)
(progn
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 6f819def93a..94cc5a22881 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -5684,11 +5684,8 @@ transcoding it."
(primary-closing
:utf-8 " »" :html " »" :latex "\\fg{}"
:texinfo "@tie{}@guillemetright{}")
- (secondary-opening
- :utf-8 "« " :html "« " :latex "\\og "
- :texinfo "@guillemetleft{}@tie{}")
- (secondary-closing :utf-8 " »" :html " »" :latex "\\fg{}"
- :texinfo "@tie{}@guillemetright{}")
+ (secondary-opening :utf-8 "“" :html "“" :latex "``" :texinfo "``")
+ (secondary-closing :utf-8 "”" :html "”" :latex "''" :texinfo "''")
(apostrophe :utf-8 "’" :html "’"))
("is"
(primary-opening