1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-30 08:09:04 +00:00
Commit Graph

57 Commits

Author SHA1 Message Date
Gerd Moellmann
1672462f74 (bookmark-write-file): Bind print-length and
print-level to nil.  From Tom Capey <tomc@edina.co.uk>.
2001-09-04 13:17:56 +00:00
Pavel Janík
e8af40eed4 Some fixes to follow coding conventions. 2001-07-16 12:23:00 +00:00
Eli Zaretskii
2fbb6576c8 (bookmark-insert-location, bookmark-bmenu-list)
(bookmark-bmenu-hide-filenames): Add help-echo to mouse-highlighted text.
(bookmark-bmenu-show-filenames): Remove help-echo property from
the whitespace.
2001-06-24 11:14:12 +00:00
Gerd Moellmann
28d80dea87 (bookmark-get-bookmark): Handle case that
BOOKMARK is not a string.
2001-03-28 14:51:26 +00:00
Gerd Moellmann
7e72649221 (bookmark-get-bookmark): Use assoc-ignore-case if
bookmark-completion-ignore-case it t.
2001-03-06 15:36:19 +00:00
Sam Steingold
dbe99ae975 new backquote syntax 2001-01-12 22:49:40 +00:00
Karl Fogel
6192b604c1 * bookmark.el: Provide a generic exit hook, as suggested by Ovidiu
Predescu <ovidiu@cup.hp.com>:
(bookmark-exit-hook): new var.
(bookmark-exit-hook-internal): new func, replaces old raw lambda form
in `kill-emacs-hook', and runs new `bookmark-exit-hooks'.  No longer
tests for the bookmark feature, as logically that feature must have
been provided if this function is running.
Removed ;;;###autoload before the `add-hook' call.
2000-12-13 22:56:38 +00:00
Karl Fogel
59cfe8b98f Applied this patch from Eli Zaretskii. Pretty much taking on faith
that it works, because I can't build the 20.6 raw tree...

2000-05-25  Eli Zaretskii  <eliz@is.elta.co.il>

	* bookmark.el (bookmark-insert-location, bookmark-bmenu-list)
	(bookmark-bmenu-show-filenames, bookmark-bmenu-hide-filenames):
	Call display-color-p and display-mouse-p instead of looking at
	window-system.
2000-06-06 22:41:24 +00:00
Gerd Moellmann
8d56596c3c (bookmark-file-or-variation-thereof): New func, for
code abstracted out of `bookmark-jump-noselect'.  Now tries info
extensions as well as compression extensions.
(bookmark-jump-noselect): Use above new func.
2000-03-06 12:46:50 +00:00
Richard M. Stallman
74002bdf23 (bookmark-bmenu-mode-map): Bind RET like f. 1999-12-09 04:49:37 +00:00
Richard M. Stallman
596ff2eefc Delete some XEmacs compatibility code.
(bookmark-jump-noselect): Check vc-backend.
1999-05-23 21:46:08 +00:00
Andreas Schwab
31fa1bd1eb (bookmark-save-flag, bookmark-version-control): Use
`other' widget type.
1998-06-24 08:48:57 +00:00
Richard M. Stallman
e197b151df Changes so bookmark list mode works with Info:
(bookmark-jump-noselect): Use an inner save-window-excursion.
(bookmark-bmenu-switch-other-window): Temporarily set
pop-up-windows, same-window-buffer-names, and same-window-regexps,
to override Info's special display behaviors.
1998-05-26 18:27:47 +00:00
Richard M. Stallman
31cd9611fe (bookmark-bmenu-mode-map): Use quit-window for q.
(bookmark-bmenu-quit): Function deleted.
1998-03-08 00:20:23 +00:00
Richard M. Stallman
91169ba7cb (bookmark-load): Use `bookmark-import-new-list' to
load the new list carefully, renaming bookmarks as necessary.
In docstring, mention new renaming behavior.
Optional arg OVERWRITE replaces inaccurately-named REVERT.
If file loaded was bookmark-default-file, then set
bookmarks-already-loaded to t.
(bookmark-import-new-list): New func.
(bookmark-maybe-rename): New func, helper to above.
(bookmark-set-name): Accept bookmark as either string (behaves
same as before) or list (treat it as a bookmark record).

(bookmark-set, bookmark-maybe-load-default-file)
(bookmark-jump-noselect, bookmark-rename)
(bookmark-show-annotation): Discard pointless `progn's.

(bookmark-bmenu-mark, bookmark-bmenu-unmark)
(bookmark-bmenu-backup-unmark, bookmark-bmenu-delete-backwards):
Renormalize position after all else is done.

(bookmark-edit-annotation-mode, bookmark-bmenu-list)
(bookmark-show-annotation, bookmark-show-all-annotations):
Use `x' instead of `(not (eq x nil))'.

(bookmark-yank-word): Inner save-excursion changed to progn.
(bookmark-send-annotation, bookmark-send-edited-annotation)
(bookmark-insert): Use buffer-string instead of buffer-substring.
(bookmark-make-cell): Make sure annotation and info-node strings
contain no text properties.
(bookmark-relocate): Remember to rebuild bmenu buffer after a
bookmark has been relocated.
(bookmark-bmenu-check-position): Return a meaningful value --
callers have apparently been assuming this anyway.
(bookmark-build-xemacs-menu): Unused function deleted.
(bookmark-version): Removed this variable; the Emacs version suffices.
1997-08-22 19:14:10 +00:00
Richard M. Stallman
77bc05c744 Make global bindings only via loaddefs.el. 1997-07-10 06:43:19 +00:00
Richard M. Stallman
9848f0caff (bookmark, bookmark-use-annotations)
(bookmark-save-flag, bookmark-save-flag): Doc fixes.
1997-04-12 03:22:41 +00:00
Richard M. Stallman
bbf5eb2805 Add defgroup's; use defcustom for user vars. 1997-04-12 03:18:33 +00:00
Richard M. Stallman
7e510a5e22 Added mouse-selection feature for bookmark list buffer.
(bookmark-bmenu-other-window-with-mouse): New function.
(bookmark-bmenu-mode-map): Bind mouse-2.
(bookmark-bmenu-list, bookmark-insert-location,
bookmark-bmenu-hide-filenames): Put text property on bookmarks.
(bookmark-bmenu-show-filenames): Remove text property from
white spaces generated by `move-to-column'.
(bookmark-bmenu-bookmark): Use `buffer-substring-no-properties'
instead of `buffer-substring'.
1997-03-30 21:38:43 +00:00
Kenichi Handa
c5536f37a6 (bookmark-jump-noselect): Use goto-char instead of
forward-char/backward-char to pay attention to multibyte
 	characters..
1997-02-26 11:53:15 +00:00
Richard M. Stallman
88fb0aaae4 (bookmark-default-file): Use convert-standard-filename. 1996-09-01 19:03:37 +00:00
Richard M. Stallman
5e0e5feb88 (bookmark-bmenu-delete-backwards)
(bookmark-write, bookmark-relocate, bookmark-insert-buffer-name)
(bookmark-insert-current-bookmark, bookmark-send-edited-annotation)
(bookmark-read-annotation, bookmark-read-annotation-text-func)
(bookmark-send-annotation, bookmark-insert-file-format-version-stamp):
Doc fixes.
1996-05-09 17:34:55 +00:00
Karl Fogel
fbd98d61b9 (bookmark-locate): ;;;###autoload this alias.
(bookmark-bmenu-mode-map): bind C-c C-c to bookmark-bmenu-this-window,
analogously to other Emacs listing modes such as *grep* and *occur*.
(bookmark-version): upped to 2.6.4.
1996-05-08 19:16:51 +00:00
Karl Fogel
a15269c0d0 (bookmark-make): take optional arg `info-node', pass it on to
bookmark-make-cell.
(bookmark-make-cell): if new optional arg `info-node' is non-nil, make
it be the bookmark's info-node.
(bookmark-info-current-node): new func.
(bookmark-set): call bookmark-make, passing result from above
bookmark-info-current-node.
(bookmark-send-annotation): same as above.
(bookmark-locate): defalias to bookmark-insert-location for backward
compatibility.
(bookmark-version): upped to 2.6.3.
1996-05-08 02:22:12 +00:00
Richard M. Stallman
9596811a3d Comment change. 1996-03-02 06:37:35 +00:00
Karl Heuer
a3ad20c239 (bookmark-alist-from-buffer): Fix error text.
(bookmark-maybe-upgrade-file-format, bookmark-set): Likewise.
(bookmark-send-annotation, bookmark-send-edited-annotation): Likewise.
(bookmark-load): Delete redundant format call.
1996-01-25 06:02:21 +00:00
Karl Heuer
bd0e5b36b9 (bookmark-write-file, bookmark-load): Delete format call inside message. 1996-01-25 00:59:34 +00:00
Erik Naggum
b578f267af Update FSF's address. 1996-01-14 07:34:30 +00:00
Karl Fogel
60d0378e48 "cyclic.com" addresses changed to "red-bean.com".
<bookmark-bmenu-mode-map>: don't bind C-k.
<bookmark-bmenu-mode>: better key description.
<bookmark-bmenu-execute-deletions>: display message while working.
<bookmark-version>: upped to 2.6.20.
<bookmark-load>: fixed "done" message, duh.
1996-01-05 21:57:54 +00:00
Karl Heuer
3b526baee9 (bookmark-save-flag, bookmark-read-annotation-text-func,
bookmark-rename, bookmark-bmenu-mode, bookmark-menu-rename): Doc fix.
1996-01-04 23:28:24 +00:00
Karl Fogel
09fd658896 Removed all `bookmark-xemacsp' conditional code relating to menus. Do
";;;###autoloads" the as they were done in 2.6.13.
(bookmark-version): new var, set to 2.6.19.
(baud-rate): set to 19200 if not already bound.
(bookmark-make): don't call `set-text-properties' on a Lisp string if
this is XEmacs, because it won't work.
(buffer-substring-no-properties): if this is not fboundp, then fset it
to `buffer-substring-without-properties'.
1995-12-30 19:52:40 +00:00
Karl Heuer
2b9118484e Update address in comment. 1995-08-17 19:37:52 +00:00
Karl Heuer
88415bfc71 (bookmark-make): Strip text properties off name.
(bookmark-make-cell): Use `buffer-substring-no-properties'.
(bookmark-yank-word): Use buffer-substring-no-properties.
1995-07-17 23:19:51 +00:00
Richard M. Stallman
4eadcdf806 Make doc strings and argument names consistent where necessary.
Moved user variables to own section.
(bookmark-alist): Better doc string.
(bookmark-insert-current-bookmark): Doc string.
(bookmark-insert-buffer-name): Doc string.
(bookmark-set): Take optional NAME argument.
(bookmark-bmenu-select): Use member to test for string's presence.
Use a more efficent test at end, as suggested by Mikio Nakajima.
1995-06-18 22:46:02 +00:00
Karl Heuer
0e520d74eb Fix capitalization in menu bar. 1995-05-30 23:05:08 +00:00
Richard M. Stallman
7af04c89d4 (menu-bar-bookmark-map): Autoload each form
used to set up this variable's value, so that the whole job
is done in loaddefs.el.
(bookmark-menu-locate, bookmark-menu-jump, bookmark-menu-insert)
(bookmark-menu-delete, bookmark-menu-rename): Add autoloads.
1995-04-06 08:44:21 +00:00
Karl Fogel
2c9ad69fec (bookmark-automatically-show-annotations): new var.
(bookmark-jump): only show annotation if above var is non-nil.
1995-03-20 14:46:38 +00:00
Karl Fogel
e40e315116 (bookmark-bmenu-2-window): go to correct position as well as
correct buffer.
(bookmark-bmenu-other-window): same.
(bookmark-bmenu-switch-other-window): same.
1995-03-15 14:47:09 +00:00
Karl Fogel
4c0b5ad1cb Removed C-v bindings; they were inconsistent.
Defvarred some variables to nil, solely to avoid compilation warnings.
Use "Author's Update Number:" instead of "Version:".
(bookmark-history): new var.
(bookmark-completing-read): use `bookmark-history'.
(bookmark-historicize-string): new macro.
Use this everywhere `bookmark-completing-read' is used, because
`completing-read' won't get a chance to add to `bookmark-history' if
we were invoked via a menu.
(bookmark-rename): use `bookmark-history' when reading the new name.
No need for the strange C-o binding anymore.
1995-03-13 22:50:35 +00:00
Richard M. Stallman
4cd51172ca (bookmark-buffer-name): Be smarter about deducing a name.
(bookmark-insert-buffer-name): Use bookmark-buffer-name.
Replaces bookmark-insert-current-file-name.

(bookmark-make-cell): Use set-text-properties,
not format, to clear text properties.
1995-03-11 20:17:37 +00:00
Richard M. Stallman
e343798900 Insure that all entry points call `bookmark-maybe-load-default-file'.
Changed format of bookmark-alist and therefore of bookmark files.
Have version stamps in bookmark files.
Automatically upgrade old bookmark files to new format.
Changed name of default bookmark file to ".emacs.bmk".
Replaced "Bookmark-menu" with "bookmark-bmenu".  The
capitalization signified nothing; "bmenu" means "buffer-menu"
-- that is, bmenu code is for the dired-like of bookmarks that
appears when `list-bookmarks' is run, and the "bookmark-menu"
prefix is for the menu-bar.
Internally, use an alist instead of hardcoded list-positions
for storing bookmark information.

Applied <johng@media.mit.edu>'s patches for annotation support:
(bookmark-send-annotation, bookmark-read-annotation-mode)
(bookmark-edit-annotation-mode, bookmark-default-annotation-text)
(bookmark-read-annotation-text-func, bookmark-read-annotation)
(bookmark-send-edited-annotation, bookmark-edit-annotation):
New functions.

(bookmark-get-bookmark, bookmark-get-bookmark-record)
(bookmark-name-from-full-record, bookmark-set-name)
(bookmark-get-annotation, bookmark-set-annotation)
(bookmark-get-info-node, bookmark-set-info-node)
(bookmark-get-filename, bookmark-set-filename)
(bookmark-get-position, bookmark-set-position)
(bookmark-get-front-context-string, bookmark-set-front-context-string)
(bookmark-get-rear-context-string, bookmark-set-rear-context-string):
New subroutines.

(bookmark-file-format-version, bookmark-end-of-version-stamp-marker):
New variables.
(bookmark-grok-file-format-version, bookmark-maybe-upgrade-file-format)
(bookmark-upgrade-version-0-alist, bookmark-upgrade-file-format-from-0)
(bookmark-insert-file-format-version-stamp): New functions.
(bookmark-maybe-load-default-file):
Renamed from bookmark-try-default-file'.
(bookmark-old-default-file): New variable.
(bookmark-default-file): Renamed from `bookmark-file'.
New initial value, ".emacs.bmk".
(bookmark-make-cell): Use backquote.
Produce with the new format (Format Version 1).
Use `format' to strip text-properties.
(bookmark-write-file): Use `pp' instead of `princ'.
Call `bookmark-insert-file-format-version-stamp'.
(bookmark-all-names, bookmark-menu-popup-paned-bookmark-menu)
(bookmark-menu-build-paned-menu, bookmark-menu-popup-paned-menu)
(bookmark-insert-location): New functions.
(bookmark-completing-read): New function.  Everyone who called
`completing-read' in the interactive spec now calls this.
(bookmark-load-hook): New hook.

(bookmark-make-menu-alist): Function deleted.
(bookmark-popup-menu-and-apply-function): replaces
`bookmark-make-menu-with-function'.

(bookmark-load): Use `bookmark-alist-from-buffer'.
Call `bookmark-maybe-upgrade-file-format'.
(bookmark-set): If Info mode, record Info-current-node.
Use `bookmark-bmenu-surreptitiously-rebuild-list'.
(bookmark-buffer-file-name): Handle Info files.
(bookmark-buffer-name): If Info mode, return Info-current-node.
(bookmark-jump-noselect): For info node, use Info-goto-node.
Use the helper functions, don't mess with the raw
alist (except in completion, which we'll take care of later).
Don't count on `bookmark-search-size' being correct; use the
length of `forward-str' and `behind-str' instead.
(bookmark-relocate): Use the helper functions; don't mess
with the raw alist except in completion.
(bookmark-rename): C-o in minibuffer now inserts old name.
(bookmark-delete): New arg BATCH.
(bookmark-bmenu-execute-deletions): Was `bookmark-bmenu-execute'.
Just call bookmark-delete with the BATCH arg.
Set the modification count and maybe save when done.
Save point intuitively.
(bookmark-insert-current-file-name): Just use `file-name-nondirectory'.
(bookmark-location): Made non-interactive.
(bookmark-bmenu-list): Replaces `list-bookmarks'.
Delete arg ANNOTATION.  Use mapcar to simplify.
If not interactive-p, then use `set-buffer' instead of
`switch-to-buffer'.
(bookmark-kill-line): New function, used instead of kill-line.
(bookmark-search-size): Init to 16 instead of 500.
1995-03-11 02:05:20 +00:00
Richard M. Stallman
cfa8348f2b (bookmark-file): Use ~/emacs.bmk on windows-nt. 1994-11-01 05:45:47 +00:00
Richard M. Stallman
07b3798c76 Comment change. 1994-06-17 20:04:22 +00:00
Richard M. Stallman
da0ac66a1d (bookmark-file): Alternate default on ms-dos. 1994-05-20 21:22:22 +00:00
Richard M. Stallman
cdf2fffe38 Doc fixes.
(bookmark-relocate): Rename arg.
1994-05-16 07:24:45 +00:00
Karl Heuer
8f1204db34 Update copyright. 1994-05-03 23:47:06 +00:00
Richard M. Stallman
cdff424e0b (kill-emacs-hook): Don't autoload this hook.
(bookmark-menu-bar-delete, bookmark-menu-bar-rename)
(bookmark-menu-bar-locate, bookmark-menu-bar-jump)
(bookmark-menu-bar-insert): Add autoloads.
1994-03-10 07:32:24 +00:00
Richard M. Stallman
5875fdac00 (menu-bar-bookmark-map): Autoload the whole setup. 1994-03-10 04:24:29 +00:00
Richard M. Stallman
5f5d794a22 Don't repeat at load time any bindings that are autoloaded. 1993-12-23 04:52:56 +00:00
Richard M. Stallman
186a7127b2 (bookmark-load, bookmark-write-file):
Bind enable-local-variables instead of enable-local-eval.
1993-10-26 03:29:54 +00:00