annotate lisp/packages/bookmark.el @ 108:360340f9fd5f r20-1b6

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