andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; Fix last commit

Browse source 
* doc/emacs/misc.texi (Shell Bookmarks): Adapt reference.

* lisp/bookmark.el (bookmark-insert): Adapt docstring.

* lisp/shell.el (shell-bookmark-name-function)
(shell-bookmark-name-from-default-directory)
(shell-bookmark-name-from-buffer-name): Adapt docstring.
(shell-bookmark-make-record, shell-bookmark-jump): Don't explain
Tramp details in the docstring, refer to the Tramp manual.
This commit is contained in:
Michael Albinus 2025-03-06 12:52:51 +01:00
parent c1ddf612d5
commit d707688f33
3 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/emacs/misc.texi
View file

@ -1547,7 +1547,7 @@ routes.
are fully qualified. This is helpful if you use the same persisted
bookmarks file on multiple hosts.
@xref{Top, The Tramp Manual,, tramp, The Tramp Manual}.
@xref{Ad-hoc multi-hops,,, tramp, The Tramp Manual}.
@node Shell Options
@subsection Shell Mode Options

2
lisp/bookmark.el
View file

@ -1522,6 +1522,8 @@ name."
(defun bookmark-insert (bookmark-name)
"Insert the text of the file pointed to by bookmark BOOKMARK-NAME.
BOOKMARK-NAME is a bookmark name (a string), not a bookmark record.
Refuse to insert bookmarks whose handlers have the property
`bookmark-inhibit' eq `insert'.
You may have a problem using this function if the value of variable
`bookmark-alist' is nil. If that happens, you need to load in some

24
lisp/shell.el
View file

@ -1867,9 +1867,10 @@ to make `shell-highlight-undef-mode' redo its setup."
(declare-function bookmark-prop-get "bookmark" (bookmark prop))
(defcustom shell-bookmark-name-function #'shell-bookmark-name-from-default-directory
(defcustom shell-bookmark-name-function
#'shell-bookmark-name-from-default-directory
"Function to generate a shell bookmark name.
The default is `shell-bookmark-name', which see."
The default is `shell-bookmark-name-from-default-directory', which see."
:group 'shell
:type `(choice (function-item ,#'shell-bookmark-name-from-default-directory)
(function-item ,#'shell-bookmark-name-from-buffer-name)
@ -1878,15 +1879,15 @@ The default is `shell-bookmark-name', which see."
(defun shell-bookmark-name-from-default-directory ()
"Return a `shell-mode' bookmark name based on `default-directory'.
Return \"shell-\" appended with the final path component of the buffer's
`default-directory'."
Return \"shell-\" appended with the final file name component of the
buffer's `default-directory'."
(format "shell-%s"
(file-name-nondirectory
(directory-file-name
(file-name-directory default-directory)))))
(defun shell-bookmark-name-from-buffer-name ()
"Return a `shell-mode' bookmark name based on buffer name'.
"Return a `shell-mode' bookmark name based on buffer name.
Return `buffer-name' stripped of its count suffix; e.g., \"*shell*<2>\",
if adorned by `rename-uniquely', which see."
(replace-regexp-in-string "<[[:digit:]]+>\\'" "" (buffer-name)))
@ -1906,12 +1907,8 @@ This list is used by `bookmark-set' and prompted by
(defun shell-bookmark-make-record ()
"Create a bookmark record for the current `shell-mode' buffer.
Handle both local and remote shell buffers.
Before creating ad-hoc multi-hop remote connections, customize either or
both:
`tramp-save-ad-hoc-proxies' to non-nil to persist proxy routes.
`tramp-show-ad-hoc-proxies' to non-nil to ensure connections are fully
qualified. This is helpful if you use the same persisted bookmarks
file on multiple hosts."
For ad-hoc multi-hop remote connections, see Info node
`(tramp)Ad-hoc multi-hops'."
(let ((bookmark-shell-file-name
(or (connection-local-value shell-file-name) sh-shell-file)))
`((defaults . ,(funcall shell-bookmark-defaults-function))
@ -1933,9 +1930,8 @@ the same name, default `shell-mode' behavior is to reuse that buffer.
For a remote shell `default-directory' will be the remote file name.
Remote shell buffers reuse existing connections that match the remote
file name, or may prompt you to create a new connection. Bind
`tramp-show-ad-hoc-proxies' to non-nil to ensure multi-hop remote
connections are fully qualified.
file name, or may prompt you to create a new connection. For ad-hoc
multi-hop remote connections, see Info node `(tramp)Ad-hoc multi-hops'.
If called with a single \\[universal-argument] prefix, a new shell
buffer will be created if there is an existing buffer with the same