master 0abf014 3/4: Merge from origin/emacs-28

[Eli Zaretskii]

branch: master
commit 0abf01402b4c1959b363ae1c7085fd356fb102a4
Merge: 3d2728b f1c9286
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-28
    
    f1c9286 ; * doc/misc/org.org: fix capture context example
    af67ce6 Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emac...
    610680a Fix rendering of title-less <abbr> tags in shr
    2ba4ccf ; * lisp/files.el (make-nearby-temp-file): Doc fix.
---
 doc/misc/org.org |  4 ++--
 lisp/files.el    |  1 +
 lisp/net/shr.el  | 13 ++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/misc/org.org b/doc/misc/org.org
index 788e5ef..17fd2dc 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -7981,7 +7981,7 @@ patches.  Then you would configure this option like this:
 
 #+begin_src emacs-lisp
 (setq org-capture-templates-contexts
-      '(("p" (in-mode . "message-mode"))))
+      '(("p" ((in-mode . "message-mode")))))
 #+end_src
 
 You can also tell that the command key {{{kbd(p)}}} should refer to
@@ -7989,7 +7989,7 @@ another template.  In that case, add this command key 
like this:
 
 #+begin_src emacs-lisp
 (setq org-capture-templates-contexts
-      '(("p" "q" (in-mode . "message-mode"))))
+      '(("p" "q" ((in-mode . "message-mode")))))
 #+end_src
 
 See the docstring of the variable for more information.
diff --git a/lisp/files.el b/lisp/files.el
index 1d2ef6f..1e65d0c 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1564,6 +1564,7 @@ This implementation works on magic file names."
 
 (defun make-nearby-temp-file (prefix &optional dir-flag suffix)
   "Create a temporary file as close as possible to `default-directory'.
+Return the absolute file name of the created file.
 If PREFIX is a relative file name, and `default-directory' is a
 remote file name or located on a mounted file systems, the
 temporary file is created in the directory returned by the
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 72d2ab7..cb8ee73 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1572,15 +1572,14 @@ ones, in case fg and bg are nil."
       (shr-urlify (or shr-start start) (shr-expand-url url) title))))
 
 (defun shr-tag-abbr (dom)
-  (when-let* ((title (dom-attr dom 'title))
-             (start (point)))
+  (let ((title (dom-attr dom 'title))
+       (start (point)))
     (shr-generic dom)
     (shr-add-font start (point) 'shr-abbreviation)
-    (add-text-properties
-     start (point)
-     (list
-      'help-echo title
-      'mouse-face 'highlight))))
+    (when title
+      (add-text-properties start (point)
+                           (list 'help-echo title
+                                 'mouse-face 'highlight)))))
 
 (defun shr-tag-acronym (dom)
   ;; `acronym' is deprecated in favor of `abbr'.