[Emacs-diffs] Changes to emacs/lisp/bookmark.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/bookmark.el
diff -c emacs/lisp/bookmark.el:1.64.2.1 emacs/lisp/bookmark.el:1.64.2.2
*** emacs/lisp/bookmark.el:1.64.2.1     Fri Apr 16 12:49:48 2004
--- emacs/lisp/bookmark.el      Mon Jun 28 07:28:26 2004
***************
*** 376,382 ****
      (if cell
          (setcdr cell filename)
        (nconc (bookmark-get-bookmark-record bookmark)
!              (list (cons 'filename filename))))))
  
  
  (defun bookmark-get-position (bookmark)
--- 376,386 ----
      (if cell
          (setcdr cell filename)
        (nconc (bookmark-get-bookmark-record bookmark)
!              (list (cons 'filename filename))))
!     (setq bookmark-alist-modification-count
!           (1+ bookmark-alist-modification-count))
!     (if (bookmark-time-to-save-p)
!         (bookmark-save))))
  
  
  (defun bookmark-get-position (bookmark)
***************
*** 893,899 ****
    (make-local-variable 'bookmark-annotation-name)
    (setq bookmark-annotation-name bookmark)
    (use-local-map bookmark-edit-annotation-mode-map)
!   (setq major-mode 'bookmark-edit-annotation-mode)
    (insert (funcall bookmark-read-annotation-text-func bookmark))
    (let ((annotation (bookmark-get-annotation bookmark)))
      (if (and annotation (not (string-equal annotation "")))
--- 897,904 ----
    (make-local-variable 'bookmark-annotation-name)
    (setq bookmark-annotation-name bookmark)
    (use-local-map bookmark-edit-annotation-mode-map)
!   (setq major-mode 'bookmark-edit-annotation-mode
!         mode-name "Edit Bookmark Annotation")
    (insert (funcall bookmark-read-annotation-text-func bookmark))
    (let ((annotation (bookmark-get-annotation bookmark)))
      (if (and annotation (not (string-equal annotation "")))
***************
*** 902,908 ****
  
  
  (defun bookmark-send-edited-annotation ()
!   "Use buffer contents (minus beginning with `#' as annotation for a 
bookmark."
    (interactive)
    (if (not (eq major-mode 'bookmark-edit-annotation-mode))
        (error "Not in bookmark-edit-annotation-mode"))
--- 907,914 ----
  
  
  (defun bookmark-send-edited-annotation ()
!   "Use buffer contents as annotation for a bookmark.
! Lines beginning with `#' are ignored."
    (interactive)
    (if (not (eq major-mode 'bookmark-edit-annotation-mode))
        (error "Not in bookmark-edit-annotation-mode"))
***************
*** 1489,1494 ****
--- 1495,1501 ----
    (define-key bookmark-bmenu-mode-map "m" 'bookmark-bmenu-mark)
    (define-key bookmark-bmenu-mode-map "l" 'bookmark-bmenu-load)
    (define-key bookmark-bmenu-mode-map "r" 'bookmark-bmenu-rename)
+   (define-key bookmark-bmenu-mode-map "R" 'bookmark-bmenu-relocate)
    (define-key bookmark-bmenu-mode-map "t" 'bookmark-bmenu-toggle-filenames)
    (define-key bookmark-bmenu-mode-map "a" 'bookmark-bmenu-show-annotation)
    (define-key bookmark-bmenu-mode-map "A" 
'bookmark-bmenu-show-all-annotations)
***************
*** 1587,1592 ****
--- 1594,1600 ----
    so the bookmark menu bookmark remains visible in its window.
  \\[bookmark-bmenu-switch-other-window] -- switch the other window to this 
bookmark.
  \\[bookmark-bmenu-rename] -- rename this bookmark \(prompts for new name\).
+ \\[bookmark-bmenu-relocate] -- relocate this bookmark's file \(prompts for 
new file\).
  \\[bookmark-bmenu-delete] -- mark this bookmark to be deleted, and move down.
  \\[bookmark-bmenu-delete-backwards] -- mark this bookmark to be deleted, and 
move up.
  \\[bookmark-bmenu-execute-deletions] -- delete bookmarks marked with 
`\\[bookmark-bmenu-delete]'.
***************
*** 2039,2044 ****
--- 2047,2061 ----
        (let ((bmrk (bookmark-bmenu-bookmark)))
          (message (bookmark-location bmrk)))))
  
+ (defun bookmark-bmenu-relocate ()
+   "Change the file path of the bookmark on the current line,
+   prompting with completion for the new path."
+   (interactive)
+   (if (bookmark-bmenu-check-position)
+       (let ((bmrk (bookmark-bmenu-bookmark))
+             (thispoint (point)))
+         (bookmark-relocate bmrk)
+         (goto-char thispoint))))
  
  
  ;;; Menu bar stuff.  Prefix is "bookmark-menu".