* bug#12107: 24.1.50; In Info mode, add the name of the manual as completion candidate for "bookmark-set"
@ 2012-07-31 20:22 Dani Moncayo
2012-08-01 0:12 ` Juri Linkov
0 siblings, 1 reply; 11+ messages in thread
From: Dani Moncayo @ 2012-07-31 20:22 UTC (permalink / raw)
To: 12107
Severity: wishlist
Hello,
I have a bookmark for each manual I'm reading in info. I like to give
the bookmark the same name as the corresponding manual (e.g. "elisp"
or "eintr").
So, when I want to update my bookmark position, I type "C-x r m", and
when I'm asked for the bookmark name, I type "M-n", expecting that
emacs fills in the name of the manual, but it writes the name of the
info node instead. A second "M-n" doesn't brings me more candidates.
Therefore, I request that the name of the info manual be included in
the list of candidates used by M-n, in addition to the name of the
node.
(Regarding the order of the candidates, I'd like the name of the
manual to be the first, but this is more subjective. I'll be content
even if that entry is the second one)
TIA.
In GNU Emacs 24.1.50.1 (i386-mingw-nt6.1.7601)
of 2012-07-30 on DANI-PC
Bzr revision: 109302 eggert@cs.ucla.edu-20120730185642-m4h1ztzpv3379wpu
Windowing system distributor `Microsoft Corp.', version 6.1.7601
Configured using:
`configure --with-gcc (4.7) --no-opt --enable-checking --cflags
-I../../libs/libiconv-1.14-2-mingw32-dev/include
-I../../libs/libxml2-2.7.8-w32-bin/include/libxml2
-I../../libs/giflib-4.1.4-1/include
-I../../emacs/libs/gnutls-3.0.16/include -I../../libs/jpeg-6b-4/include
-I../../libs/libpng-1.4.10 -I../../libs/libxpm-3.5.8/include
-I../../libs/libxpm-3.5.8/src -I../../libs/tiff-3.8.2-1/include
-I../../libs/zlib-1.2.6'
--
Dani Moncayo
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#12107: 24.1.50; In Info mode, add the name of the manual as completion candidate for "bookmark-set"
2012-07-31 20:22 bug#12107: 24.1.50; In Info mode, add the name of the manual as completion candidate for "bookmark-set" Dani Moncayo
@ 2012-08-01 0:12 ` Juri Linkov
2012-08-01 1:09 ` Dani Moncayo
0 siblings, 1 reply; 11+ messages in thread
From: Juri Linkov @ 2012-08-01 0:12 UTC (permalink / raw)
To: Dani Moncayo; +Cc: 12107
> Therefore, I request that the name of the info manual be included in
> the list of candidates used by M-n, in addition to the name of the
> node.
Completely agree with you. The standard Info node name is what you see
in the modeline and also by typing `w' (`Info-copy-current-node-name').
So it should be used in bookmarks as well:
=== modified file 'lisp/info.el'
--- lisp/info.el 2012-07-17 16:53:39 +0000
+++ lisp/info.el 2012-08-01 00:12:40 +0000
@@ -5025,7 +5025,10 @@ (declare-function bookmark-get-bookmark-
(defun Info-bookmark-make-record ()
"This implements the `bookmark-make-record-function' type (which see)
for Info nodes."
- `(,Info-current-node
+ `(,(if (stringp Info-current-file)
+ (concat "(" (file-name-nondirectory Info-current-file) ") "
+ Info-current-node)
+ Info-current-node)
,@(bookmark-make-record-default 'no-file)
(filename . ,Info-current-file)
(info-node . ,Info-current-node)
^ permalink raw reply [flat|nested] 11+ messages in thread* bug#12107: 24.1.50; In Info mode, add the name of the manual as completion candidate for "bookmark-set"
2012-08-01 0:12 ` Juri Linkov
@ 2012-08-01 1:09 ` Dani Moncayo
2012-08-01 8:19 ` Juri Linkov
0 siblings, 1 reply; 11+ messages in thread
From: Dani Moncayo @ 2012-08-01 1:09 UTC (permalink / raw)
To: Juri Linkov; +Cc: 12107
>> Therefore, I request that the name of the info manual be included in
>> the list of candidates used by M-n, in addition to the name of the
>> node.
>
> Completely agree with you. The standard Info node name is what you see
> in the modeline and also by typing `w' (`Info-copy-current-node-name').
> So it should be used in bookmarks as well:
Thank you. Of course I support the change you've posted. But my
problem was another (probably I didn't explained it well enough).
I'll give an example: If I am in info node "(emacs) Mark" and type
"C-x r m M-n", I'd like to see "emacs" (i.e. the name of the info
_manual_ alone) in the minibuffer.
This completion candidate is useful in situations where an user is
reading a manual from the beginning, and wants to keep a bookmark of
the last position read. In this case, the user wants to name the
bookmark after the manual, not after any of its nodes.
Thus, summing up:
1. Currently there is only one completion candidate: the name of the
node. As you've pointed out, it would be better to use the complete
node name instead, which includes the name of the manual (e.g.
"(emacs) Mark").
2. Additionally, I'd like to have another (different) completion
candidate, consisting of the name of the manual alone (e.g. "emacs"),
for the reason explained above.
--
Dani Moncayo
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#12107: 24.1.50; In Info mode, add the name of the manual as completion candidate for "bookmark-set"
2012-08-01 1:09 ` Dani Moncayo
@ 2012-08-01 8:19 ` Juri Linkov
2012-08-01 9:16 ` Dani Moncayo
2012-08-01 20:35 ` Stefan Monnier
0 siblings, 2 replies; 11+ messages in thread
From: Juri Linkov @ 2012-08-01 8:19 UTC (permalink / raw)
To: Dani Moncayo; +Cc: 12107
> 2. Additionally, I'd like to have another (different) completion
> candidate, consisting of the name of the manual alone (e.g. "emacs"),
> for the reason explained above.
Multiple values for bookmark names are not supported
by `bookmark-make-record'. But fortunately, with
complete node names like "(emacs) Mark" you can delete
part of the name that you don't need (e.g. "Mark").
Deleting part of the name is always easier
than typing a missing part.
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#12107: 24.1.50; In Info mode, add the name of the manual as completion candidate for "bookmark-set"
2012-08-01 8:19 ` Juri Linkov
@ 2012-08-01 9:16 ` Dani Moncayo
2012-08-01 20:35 ` Stefan Monnier
1 sibling, 0 replies; 11+ messages in thread
From: Dani Moncayo @ 2012-08-01 9:16 UTC (permalink / raw)
To: Juri Linkov; +Cc: 12107
>> 2. Additionally, I'd like to have another (different) completion
>> candidate, consisting of the name of the manual alone (e.g. "emacs"),
>> for the reason explained above.
>
> Multiple values for bookmark names are not supported
> by `bookmark-make-record'. But fortunately, with
> complete node names like "(emacs) Mark" you can delete
> part of the name that you don't need (e.g. "Mark").
> Deleting part of the name is always easier
> than typing a missing part.
Mmmm, I'm not sure what you mean by "multiples values for bookmark names".
The emacs manual says this in "(emacs) Minibuffer History":
If you type `M-n' in the minibuffer when there are no later entries
in the minibuffer history (e.g., if you haven't previously typed
`M-p'), Emacs tries fetching from a list of default arguments: values
that you are likely to enter. You can think of this as moving through
the "future history" list.
So, what I am requesting is just a new entry in that list of default
arguments. In the case at hand, that list currently has only one
entry: the name of the node. I'm missing a second entry (accessible
by typing a second M-n) with just the name of the manual. As I said,
in some cases this second entry may be the name that the user is
looking for.
--
Dani Moncayo
^ permalink raw reply [flat|nested] 11+ messages in thread* bug#12107: 24.1.50; In Info mode, add the name of the manual as completion candidate for "bookmark-set"
2012-08-01 8:19 ` Juri Linkov
2012-08-01 9:16 ` Dani Moncayo
@ 2012-08-01 20:35 ` Stefan Monnier
2012-08-01 23:04 ` Juri Linkov
1 sibling, 1 reply; 11+ messages in thread
From: Stefan Monnier @ 2012-08-01 20:35 UTC (permalink / raw)
To: Juri Linkov; +Cc: 12107
> Multiple values for bookmark names are not supported
> by `bookmark-make-record'.
Then let's change that.
Stefan
^ permalink raw reply [flat|nested] 11+ messages in thread* bug#12107: 24.1.50; In Info mode, add the name of the manual as completion candidate for "bookmark-set"
2012-08-01 20:35 ` Stefan Monnier
@ 2012-08-01 23:04 ` Juri Linkov
2012-08-02 0:10 ` Stefan Monnier
0 siblings, 1 reply; 11+ messages in thread
From: Juri Linkov @ 2012-08-01 23:04 UTC (permalink / raw)
To: Stefan Monnier; +Cc: 12107
>> Multiple values for bookmark names are not supported
>> by `bookmark-make-record'.
>
> Then let's change that.
Due to the extensible design of bookmark records,
it's easy to implement this:
=== modified file 'lisp/bookmark.el'
--- lisp/bookmark.el 2012-07-10 11:51:54 +0000
+++ lisp/bookmark.el 2012-08-01 23:02:43 +0000
@@ -772,7 +772,14 @@ (defun bookmark-set (&optional name no-o
(interactive (list nil current-prefix-arg))
(unwind-protect
(let* ((record (bookmark-make-record))
- (default (car record)))
+ (defaults (bookmark-prop-get record 'defaults))
+ (default (if (consp defaults) (car defaults) defaults)))
+
+ (if defaults
+ ;; Don't store default values in the record.
+ (setq record (assq-delete-all 'defaults record))
+ ;; When no defaults in the record, use its first element.
+ (setq defaults (car record) default defaults))
(bookmark-maybe-load-default-file)
;; Don't set `bookmark-yank-point' and `bookmark-current-buffer'
@@ -788,7 +795,7 @@ (defun bookmark-set (&optional name no-o
(format "Set bookmark (%s): " default)
nil
bookmark-minibuffer-read-name-map
- nil nil default))))
+ nil nil defaults))))
(and (string-equal str "") (setq str default))
(bookmark-store str (cdr record) no-overwrite)
=== modified file 'lisp/info.el'
--- lisp/info.el 2012-07-10 11:51:54 +0000
+++ lisp/info.el 2012-08-01 23:02:53 +0000
@@ -5020,11 +5025,18 @@ (declare-function bookmark-get-bookmark-
(defun Info-bookmark-make-record ()
"This implements the `bookmark-make-record-function' type (which see)
for Info nodes."
- `(,Info-current-node
- ,@(bookmark-make-record-default 'no-file)
- (filename . ,Info-current-file)
- (info-node . ,Info-current-node)
- (handler . Info-bookmark-jump)))
+ (let* ((file (and (stringp Info-current-file)
+ (file-name-nondirectory Info-current-file)))
+ (bookmark-name (if file
+ (concat "(" file ") " Info-current-node)
+ Info-current-node))
+ (defaults (delq nil (list bookmark-name file Info-current-node))))
+ `(,bookmark-name
+ ,@(bookmark-make-record-default 'no-file)
+ (filename . ,Info-current-file)
+ (info-node . ,Info-current-node)
+ (handler . Info-bookmark-jump)
+ (defaults . ,defaults))))
;;;###autoload
(defun Info-bookmark-jump (bmk)
^ permalink raw reply [flat|nested] 11+ messages in thread* bug#12107: 24.1.50; In Info mode, add the name of the manual as completion candidate for "bookmark-set"
2012-08-01 23:04 ` Juri Linkov
@ 2012-08-02 0:10 ` Stefan Monnier
2012-08-02 8:03 ` Juri Linkov
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Stefan Monnier @ 2012-08-02 0:10 UTC (permalink / raw)
To: Juri Linkov; +Cc: 12107
> - (default (car record)))
> + (defaults (bookmark-prop-get record 'defaults))
> + (default (if (consp defaults) (car defaults) defaults)))
> +
> + (if defaults
> + ;; Don't store default values in the record.
> + (setq record (assq-delete-all 'defaults record))
> + ;; When no defaults in the record, use its first element.
> + (setq defaults (car record) default defaults))
Is there a good reason why we can't use a list in (car record) and avoid
using a new `defaults' field?
If so, please add a comment explaining it.
Stefan
^ permalink raw reply [flat|nested] 11+ messages in thread* bug#12107: 24.1.50; In Info mode, add the name of the manual as completion candidate for "bookmark-set"
2012-08-02 0:10 ` Stefan Monnier
@ 2012-08-02 8:03 ` Juri Linkov
2012-08-05 0:01 ` Juri Linkov
2012-08-08 8:49 ` Juri Linkov
2 siblings, 0 replies; 11+ messages in thread
From: Juri Linkov @ 2012-08-02 8:03 UTC (permalink / raw)
To: Stefan Monnier; +Cc: 12107
> Is there a good reason why we can't use a list in (car record) and avoid
> using a new `defaults' field?
Using a list in (car record) means changing the format of the bookmark record
that will require adding special casing in other packages that use it.
OTOH, adding a new `defaults' field is harmless and doesn't change the format.
> If so, please add a comment explaining it.
Will do.
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#12107: 24.1.50; In Info mode, add the name of the manual as completion candidate for "bookmark-set"
2012-08-02 0:10 ` Stefan Monnier
2012-08-02 8:03 ` Juri Linkov
@ 2012-08-05 0:01 ` Juri Linkov
2012-08-08 8:49 ` Juri Linkov
2 siblings, 0 replies; 11+ messages in thread
From: Juri Linkov @ 2012-08-05 0:01 UTC (permalink / raw)
To: Stefan Monnier; +Cc: 12107
> Is there a good reason why we can't use a list in (car record) and avoid
> using a new `defaults' field?
> If so, please add a comment explaining it.
BTW, I noticed your comment about removing
`bookmark-insert-current-bookmark', so it could be
replaced with a list of the same default values for M-n
(this patch is an addition to the previous patch):
=== modified file 'lisp/bookmark.el'
--- lisp/bookmark.el 2012-08-04 23:12:29 +0000
+++ lisp/bookmark.el 2012-08-04 23:54:51 +0000
@@ -473,6 +473,12 @@ (defvar bookmark-make-record-function 'b
(defun bookmark-make-record ()
"Return a new bookmark record (NAME . ALIST) for the current location."
(let ((record (funcall bookmark-make-record-function)))
+ ;; Set up defaults.
+ (bookmark-prop-set
+ record 'defaults
+ (delq nil (delete-dups (append (bookmark-prop-get record 'defaults)
+ (list bookmark-current-bookmark
+ (bookmark-buffer-name))))))
;; Set up default name.
(if (stringp (car record))
;; The function already provided a default name.
@@ -738,10 +744,6 @@ (defvar bookmark-minibuffer-read-name-ma
(let ((map (make-sparse-keymap)))
(set-keymap-parent map minibuffer-local-map)
(define-key map "\C-w" 'bookmark-yank-word)
- ;; This C-u binding might not be very useful any more now that we
- ;; provide access to the default via the standard M-n binding.
- ;; Maybe we should just remove it? --Stef-08
- (define-key map "\C-u" 'bookmark-insert-current-bookmark)
map))
;;;###autoload
@@ -900,19 +902,6 @@ (defun bookmark-edit-annotation (bookmar
(bookmark-edit-annotation-mode bookmark-name-or-record))
-(defun bookmark-insert-current-bookmark ()
- "Insert into the bookmark name currently being set the value of
-`bookmark-current-bookmark' in `bookmark-current-buffer', defaulting
-to the buffer's file name if `bookmark-current-bookmark' is nil."
- (interactive)
- (let ((str
- (with-current-buffer bookmark-current-buffer
- (or bookmark-current-bookmark
- (bookmark-buffer-name)))))
- (insert str)))
-
-
(defun bookmark-buffer-name ()
"Return the name of the current buffer in a form usable as a bookmark name.
If the buffer is associated with a file or directory, use that name."
^ permalink raw reply [flat|nested] 11+ messages in thread* bug#12107: 24.1.50; In Info mode, add the name of the manual as completion candidate for "bookmark-set"
2012-08-02 0:10 ` Stefan Monnier
2012-08-02 8:03 ` Juri Linkov
2012-08-05 0:01 ` Juri Linkov
@ 2012-08-08 8:49 ` Juri Linkov
2 siblings, 0 replies; 11+ messages in thread
From: Juri Linkov @ 2012-08-08 8:49 UTC (permalink / raw)
To: Stefan Monnier; +Cc: 12107-done
> If so, please add a comment explaining it.
Installed with an explanatory comment.
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-08-08 8:49 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-31 20:22 bug#12107: 24.1.50; In Info mode, add the name of the manual as completion candidate for "bookmark-set" Dani Moncayo
2012-08-01 0:12 ` Juri Linkov
2012-08-01 1:09 ` Dani Moncayo
2012-08-01 8:19 ` Juri Linkov
2012-08-01 9:16 ` Dani Moncayo
2012-08-01 20:35 ` Stefan Monnier
2012-08-01 23:04 ` Juri Linkov
2012-08-02 0:10 ` Stefan Monnier
2012-08-02 8:03 ` Juri Linkov
2012-08-05 0:01 ` Juri Linkov
2012-08-08 8:49 ` Juri Linkov
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).