(server-process-filter): Simplify code.
[bpt/emacs.git] / lisp / bookmark.el
CommitLineData
e8af40ee 1;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later
b3bf02fa 2
7e726492 3;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 2001 Free Software Foundation
b3bf02fa 4
60d0378e
KF
5;; Author: Karl Fogel <kfogel@red-bean.com>
6;; Maintainer: Karl Fogel <kfogel@red-bean.com>
b3bf02fa 7;; Created: July, 1993
e3437989 8;; Keywords: bookmarks, placeholders, annotations
b3bf02fa
RS
9
10;; This file is part of GNU Emacs.
11
12;; GNU Emacs is free software; you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation; either version 2, or (at your option)
15;; any later version.
16
17;; GNU Emacs is distributed in the hope that it will be useful,
18;; but WITHOUT ANY WARRANTY; without even the implied warranty of
19;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20;; GNU General Public License for more details.
21
22;; You should have received a copy of the GNU General Public License
b578f267
EN
23;; along with GNU Emacs; see the file COPYING. If not, write to the
24;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
25;; Boston, MA 02111-1307, USA.
26
27;;; Commentary:
28
29;; This package is for setting "bookmarks" in files. A bookmark
30;; associates a string with a location in a certain file. Thus, you
31;; can navigate your way to that location by providing the string.
32;; See the "User Variables" section for customizations.
b3bf02fa
RS
33
34;; Thanks to David Bremner <bremner@cs.sfu.ca> for thinking of and
35;; then implementing the bookmark-current-bookmark idea. He even
d23e2c3f 36;; sent *patches*, bless his soul...
b3bf02fa
RS
37
38;; Thanks to Gregory M. Saunders <saunders@cis.ohio-state.edu> for
39;; fixing and improving bookmark-time-to-save-p.
40
e3437989
RS
41;; Thanks go to Andrew V. Klein <avk@cig.mot.com> for the code that
42;; sorts the alist before presenting it to the user (in bookmark-bmenu-list
d23e2c3f
KF
43;; and the menu-bar).
44
d22d6453
RS
45;; And much thanks to David Hughes <djh@harston.cv.com> for many small
46;; suggestions and the code to implement them (like
e3437989 47;; bookmark-bmenu-check-position, and some of the Lucid compatibility
d22d6453
RS
48;; stuff).
49
60d0378e 50;; Kudos (whatever they are) go to Jim Blandy <jimb@red-bean.com>
d23e2c3f
KF
51;; for his eminently sensible suggestion to separate bookmark-jump
52;; into bookmark-jump and bookmark-jump-noselect, which made many
53;; other things cleaner as well.
54
d22d6453
RS
55;; Thanks to Roland McGrath for encouragement and help with defining
56;; autoloads on the menu-bar.
57
2b911848 58;; Jonathan Stigelman <stig@hackvan.com> gave patches for default
d23e2c3f
KF
59;; values in bookmark-jump and bookmark-set. Everybody please keep
60;; all the keystrokes they save thereby and send them to him at the
61;; end of each year :-) (No, seriously, thanks Jonathan!)
62
e3437989
RS
63;; Buckets of gratitude to John Grabowski <johng@media.mit.edu> for
64;; thinking up the annotations feature and implementing it so well.
65
b3bf02fa
RS
66;; Based on info-bookmark.el, by Karl Fogel and Ken Olstad
67;; <olstad@msc.edu>.
68
4eadcdf8
RS
69;; Thanks to Mikio Nakajima <PBC01764@niftyserve.or.jp> for many bugs
70;; reported and fixed.
71
09fd6588
KF
72;; Thank you, Michael Kifer, for contributing the XEmacs support.
73
d22d6453 74;; Enough with the credits already, get on to the good stuff:
b3bf02fa 75
dbe99ae9 76;; FAVORITE CHINESE RESTAURANT:
b3bf02fa
RS
77;; Boy, that's a tough one. Probably Hong Min, or maybe Emperor's
78;; Choice (both in Chicago's Chinatown). Well, both. How about you?
e3437989 79\f
e8af40ee 80;;; Code:
b3bf02fa 81
b578f267
EN
82(require 'pp)
83
e3437989 84;;; Misc comments:
b3bf02fa 85;;
e3437989 86;; If variable bookmark-use-annotations is non-nil, an annotation is
dbe99ae9 87;; queried for when setting a bookmark.
11eb4275 88;;
d22d6453
RS
89;; The bookmark list is sorted lexically by default, but you can turn
90;; this off by setting bookmark-sort-flag to nil. If it is nil, then
91;; the list will be presented in the order it is recorded
92;; (chronologically), which is actually fairly useful as well.
b3bf02fa 93
4eadcdf8
RS
94;;; User Variables
95
bbf5eb28 96(defgroup bookmark nil
9848f0ca 97 "Setting, annotation and jumping to bookmarks."
bbf5eb28
RS
98 :group 'matching)
99
100
101(defcustom bookmark-use-annotations nil
9848f0ca 102 "*If non-nil, saving a bookmark queries for an annotation in a buffer."
bbf5eb28
RS
103 :type 'boolean
104 :group 'bookmark)
4eadcdf8
RS
105
106
bbf5eb28 107(defcustom bookmark-save-flag t
4eadcdf8 108 "*Controls when Emacs saves bookmarks to a file.
9848f0ca 109--> nil means never save bookmarks, except when `bookmark-save' is
4eadcdf8
RS
110 explicitly called \(\\[bookmark-save]\).
111--> t means save bookmarks when Emacs is killed.
3b526bae 112--> Otherwise, it should be a number that is the frequency with which
4eadcdf8
RS
113 the bookmark list is saved \(i.e.: the number of times which
114 Emacs' bookmark list may be modified before it is automatically
115 saved.\). If it is a number, Emacs will also automatically save
116 bookmarks when it is killed.
117
118Therefore, the way to get it to save every time you make or delete a
119bookmark is to set this variable to 1 \(or 0, which produces the same
120behavior.\)
121
122To specify the file in which to save them, modify the variable
9848f0ca 123`bookmark-default-file', which is `~/.emacs.bmk' by default."
31fa1bd1 124 :type '(choice (const nil) integer (other t))
bbf5eb28 125 :group 'bookmark)
4eadcdf8
RS
126
127
128(defconst bookmark-old-default-file "~/.emacs-bkmrks"
9848f0ca 129 "*The `.emacs.bmk' file used to be called this name.")
4eadcdf8
RS
130
131
132;; defvarred to avoid a compilation warning:
133(defvar bookmark-file nil
134 "Old name for `bookmark-default-file'.")
135
bbf5eb28 136(defcustom bookmark-default-file
4eadcdf8
RS
137 (if bookmark-file
138 ;; In case user set `bookmark-file' in her .emacs:
139 bookmark-file
88fb0aaa 140 (convert-standard-filename "~/.emacs.bmk"))
bbf5eb28
RS
141 "*File in which to save bookmarks by default."
142 :type 'file
143 :group 'bookmark)
4eadcdf8
RS
144
145
bbf5eb28 146(defcustom bookmark-version-control 'nospecial
4eadcdf8
RS
147 "*Whether or not to make numbered backups of the bookmark file.
148It can have four values: t, nil, `never', and `nospecial'.
149The first three have the same meaning that they do for the
150variable `version-control', and the final value `nospecial' means just
bbf5eb28 151use the value of `version-control'."
31fa1bd1
AS
152 :type '(choice (const nil) (const never) (const nospecial)
153 (other t))
bbf5eb28 154 :group 'bookmark)
4eadcdf8
RS
155
156
bbf5eb28
RS
157(defcustom bookmark-completion-ignore-case t
158 "*Non-nil means bookmark functions ignore case in completion."
159 :type 'boolean
160 :group 'bookmark)
4eadcdf8
RS
161
162
bbf5eb28 163(defcustom bookmark-sort-flag t
9848f0ca
RS
164 "*Non-nil means that bookmarks will be displayed sorted by bookmark name.
165Otherwise they will be displayed in LIFO order (that is, most
bbf5eb28
RS
166recently set ones come first, oldest ones come last)."
167 :type 'boolean
168 :group 'bookmark)
4eadcdf8
RS
169
170
bbf5eb28 171(defcustom bookmark-automatically-show-annotations t
f0529b5b 172 "*nil means don't show annotations when jumping to a bookmark."
bbf5eb28
RS
173 :type 'boolean
174 :group 'bookmark)
4eadcdf8
RS
175
176
bbf5eb28 177(defcustom bookmark-bmenu-file-column 30
4eadcdf8 178 "*Column at which to display filenames in a buffer listing bookmarks.
bbf5eb28
RS
179You can toggle whether files are shown with \\<bookmark-bmenu-mode-map>\\[bookmark-bmenu-toggle-filenames]."
180 :type 'integer
181 :group 'bookmark)
4eadcdf8
RS
182
183
bbf5eb28 184(defcustom bookmark-bmenu-toggle-filenames t
4eadcdf8
RS
185 "*Non-nil means show filenames when listing bookmarks.
186This may result in truncated bookmark names. To disable this, put the
9848f0ca 187following in your `.emacs' file:
4eadcdf8 188
bbf5eb28
RS
189\(setq bookmark-bmenu-toggle-filenames nil\)"
190 :type 'boolean
191 :group 'bookmark)
4eadcdf8
RS
192
193
bbf5eb28
RS
194(defcustom bookmark-menu-length 70
195 "*Maximum length of a bookmark name displayed on a popup menu."
196 :type 'integer
197 :group 'boolean)
4eadcdf8
RS
198
199
200;;; No user-serviceable parts beyond this point.
b3bf02fa 201
09fd6588
KF
202;; Is it XEmacs?
203(defconst bookmark-xemacsp
204 (string-match "\\(Lucid\\|Xemacs\\)" emacs-version))
205
206
b3bf02fa
RS
207;; Added for lucid emacs compatibility, db
208(or (fboundp 'defalias) (fset 'defalias 'fset))
209
d22d6453 210;; suggested for lucid compatibility by david hughes:
4eadcdf8 211(or (fboundp 'frame-height) (defalias 'frame-height 'screen-height))
d22d6453 212
09fd6588
KF
213;; This variable is probably obsolete now...
214(or (boundp 'baud-rate)
dbe99ae9 215 ;; some random value higher than 9600
09fd6588
KF
216 (setq baud-rate 19200))
217
e3437989
RS
218
219\f
220;;; Keymap stuff:
b3bf02fa 221
77bc05c7
RS
222;; Set up these bindings dumping time *only*;
223;; if the user alters them, don't override the user when loading bookmark.el.
224
225;;;###autoload (define-key ctl-x-map "rb" 'bookmark-jump)
226;;;###autoload (define-key ctl-x-map "rm" 'bookmark-set)
227;;;###autoload (define-key ctl-x-map "rl" 'bookmark-bmenu-list)
b3bf02fa 228
d22d6453 229;;;###autoload
9aef3b21
RS
230(defvar bookmark-map nil
231 "Keymap containing bindings to bookmark functions.
232It is not bound to any key by default: to bind it
233so that you have a bookmark prefix, just use `global-set-key' and bind a
234key of your choice to `bookmark-map'. All interactive bookmark
b3bf02fa
RS
235functions have a binding in this keymap.")
236
d22d6453 237;;;###autoload
b3bf02fa
RS
238(define-prefix-command 'bookmark-map)
239
240;; Read the help on all of these functions for details...
d22d6453 241;;;###autoload
b3bf02fa 242(define-key bookmark-map "x" 'bookmark-set)
d22d6453
RS
243;;;###autoload
244(define-key bookmark-map "m" 'bookmark-set) ; "m" for "mark"
245;;;###autoload
b3bf02fa 246(define-key bookmark-map "j" 'bookmark-jump)
d22d6453
RS
247;;;###autoload
248(define-key bookmark-map "g" 'bookmark-jump) ; "g" for "go"
249;;;###autoload
b3bf02fa 250(define-key bookmark-map "i" 'bookmark-insert)
d22d6453
RS
251;;;###autoload
252(define-key bookmark-map "e" 'edit-bookmarks)
253;;;###autoload
e3437989 254(define-key bookmark-map "f" 'bookmark-insert-location) ; "f" for "find"
d22d6453 255;;;###autoload
9aef3b21 256(define-key bookmark-map "r" 'bookmark-rename)
d22d6453 257;;;###autoload
b3bf02fa 258(define-key bookmark-map "d" 'bookmark-delete)
d22d6453 259;;;###autoload
b3bf02fa 260(define-key bookmark-map "l" 'bookmark-load)
d22d6453
RS
261;;;###autoload
262(define-key bookmark-map "w" 'bookmark-write)
263;;;###autoload
b3bf02fa
RS
264(define-key bookmark-map "s" 'bookmark-save)
265
e3437989
RS
266
267;;; The annotation maps.
268(defvar bookmark-read-annotation-mode-map (copy-keymap text-mode-map)
269 "Keymap for composing an annotation for a bookmark.")
270
271(define-key bookmark-read-annotation-mode-map "\C-c\C-c"
272 'bookmark-send-annotation)
273
274
275\f
276;;; Core variables and data structures:
7e2d009d 277(defvar bookmark-alist ()
e3437989 278 "Association list of bookmarks and their records.
7e2d009d 279You probably don't want to change the value of this alist yourself;
4eadcdf8
RS
280instead, let the various bookmark functions do it for you.
281
282The format of the alist is
283
284 \(BOOKMARK1 BOOKMARK2 ...\)
285
286where each BOOKMARK is of the form
287
288\(NAME
289 \(filename . FILE\)
290 \(front-context-string . FRONT-STR\)
291 \(rear-context-string . REAR-STR\)
292 \(position . POS\)
293 \(info-node . POS\)
294 \(annotation . ANNOTATION\)\)
295
296So the cdr of each bookmark is an alist too.
297`info-node' is optional, by the way.")
7e2d009d 298
e3437989 299
d22d6453
RS
300(defvar bookmarks-already-loaded nil)
301
e3437989 302
b3bf02fa 303;; more stuff added by db.
d22d6453 304
dbe99ae9 305(defvar bookmark-current-bookmark nil
9aef3b21
RS
306 "Name of bookmark most recently used in the current file.
307It is buffer local, used to make moving a bookmark forward
8027e2ad 308through a file easier.")
b3bf02fa
RS
309
310(make-variable-buffer-local 'bookmark-current-bookmark)
311
e3437989 312
b3bf02fa 313(defvar bookmark-alist-modification-count 0
9aef3b21 314 "Number of modifications to bookmark list since it was last saved.")
b3bf02fa 315
e3437989 316
e3437989 317(defvar bookmark-search-size 16
9aef3b21 318 "Length of the context strings recorded on either side of a bookmark.")
b3bf02fa 319
e3437989 320
b3bf02fa
RS
321(defvar bookmark-current-point 0)
322(defvar bookmark-yank-point 0)
323(defvar bookmark-current-buffer nil)
324
e3437989
RS
325
326\f
327;; Helper functions.
328
329;; Only functions on this page and the next one (file formats) need to
330;; know anything about the format of bookmark-alist entries.
331;; Everyone else should go through them.
332
333(defun bookmark-name-from-full-record (full-record)
4eadcdf8 334 "Return name of FULL-RECORD \(an alist element instead of a string\)."
e3437989
RS
335 (car full-record))
336
337
338(defun bookmark-all-names ()
339 "Return a list of all current bookmark names."
340 (bookmark-maybe-load-default-file)
341 (mapcar
342 (lambda (full-record)
343 (bookmark-name-from-full-record full-record))
344 bookmark-alist))
345
346
347(defun bookmark-get-bookmark (bookmark)
28d80dea
GM
348 "Return the full entry for BOOKMARK in bookmark-alist.
349If BOOKMARK is not a string, return nil."
350 (when (stringp bookmark)
351 (apply (if bookmark-completion-ignore-case
352 #'assoc-ignore-case
353 #'assoc)
354 (list bookmark bookmark-alist))))
e3437989
RS
355
356
357(defun bookmark-get-bookmark-record (bookmark)
358 "Return the guts of the entry for BOOKMARK in bookmark-alist.
359That is, all information but the name."
360 (car (cdr (bookmark-get-bookmark bookmark))))
361
362
363(defun bookmark-set-name (bookmark newname)
364 "Set BOOKMARK's name to NEWNAME."
91169ba7
RS
365 (setcar
366 (if (stringp bookmark) (bookmark-get-bookmark bookmark) bookmark)
367 newname))
e3437989
RS
368
369
370(defun bookmark-get-annotation (bookmark)
371 "Return the annotation of BOOKMARK, or nil if none."
372 (cdr (assq 'annotation (bookmark-get-bookmark-record bookmark))))
373
374
375(defun bookmark-set-annotation (bookmark ann)
4eadcdf8 376 "Set the annotation of BOOKMARK to ANN."
e3437989
RS
377 (let ((cell (assq 'annotation (bookmark-get-bookmark-record bookmark))))
378 (if cell
379 (setcdr cell ann)
380 (nconc (bookmark-get-bookmark-record bookmark)
381 (list (cons 'annotation ann))))))
382
383
384(defun bookmark-get-filename (bookmark)
385 "Return the full filename of BOOKMARK."
386 (cdr (assq 'filename (bookmark-get-bookmark-record bookmark))))
387
388
389(defun bookmark-set-filename (bookmark filename)
390 "Set the full filename of BOOKMARK to FILENAME."
391 (let ((cell (assq 'filename (bookmark-get-bookmark-record bookmark))))
392 (if cell
393 (setcdr cell filename)
394 (nconc (bookmark-get-bookmark-record bookmark)
395 (list (cons 'filename filename))))))
396
397
398(defun bookmark-get-position (bookmark)
399 "Return the position \(i.e.: point\) of BOOKMARK."
400 (cdr (assq 'position (bookmark-get-bookmark-record bookmark))))
401
402
403(defun bookmark-set-position (bookmark position)
404 "Set the position \(i.e.: point\) of BOOKMARK to POSITION."
405 (let ((cell (assq 'position (bookmark-get-bookmark-record bookmark))))
406 (if cell
407 (setcdr cell position)
408 (nconc (bookmark-get-bookmark-record bookmark)
409 (list (cons 'position position))))))
410
411
412(defun bookmark-get-front-context-string (bookmark)
413 "Return the front-context-string of BOOKMARK."
414 (cdr (assq 'front-context-string (bookmark-get-bookmark-record bookmark))))
415
416
417(defun bookmark-set-front-context-string (bookmark string)
418 "Set the front-context-string of BOOKMARK to STRING."
419 (let ((cell (assq 'front-context-string
420 (bookmark-get-bookmark-record bookmark))))
421 (if cell
422 (setcdr cell string)
423 (nconc (bookmark-get-bookmark-record bookmark)
424 (list (cons 'front-context-string string))))))
425
426
427(defun bookmark-get-rear-context-string (bookmark)
428 "Return the rear-context-string of BOOKMARK."
429 (cdr (assq 'rear-context-string (bookmark-get-bookmark-record bookmark))))
430
431
432(defun bookmark-set-rear-context-string (bookmark string)
433 "Set the rear-context-string of BOOKMARK to STRING."
434 (let ((cell (assq 'rear-context-string
435 (bookmark-get-bookmark-record bookmark))))
436 (if cell
437 (setcdr cell string)
438 (nconc (bookmark-get-bookmark-record bookmark)
439 (list (cons 'rear-context-string string))))))
440
441
442(defun bookmark-get-info-node (bookmark)
4eadcdf8 443 "Get the info node associated with BOOKMARK."
e3437989 444 (cdr (assq 'info-node (bookmark-get-bookmark-record bookmark))))
dbe99ae9 445
e3437989
RS
446
447(defun bookmark-set-info-node (bookmark node)
448 "Set the Info node of BOOKMARK to NODE."
449 (let ((cell (assq 'info-node
450 (bookmark-get-bookmark-record bookmark))))
451 (if cell
452 (setcdr cell node)
453 (nconc (bookmark-get-bookmark-record bookmark)
a15269c0
KF
454 (list (cons 'info-node node)))))
455
456 (message "%S" (assq 'info-node (bookmark-get-bookmark-record bookmark)))
457 (sit-for 4)
458 )
dbe99ae9 459
e3437989 460
4c0b5ad1
KF
461(defvar bookmark-history nil
462 "The history list for bookmark functions.")
463
464
e3437989
RS
465(defun bookmark-completing-read (prompt &optional default)
466 "Prompting with PROMPT, read a bookmark name in completion.
467PROMPT will get a \": \" stuck on the end no matter what, so you
468probably don't want to include one yourself.
469Optional second arg DEFAULT is a string to return if the user enters
470the empty string."
471 (bookmark-maybe-load-default-file) ; paranoia
472 (let* ((completion-ignore-case bookmark-completion-ignore-case)
473 (default default)
474 (prompt (if default
475 (concat prompt (format " (%s): " default))
476 (concat prompt ": ")))
477 (str
478 (completing-read prompt
479 bookmark-alist
480 nil
4c0b5ad1
KF
481 0
482 nil
483 'bookmark-history)))
e3437989
RS
484 (if (string-equal "" str)
485 (list default)
486 (list str))))
487
488
4c0b5ad1
KF
489(defmacro bookmark-maybe-historicize-string (string)
490 "Put STRING into the bookmark prompt history, if caller non-interactive.
491We need this because sometimes bookmark functions are invoked from
492menus, so `completing-read' never gets a chance to set `bookmark-history'."
dbe99ae9
SS
493 `(or
494 (interactive-p)
495 (setq bookmark-history (cons ,string bookmark-history))))
4c0b5ad1
KF
496
497
a15269c0 498(defun bookmark-make (name &optional annotation overwrite info-node)
e3437989
RS
499 "Make a bookmark named NAME.
500Optional second arg ANNOTATION gives it an annotation.
501Optional third arg OVERWRITE means replace any existing bookmarks with
a15269c0
KF
502this name.
503Optional fourth arg INFO-NODE means this bookmark is at info node
504INFO-NODE, so record this fact in the bookmark's entry."
e3437989 505 (bookmark-maybe-load-default-file)
88415bfc 506 (let ((stripped-name (copy-sequence name)))
09fd6588
KF
507 (or bookmark-xemacsp
508 ;; XEmacs's `set-text-properties' doesn't work on
509 ;; free-standing strings, apparently.
510 (set-text-properties 0 (length stripped-name) nil stripped-name))
88415bfc 511 (if (and (bookmark-get-bookmark stripped-name) (not overwrite))
3b526bae 512 ;; already existing bookmark under that name and
88415bfc
KH
513 ;; no prefix arg means just overwrite old bookmark
514 (setcdr (bookmark-get-bookmark stripped-name)
a15269c0 515 (list (bookmark-make-cell annotation info-node)))
dbe99ae9 516
88415bfc
KH
517 ;; otherwise just cons it onto the front (either the bookmark
518 ;; doesn't exist already, or there is no prefix arg. In either
519 ;; case, we want the new bookmark consed onto the alist...)
dbe99ae9 520
88415bfc
KH
521 (setq bookmark-alist
522 (cons
dbe99ae9 523 (list stripped-name
a15269c0 524 (bookmark-make-cell annotation info-node))
88415bfc 525 bookmark-alist)))
dbe99ae9 526
88415bfc
KH
527 ;; Added by db
528 (setq bookmark-current-bookmark stripped-name)
529 (setq bookmark-alist-modification-count
530 (1+ bookmark-alist-modification-count))
531 (if (bookmark-time-to-save-p)
532 (bookmark-save))))
e3437989
RS
533
534
a15269c0 535(defun bookmark-make-cell (annotation &optional info-node)
4eadcdf8 536 "Return the record part of a new bookmark, given ANNOTATION.
e3437989 537Must be at the correct position in the buffer in which the bookmark is
a15269c0
KF
538being set. This might change someday.
539Optional second arg INFO-NODE means this bookmark is at info node
540INFO-NODE, so record this fact in the bookmark's entry."
541 (let ((the-record
8a946354
SS
542 `((filename . ,(bookmark-buffer-file-name))
543 (front-context-string
544 . ,(if (>= (- (point-max) (point)) bookmark-search-size)
545 (buffer-substring-no-properties
546 (point)
547 (+ (point) bookmark-search-size))
548 nil))
549 (rear-context-string
550 . ,(if (>= (- (point) (point-min)) bookmark-search-size)
551 (buffer-substring-no-properties
552 (point)
553 (- (point) bookmark-search-size))
554 nil))
555 (position . ,(point)))))
a15269c0
KF
556
557 ;; Now fill in the optional parts:
91169ba7
RS
558
559 ;; Take no chances with text properties
560 (set-text-properties 0 (length annotation) nil annotation)
561 (set-text-properties 0 (length info-node) nil info-node)
562
a15269c0
KF
563 (if annotation
564 (nconc the-record (list (cons 'annotation annotation))))
565 (if info-node
566 (nconc the-record (list (cons 'info-node info-node))))
567
568 ;; Finally, return the completed record.
569 the-record))
dbe99ae9
SS
570
571
e3437989
RS
572\f
573;;; File format stuff
574
575;; The OLD format of the bookmark-alist was:
576;;
577;; ((bookmark-name (filename
578;; string-in-front
579;; string-behind
580;; point))
581;; ...)
582;;
583;; The NEW format of the bookmark-alist is:
584;;
585;; ((bookmark-name ((filename . FILENAME)
586;; (front-context-string . string-in-front)
587;; (rear-context-string . string-behind)
588;; (position . POINT)
589;; (annotation . annotation)
590;; (whatever . VALUE)
591;; ...
592;; ))
593;; ...)
594;;
595;;
596;; I switched to using an internal as well as external alist because I
597;; felt that would be a more flexible framework in which to add
598;; features. It means that the order in which values appear doesn't
599;; matter, and it means that arbitrary values can be added without
600;; risk of interfering with existing ones.
601;;
602;; BOOKMARK-NAME is the string the user gives the bookmark and
dbe99ae9 603;; accesses it by from then on.
e3437989
RS
604;;
605;; FILENAME is the location of the file in which the bookmark is set.
606;;
607;; STRING-IN-FRONT is a string of `bookmark-search-size' chars of
608;; context in front of the point at which the bookmark is set.
609;;
dbe99ae9 610;; STRING-BEHIND is the same thing, but after the point.
e3437989
RS
611;;
612;; The context strings exist so that modifications to a file don't
dbe99ae9 613;; necessarily cause a bookmark's position to be invalidated.
e3437989
RS
614;; bookmark-jump will search for STRING-BEHIND and STRING-IN-FRONT in
615;; case the file has changed since the bookmark was set. It will
616;; attempt to place the user before the changes, if there were any.
a15269c0 617;; ANNOTATION is the annotation for the bookmark; it may not exist
e3437989
RS
618;; (for backward compatibility), be nil (no annotation), or be a
619;; string.
e3437989
RS
620
621
622(defconst bookmark-file-format-version 1
623 "The current version of the format used by bookmark files.
624You should never need to change this.")
625
626
627(defconst bookmark-end-of-version-stamp-marker
628 "-*- End Of Bookmark File Format Version Stamp -*-\n"
629 "This string marks the end of the version stamp in a bookmark file.")
630
631
632(defun bookmark-alist-from-buffer ()
633 "Return a bookmark-alist (in any format) from the current buffer.
634The buffer must of course contain bookmark format information.
635Does not care from where in the buffer it is called, and does not
636affect point."
637 (save-excursion
638 (goto-char (point-min))
639 (if (search-forward bookmark-end-of-version-stamp-marker nil t)
640 (read (current-buffer))
641 ;; Else we're dealing with format version 0
642 (if (search-forward "(" nil t)
643 (progn
644 (forward-char -1)
645 (read (current-buffer)))
646 ;; Else no hope of getting information here.
a3ad20c2 647 (error "Not bookmark format")))))
e3437989
RS
648
649
650(defun bookmark-upgrade-version-0-alist (old-list)
4eadcdf8 651 "Upgrade a version 0 alist OLD-LIST to the current version."
e3437989
RS
652 (mapcar
653 (lambda (bookmark)
654 (let* ((name (car bookmark))
655 (record (car (cdr bookmark)))
656 (filename (nth 0 record))
657 (front-str (nth 1 record))
658 (rear-str (nth 2 record))
659 (position (nth 3 record))
660 (ann (nth 4 record)))
661 (list
662 name
8a946354
SS
663 `((filename . ,filename)
664 (front-context-string . ,(or front-str ""))
665 (rear-context-string . ,(or rear-str ""))
666 (position . ,position)
667 (annotation . ,ann)))))
e3437989
RS
668 old-list))
669
670
671(defun bookmark-upgrade-file-format-from-0 ()
672 "Upgrade a bookmark file of format 0 (the original format) to format 1.
673This expects to be called from point-min in a bookmark file."
674 (message "Upgrading bookmark format from 0 to %d..."
675 bookmark-file-format-version)
676 (let* ((old-list (bookmark-alist-from-buffer))
677 (new-list (bookmark-upgrade-version-0-alist old-list)))
678 (delete-region (point-min) (point-max))
679 (bookmark-insert-file-format-version-stamp)
680 (pp new-list (current-buffer))
681 (save-buffer))
682 (goto-char (point-min))
60d0378e 683 (message "Upgrading bookmark format from 0 to %d...done"
e3437989
RS
684 bookmark-file-format-version)
685 )
686
687
688(defun bookmark-grok-file-format-version ()
689 "Return an integer which is the file-format version of this bookmark file.
690This expects to be called from point-min in a bookmark file."
691 (if (looking-at "^;;;;")
692 (save-excursion
693 (save-match-data
694 (re-search-forward "[0-9]")
695 (forward-char -1)
696 (read (current-buffer))))
697 ;; Else this is format version 0, the original one, which didn't
698 ;; even have version stamps.
699 0))
700
701
702(defun bookmark-maybe-upgrade-file-format ()
703 "Check the file-format version of this bookmark file.
704If the version is not up-to-date, upgrade it automatically.
705This expects to be called from point-min in a bookmark file."
706 (let ((version (bookmark-grok-file-format-version)))
707 (cond
708 ((= version bookmark-file-format-version)
709 ) ; home free -- version is current
710 ((= version 0)
711 (bookmark-upgrade-file-format-from-0))
712 (t
a3ad20c2 713 (error "Bookmark file format version strangeness")))))
e3437989
RS
714
715
716(defun bookmark-insert-file-format-version-stamp ()
5e0e5feb 717 "Insert text indicating current version of bookmark file format."
e3437989
RS
718 (insert
719 (format ";;;; Emacs Bookmark Format Version %d ;;;;\n"
720 bookmark-file-format-version))
721 (insert ";;; This format is meant to be slightly human-readable;\n"
722 ";;; nevertheless, you probably don't want to edit it.\n"
723 ";;; "
724 bookmark-end-of-version-stamp-marker))
725
726
727;;; end file-format stuff
728
729\f
730;;; Core code:
731
d22d6453 732;;;###autoload
4eadcdf8
RS
733(defun bookmark-set (&optional name parg)
734 "Set a bookmark named NAME inside a file.
735If name is nil, then the user will be prompted.
9aef3b21
RS
736With prefix arg, will not overwrite a bookmark that has the same name
737as NAME if such a bookmark already exists, but instead will \"push\"
738the new bookmark onto the bookmark alist. Thus the most recently set
739bookmark with name NAME would be the one in effect at any given time,
740but the others are still there, should you decide to delete the most
741recent one.
b3bf02fa
RS
742
743To yank words from the text of the buffer and use them as part of the
9aef3b21 744bookmark name, type C-w while setting a bookmark. Successive C-w's
b3bf02fa
RS
745yank successive words.
746
4c0b5ad1
KF
747Typing C-u inserts the name of the last bookmark used in the buffer
748\(as an aid in using a single bookmark name to track your progress
749through a large file\). If no bookmark was used, then C-u inserts the
750name of the file being visited.
b3bf02fa
RS
751
752Use \\[bookmark-delete] to remove bookmarks \(you give it a name,
753and it removes only the first instance of a bookmark with that name from
754the list of bookmarks.\)"
4eadcdf8 755 (interactive (list nil current-prefix-arg))
e3437989
RS
756 (or
757 (bookmark-buffer-file-name)
a3ad20c2 758 (error "Buffer not visiting a file or directory"))
e3437989
RS
759
760 (bookmark-maybe-load-default-file)
761
b3bf02fa
RS
762 (setq bookmark-current-point (point))
763 (setq bookmark-yank-point (point))
764 (setq bookmark-current-buffer (current-buffer))
e3437989 765
d22d6453 766 (let* ((default (or bookmark-current-bookmark
e3437989 767 (bookmark-buffer-name)))
d22d6453 768 (str
4eadcdf8
RS
769 (or name
770 (read-from-minibuffer
771 (format "Set bookmark (%s): " default)
772 nil
773 (let ((now-map (copy-keymap minibuffer-local-map)))
91169ba7
RS
774 (define-key now-map "\C-w" 'bookmark-yank-word)
775 (define-key now-map "\C-u" 'bookmark-insert-current-bookmark)
4eadcdf8 776 now-map))))
e3437989
RS
777 (annotation nil))
778 (and (string-equal str "") (setq str default))
dbe99ae9 779 ;; Ask for an annotation buffer for this bookmark
e3437989
RS
780 (if bookmark-use-annotations
781 (bookmark-read-annotation parg str)
91169ba7
RS
782 (bookmark-make str annotation parg (bookmark-info-current-node))
783 (setq bookmark-current-bookmark str)
784 (bookmark-bmenu-surreptitiously-rebuild-list)
785 (goto-char bookmark-current-point))))
e3437989
RS
786
787
a15269c0
KF
788(defun bookmark-info-current-node ()
789 "If in Info-mode, return current node name (a string), else nil."
790 (if (eq major-mode 'Info-mode)
791 Info-current-node))
792
793
e3437989
RS
794(defun bookmark-kill-line (&optional newline-too)
795 "Kill from point to end of line.
796If optional arg NEWLINE-TOO is non-nil, delete the newline too.
797Does not affect the kill-ring."
798 (let ((eol (save-excursion (end-of-line) (point))))
799 (delete-region (point) eol)
800 (if (and newline-too (looking-at "\n"))
801 (delete-char 1))))
802
803
4c0b5ad1
KF
804;; Defvars to avoid compilation warnings:
805(defvar bookmark-annotation-paragraph nil)
806(defvar bookmark-annotation-name nil)
807(defvar bookmark-annotation-buffer nil)
808(defvar bookmark-annotation-file nil)
809(defvar bookmark-annotation-point nil)
810
811
e3437989 812(defun bookmark-send-annotation ()
5e0e5feb
RS
813 "Use buffer contents as the annotation for a bookmark.
814Exclude lines that begin with `#'.
815Store the annotation text in the bookmark list with
e3437989
RS
816the bookmark (and file, and point) specified in buffer local variables."
817 (interactive)
818 (if (not (eq major-mode 'bookmark-read-annotation-mode))
a3ad20c2 819 (error "Not in bookmark-read-annotation-mode"))
e3437989
RS
820 (goto-char (point-min))
821 (while (< (point) (point-max))
822 (if (looking-at "^#")
823 (bookmark-kill-line t)
824 (forward-line 1)))
91169ba7 825 (let ((annotation (buffer-string))
e3437989
RS
826 (parg bookmark-annotation-paragraph)
827 (bookmark bookmark-annotation-name)
828 (pt bookmark-annotation-point)
829 (buf bookmark-annotation-buffer))
830 ;; for bookmark-make-cell to work, we need to be
831 ;; in the relevant buffer, at the relevant point.
832 ;; Actually, bookmark-make-cell should probably be re-written,
833 ;; to avoid this need. Should I handle the error if a buffer is
834 ;; killed between "C-x r m" and a "C-c C-c" in the annotation buffer?
dbe99ae9 835 (save-excursion
e3437989
RS
836 (pop-to-buffer buf)
837 (goto-char pt)
a15269c0 838 (bookmark-make bookmark annotation parg (bookmark-info-current-node))
e3437989
RS
839 (setq bookmark-current-bookmark bookmark))
840 (bookmark-bmenu-surreptitiously-rebuild-list)
841 (goto-char bookmark-current-point))
842 (kill-buffer (current-buffer)))
843
844
845(defun bookmark-default-annotation-text (bookmark)
846 (concat "# Type the annotation for bookmark '" bookmark "' here.\n"
847 "# All lines which start with a '#' will be deleted.\n"
848 "# Type C-c C-c when done.\n#\n"
849 "# Author: " (user-full-name) " <" (user-login-name) "@"
850 (system-name) ">\n"
851 "# Date: " (current-time-string) "\n"))
852
853
854(defvar bookmark-read-annotation-text-func 'bookmark-default-annotation-text
5e0e5feb
RS
855 "Function to return default text to use for a bookmark annotation.
856It takes the name of the bookmark, as a string, as an arg.")
e3437989
RS
857
858(defun bookmark-read-annotation-mode (buf point parg bookmark)
859 "Mode for composing annotations for a bookmark.
4eadcdf8 860Wants BUF POINT PARG and BOOKMARK.
e3437989
RS
861When you have finished composing, type \\[bookmark-send-annotation] to send
862the annotation.
863
864\\{bookmark-read-annotation-mode-map}
865"
866 (interactive)
867 (kill-all-local-variables)
868 (make-local-variable 'bookmark-annotation-paragraph)
869 (make-local-variable 'bookmark-annotation-name)
870 (make-local-variable 'bookmark-annotation-buffer)
871 (make-local-variable 'bookmark-annotation-file)
872 (make-local-variable 'bookmark-annotation-point)
873 (setq bookmark-annotation-paragraph parg)
874 (setq bookmark-annotation-name bookmark)
875 (setq bookmark-annotation-buffer buf)
876 (setq bookmark-annotation-file (buffer-file-name buf))
877 (setq bookmark-annotation-point point)
878 (use-local-map bookmark-read-annotation-mode-map)
879 (setq major-mode 'bookmark-read-annotation-mode)
880 (insert (funcall bookmark-read-annotation-text-func bookmark))
881 (run-hooks 'text-mode-hook))
882
883
884(defun bookmark-read-annotation (parg bookmark)
5e0e5feb
RS
885 "Pop up a buffer for entering a bookmark annotation.
886Text surrounding the bookmark is PARG; the bookmark name is BOOKMARK."
e3437989
RS
887 (let ((buf (current-buffer))
888 (point (point)))
889 (pop-to-buffer (generate-new-buffer-name "*Bookmark Annotation Compose*"))
890 (bookmark-read-annotation-mode buf point parg bookmark)))
891
892
893(defvar bookmark-edit-annotation-mode-map (copy-keymap text-mode-map)
894 "Keymap for editing an annotation of a bookmark.")
895
896
897(define-key bookmark-edit-annotation-mode-map "\C-c\C-c"
898 'bookmark-send-edited-annotation)
899
900
901(defun bookmark-edit-annotation-mode (bookmark)
902 "Mode for editing the annotation of bookmark BOOKMARK.
903When you have finished composing, type \\[bookmark-send-annotation].
904
905\\{bookmark-edit-annotation-mode-map}
906"
907 (interactive)
908 (kill-all-local-variables)
909 (make-local-variable 'bookmark-annotation-name)
910 (setq bookmark-annotation-name bookmark)
911 (use-local-map bookmark-edit-annotation-mode-map)
912 (setq major-mode 'bookmark-edit-annotation-mode)
913 (insert (funcall bookmark-read-annotation-text-func bookmark))
914 (let ((annotation (bookmark-get-annotation bookmark)))
91169ba7 915 (if (and annotation (not (string-equal annotation "")))
e3437989
RS
916 (insert annotation)))
917 (run-hooks 'text-mode-hook))
918
919
920(defun bookmark-send-edited-annotation ()
5e0e5feb 921 "Use buffer contents (minus beginning with `#' as annotation for a bookmark."
e3437989
RS
922 (interactive)
923 (if (not (eq major-mode 'bookmark-edit-annotation-mode))
a3ad20c2 924 (error "Not in bookmark-edit-annotation-mode"))
e3437989
RS
925 (goto-char (point-min))
926 (while (< (point) (point-max))
927 (if (looking-at "^#")
928 (bookmark-kill-line t)
929 (forward-line 1)))
91169ba7 930 (let ((annotation (buffer-string))
e3437989
RS
931 (bookmark bookmark-annotation-name))
932 (bookmark-set-annotation bookmark annotation)
933 (bookmark-bmenu-surreptitiously-rebuild-list)
934 (goto-char bookmark-current-point))
935 (kill-buffer (current-buffer)))
936
937
938(defun bookmark-edit-annotation (bookmark)
939 "Pop up a buffer for editing bookmark BOOKMARK's annotation."
940 (let ((buf (current-buffer))
941 (point (point)))
942 (pop-to-buffer (generate-new-buffer-name "*Bookmark Annotation Compose*"))
943 (bookmark-edit-annotation-mode bookmark)))
944
b3bf02fa
RS
945
946(defun bookmark-insert-current-bookmark ()
5e0e5feb
RS
947 "Insert this buffer's value of bookmark-current-bookmark.
948Default to file name if it's nil."
b3bf02fa
RS
949 (interactive)
950 (let ((str
951 (save-excursion
952 (set-buffer bookmark-current-buffer)
953 bookmark-current-bookmark)))
4cd51172 954 (if str (insert str) (bookmark-insert-buffer-name))))
b3bf02fa 955
e3437989 956
4cd51172 957(defun bookmark-insert-buffer-name ()
5e0e5feb
RS
958 "Insert the current file name into the bookmark name being set.
959The directory part of the file name is not used."
b3bf02fa 960 (interactive)
e3437989
RS
961 (let ((str
962 (save-excursion
963 (set-buffer bookmark-current-buffer)
4cd51172 964 (bookmark-buffer-name))))
e3437989
RS
965 (insert str)))
966
b3bf02fa 967
4cd51172
RS
968(defun bookmark-buffer-name ()
969 "Return the name of the current buffer's file, non-directory.
970In Info, return the current node."
971 (cond
972 ;; Are we in Info?
973 ((string-equal mode-name "Info") Info-current-node)
974 ;; Or are we a file?
975 (buffer-file-name (file-name-nondirectory buffer-file-name))
976 ;; Or are we a directory?
977 ((and (boundp 'dired-directory) dired-directory)
978 (let* ((dirname (if (stringp dired-directory)
979 dired-directory
980 (car dired-directory)))
981 (idx (1- (length dirname))))
982 ;; Strip the trailing slash.
983 (if (= ?/ (aref dirname idx))
984 (file-name-nondirectory (substring dirname 0 idx))
985 ;; Else return the current-buffer
986 (buffer-name (current-buffer)))))
987 ;; If all else fails, use the buffer's name.
988 (t
989 (buffer-name (current-buffer)))))
990
991
b3bf02fa
RS
992(defun bookmark-yank-word ()
993 (interactive)
994 ;; get the next word from the buffer and append it to the name of
995 ;; the bookmark currently being set.
996 (let ((string (save-excursion
d22d6453
RS
997 (set-buffer bookmark-current-buffer)
998 (goto-char bookmark-yank-point)
88415bfc 999 (buffer-substring-no-properties
d22d6453 1000 (point)
91169ba7 1001 (progn
d22d6453
RS
1002 (forward-word 1)
1003 (setq bookmark-yank-point (point)))))))
b3bf02fa
RS
1004 (insert string)))
1005
b3bf02fa
RS
1006
1007(defun bookmark-buffer-file-name ()
e3437989
RS
1008 "Return the current buffer's file in a way useful for bookmarks.
1009For example, if this is a Info buffer, return the Info file's name."
1010 (if (eq major-mode 'Info-mode)
1011 Info-current-file
1012 (or
1013 buffer-file-name
1014 (if (and (boundp 'dired-directory) dired-directory)
1015 (if (stringp dired-directory)
1016 dired-directory
1017 (car dired-directory))))))
1018
1019
e3437989 1020(defun bookmark-maybe-load-default-file ()
d22d6453
RS
1021 (and (not bookmarks-already-loaded)
1022 (null bookmark-alist)
e3437989
RS
1023 (prog2
1024 (and
1025 ;; Possibly the old bookmark file, "~/.emacs-bkmrks", needs
1026 ;; to be renamed.
1027 (file-exists-p (expand-file-name bookmark-old-default-file))
1028 (not (file-exists-p (expand-file-name bookmark-default-file)))
1029 (rename-file (expand-file-name bookmark-old-default-file)
1030 (expand-file-name bookmark-default-file)))
1031 ;; return t so the `and' will continue...
1032 t)
dbe99ae9 1033
e3437989 1034 (file-readable-p (expand-file-name bookmark-default-file))
91169ba7
RS
1035 (bookmark-load bookmark-default-file t t)
1036 (setq bookmarks-already-loaded t)))
d22d6453 1037
e3437989 1038
d22d6453
RS
1039(defun bookmark-maybe-sort-alist ()
1040 ;;Return the bookmark-alist for display. If the bookmark-sort-flag
1041 ;;is non-nil, then return a sorted copy of the alist.
1042 (if bookmark-sort-flag
1043 (setq bookmark-alist
1044 (sort (copy-alist bookmark-alist)
1045 (function
1046 (lambda (x y) (string-lessp (car x) (car y))))))))
1047
e3437989 1048
d22d6453 1049;;;###autoload
4eadcdf8 1050(defun bookmark-jump (bookmark)
dbe99ae9 1051 "Jump to bookmark BOOKMARK (a point in some file).
9aef3b21
RS
1052You may have a problem using this function if the value of variable
1053`bookmark-alist' is nil. If that happens, you need to load in some
1054bookmarks. See help on function `bookmark-load' for more about
d22d6453
RS
1055this.
1056
e3437989
RS
1057If the file pointed to by BOOKMARK no longer exists, you will be asked
1058if you wish to give the bookmark a new location, and bookmark-jump
1059will then jump to the new location, as well as recording it in place
1060of the old one in the permanent bookmark record."
1061 (interactive
1062 (bookmark-completing-read "Jump to bookmark" bookmark-current-bookmark))
4eadcdf8
RS
1063 (bookmark-maybe-historicize-string bookmark)
1064 (let ((cell (bookmark-jump-noselect bookmark)))
d22d6453
RS
1065 (and cell
1066 (switch-to-buffer (car cell))
e3437989 1067 (goto-char (cdr cell))
2c9ad69f
KF
1068 (if bookmark-automatically-show-annotations
1069 ;; if there is an annotation for this bookmark,
1070 ;; show it in a buffer.
4eadcdf8 1071 (bookmark-show-annotation bookmark)))))
e3437989 1072
d22d6453 1073
8d56596c 1074(defun bookmark-file-or-variation-thereof (file)
76bc6ee3
KF
1075 "Return FILE (a string) if it exists, or return a reasonable
1076variation of FILE if that exists. Reasonable variations are checked
1077by appending suffixes defined in `Info-suffix-list'. If cannot find FILE
1078nor a reasonable variation thereof, then still return FILE if it can
1079be retrieved from a VC backend, else return nil."
dd33e6e9
KF
1080 (if (file-exists-p file)
1081 file
76bc6ee3
KF
1082 (or
1083 (progn (require 'info) ; ensure Info-suffix-list is bound
1084 (catch 'found
1085 (mapc (lambda (elt)
1086 (let ((suffixed-file (concat file (car elt))))
1087 (if (file-exists-p suffixed-file)
1088 (throw 'found suffixed-file))))
1089 Info-suffix-list)
1090 nil))
1091 ;; Last possibility: try VC
1092 (if (vc-backend file) file))))
1093
8d56596c 1094
d22d6453
RS
1095(defun bookmark-jump-noselect (str)
1096 ;; a leetle helper for bookmark-jump :-)
1097 ;; returns (BUFFER . POINT)
e3437989
RS
1098 (bookmark-maybe-load-default-file)
1099 (let* ((file (expand-file-name (bookmark-get-filename str)))
1100 (forward-str (bookmark-get-front-context-string str))
1101 (behind-str (bookmark-get-rear-context-string str))
1102 (place (bookmark-get-position str))
1103 (info-node (bookmark-get-info-node str))
1104 (orig-file file)
1105 )
8d56596c 1106 (if (setq file (bookmark-file-or-variation-thereof file))
e3437989 1107 (save-excursion
e197b151
RS
1108 (save-window-excursion
1109 (if info-node
1110 ;; Info nodes must be visited with care.
1111 (progn
1112 (require 'info)
1113 (Info-find-node file info-node))
1114 ;; Else no Info. Can do an ordinary find-file:
1115 (set-buffer (find-file-noselect file))
1116 (goto-char place))
1117
1118 ;; Go searching forward first. Then, if forward-str exists and
1119 ;; was found in the file, we can search backward for behind-str.
1120 ;; Rationale is that if text was inserted between the two in the
1121 ;; file, it's better to be put before it so you can read it,
1122 ;; rather than after and remain perhaps unaware of the changes.
1123 (if forward-str
1124 (if (search-forward forward-str (point-max) t)
1125 (goto-char (match-beginning 0))))
1126 (if behind-str
1127 (if (search-backward behind-str (point-min) t)
1128 (goto-char (match-end 0))))
1129 ;; added by db
1130 (setq bookmark-current-bookmark str)
1131 (cons (current-buffer) (point))))
1132
91169ba7
RS
1133 ;; Else unable to find the marked file, so ask if user wants to
1134 ;; relocate the bookmark, else remind them to consider deletion.
1135 (ding)
1136 (if (y-or-n-p (concat (file-name-nondirectory orig-file)
1137 " nonexistent. Relocate \""
1138 str
1139 "\"? "))
1140 (progn
1141 (bookmark-relocate str)
1142 ;; gasp! It's a recursive function call in Emacs Lisp!
1143 (bookmark-jump-noselect str))
dbe99ae9 1144 (message
91169ba7
RS
1145 "Bookmark not relocated; consider removing it \(%s\)." str)
1146 nil))))
e3437989 1147
d22d6453
RS
1148
1149;;;###autoload
4eadcdf8 1150(defun bookmark-relocate (bookmark)
5e0e5feb
RS
1151 "Relocate BOOKMARK to another file (reading file name with minibuffer).
1152This makes an already existing bookmark point to that file, instead of
1153the one it used to point at. Useful when a file has been renamed
1154after a bookmark was set in it."
e3437989 1155 (interactive (bookmark-completing-read "Bookmark to relocate"))
4eadcdf8 1156 (bookmark-maybe-historicize-string bookmark)
e3437989 1157 (bookmark-maybe-load-default-file)
4eadcdf8 1158 (let* ((bmrk-filename (bookmark-get-filename bookmark))
d22d6453 1159 (newloc (expand-file-name
e3437989 1160 (read-file-name
4eadcdf8 1161 (format "Relocate %s to: " bookmark)
e3437989 1162 (file-name-directory bmrk-filename)))))
91169ba7
RS
1163 (bookmark-set-filename bookmark newloc)
1164 (bookmark-bmenu-surreptitiously-rebuild-list)))
e3437989 1165
d22d6453
RS
1166
1167;;;###autoload
4eadcdf8 1168(defun bookmark-insert-location (bookmark &optional no-history)
4c0b5ad1
KF
1169 "Insert the name of the file associated with BOOKMARK.
1170Optional second arg NO-HISTORY means don't record this in the
1171minibuffer history list `bookmark-history'."
e3437989 1172 (interactive (bookmark-completing-read "Insert bookmark location"))
4eadcdf8 1173 (or no-history (bookmark-maybe-historicize-string bookmark))
7e510a5e
RS
1174 (let ((start (point)))
1175 (prog1
1176 (insert (bookmark-location bookmark)) ; *Return this line*
59cfe8b9 1177 (if (and (display-color-p) (display-mouse-p))
2fbb6576
EZ
1178 (add-text-properties start
1179 (save-excursion (re-search-backward
1180 "[^ \t]")
1181 (1+ (point)))
1182 '(mouse-face highlight
1183 help-echo "mouse-2: go to this bookmark"))))))
e3437989 1184
fbd98d61 1185;;;###autoload
a15269c0 1186(defalias 'bookmark-locate 'bookmark-insert-location)
e3437989 1187
4eadcdf8 1188(defun bookmark-location (bookmark)
e3437989
RS
1189 "Return the name of the file associated with BOOKMARK."
1190 (bookmark-maybe-load-default-file)
4eadcdf8 1191 (bookmark-get-filename bookmark))
e3437989 1192
d22d6453
RS
1193
1194;;;###autoload
9aef3b21 1195(defun bookmark-rename (old &optional new)
5e0e5feb
RS
1196 "Change the name of OLD bookmark to NEW name.
1197If called from keyboard, prompt for OLD and NEW. If called from
1198menubar, select OLD from a menu and prompt for NEW.
4eadcdf8 1199
5e0e5feb 1200If called from Lisp, prompt for NEW if only OLD was passed as an
4eadcdf8
RS
1201argument. If called with two strings, then no prompting is done. You
1202must pass at least OLD when calling from Lisp.
9aef3b21
RS
1203
1204While you are entering the new name, consecutive C-w's insert
3b526bae 1205consecutive words from the text of the buffer into the new bookmark
4c0b5ad1 1206name."
e3437989 1207 (interactive (bookmark-completing-read "Old bookmark name"))
4c0b5ad1 1208 (bookmark-maybe-historicize-string old)
e3437989 1209 (bookmark-maybe-load-default-file)
91169ba7
RS
1210
1211 (setq bookmark-current-point (point))
1212 (setq bookmark-yank-point (point))
1213 (setq bookmark-current-buffer (current-buffer))
1214 (let ((newname
1215 (or new ; use second arg, if non-nil
1216 (read-from-minibuffer
1217 "New name: "
1218 nil
1219 (let ((now-map (copy-keymap minibuffer-local-map)))
1220 (define-key now-map "\C-w" 'bookmark-yank-word)
1221 now-map)
1222 nil
1223 'bookmark-history))))
1224 (bookmark-set-name old newname)
1225 (setq bookmark-current-bookmark newname)
1226 (bookmark-bmenu-surreptitiously-rebuild-list)
1227 (setq bookmark-alist-modification-count
1228 (1+ bookmark-alist-modification-count))
1229 (if (bookmark-time-to-save-p)
1230 (bookmark-save))))
b3bf02fa 1231
e3437989 1232
d22d6453 1233;;;###autoload
4eadcdf8 1234(defun bookmark-insert (bookmark)
dbe99ae9 1235 "Insert the text of the file pointed to by bookmark BOOKMARK.
9aef3b21
RS
1236You may have a problem using this function if the value of variable
1237`bookmark-alist' is nil. If that happens, you need to load in some
1238bookmarks. See help on function `bookmark-load' for more about
8027e2ad 1239this."
e3437989 1240 (interactive (bookmark-completing-read "Insert bookmark contents"))
4eadcdf8 1241 (bookmark-maybe-historicize-string bookmark)
e3437989 1242 (bookmark-maybe-load-default-file)
d22d6453
RS
1243 (let ((orig-point (point))
1244 (str-to-insert
1245 (save-excursion
4eadcdf8 1246 (set-buffer (car (bookmark-jump-noselect bookmark)))
91169ba7 1247 (buffer-string))))
d22d6453
RS
1248 (insert str-to-insert)
1249 (push-mark)
1250 (goto-char orig-point)))
1251
e3437989 1252
d22d6453 1253;;;###autoload
e3437989 1254(defun bookmark-delete (bookmark &optional batch)
dbe99ae9 1255 "Delete BOOKMARK from the bookmark list.
9aef3b21
RS
1256Removes only the first instance of a bookmark with that name. If
1257there are one or more other bookmarks with the same name, they will
1258not be deleted. Defaults to the \"current\" bookmark \(that is, the
e3437989
RS
1259one most recently used in this file, if any\).
1260Optional second arg BATCH means don't update the bookmark list buffer,
1261probably because we were called from there."
1262 (interactive
1263 (bookmark-completing-read "Delete bookmark" bookmark-current-bookmark))
4c0b5ad1 1264 (bookmark-maybe-historicize-string bookmark)
e3437989
RS
1265 (bookmark-maybe-load-default-file)
1266 (let ((will-go (bookmark-get-bookmark bookmark)))
11eb4275
RS
1267 (setq bookmark-alist (delq will-go bookmark-alist))
1268 ;; Added by db, nil bookmark-current-bookmark if the last
3b526bae 1269 ;; occurrence has been deleted
e3437989 1270 (or (bookmark-get-bookmark bookmark-current-bookmark)
11eb4275 1271 (setq bookmark-current-bookmark nil)))
e3437989
RS
1272 ;; Don't rebuild the list
1273 (if batch
1274 nil
1275 (bookmark-bmenu-surreptitiously-rebuild-list)
1276 (setq bookmark-alist-modification-count
1277 (1+ bookmark-alist-modification-count))
1278 (if (bookmark-time-to-save-p)
1279 (bookmark-save))))
1280
b3bf02fa
RS
1281
1282(defun bookmark-time-to-save-p (&optional last-time)
1283 ;; By Gregory M. Saunders <saunders@cis.ohio-state.edu>
1284 ;; finds out whether it's time to save bookmarks to a file, by
1285 ;; examining the value of variable bookmark-save-flag, and maybe
1286 ;; bookmark-alist-modification-count. Returns t if they should be
1287 ;; saved, nil otherwise. if last-time is non-nil, then this is
1288 ;; being called when emacs is killed.
dbe99ae9 1289 (cond (last-time
b3bf02fa
RS
1290 (and (> bookmark-alist-modification-count 0)
1291 bookmark-save-flag))
1292 ((numberp bookmark-save-flag)
1293 (>= bookmark-alist-modification-count bookmark-save-flag))
1294 (t
1295 nil)))
1296
e3437989 1297
d22d6453 1298;;;###autoload
b3bf02fa 1299(defun bookmark-write ()
5e0e5feb
RS
1300 "Write bookmarks to a file (reading the file name with the minibuffer).
1301Don't use this in Lisp programs; use `bookmark-save' instead."
b3bf02fa 1302 (interactive)
e3437989 1303 (bookmark-maybe-load-default-file)
b3bf02fa
RS
1304 (bookmark-save t))
1305
e3437989 1306
d22d6453 1307;;;###autoload
dbe99ae9 1308(defun bookmark-save (&optional parg file)
9aef3b21
RS
1309 "Save currently defined bookmarks.
1310Saves by default in the file defined by the variable
4eadcdf8
RS
1311`bookmark-default-file'. With a prefix arg, save it in file FILE
1312\(second argument\).
b3bf02fa
RS
1313
1314If you are calling this from Lisp, the two arguments are PREFIX-ARG
1315and FILE, and if you just want it to write to the default file, then
1316pass no arguments. Or pass in nil and FILE, and it will save in FILE
1317instead. If you pass in one argument, and it is non-nil, then the
1318user will be interactively queried for a file to save in.
1319
11eb4275 1320When you want to load in the bookmarks from a file, use
9aef3b21 1321\`bookmark-load\', \\[bookmark-load]. That function will prompt you
11eb4275 1322for a file, defaulting to the file defined by variable
e3437989 1323`bookmark-default-file'."
b3bf02fa 1324 (interactive "P")
e3437989 1325 (bookmark-maybe-load-default-file)
b3bf02fa
RS
1326 (cond
1327 ((and (null parg) (null file))
1328 ;;whether interactive or not, write to default file
e3437989 1329 (bookmark-write-file bookmark-default-file))
b3bf02fa
RS
1330 ((and (null parg) file)
1331 ;;whether interactive or not, write to given file
1332 (bookmark-write-file file))
1333 ((and parg (not file))
1334 ;;have been called interactively w/ prefix arg
1335 (let ((file (read-file-name "File to save bookmarks in: ")))
1336 (bookmark-write-file file)))
1337 (t ; someone called us with prefix-arg *and* a file, so just write to file
1338 (bookmark-write-file file)))
1339 ;; signal that we have synced the bookmark file by setting this to
1340 ;; 0. If there was an error at any point before, it will not get
1341 ;; set, which is what we want.
1342 (setq bookmark-alist-modification-count 0))
1343
e3437989
RS
1344
1345\f
b3bf02fa
RS
1346(defun bookmark-write-file (file)
1347 (save-excursion
d22d6453
RS
1348 (save-window-excursion
1349 (if (>= baud-rate 9600)
bd0e5b36 1350 (message "Saving bookmarks to file %s..." file))
186a7127 1351 (set-buffer (let ((enable-local-variables nil))
d23e2c3f 1352 (find-file-noselect file)))
d22d6453 1353 (goto-char (point-min))
8a946354 1354 (let ((print-length nil)
1672462f
GM
1355 (print-level nil))
1356 (delete-region (point-min) (point-max))
1357 (bookmark-insert-file-format-version-stamp)
1358 (pp bookmark-alist (current-buffer))
1359 (let ((version-control
1360 (cond
1361 ((null bookmark-version-control) nil)
1362 ((eq 'never bookmark-version-control) 'never)
1363 ((eq 'nospecial bookmark-version-control) version-control)
1364 (t
1365 t))))
1366 (write-file file)
1367 (kill-buffer (current-buffer))
1368 (if (>= baud-rate 9600)
1369 (message "Saving bookmarks to file %s...done" file)))))))
e3437989 1370
d22d6453 1371
91169ba7
RS
1372(defun bookmark-import-new-list (new-list)
1373 ;; Walk over the new list, adding each individual bookmark
1374 ;; carefully. "Carefully" means checking against the existing
1375 ;; bookmark-alist and renaming the new bookmarks with <N> extensions
1376 ;; as necessary.
1377 (let ((lst new-list)
1378 (names (bookmark-all-names)))
1379 (while lst
1380 (let* ((full-record (car lst)))
1381 (bookmark-maybe-rename full-record names)
1382 (setq bookmark-alist (nconc bookmark-alist (list full-record)))
1383 (setq names (cons (bookmark-name-from-full-record full-record) names))
1384 (setq lst (cdr lst))))))
1385
1386
1387(defun bookmark-maybe-rename (full-record names)
1388 ;; just a helper for bookmark-import-new-list; it is only for
1389 ;; readability that this is not inlined.
1390 ;;
1391 ;; Once this has found a free name, it sets full-record to that
1392 ;; name.
1393 (let ((found-name (bookmark-name-from-full-record full-record)))
1394 (if (member found-name names)
1395 ;; We've got a conflict, so generate a new name
1396 (let ((count 2)
1397 (new-name found-name))
1398 (while (member new-name names)
1399 (setq new-name (concat found-name (format "<%d>" count)))
1400 (setq count (1+ count)))
1401 (bookmark-set-name full-record new-name)))))
1402
1403
d22d6453 1404;;;###autoload
91169ba7 1405(defun bookmark-load (file &optional overwrite no-msg)
9aef3b21
RS
1406 "Load bookmarks from FILE (which must be in bookmark format).
1407Appends loaded bookmarks to the front of the list of bookmarks. If
91169ba7 1408optional second argument OVERWRITE is non-nil, existing bookmarks are
9aef3b21
RS
1409destroyed. Optional third arg NO-MSG means don't display any messages
1410while loading.
b3bf02fa
RS
1411
1412If you load a file that doesn't contain a proper bookmark alist, you
9aef3b21 1413will corrupt Emacs's bookmark list. Generally, you should only load
b3bf02fa 1414in files that were created with the bookmark functions in the first
e3437989 1415place. Your own personal bookmark file, `~/.emacs.bmk', is
8027e2ad 1416maintained automatically by Emacs; you shouldn't need to load it
91169ba7
RS
1417explicitly.
1418
1419If you load a file containing bookmarks with the same names as
1420bookmarks already present in your Emacs, the new bookmarks will get
1421unique numeric suffixes \"<2>\", \"<3>\", ... following the same
1422method buffers use to resolve name collisions."
b3bf02fa 1423 (interactive
e3437989
RS
1424 (list (read-file-name
1425 (format "Load bookmarks from: (%s) "
dbe99ae9 1426 bookmark-default-file)
e3437989
RS
1427 ;;Default might not be used often,
1428 ;;but there's no better default, and
1429 ;;I guess it's better than none at all.
1430 "~/" bookmark-default-file 'confirm)))
b3bf02fa
RS
1431 (setq file (expand-file-name file))
1432 (if (file-readable-p file)
1433 (save-excursion
d22d6453
RS
1434 (save-window-excursion
1435 (if (and (null no-msg) (>= baud-rate 9600))
bd0e5b36 1436 (message "Loading bookmarks from %s..." file))
186a7127 1437 (set-buffer (let ((enable-local-variables nil))
d23e2c3f 1438 (find-file-noselect file)))
d22d6453 1439 (goto-char (point-min))
e3437989
RS
1440 (bookmark-maybe-upgrade-file-format)
1441 (let ((blist (bookmark-alist-from-buffer)))
d22d6453
RS
1442 (if (listp blist)
1443 (progn
91169ba7
RS
1444 (if overwrite
1445 (progn
1446 (setq bookmark-alist blist)
1447 (setq bookmark-alist-modification-count 0))
1448 ;; else
1449 (bookmark-import-new-list blist)
1450 (setq bookmark-alist-modification-count
1451 (1+ bookmark-alist-modification-count)))
1452 (if (string-equal
1453 (expand-file-name bookmark-default-file)
1454 file)
1455 (setq bookmarks-already-loaded t))
dbe99ae9 1456 (bookmark-bmenu-surreptitiously-rebuild-list))
a3ad20c2 1457 (error "Invalid bookmark list in %s" file)))
d22d6453
RS
1458 (kill-buffer (current-buffer)))
1459 (if (and (null no-msg) (>= baud-rate 9600))
bd0e5b36 1460 (message "Loading bookmarks from %s...done" file)))
a3ad20c2 1461 (error "Cannot read bookmark file %s" file)))
b3bf02fa 1462
d22d6453 1463
e3437989
RS
1464\f
1465;;; Code supporting the dired-like bookmark menu. Prefix is
1466;;; "bookmark-bmenu" for "buffer-menu":
1467
1468
1469(defvar bookmark-bmenu-bookmark-column nil)
d22d6453 1470
d22d6453 1471
e3437989
RS
1472(defvar bookmark-bmenu-hidden-bookmarks ())
1473
1474
e3437989 1475(defvar bookmark-bmenu-mode-map nil)
d22d6453 1476
d22d6453 1477
e3437989 1478(if bookmark-bmenu-mode-map
d22d6453 1479 nil
e3437989
RS
1480 (setq bookmark-bmenu-mode-map (make-keymap))
1481 (suppress-keymap bookmark-bmenu-mode-map t)
31cd9611 1482 (define-key bookmark-bmenu-mode-map "q" 'quit-window)
e3437989
RS
1483 (define-key bookmark-bmenu-mode-map "v" 'bookmark-bmenu-select)
1484 (define-key bookmark-bmenu-mode-map "w" 'bookmark-bmenu-locate)
1485 (define-key bookmark-bmenu-mode-map "2" 'bookmark-bmenu-2-window)
1486 (define-key bookmark-bmenu-mode-map "1" 'bookmark-bmenu-1-window)
1487 (define-key bookmark-bmenu-mode-map "j" 'bookmark-bmenu-this-window)
fbd98d61 1488 (define-key bookmark-bmenu-mode-map "\C-c\C-c" 'bookmark-bmenu-this-window)
e3437989 1489 (define-key bookmark-bmenu-mode-map "f" 'bookmark-bmenu-this-window)
74002bdf 1490 (define-key bookmark-bmenu-mode-map "\C-m" 'bookmark-bmenu-this-window)
e3437989 1491 (define-key bookmark-bmenu-mode-map "o" 'bookmark-bmenu-other-window)
fbd98d61
KF
1492 (define-key bookmark-bmenu-mode-map "\C-o"
1493 'bookmark-bmenu-switch-other-window)
e3437989
RS
1494 (define-key bookmark-bmenu-mode-map "s" 'bookmark-bmenu-save)
1495 (define-key bookmark-bmenu-mode-map "k" 'bookmark-bmenu-delete)
1496 (define-key bookmark-bmenu-mode-map "\C-d" 'bookmark-bmenu-delete-backwards)
1497 (define-key bookmark-bmenu-mode-map "x" 'bookmark-bmenu-execute-deletions)
e3437989
RS
1498 (define-key bookmark-bmenu-mode-map "d" 'bookmark-bmenu-delete)
1499 (define-key bookmark-bmenu-mode-map " " 'next-line)
1500 (define-key bookmark-bmenu-mode-map "n" 'next-line)
1501 (define-key bookmark-bmenu-mode-map "p" 'previous-line)
1502 (define-key bookmark-bmenu-mode-map "\177" 'bookmark-bmenu-backup-unmark)
1503 (define-key bookmark-bmenu-mode-map "?" 'describe-mode)
1504 (define-key bookmark-bmenu-mode-map "u" 'bookmark-bmenu-unmark)
1505 (define-key bookmark-bmenu-mode-map "m" 'bookmark-bmenu-mark)
dbe99ae9 1506 (define-key bookmark-bmenu-mode-map "l" 'bookmark-bmenu-load)
e3437989
RS
1507 (define-key bookmark-bmenu-mode-map "r" 'bookmark-bmenu-rename)
1508 (define-key bookmark-bmenu-mode-map "t" 'bookmark-bmenu-toggle-filenames)
1509 (define-key bookmark-bmenu-mode-map "a" 'bookmark-bmenu-show-annotation)
1510 (define-key bookmark-bmenu-mode-map "A" 'bookmark-bmenu-show-all-annotations)
7e510a5e
RS
1511 (define-key bookmark-bmenu-mode-map "e" 'bookmark-bmenu-edit-annotation)
1512 (define-key bookmark-bmenu-mode-map [mouse-2]
1513 'bookmark-bmenu-other-window-with-mouse))
e3437989 1514
dbe99ae9 1515
e3437989
RS
1516
1517;; Bookmark Buffer Menu mode is suitable only for specially formatted
1518;; data.
1519(put 'bookmark-bmenu-mode 'mode-class 'special)
1520
1521
1522;; todo: need to display whether or not bookmark exists as a buffer in
dbe99ae9 1523;; flag column.
d22d6453
RS
1524
1525;; Format:
e3437989
RS
1526;; FLAGS BOOKMARK [ LOCATION ]
1527
1528
1529(defun bookmark-bmenu-surreptitiously-rebuild-list ()
1530 "Rebuild the Bookmark List if it exists.
1531Don't affect the buffer ring order."
1532 (if (get-buffer "*Bookmark List*")
1533 (save-excursion
dbe99ae9 1534 (save-window-excursion
e3437989 1535 (bookmark-bmenu-list)))))
d22d6453 1536
d22d6453
RS
1537
1538;;;###autoload
e3437989 1539(defun bookmark-bmenu-list ()
d22d6453
RS
1540 "Display a list of existing bookmarks.
1541The list is displayed in a buffer named `*Bookmark List*'.
e3437989
RS
1542The leftmost column displays a D if the bookmark is flagged for
1543deletion, or > if it is flagged for displaying."
d22d6453 1544 (interactive)
e3437989
RS
1545 (bookmark-maybe-load-default-file)
1546 (if (interactive-p)
1547 (switch-to-buffer (get-buffer-create "*Bookmark List*"))
1548 (set-buffer (get-buffer-create "*Bookmark List*")))
d22d6453
RS
1549 (let ((buffer-read-only nil))
1550 (delete-region (point-max) (point-min))
1551 (goto-char (point-min)) ;sure are playing it safe...
1552 (insert "% Bookmark\n- --------\n")
1553 (bookmark-maybe-sort-alist)
e3437989
RS
1554 (mapcar
1555 (lambda (full-record)
3b526bae 1556 ;; if a bookmark has an annotation, prepend a "*"
e3437989
RS
1557 ;; in the list of bookmarks.
1558 (let ((annotation (bookmark-get-annotation
1559 (bookmark-name-from-full-record full-record))))
91169ba7 1560 (if (and annotation (not (string-equal annotation "")))
e3437989
RS
1561 (insert " *")
1562 (insert " "))
7e510a5e
RS
1563 (let ((start (point)))
1564 (insert (bookmark-name-from-full-record full-record))
59cfe8b9 1565 (if (and (display-color-p) (display-mouse-p))
2fbb6576
EZ
1566 (add-text-properties start
1567 (save-excursion (re-search-backward
1568 "[^ \t]")
1569 (1+ (point)))
1570 '(mouse-face highlight
1571 help-echo "mouse-2: go to this bookmark")))
7e510a5e
RS
1572 (insert "\n")
1573 )))
e3437989 1574 bookmark-alist))
d22d6453
RS
1575 (goto-char (point-min))
1576 (forward-line 2)
e3437989
RS
1577 (bookmark-bmenu-mode)
1578 (if bookmark-bmenu-toggle-filenames
1579 (bookmark-bmenu-toggle-filenames t)))
1580
1581;;;###autoload
1582(defalias 'list-bookmarks 'bookmark-bmenu-list)
1583;;;###autoload
1584(defalias 'edit-bookmarks 'bookmark-bmenu-list)
d22d6453 1585
e3437989
RS
1586
1587
1588(defun bookmark-bmenu-mode ()
d22d6453
RS
1589 "Major mode for editing a list of bookmarks.
1590Each line describes one of the bookmarks in Emacs.
1591Letters do not insert themselves; instead, they are commands.
3b526bae 1592Bookmark names preceded by a \"*\" have annotations.
e3437989
RS
1593\\<bookmark-bmenu-mode-map>
1594\\[bookmark-bmenu-mark] -- mark bookmark to be displayed.
1595\\[bookmark-bmenu-select] -- select bookmark of line point is on.
1596 Also show bookmarks marked using m in other windows.
1597\\[bookmark-bmenu-toggle-filenames] -- toggle displaying of filenames (they may obscure long bookmark names).
1598\\[bookmark-bmenu-locate] -- display (in minibuffer) location of this bookmark.
1599\\[bookmark-bmenu-1-window] -- select this bookmark in full-frame window.
1600\\[bookmark-bmenu-2-window] -- select this bookmark in one window,
d22d6453 1601 together with bookmark selected before this one in another window.
e3437989
RS
1602\\[bookmark-bmenu-this-window] -- select this bookmark in place of the bookmark menu buffer.
1603\\[bookmark-bmenu-other-window] -- select this bookmark in another window,
d22d6453 1604 so the bookmark menu bookmark remains visible in its window.
e3437989 1605\\[bookmark-bmenu-switch-other-window] -- switch the other window to this bookmark.
dbe99ae9 1606\\[bookmark-bmenu-rename] -- rename this bookmark \(prompts for new name\).
e3437989 1607\\[bookmark-bmenu-delete] -- mark this bookmark to be deleted, and move down.
dbe99ae9 1608\\[bookmark-bmenu-delete-backwards] -- mark this bookmark to be deleted, and move up.
60d0378e 1609\\[bookmark-bmenu-execute-deletions] -- delete bookmarks marked with `\\[bookmark-bmenu-delete]'.
e3437989 1610\\[bookmark-bmenu-save] -- save the current bookmark list in the default file.
d22d6453 1611 With a prefix arg, prompts for a file to save in.
e3437989
RS
1612\\[bookmark-bmenu-load] -- load in a file of bookmarks (prompts for file.)
1613\\[bookmark-bmenu-unmark] -- remove all kinds of marks from current line.
d22d6453 1614 With prefix argument, also move up one line.
e3437989
RS
1615\\[bookmark-bmenu-backup-unmark] -- back up a line and remove marks.
1616\\[bookmark-bmenu-show-annotation] -- show the annotation, if it exists, for the current bookmark
1617 in another buffer.
1618\\[bookmark-bmenu-show-all-annotations] -- show the annotations of all bookmarks in another buffer.
1619\\[bookmark-bmenu-edit-annotation] -- edit the annotation for the current bookmark."
d22d6453 1620 (kill-all-local-variables)
e3437989 1621 (use-local-map bookmark-bmenu-mode-map)
d22d6453
RS
1622 (setq truncate-lines t)
1623 (setq buffer-read-only t)
e3437989 1624 (setq major-mode 'bookmark-bmenu-mode)
d22d6453 1625 (setq mode-name "Bookmark Menu")
e3437989 1626 (run-hooks 'bookmark-bmenu-mode-hook))
d22d6453 1627
e3437989 1628
4eadcdf8 1629(defun bookmark-bmenu-toggle-filenames (&optional show)
d22d6453
RS
1630 "Toggle whether filenames are shown in the bookmark list.
1631Optional argument SHOW means show them unconditionally."
1632 (interactive)
1633 (cond
4eadcdf8 1634 (show
e3437989
RS
1635 (setq bookmark-bmenu-toggle-filenames nil)
1636 (bookmark-bmenu-show-filenames)
1637 (setq bookmark-bmenu-toggle-filenames t))
1638 (bookmark-bmenu-toggle-filenames
1639 (bookmark-bmenu-hide-filenames)
1640 (setq bookmark-bmenu-toggle-filenames nil))
d22d6453 1641 (t
e3437989
RS
1642 (bookmark-bmenu-show-filenames)
1643 (setq bookmark-bmenu-toggle-filenames t))))
1644
d22d6453 1645
e3437989
RS
1646(defun bookmark-bmenu-show-filenames (&optional force)
1647 (if (and (not force) bookmark-bmenu-toggle-filenames)
d22d6453
RS
1648 nil ;already shown, so do nothing
1649 (save-excursion
1650 (save-window-excursion
1651 (goto-char (point-min))
1652 (forward-line 2)
e3437989 1653 (setq bookmark-bmenu-hidden-bookmarks ())
d22d6453
RS
1654 (let ((buffer-read-only nil))
1655 (while (< (point) (point-max))
e3437989
RS
1656 (let ((bmrk (bookmark-bmenu-bookmark)))
1657 (setq bookmark-bmenu-hidden-bookmarks
1658 (cons bmrk bookmark-bmenu-hidden-bookmarks))
7e510a5e
RS
1659 (let ((start (save-excursion (end-of-line) (point))))
1660 (move-to-column bookmark-bmenu-file-column t)
1661 ;; Strip off `mouse-face' from the white spaces region.
59cfe8b9 1662 (if (and (display-color-p) (display-mouse-p))
7e510a5e 1663 (remove-text-properties start (point)
2fbb6576 1664 '(mouse-face nil help-echo nil))))
7e510a5e 1665 (delete-region (point) (progn (end-of-line) (point)))
d22d6453 1666 (insert " ")
4c0b5ad1
KF
1667 ;; Pass the NO-HISTORY arg:
1668 (bookmark-insert-location bmrk t)
d22d6453
RS
1669 (forward-line 1))))))))
1670
e3437989
RS
1671
1672(defun bookmark-bmenu-hide-filenames (&optional force)
1673 (if (and (not force) bookmark-bmenu-toggle-filenames)
d22d6453
RS
1674 ;; nothing to hide if above is nil
1675 (save-excursion
1676 (save-window-excursion
1677 (goto-char (point-min))
1678 (forward-line 2)
e3437989
RS
1679 (setq bookmark-bmenu-hidden-bookmarks
1680 (nreverse bookmark-bmenu-hidden-bookmarks))
d22d6453
RS
1681 (save-excursion
1682 (goto-char (point-min))
1683 (search-forward "Bookmark")
1684 (backward-word 1)
e3437989 1685 (setq bookmark-bmenu-bookmark-column (current-column)))
d22d6453
RS
1686 (save-excursion
1687 (let ((buffer-read-only nil))
e3437989
RS
1688 (while bookmark-bmenu-hidden-bookmarks
1689 (move-to-column bookmark-bmenu-bookmark-column t)
1690 (bookmark-kill-line)
7e510a5e
RS
1691 (let ((start (point)))
1692 (insert (car bookmark-bmenu-hidden-bookmarks))
59cfe8b9 1693 (if (and (display-color-p) (display-mouse-p))
2fbb6576
EZ
1694 (add-text-properties start
1695 (save-excursion (re-search-backward
1696 "[^ \t]")
1697 (1+ (point)))
1698 '(mouse-face highlight
1699 help-echo
1700 "mouse-2: go to this bookmark"))))
e3437989
RS
1701 (setq bookmark-bmenu-hidden-bookmarks
1702 (cdr bookmark-bmenu-hidden-bookmarks))
d22d6453
RS
1703 (forward-line 1))))))))
1704
e3437989 1705
e3437989 1706(defun bookmark-bmenu-check-position ()
91169ba7
RS
1707 ;; Returns non-nil if on a line with a bookmark.
1708 ;; (The actual value returned is bookmark-alist).
1709 ;; Else reposition and try again, else return nil.
d22d6453
RS
1710 (cond ((< (count-lines (point-min) (point)) 2)
1711 (goto-char (point-min))
1712 (forward-line 2)
91169ba7 1713 bookmark-alist)
d22d6453
RS
1714 ((and (bolp) (eobp))
1715 (beginning-of-line 0)
91169ba7 1716 bookmark-alist)
d22d6453 1717 (t
91169ba7 1718 bookmark-alist)))
d22d6453 1719
e3437989
RS
1720
1721(defun bookmark-bmenu-bookmark ()
d22d6453 1722 ;; return a string which is bookmark of this line.
e3437989 1723 (if (bookmark-bmenu-check-position)
d22d6453
RS
1724 (save-excursion
1725 (save-window-excursion
1726 (goto-char (point-min))
1727 (search-forward "Bookmark")
1728 (backward-word 1)
e3437989
RS
1729 (setq bookmark-bmenu-bookmark-column (current-column)))))
1730 (if bookmark-bmenu-toggle-filenames
1731 (bookmark-bmenu-hide-filenames))
d22d6453
RS
1732 (save-excursion
1733 (save-window-excursion
1734 (beginning-of-line)
e3437989 1735 (forward-char bookmark-bmenu-bookmark-column)
d22d6453 1736 (prog1
dbe99ae9
SS
1737 (buffer-substring-no-properties (point)
1738 (progn
d22d6453
RS
1739 (end-of-line)
1740 (point)))
1741 ;; well, this is certainly crystal-clear:
e3437989
RS
1742 (if bookmark-bmenu-toggle-filenames
1743 (bookmark-bmenu-toggle-filenames t))))))
d22d6453 1744
e3437989
RS
1745
1746(defun bookmark-show-annotation (bookmark)
1747 "Display the annotation for bookmark named BOOKMARK in a buffer,
1748if an annotation exists."
1749 (let ((annotation (bookmark-get-annotation bookmark)))
91169ba7
RS
1750 (if (and annotation (not (string-equal annotation "")))
1751 (save-excursion
1752 (let ((old-buf (current-buffer)))
1753 (pop-to-buffer (get-buffer-create "*Bookmark Annotation*") t)
1754 (delete-region (point-min) (point-max))
1755 ;; (insert (concat "Annotation for bookmark '" bookmark "':\n\n"))
1756 (insert annotation)
1757 (goto-char (point-min))
1758 (pop-to-buffer old-buf))))))
e3437989
RS
1759
1760
1761(defun bookmark-show-all-annotations ()
1762 "Display the annotations for all bookmarks in a buffer."
1763 (let ((old-buf (current-buffer)))
1764 (pop-to-buffer (get-buffer-create "*Bookmark Annotation*") t)
1765 (delete-region (point-min) (point-max))
1766 (mapcar
1767 (lambda (full-record)
1768 (let* ((name (bookmark-name-from-full-record full-record))
1769 (ann (bookmark-get-annotation name)))
1770 (insert (concat name ":\n"))
91169ba7 1771 (if (and ann (not (string-equal ann "")))
e3437989
RS
1772 ;; insert the annotation, indented by 4 spaces.
1773 (progn
1774 (save-excursion (insert ann))
1775 (while (< (point) (point-max))
1776 (beginning-of-line) ; paranoia
1777 (insert " ")
1778 (forward-line)
1779 (end-of-line))))))
1780 bookmark-alist)
1781 (goto-char (point-min))
1782 (pop-to-buffer old-buf)))
1783
1784
1785(defun bookmark-bmenu-mark ()
5e0e5feb 1786 "Mark bookmark on this line to be displayed by \\<bookmark-bmenu-mode-map>\\[bookmark-bmenu-select]."
d22d6453
RS
1787 (interactive)
1788 (beginning-of-line)
e3437989 1789 (if (bookmark-bmenu-check-position)
d22d6453
RS
1790 (let ((buffer-read-only nil))
1791 (delete-char 1)
1792 (insert ?>)
91169ba7
RS
1793 (forward-line 1)
1794 (bookmark-bmenu-check-position))))
d22d6453 1795
e3437989
RS
1796
1797(defun bookmark-bmenu-select ()
d22d6453 1798 "Select this line's bookmark; also display bookmarks marked with `>'.
e3437989 1799You can mark bookmarks with the \\<bookmark-bmenu-mode-map>\\[bookmark-bmenu-mark] command."
d22d6453 1800 (interactive)
e3437989
RS
1801 (if (bookmark-bmenu-check-position)
1802 (let ((bmrk (bookmark-bmenu-bookmark))
dbe99ae9 1803 (menu (current-buffer))
d22d6453
RS
1804 (others ())
1805 tem)
1806 (goto-char (point-min))
1807 (while (re-search-forward "^>" nil t)
e3437989 1808 (setq tem (bookmark-bmenu-bookmark))
d22d6453
RS
1809 (let ((buffer-read-only nil))
1810 (delete-char -1)
1811 (insert ?\ ))
dbe99ae9
SS
1812 (or (string-equal tem bmrk)
1813 (member tem others)
d22d6453
RS
1814 (setq others (cons tem others))))
1815 (setq others (nreverse others)
1816 tem (/ (1- (frame-height)) (1+ (length others))))
1817 (delete-other-windows)
1818 (bookmark-jump bmrk)
1819 (bury-buffer menu)
4eadcdf8
RS
1820 (if others
1821 (while others
1822 (split-window nil tem)
1823 (other-window 1)
1824 (bookmark-jump (car others))
1825 (setq others (cdr others)))
d22d6453
RS
1826 (other-window 1)))))
1827
e3437989
RS
1828
1829(defun bookmark-bmenu-save (parg)
d22d6453
RS
1830 "Save the current list into a bookmark file.
1831With a prefix arg, prompts for a file to save them in."
1832 (interactive "P")
1833 (save-excursion
1834 (save-window-excursion
1835 (bookmark-save parg))))
1836
e3437989
RS
1837
1838(defun bookmark-bmenu-load ()
1839 "Load the bookmark file and rebuild the bookmark menu-buffer."
d22d6453 1840 (interactive)
e3437989 1841 (if (bookmark-bmenu-check-position)
d22d6453
RS
1842 (save-excursion
1843 (save-window-excursion
e3437989 1844 ;; This will call `bookmark-bmenu-list'
d22d6453
RS
1845 (call-interactively 'bookmark-load)))))
1846
e3437989
RS
1847
1848(defun bookmark-bmenu-1-window ()
d22d6453
RS
1849 "Select this line's bookmark, alone, in full frame."
1850 (interactive)
e3437989 1851 (if (bookmark-bmenu-check-position)
d22d6453 1852 (progn
e3437989 1853 (bookmark-jump (bookmark-bmenu-bookmark))
d22d6453
RS
1854 (bury-buffer (other-buffer))
1855 (delete-other-windows))))
1856
e3437989
RS
1857
1858(defun bookmark-bmenu-2-window ()
d22d6453
RS
1859 "Select this line's bookmark, with previous buffer in second window."
1860 (interactive)
e3437989
RS
1861 (if (bookmark-bmenu-check-position)
1862 (let ((bmrk (bookmark-bmenu-bookmark))
d22d6453
RS
1863 (menu (current-buffer))
1864 (pop-up-windows t))
1865 (delete-other-windows)
1866 (switch-to-buffer (other-buffer))
e40e3151
KF
1867 (let* ((pair (bookmark-jump-noselect bmrk))
1868 (buff (car pair))
1869 (pos (cdr pair)))
1870 (pop-to-buffer buff)
1871 (goto-char pos))
d22d6453
RS
1872 (bury-buffer menu))))
1873
e3437989
RS
1874
1875(defun bookmark-bmenu-this-window ()
d22d6453
RS
1876 "Select this line's bookmark in this window."
1877 (interactive)
e3437989
RS
1878 (if (bookmark-bmenu-check-position)
1879 (bookmark-jump (bookmark-bmenu-bookmark))))
d22d6453 1880
e3437989
RS
1881
1882(defun bookmark-bmenu-other-window ()
d22d6453
RS
1883 "Select this line's bookmark in other window, leaving bookmark menu visible."
1884 (interactive)
e3437989
RS
1885 (let ((bookmark (bookmark-bmenu-bookmark)))
1886 (if (bookmark-bmenu-check-position)
e40e3151
KF
1887 (let* ((pair (bookmark-jump-noselect bookmark))
1888 (buff (car pair))
1889 (pos (cdr pair)))
e3437989 1890 (switch-to-buffer-other-window buff)
e40e3151
KF
1891 (goto-char pos)
1892 (set-window-point (get-buffer-window buff) pos)
1893 (bookmark-show-annotation bookmark)))))
1894
1895
1896(defun bookmark-bmenu-switch-other-window ()
1897 "Make the other window select this line's bookmark.
1898The current window remains selected."
1899 (interactive)
e197b151
RS
1900 (let ((bookmark (bookmark-bmenu-bookmark))
1901 (pop-up-windows t)
dbe99ae9 1902 same-window-buffer-names
e197b151 1903 same-window-regexps)
e40e3151
KF
1904 (if (bookmark-bmenu-check-position)
1905 (let* ((pair (bookmark-jump-noselect bookmark))
1906 (buff (car pair))
1907 (pos (cdr pair)))
1908 (display-buffer buff)
1909 (let ((o-buffer (current-buffer)))
1910 ;; save-excursion won't do
1911 (set-buffer buff)
1912 (goto-char pos)
1913 (set-window-point (get-buffer-window buff) pos)
1914 (set-buffer o-buffer))
e3437989
RS
1915 (bookmark-show-annotation bookmark)))))
1916
7e510a5e
RS
1917(defun bookmark-bmenu-other-window-with-mouse (event)
1918 "Select bookmark at the mouse pointer in other window, leaving bookmark menu visible."
1919 (interactive "e")
1920 (save-excursion
1921 (set-buffer (window-buffer (posn-window (event-end event))))
1922 (save-excursion
1923 (goto-char (posn-point (event-end event)))
1924 (bookmark-bmenu-other-window))))
1925
e3437989
RS
1926
1927(defun bookmark-bmenu-show-annotation ()
1928 "Show the annotation for the current bookmark in another window."
1929 (interactive)
1930 (let ((bookmark (bookmark-bmenu-bookmark)))
1931 (if (bookmark-bmenu-check-position)
1932 (bookmark-show-annotation bookmark))))
d22d6453 1933
e3437989
RS
1934
1935(defun bookmark-bmenu-show-all-annotations ()
1936 "Show the annotation for all bookmarks in another window."
1937 (interactive)
1938 (bookmark-show-all-annotations))
1939
1940
1941(defun bookmark-bmenu-edit-annotation ()
1942 "Edit the annotation for the current bookmark in another window."
1943 (interactive)
1944 (let ((bookmark (bookmark-bmenu-bookmark)))
1945 (if (bookmark-bmenu-check-position)
1946 (bookmark-edit-annotation bookmark))))
1947
1948
e3437989 1949(defun bookmark-bmenu-unmark (&optional backup)
d22d6453 1950 "Cancel all requested operations on bookmark on this line and move down.
4eadcdf8 1951Optional BACKUP means move up."
d22d6453
RS
1952 (interactive "P")
1953 (beginning-of-line)
e3437989 1954 (if (bookmark-bmenu-check-position)
d22d6453
RS
1955 (progn
1956 (let ((buffer-read-only nil))
1957 (delete-char 1)
1958 ;; any flags to reset according to circumstances? How about a
1959 ;; flag indicating whether this bookmark is being visited?
1960 ;; well, we don't have this now, so maybe later.
1961 (insert " "))
91169ba7
RS
1962 (forward-line (if backup -1 1))
1963 (bookmark-bmenu-check-position))))
d22d6453 1964
e3437989
RS
1965
1966(defun bookmark-bmenu-backup-unmark ()
d22d6453
RS
1967 "Move up and cancel all requested operations on bookmark on line above."
1968 (interactive)
1969 (forward-line -1)
e3437989 1970 (if (bookmark-bmenu-check-position)
d22d6453 1971 (progn
e3437989 1972 (bookmark-bmenu-unmark)
91169ba7
RS
1973 (forward-line -1)
1974 (bookmark-bmenu-check-position))))
d22d6453 1975
e3437989
RS
1976
1977(defun bookmark-bmenu-delete ()
5e0e5feb
RS
1978 "Mark bookmark on this line to be deleted.
1979To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\[bookmark-bmenu-execute-deletions]."
d22d6453
RS
1980 (interactive)
1981 (beginning-of-line)
e3437989 1982 (if (bookmark-bmenu-check-position)
d22d6453
RS
1983 (let ((buffer-read-only nil))
1984 (delete-char 1)
1985 (insert ?D)
91169ba7
RS
1986 (forward-line 1)
1987 (bookmark-bmenu-check-position))))
d22d6453 1988
e3437989
RS
1989
1990(defun bookmark-bmenu-delete-backwards ()
5e0e5feb
RS
1991 "Mark bookmark on this line to be deleted, then move up one line.
1992To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\[bookmark-bmenu-execute-deletions]."
d22d6453 1993 (interactive)
e3437989 1994 (bookmark-bmenu-delete)
d22d6453 1995 (forward-line -2)
e3437989 1996 (if (bookmark-bmenu-check-position)
91169ba7
RS
1997 (forward-line 1))
1998 (bookmark-bmenu-check-position))
d22d6453 1999
e3437989
RS
2000
2001(defun bookmark-bmenu-execute-deletions ()
d22d6453
RS
2002 "Delete bookmarks marked with \\<Buffer-menu-mode-map>\\[Buffer-menu-delete] commands."
2003 (interactive)
60d0378e 2004 (message "Deleting bookmarks...")
e3437989
RS
2005 (let ((hide-em bookmark-bmenu-toggle-filenames)
2006 (o-point (point))
2007 (o-str (save-excursion
2008 (beginning-of-line)
2009 (if (looking-at "^D")
2010 nil
2011 (buffer-substring
2012 (point)
2013 (progn (end-of-line) (point))))))
2014 (o-col (current-column)))
2015 (if hide-em (bookmark-bmenu-hide-filenames))
2016 (setq bookmark-bmenu-toggle-filenames nil)
d22d6453
RS
2017 (goto-char (point-min))
2018 (forward-line 1)
e3437989
RS
2019 (while (re-search-forward "^D" (point-max) t)
2020 (bookmark-delete (bookmark-bmenu-bookmark) t)) ; pass BATCH arg
2021 (bookmark-bmenu-list)
2022 (setq bookmark-bmenu-toggle-filenames hide-em)
2023 (if bookmark-bmenu-toggle-filenames
2024 (bookmark-bmenu-toggle-filenames t))
2025 (if o-str
2026 (progn
2027 (goto-char (point-min))
2028 (search-forward o-str)
2029 (beginning-of-line)
2030 (forward-char o-col))
2031 (goto-char o-point))
2032 (beginning-of-line)
2033 (setq bookmark-alist-modification-count
2034 (1+ bookmark-alist-modification-count))
2035 (if (bookmark-time-to-save-p)
60d0378e
KF
2036 (bookmark-save))
2037 (message "Deleting bookmarks...done")
2038 ))
e3437989
RS
2039
2040
2041(defun bookmark-bmenu-rename ()
d22d6453
RS
2042 "Rename bookmark on current line. Prompts for a new name."
2043 (interactive)
e3437989
RS
2044 (if (bookmark-bmenu-check-position)
2045 (let ((bmrk (bookmark-bmenu-bookmark))
d22d6453
RS
2046 (thispoint (point)))
2047 (bookmark-rename bmrk)
e3437989 2048 (bookmark-bmenu-list)
d22d6453
RS
2049 (goto-char thispoint))))
2050
e3437989
RS
2051
2052(defun bookmark-bmenu-locate ()
d22d6453
RS
2053 "Display location of this bookmark. Displays in the minibuffer."
2054 (interactive)
e3437989
RS
2055 (if (bookmark-bmenu-check-position)
2056 (let ((bmrk (bookmark-bmenu-bookmark)))
2057 (message (bookmark-location bmrk)))))
2058
d22d6453 2059
e3437989
RS
2060\f
2061;;; Menu bar stuff. Prefix is "bookmark-menu".
11eb4275 2062
e3437989
RS
2063(defun bookmark-menu-build-paned-menu (name entries)
2064 "Build a multi-paned menu named NAME from the strings in ENTRIES.
2065That is, ENTRIES is a list of strings which appear as the choices
2066in the menu. The number of panes depends on the number of entries.
2067The visible entries are truncated to `bookmark-menu-length', but the
2068strings returned are not."
2069 (let* ((f-height (/ (frame-height) 2))
2070 (pane-list
2071 (let (temp-pane-list
2072 (iter 0))
2073 (while entries
2074 (let (lst
2075 (count 0))
2076 (while (and (< count f-height) entries)
2077 (let ((str (car entries)))
2078 (setq lst (cons
2079 (cons
2080 (if (> (length str) bookmark-menu-length)
2081 (substring str 0 bookmark-menu-length)
2082 str)
2083 str)
2084 lst))
2085 (setq entries (cdr entries))
2086 (setq count (1+ count))))
2087 (setq iter (1+ iter))
2088 (setq
2089 temp-pane-list
2090 (cons
2091 (cons
2092 (format "-*- %s (%d) -*-" name iter)
2093 (nreverse lst))
2094 temp-pane-list))))
2095 (nreverse temp-pane-list))))
2096
2097 ;; Return the menu:
2098 (cons (concat "-*- " name " -*-") pane-list)))
2099
2100
2101(defun bookmark-menu-popup-paned-menu (event name entries)
2102 "Pop up multi-paned menu at EVENT, return string chosen from ENTRIES.
2103That is, ENTRIES is a list of strings which appear as the choices
2104in the menu.
2105The number of panes depends on the number of entries."
2106 (interactive "e")
2107 (x-popup-menu event (bookmark-menu-build-paned-menu name entries)))
2108
2109
2110(defun bookmark-menu-popup-paned-bookmark-menu (event name)
2111 "Pop up menu of bookmarks, return chosen bookmark.
2112Pop up at EVENT, menu's name is NAME.
2113The number of panes depends on the number of bookmarks."
2114 (bookmark-menu-popup-paned-menu event name (bookmark-all-names)))
2115
2116
2117(defun bookmark-popup-menu-and-apply-function (func-sym menu-label event)
b3bf02fa
RS
2118 ;; help function for making menus that need to apply a bookmark
2119 ;; function to a string.
e3437989
RS
2120 (let* ((choice (bookmark-menu-popup-paned-bookmark-menu
2121 event menu-label)))
2122 (if choice (apply func-sym (list choice)))))
b3bf02fa 2123
e3437989 2124
7af04c89 2125;;;###autoload
e3437989 2126(defun bookmark-menu-insert (event)
dbe99ae9 2127 "Insert the text of the file pointed to by bookmark BOOKMARK.
9aef3b21
RS
2128You may have a problem using this function if the value of variable
2129`bookmark-alist' is nil. If that happens, you need to load in some
2130bookmarks. See help on function `bookmark-load' for more about
4eadcdf8
RS
2131this.
2132
2133Warning: this function only takes an EVENT as argument. Use the
2134corresponding bookmark function from Lisp \(the one without the
2135\"-menu-\" in its name\)."
b3bf02fa 2136 (interactive "e")
e3437989
RS
2137 (bookmark-popup-menu-and-apply-function
2138 'bookmark-insert "Insert Bookmark Contents" event))
b3bf02fa 2139
e3437989 2140
7af04c89 2141;;;###autoload
e3437989 2142(defun bookmark-menu-jump (event)
dbe99ae9 2143 "Jump to bookmark BOOKMARK (a point in some file).
9aef3b21
RS
2144You may have a problem using this function if the value of variable
2145`bookmark-alist' is nil. If that happens, you need to load in some
2146bookmarks. See help on function `bookmark-load' for more about
4eadcdf8
RS
2147this.
2148
2149Warning: this function only takes an EVENT as argument. Use the
2150corresponding bookmark function from Lisp \(the one without the
2151\"-menu-\" in its name\)."
b3bf02fa 2152 (interactive "e")
e3437989
RS
2153 (bookmark-popup-menu-and-apply-function
2154 'bookmark-jump "Jump to Bookmark" event))
b3bf02fa 2155
e3437989 2156
7af04c89 2157;;;###autoload
e3437989 2158(defun bookmark-menu-locate (event)
dbe99ae9 2159 "Insert the name of the file associated with BOOKMARK.
4eadcdf8
RS
2160\(This is not the same as the contents of that file\).
2161
2162Warning: this function only takes an EVENT as argument. Use the
2163corresponding bookmark function from Lisp \(the one without the
2164\"-menu-\" in its name\)."
b3bf02fa 2165 (interactive "e")
e3437989
RS
2166 (bookmark-popup-menu-and-apply-function
2167 'bookmark-insert-location "Insert Bookmark Location" event))
b3bf02fa 2168
e3437989 2169
7af04c89 2170;;;###autoload
e3437989 2171(defun bookmark-menu-rename (event)
dbe99ae9 2172 "Change the name of OLD-BOOKMARK to NEWNAME.
d22d6453
RS
2173If called from keyboard, prompts for OLD-BOOKMARK and NEWNAME.
2174If called from menubar, OLD-BOOKMARK is selected from a menu, and
dbe99ae9 2175prompts for NEWNAME.
d22d6453
RS
2176If called from Lisp, prompts for NEWNAME if only OLD-BOOKMARK was
2177passed as an argument. If called with two strings, then no prompting
2178is done. You must pass at least OLD-BOOKMARK when calling from Lisp.
9aef3b21
RS
2179
2180While you are entering the new name, consecutive C-w's insert
3b526bae 2181consecutive words from the text of the buffer into the new bookmark
4eadcdf8
RS
2182name.
2183
2184Warning: this function only takes an EVENT as argument. Use the
2185corresponding bookmark function from Lisp \(the one without the
2186\"-menu-\" in its name\)."
b3bf02fa 2187 (interactive "e")
e3437989
RS
2188 (bookmark-popup-menu-and-apply-function
2189 'bookmark-rename "Rename Bookmark" event))
b3bf02fa 2190
e3437989 2191
7af04c89 2192;;;###autoload
e3437989 2193(defun bookmark-menu-delete (event)
dbe99ae9 2194 "Delete the bookmark named NAME from the bookmark list.
9aef3b21
RS
2195Removes only the first instance of a bookmark with that name. If
2196there are one or more other bookmarks with the same name, they will
2197not be deleted. Defaults to the \"current\" bookmark \(that is, the
4eadcdf8
RS
2198one most recently used in this file, if any\).
2199
2200Warning: this function only takes an EVENT as argument. Use the
2201corresponding bookmark function from Lisp \(the one without the
2202\"-menu-\" in its name\)."
b3bf02fa 2203 (interactive "e")
e3437989
RS
2204 (bookmark-popup-menu-and-apply-function
2205 'bookmark-delete "Delete Bookmark" event))
2206
b3bf02fa 2207
d22d6453
RS
2208;; Thanks to Roland McGrath for fixing menubar.el so that the
2209;; following works, and for explaining what to do to make it work.
b3bf02fa 2210
7af04c89
RS
2211;; We MUST autoload EACH form used to set up this variable's value, so
2212;; that the whole job is done in loaddefs.el.
b3bf02fa 2213
5e0e5feb 2214;; Emacs menubar stuff.
09fd6588 2215
7af04c89
RS
2216;;;###autoload
2217(defvar menu-bar-bookmark-map (make-sparse-keymap "Bookmark functions"))
09fd6588 2218
7af04c89 2219;;;###autoload
4eadcdf8 2220(defalias 'menu-bar-bookmark-map (symbol-value 'menu-bar-bookmark-map))
e3437989 2221
09fd6588
KF
2222;; make bookmarks appear toward the right side of the menu.
2223(if (boundp 'menu-bar-final-items)
dbe99ae9 2224 (if menu-bar-final-items
09fd6588
KF
2225 (setq menu-bar-final-items
2226 (cons 'bookmark menu-bar-final-items)))
2227 (setq menu-bar-final-items '(bookmark)))
2228
7af04c89 2229;;;###autoload
d22d6453 2230(define-key menu-bar-bookmark-map [load]
09fd6588 2231 '("Load a Bookmark File..." . bookmark-load))
b3bf02fa 2232
7af04c89 2233;;;###autoload
d22d6453 2234(define-key menu-bar-bookmark-map [write]
09fd6588 2235 '("Save Bookmarks As..." . bookmark-write))
d22d6453 2236
7af04c89 2237;;;###autoload
d22d6453 2238(define-key menu-bar-bookmark-map [save]
09fd6588 2239 '("Save Bookmarks" . bookmark-save))
d22d6453 2240
7af04c89 2241;;;###autoload
d22d6453 2242(define-key menu-bar-bookmark-map [edit]
e3437989 2243 '("Edit Bookmark List" . bookmark-bmenu-list))
d22d6453 2244
7af04c89 2245;;;###autoload
d22d6453 2246(define-key menu-bar-bookmark-map [delete]
0e520d74 2247 '("Delete Bookmark" . bookmark-menu-delete))
d22d6453 2248
7af04c89 2249;;;###autoload
d22d6453 2250(define-key menu-bar-bookmark-map [rename]
0e520d74 2251 '("Rename Bookmark" . bookmark-menu-rename))
d22d6453 2252
7af04c89 2253;;;###autoload
d22d6453 2254(define-key menu-bar-bookmark-map [locate]
0e520d74 2255 '("Insert Location" . bookmark-menu-locate))
b3bf02fa 2256
7af04c89 2257;;;###autoload
d22d6453 2258(define-key menu-bar-bookmark-map [insert]
0e520d74 2259 '("Insert Contents" . bookmark-menu-insert))
d22d6453 2260
7af04c89 2261;;;###autoload
d22d6453 2262(define-key menu-bar-bookmark-map [set]
0e520d74 2263 '("Set Bookmark" . bookmark-set))
d22d6453 2264
7af04c89 2265;;;###autoload
dbe99ae9 2266(define-key menu-bar-bookmark-map [jump]
0e520d74 2267 '("Jump to Bookmark" . bookmark-menu-jump))
d22d6453 2268
e3437989
RS
2269;;;; end bookmark menu stuff ;;;;
2270
2271\f
2272;;; Load Hook
2273(defvar bookmark-load-hook nil
2274 "Hook to run at the end of loading bookmark.")
2275
6192b604
KF
2276;;; Exit Hook, called from kill-emacs-hook
2277(defvar bookmark-exit-hook nil
2278 "Hook to run when emacs exits")
dbe99ae9 2279
6192b604
KF
2280(defun bookmark-exit-hook-internal ()
2281 "Save bookmark state, if necessary, at Emacs exit time.
2282This also runs `bookmark-exit-hooks'."
2283 (and
2284 (progn (run-hooks 'bookmark-exit-hooks) t)
2285 bookmark-alist
2286 (bookmark-time-to-save-p t)
2287 (bookmark-save)))
2288
2289(add-hook 'kill-emacs-hook 'bookmark-exit-hook-internal)
2290
2291
e3437989 2292(run-hooks 'bookmark-load-hook)
b3bf02fa 2293
b3bf02fa 2294(provide 'bookmark)
dbe99ae9 2295
11eb4275 2296;;; bookmark.el ends here