Update to Org 9.7.11

6 files changed, 31 insertions, 7 deletions

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 22212fa6d07..eeab970e3e1 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -284,6 +284,26 @@ respected.
 Images dropped also respect the value of ~org-yank-image-save-method~
 when ~org-yank-dnd-method~ is =attach=.
 
+*** Alignment of image previews can be customized
+
+Previously, all the image previews where always left-aligned.
+
+Now, you can customize image previews to be left-aligned, centered, or right-aligned.
+
+The customization can be done globally, via ~org-image-align~, or per
+image, using =#+attr_...:=.  Example:
+
+: #+attr_org: :align center
+: [[/path/to/image/file/png]]
+:
+: or
+:
+: #+attr_org: :center t
+: [[/path/to/image/file/png]]
+
+When =#+attr_org= is not present, ~:align~ and ~:center~ attributes
+from other =#+attr_...:= keywords will be used.
+
 *** =id:= links support search options; ~org-id-store-link~ adds search option by default
 
 Adding search option by ~org-id-store-link~ can be disabled by setting
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 65e9caa26d2..1a525289987 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{9.7.10}
+\def\orgversionnumber{9.7.11}
 \def\versionyear{2024}          % latest update
 \input emacsver.tex
 
diff --git a/lisp/org/ob-gnuplot.el b/lisp/org/ob-gnuplot.el
index 956763c587e..10192cb9a32 100644
--- a/lisp/org/ob-gnuplot.el
+++ b/lisp/org/ob-gnuplot.el
@@ -45,7 +45,6 @@
 
 (require 'ob)
 (require 'org-macs)
-(require 'ox-ascii)
 
 (declare-function org-time-string-to-time "org" (s))
 (declare-function orgtbl-to-generic "org-table" (table params))
@@ -295,6 +294,8 @@ then create one.  Return the initialized session.  The current
   "Export TABLE to DATA-FILE in a format readable by gnuplot.
 Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
   (require 'ox-org)
+  (require 'ox-ascii)
+  (declare-function org-export-create-backend "ox")
   (with-temp-file data-file
     (insert (let ((org-babel-gnuplot-timestamp-fmt
                    (or (plist-get params :timefmt) "%Y-%m-%d-%H:%M:%S"))
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 989fadf69fa..657d657d2ab 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -5,13 +5,13 @@
 (defun org-release ()
   "The release version of Org.
 Inserted by installing Org mode or when a release is made."
-   (let ((org-release "9.7.10"))
+   (let ((org-release "9.7.11"))
      org-release))
 ;;;###autoload
 (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.7.10"))
+   (let ((org-git-version "release_9.7.11"))
      org-git-version))
 
 (provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 26812bbfb29..5bee96fb0b5 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -9,7 +9,7 @@
 ;; URL: https://orgmode.org
 ;; Package-Requires: ((emacs "26.1"))
 
-;; Version: 9.7.10
+;; Version: 9.7.11
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 1024bdc4bae..7cdf622ec44 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -156,8 +156,11 @@
     (:cite-export "CITE_EXPORT" nil org-cite-export-processors))
   "Alist between export properties and ways to set them.
 
-The key of the alist is the property name, and the value is a list
-like (KEYWORD OPTION DEFAULT BEHAVIOR) where:
+Each element of the alist is a list like
+(ALIST-KEY KEYWORD OPTION DEFAULT BEHAVIOR)
+
+ALIST-KEY is the key of the alist - a symbol like `:option', and the
+value is (KEYWORD OPTION ...).
 
 KEYWORD is a string representing a buffer keyword, or nil.  Each
   property defined this way can also be set, during subtree