[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp bookmark.el ChangeLog
From: |
Karl Fogel |
Subject: |
[Emacs-diffs] emacs/lisp bookmark.el ChangeLog |
Date: |
Sat, 10 Oct 2009 21:48:27 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Karl Fogel <kfogel> 09/10/10 21:48:26
Modified files:
lisp : bookmark.el ChangeLog
Log message:
* bookmark.el
(Info-suffix-list): Remove this completely unused variable.
(bookmark-current-point): Remove this obsolete variable.
(bookmark-set, bookmark-rename, bookmark-send-edited-annotation):
Adjust for removal of bookmark-current-point.
(bookmarks-already-loaded, bookmark-current-buffer,
bookmark-yank-point):
Document. (Bug#4188)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/bookmark.el?cvsroot=emacs&r1=1.134&r2=1.135
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16399&r2=1.16400
Patches:
Index: bookmark.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/bookmark.el,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- bookmark.el 9 Oct 2009 06:50:14 -0000 1.134
+++ bookmark.el 10 Oct 2009 21:48:22 -0000 1.135
@@ -278,7 +278,8 @@
whose calling discipline HANDLER-FUNC should of course match.")
-(defvar bookmarks-already-loaded nil)
+(defvar bookmarks-already-loaded nil
+ "Non-nil iff bookmarks have been loaded from `bookmark-default-file'.")
;; more stuff added by db.
@@ -299,11 +300,18 @@
"Length of the context strings recorded on either side of a bookmark.")
-(defvar bookmark-current-point 0)
-(defvar bookmark-yank-point 0)
-(defvar bookmark-current-buffer nil)
+(defvar bookmark-current-buffer nil
+ "The buffer in which a bookmark is currently being set or renamed.
+Functions that insert strings into the minibuffer use this to know
+the source buffer for that information; see `bookmark-yank-word' and
+`bookmark-insert-current-bookmark' for example.")
+
+
+(defvar bookmark-yank-point 0
+ "The next point from which to pull source text for `bookmark-yank-word'.
+This point is in `bookmark-curent-buffer'.")
+
-(defvar Info-suffix-list)
;; Helper functions.
@@ -762,7 +770,6 @@
(bookmark-maybe-load-default-file)
- (setq bookmark-current-point (point))
(setq bookmark-yank-point (point))
(setq bookmark-current-buffer (current-buffer))
@@ -777,9 +784,8 @@
(bookmark-store str (cdr record) no-overwrite)
;; Ask for an annotation buffer for this bookmark
- (if bookmark-use-annotations
- (bookmark-edit-annotation str)
- (goto-char bookmark-current-point)))))
+ (when bookmark-use-annotations
+ (bookmark-edit-annotation str)))))
(defun bookmark-kill-line (&optional newline-too)
"Kill from point to end of line.
@@ -860,8 +866,7 @@
(let ((annotation (buffer-substring-no-properties (point-min) (point-max)))
(bookmark bookmark-annotation-name))
(bookmark-set-annotation bookmark annotation)
- (bookmark-bmenu-surreptitiously-rebuild-list)
- (goto-char bookmark-current-point))
+ (bookmark-bmenu-surreptitiously-rebuild-list))
(kill-buffer (current-buffer)))
@@ -1195,7 +1200,6 @@
(bookmark-maybe-historicize-string old)
(bookmark-maybe-load-default-file)
- (setq bookmark-current-point (point))
(setq bookmark-yank-point (point))
(setq bookmark-current-buffer (current-buffer))
(let ((newname
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16399
retrieving revision 1.16400
diff -u -b -r1.16399 -r1.16400
--- ChangeLog 10 Oct 2009 20:50:39 -0000 1.16399
+++ ChangeLog 10 Oct 2009 21:48:23 -0000 1.16400
@@ -1,3 +1,13 @@
+2009-10-10 Karl Fogel <address@hidden>
+
+ * bookmark.el (Info-suffix-list): Remove this unused variable.
+ (bookmark-current-point): Remove this obsolete variable.
+ (bookmark-set, bookmark-rename, bookmark-send-edited-annotation):
+ Adjust for removal of bookmark-current-point.
+
+ (bookmarks-already-loaded, bookmark-current-buffer)
+ (bookmark-yank-point): Document. (Bug#4188)
+
2009-10-10 Glenn Morris <address@hidden>
* calendar/calendar.el (calendar-split-width-threshold): New option.
- [Emacs-diffs] emacs/lisp bookmark.el ChangeLog, Karl Fogel, 2009/10/04
- [Emacs-diffs] emacs/lisp bookmark.el ChangeLog, Karl Fogel, 2009/10/04
- [Emacs-diffs] emacs/lisp bookmark.el ChangeLog, Karl Fogel, 2009/10/04
- [Emacs-diffs] emacs/lisp bookmark.el ChangeLog, Karl Fogel, 2009/10/04
- [Emacs-diffs] emacs/lisp bookmark.el ChangeLog, Karl Fogel, 2009/10/05
- [Emacs-diffs] emacs/lisp bookmark.el ChangeLog, Karl Fogel, 2009/10/09
- [Emacs-diffs] emacs/lisp bookmark.el ChangeLog, Karl Fogel, 2009/10/09
- [Emacs-diffs] emacs/lisp bookmark.el ChangeLog, Karl Fogel, 2009/10/09
- [Emacs-diffs] emacs/lisp bookmark.el ChangeLog,
Karl Fogel <=
- [Emacs-diffs] emacs/lisp bookmark.el ChangeLog, Karl Fogel, 2009/10/10
- [Emacs-diffs] emacs/lisp bookmark.el ChangeLog, Karl Fogel, 2009/10/24