aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1996-01-04 23:28:24 +0000
committerKarl Heuer1996-01-04 23:28:24 +0000
commit3b526baee9a2241aa4e1bdb429936dd318af6039 (patch)
tree6f61273bbdc42bd332f74706b599cdee06985665
parent2e282f9210b79dde95e534769efaae078c1b8db1 (diff)
downloademacs-3b526baee9a2241aa4e1bdb429936dd318af6039.tar.gz
emacs-3b526baee9a2241aa4e1bdb429936dd318af6039.zip
(bookmark-save-flag, bookmark-read-annotation-text-func,
bookmark-rename, bookmark-bmenu-mode, bookmark-menu-rename): Doc fix.
-rw-r--r--lisp/bookmark.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index f80acc9db0c..551454e1e41 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -110,7 +110,7 @@ buffer.")
110--> Nil means never save bookmarks, except when `bookmark-save' is 110--> Nil means never save bookmarks, except when `bookmark-save' is
111 explicitly called \(\\[bookmark-save]\). 111 explicitly called \(\\[bookmark-save]\).
112--> t means save bookmarks when Emacs is killed. 112--> t means save bookmarks when Emacs is killed.
113--> Otherise, it should be a number that is the frequency with which 113--> Otherwise, it should be a number that is the frequency with which
114 the bookmark list is saved \(i.e.: the number of times which 114 the bookmark list is saved \(i.e.: the number of times which
115 Emacs' bookmark list may be modified before it is automatically 115 Emacs' bookmark list may be modified before it is automatically
116 saved.\). If it is a number, Emacs will also automatically save 116 saved.\). If it is a number, Emacs will also automatically save
@@ -503,7 +503,7 @@ this name."
503 ;; free-standing strings, apparently. 503 ;; free-standing strings, apparently.
504 (set-text-properties 0 (length stripped-name) nil stripped-name)) 504 (set-text-properties 0 (length stripped-name) nil stripped-name))
505 (if (and (bookmark-get-bookmark stripped-name) (not overwrite)) 505 (if (and (bookmark-get-bookmark stripped-name) (not overwrite))
506 ;; already existing boookmark under that name and 506 ;; already existing bookmark under that name and
507 ;; no prefix arg means just overwrite old bookmark 507 ;; no prefix arg means just overwrite old bookmark
508 (setcdr (bookmark-get-bookmark stripped-name) 508 (setcdr (bookmark-get-bookmark stripped-name)
509 (list (bookmark-make-cell annotation))) 509 (list (bookmark-make-cell annotation)))
@@ -831,7 +831,7 @@ the bookmark (and file, and point) specified in buffer local variables."
831 831
832(defvar bookmark-read-annotation-text-func 'bookmark-default-annotation-text 832(defvar bookmark-read-annotation-text-func 'bookmark-default-annotation-text
833 "A variable containing a function which returns the text to insert 833 "A variable containing a function which returns the text to insert
834into an annotation compisition buffer. It takes the name of the bookmark, 834into an annotation composition buffer. It takes the name of the bookmark,
835as a string, as an arg.") 835as a string, as an arg.")
836 836
837 837
@@ -1166,7 +1166,7 @@ argument. If called with two strings, then no prompting is done. You
1166must pass at least OLD when calling from Lisp. 1166must pass at least OLD when calling from Lisp.
1167 1167
1168While you are entering the new name, consecutive C-w's insert 1168While you are entering the new name, consecutive C-w's insert
1169consectutive words from the text of the buffer into the new bookmark 1169consecutive words from the text of the buffer into the new bookmark
1170name." 1170name."
1171 (interactive (bookmark-completing-read "Old bookmark name")) 1171 (interactive (bookmark-completing-read "Old bookmark name"))
1172 (bookmark-maybe-historicize-string old) 1172 (bookmark-maybe-historicize-string old)
@@ -1231,7 +1231,7 @@ probably because we were called from there."
1231 (let ((will-go (bookmark-get-bookmark bookmark))) 1231 (let ((will-go (bookmark-get-bookmark bookmark)))
1232 (setq bookmark-alist (delq will-go bookmark-alist)) 1232 (setq bookmark-alist (delq will-go bookmark-alist))
1233 ;; Added by db, nil bookmark-current-bookmark if the last 1233 ;; Added by db, nil bookmark-current-bookmark if the last
1234 ;; occurence has been deleted 1234 ;; occurrence has been deleted
1235 (or (bookmark-get-bookmark bookmark-current-bookmark) 1235 (or (bookmark-get-bookmark bookmark-current-bookmark)
1236 (setq bookmark-current-bookmark nil))) 1236 (setq bookmark-current-bookmark nil)))
1237 ;; Don't rebuild the list 1237 ;; Don't rebuild the list
@@ -1471,7 +1471,7 @@ deletion, or > if it is flagged for displaying."
1471 (bookmark-maybe-sort-alist) 1471 (bookmark-maybe-sort-alist)
1472 (mapcar 1472 (mapcar
1473 (lambda (full-record) 1473 (lambda (full-record)
1474 ;; if a bookmark has an annotation, preceed it with a "*" 1474 ;; if a bookmark has an annotation, prepend a "*"
1475 ;; in the list of bookmarks. 1475 ;; in the list of bookmarks.
1476 (let ((annotation (bookmark-get-annotation 1476 (let ((annotation (bookmark-get-annotation
1477 (bookmark-name-from-full-record full-record)))) 1477 (bookmark-name-from-full-record full-record))))
@@ -1498,7 +1498,7 @@ deletion, or > if it is flagged for displaying."
1498 "Major mode for editing a list of bookmarks. 1498 "Major mode for editing a list of bookmarks.
1499Each line describes one of the bookmarks in Emacs. 1499Each line describes one of the bookmarks in Emacs.
1500Letters do not insert themselves; instead, they are commands. 1500Letters do not insert themselves; instead, they are commands.
1501Bookmark names preceeded by a \"*\" have annotations. 1501Bookmark names preceded by a \"*\" have annotations.
1502\\<bookmark-bmenu-mode-map> 1502\\<bookmark-bmenu-mode-map>
1503\\[bookmark-bmenu-mark] -- mark bookmark to be displayed. 1503\\[bookmark-bmenu-mark] -- mark bookmark to be displayed.
1504\\[bookmark-bmenu-select] -- select bookmark of line point is on. 1504\\[bookmark-bmenu-select] -- select bookmark of line point is on.
@@ -2092,7 +2092,7 @@ passed as an argument. If called with two strings, then no prompting
2092is done. You must pass at least OLD-BOOKMARK when calling from Lisp. 2092is done. You must pass at least OLD-BOOKMARK when calling from Lisp.
2093 2093
2094While you are entering the new name, consecutive C-w's insert 2094While you are entering the new name, consecutive C-w's insert
2095consectutive words from the text of the buffer into the new bookmark 2095consecutive words from the text of the buffer into the new bookmark
2096name. 2096name.
2097 2097
2098Warning: this function only takes an EVENT as argument. Use the 2098Warning: this function only takes an EVENT as argument. Use the