master e45ddf2fdc6 2/8: Merge from origin/emacs-29

[Eli Zaretskii]

branch: master
commit e45ddf2fdc6b25c72ed6be29ad9e8effda6a2b6a
Merge: 0bdd7707626 4df510c7a70
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-29
    
    4df510c7a70 Fix VC package build when doc file isn't in a subdir
    382f5fa8130 ; * doc/emacs/package.texi (Fetching Package Sources): Fi...
    fc7e7c3fde3 Fix type check in tramp-get-buffer-string
    2aa57fe6cf9 ; Fix typo in maintaining.texi (bug#64279)
---
 doc/emacs/maintaining.texi    | 2 +-
 doc/emacs/package.texi        | 2 +-
 lisp/emacs-lisp/package-vc.el | 2 +-
 lisp/net/tramp.el             | 7 +++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 246e335cfe7..2dad70d3d13 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -716,7 +716,7 @@ started editing (@pxref{Old Revisions}), type @kbd{C-c C-d}
 (@code{log-edit-generate-changelog-from-diff}), to generate skeleton
 ChangeLog entries, listing all changed file and function names based
 on the diff of the VC fileset.  Consecutive entries left empty will be
-combined by @kbd{C-q} (@code{fill-paragraph}).  By default the
+combined by @kbd{M-q} (@code{fill-paragraph}).  By default the
 skeleton will just include the file name, without any leading
 directories.  If you wish to prepend the leading directories up to the
 VC root, customize @code{diff-add-log-use-relative-names}.
diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi
index f1f88ac7f58..b294e3d58bd 100644
--- a/doc/emacs/package.texi
+++ b/doc/emacs/package.texi
@@ -625,7 +625,7 @@ checkout instead of cloning a remote repository.  You can 
do this by
 using @code{package-vc-install-from-checkout}, which creates a symbolic link
 from the package directory (@pxref{Package Files}) to your checkout
 and initializes the code.  Note that you might have to use
-@code{package-vc-refresh} to repeat the initialization and update the
+@code{package-vc-rebuild} to repeat the initialization and update the
 autoloads.
 
 @subsection Specifying Package Sources
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index f34cfb3120b..db8b41aee6a 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -386,7 +386,7 @@ FILE can be an Org file, indicated by its \".org\" 
extension,
 otherwise it's assumed to be an Info file."
   (let* ((pkg-name (package-desc-name pkg-desc))
          (default-directory (package-desc-dir pkg-desc))
-         (docs-directory (expand-file-name (file-name-directory file)))
+         (docs-directory (file-name-directory (expand-file-name file)))
          (output (expand-file-name (format "%s.info" pkg-name)))
          clean-up)
     (when (string-match-p "\\.org\\'" file)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index f64abbcf06e..4820feb276e 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1950,8 +1950,11 @@ version, the function does nothing."
   "Return contents of BUFFER.
 If BUFFER is not a buffer or a buffer name, return the contents
 of `current-buffer'."
-  (with-current-buffer (or buffer (current-buffer))
-    (substring-no-properties (buffer-string))))
+  (or (let ((buf (or buffer (current-buffer))))
+        (when (bufferp buf)
+          (with-current-buffer (or buffer (current-buffer))
+           (substring-no-properties (buffer-string)))))
+      ""))
 
 (defun tramp-debug-buffer-name (vec)
   "A name for the debug buffer for VEC."