HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove sigio blocking
[bpt/emacs.git]
/
lisp
/
bookmark.el
diff --git
a/lisp/bookmark.el
b/lisp/bookmark.el
index
ce0d683
..
7ea54a8
100644
(file)
--- a/
lisp/bookmark.el
+++ b/
lisp/bookmark.el
@@
-1,6
+1,6
@@
;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later
;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later
-;; Copyright (C) 1993-1997, 2001-201
3
Free Software Foundation, Inc.
+;; Copyright (C) 1993-1997, 2001-201
4
Free Software Foundation, Inc.
;; Author: Karl Fogel <kfogel@red-bean.com>
;; Maintainer: Karl Fogel <kfogel@red-bean.com>
;; Author: Karl Fogel <kfogel@red-bean.com>
;; Maintainer: Karl Fogel <kfogel@red-bean.com>
@@
-130,8
+130,9
@@
recently set ones come first, oldest ones come last)."
:group 'bookmark)
(defcustom bookmark-bmenu-use-header-line t
:group 'bookmark)
(defcustom bookmark-bmenu-use-header-line t
- "Non-nil means to use an immovable header line, as opposed to inline
-text at the top of the buffer."
+ "Non-nil means to use an immovable header line.
+This is as opposed to inline text at the top of the buffer."
+ :version "24.4"
:type 'boolean
:group 'bookmark)
:type 'boolean
:group 'bookmark)
@@
-1297,8
+1298,8
@@
is greater than `bookmark-alist-modification-count'."
;;;###autoload
(defun bookmark-write ()
;;;###autoload
(defun bookmark-write ()
- "Write bookmarks to a file (reading the file name with the minibuffer).
-Don't use this in Lisp programs; use `bookmark-save' instead."
+ "Write bookmarks to a file (reading the file name with the minibuffer).
"
+ (declare (interactive-only bookmark-save))
(interactive)
(bookmark-maybe-load-default-file)
(bookmark-save t))
(interactive)
(bookmark-maybe-load-default-file)
(bookmark-save t))
@@
-1419,8
+1420,7
@@
explicitly.
If you load a file containing bookmarks with the same names as
bookmarks already present in your Emacs, the new bookmarks will get
If you load a file containing bookmarks with the same names as
bookmarks already present in your Emacs, the new bookmarks will get
-unique numeric suffixes \"<2>\", \"<3>\", ... following the same
-method buffers use to resolve name collisions."
+unique numeric suffixes \"<2>\", \"<3>\", etc."
(interactive
(list (read-file-name
(format "Load bookmarks from: (%s) "
(interactive
(list (read-file-name
(format "Load bookmarks from: (%s) "