diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-02-22 06:30:59 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-02-22 06:30:59 +0100 |
| commit | bee54495e92ddf5d75e3f68ac7e823b221306719 (patch) | |
| tree | 3469a04a9a7117c7e546e16605b543777d6d3d77 /lisp/org | |
| parent | 6b0e23412d367a3b90db01de9456431158525938 (diff) | |
| parent | 666e40a109ea6c0079467e72c806bb04191ff4cc (diff) | |
| download | emacs-bee54495e92ddf5d75e3f68ac7e823b221306719.tar.gz emacs-bee54495e92ddf5d75e3f68ac7e823b221306719.tar.bz2 emacs-bee54495e92ddf5d75e3f68ac7e823b221306719.zip | |
Merge from origin/emacs-28
666e40a109 Fix 'display-line-numbers-mode' in hide-show buffers
68d134cf0f Don't check whether a deleted window is deletable (Bug#54028)
b38223a844 A friendlier error message from image-mode in an empty buffer
b7a651ba37 Update to Org 9.5.2-17-gea6b74
3a8c3f7abd ; Don't reference obsolete variables in edebug.el
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/org-lint.el | 8 | ||||
| -rw-r--r-- | lisp/org/org-version.el | 2 | ||||
| -rw-r--r-- | lisp/org/ox.el | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/lisp/org/org-lint.el b/lisp/org/org-lint.el index 0894951b654..83c2d08a907 100644 --- a/lisp/org/org-lint.el +++ b/lisp/org/org-lint.el @@ -784,8 +784,12 @@ Use \"export %s\" instead" reports)) (defun org-lint-undefined-footnote-reference (ast) - (let ((definitions (org-element-map ast 'footnote-definition - (lambda (f) (org-element-property :label f))))) + (let ((definitions + (org-element-map ast '(footnote-definition footnote-reference) + (lambda (f) + (and (or (eq 'footnote-definition (org-element-type f)) + (eq 'inline (org-element-property :type f))) + (org-element-property :label f)))))) (org-element-map ast 'footnote-reference (lambda (f) (let ((label (org-element-property :label f))) diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 336347b29c2..6a2aa8ca5ba 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.2-15-gc5ceb6")) + (let ((org-git-version "release_9.5.2-17-gea6b74")) org-git-version)) (provide 'org-version) diff --git a/lisp/org/ox.el b/lisp/org/ox.el index afea529f640..2a3edaa500f 100644 --- a/lisp/org/ox.el +++ b/lisp/org/ox.el @@ -632,7 +632,7 @@ This option can also be set with the SELECT_TAGS keyword." (defcustom org-export-with-smart-quotes nil "Non-nil means activate smart quotes during export. This option can also be set with the OPTIONS keyword, -e.g., \"':t\". +e.g., \"\\=':t\". When setting this to non-nil, you need to take care of using the correct Babel package when exporting to LaTeX. |