Merge from savannah/emacs-30

5ec73eca57 Update to Org 9.7.7-2-gf308d3
33ba72f52f Fix decoding 'display' properties with SVG images in Enri...
174a0b7642 * configure.ac (D8): Fix typo.
c56e837a10 ; * src/android.c (setEmacsParams): Delete unused variable.

configure.ac

@@ -1032,7 +1032,7 @@ Please verify that the path to the SDK build tools you specified is correct])
   fi
 
   AC_PATH_PROGS([D8], [d8], [], "${SDK_BUILD_TOOLS}:$PATH")
-  if test "D8" = ""; then
+  if test "$D8" = ""; then
     AC_MSG_ERROR([The Android dexer was not found.
 Please verify that the path to the SDK build tools you specified is correct])
   fi

etc/ORG-NEWS

@@ -271,6 +271,10 @@ Image filename chosen can be customized by setting
 ~org-yank-image-file-name-function~ which by default autogenerates a
 filename based on the current time.
 
+Note that ~yank-media~, as of Emacs 30, does not yet support Windows
+(Emacs bug#71909) and may not be always reliable on Mac (Emacs
+bug#71731).
+
 *** Files and images can be attached by dropping onto Emacs
 
 By default, Org asks the user what to do with the dropped file like

etc/refcards/orgcard.tex

@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{9.7.5}
+\def\orgversionnumber{9.7.7}
 \def\versionyear{2024}          % latest update
 \input emacsver.tex
 

lisp/org/ob-core.el

@@ -2455,8 +2455,8 @@ the inline source block.  The macro is stripped upon export.
 Multiline and non-scalar RESULTS from inline source blocks are
 not allowed.  When EXEC-TIME is provided it may be included in a
 generated message.  With optional argument RESULT-PARAMS controls
-insertion of results in the Org mode file.  RESULT-PARAMS can
-take the following values:
+insertion of results in the Org mode file.  RESULT-PARAMS is a list
+that can contain the following values:
 
 replace - (default option) insert results after the source block
           or inline source block replacing any previously
@@ -2515,15 +2515,17 @@ list ---- the results are rendered as a list.  This option not
 table --- the results are rendered as a table.  This option not
           allowed for inline source blocks.
 
-INFO may provide the values of these header arguments (in the
-`header-arguments-alist' see the docstring for
-`org-babel-get-src-block-info'):
+INFO is the src block info, as returned by
+`org-babel-get-src-block-info' (which see).  Some values from its
+PARAMETERS part (header argument alist) can affect the inserted
+result:
 
-:file --- the name of the file to which output should be written.
+:file-desc - when RESULT-PARAMS contains \"file\", use it as
+             description of the inserted link.
 
-:wrap --- the effect is similar to `latex' in RESULT-PARAMS but
-          using the argument supplied to specify the export block
-          or snippet type."
+:wrap        the effect is similar to `latex' in RESULT-PARAMS but
+             using the argument supplied to specify the export block
+             or snippet type."
   (cond ((stringp result)
 	 (setq result (substring-no-properties result))
 	 (when (member "file" result-params)

lisp/org/org-agenda.el

@@ -2048,6 +2048,9 @@ the normal rules apply."
 (defcustom org-agenda-category-icon-alist nil
   "Alist of category icon to be displayed in agenda views.
 
+The icons are displayed in place of the %i placeholders in
+`org-agenda-prefix-format', which see.
+
 Each entry should have the following format:
 
   (CATEGORY-REGEXP FILE-OR-DATA TYPE DATA-P PROPS)

lisp/org/org-persist.el

@@ -670,8 +670,8 @@ When INNER is non-nil, do not try to match as list of containers."
                ;; `secure-hash' may trigger interactive dialog when it
                ;; cannot determine the coding system automatically.
                ;; Force coding system that works reliably for any text
-               ;; to avoid it.  The has will be consistent anyway, as
-               ;; long as we use the same coding system.
+               ;; to avoid it.  The hash will be consistent, as long
+               ;; as we use the same coding system.
                (let ((coding-system-for-write 'emacs-internal))
                  (secure-hash 'md5 associated)))
          (puthash associated

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.5"))
+   (let ((org-release "9.7.7"))
      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.5-9-ga091ca"))
+   (let ((org-git-version "release_9.7.7-2-gf308d3"))
      org-git-version))
 
 (provide 'org-version)

lisp/org/org.el

@@ -9,7 +9,7 @@
 ;; URL: https://orgmode.org
 ;; Package-Requires: ((emacs "26.1"))
 
-;; Version: 9.7.5
+;; Version: 9.7.7
 
 ;; This file is part of GNU Emacs.
 ;;
@@ -6698,7 +6698,7 @@ The prefix argument ARG is passed to `org-insert-heading'.
 Unlike `org-insert-heading', when point is at the beginning of a
 heading, still insert the new sub-heading below."
   (interactive "P")
-  (when (bolp) (forward-char))
+  (when (and (bolp) (not (eobp)) (not (eolp))) (forward-char))
   (org-insert-heading arg)
   (cond
    ((org-at-heading-p) (org-do-demote))
@@ -19809,7 +19809,11 @@ Also align node properties according to `org-property-format'."
                         (+ (org-current-text-indentation)
                            org-edit-src-content-indentation)))))
                (ignore-errors ; do not err when there is no proper major mode
-                 (org-babel-do-in-edit-buffer (funcall indent-line-function)))
+                 ;; It is important to call `indent-according-to-mode'
+                 ;; rather than `indent-line-function' here or we may
+                 ;; sometimes break `electric-indent-mode'
+                 ;; https://orgmode.org/list/5O9VMGb6WRaqeHR5_NXTb832Z2Lek_5L40YPDA52-S3kPwGYJspI8kLWaGtuq3DXyhtHpj1J7jTIXb39RX9BtCa2ecrWHjijZqI8QAD742U=@proton.me
+                 (org-babel-do-in-edit-buffer (indent-according-to-mode)))
                (when (and block-content-ind (looking-at-p "^$"))
                  (indent-line-to block-content-ind))))
 	    (t

lisp/textmodes/enriched.el

@@ -453,7 +453,12 @@ Any \"<<\" strings encountered are converted to \"<\".
 Return value is \(begin end name positive-p), or nil if none was found."
   (while (and (search-forward "<" nil 1)
 	      (progn (goto-char (match-beginning 0))
-		     (not (looking-at enriched-annotation-regexp))))
+                     ;; Make sure we are not inside a string, where any
+                     ;; matches for 'enriched-annotation-regexp' are
+                     ;; false positives.  This happens, for example, in
+                     ;; display properties that specify SVG images.
+                     (or (nth 3 (syntax-ppss))
+		         (not (looking-at enriched-annotation-regexp)))))
     (forward-char 1)
     (if (eq ?< (char-after (point)))
 	(delete-char 1)

src/android.c

@@ -1338,7 +1338,7 @@ NATIVE_NAME (setEmacsParams) (JNIEnv *env, jobject object,
 
   int pipefd[2];
   pthread_t thread;
-  const char *java_string, *tem;
+  const char *java_string;
   struct stat statb;
 
 #ifdef THREADS_ENABLED