*** empty log message ***

[gnu-emacs] / lisp / bookmark.el

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index b25c261c1e79eab71df950287a5a6fe1072bf322..0696f929584aa0b0efbae5ab244c026c4cb63b80 100644 (file)
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1049,6 +1049,8 @@ of the old one in the permanent bookmark record."
   (interactive
    (list (bookmark-completing-read "Jump to bookmark"
                                   bookmark-current-bookmark)))
+  (unless bookmark
+    (error "No bookmark specified"))
   (bookmark-maybe-historicize-string bookmark)
   (let ((cell (bookmark-jump-noselect bookmark)))
     (and cell
@@ -1353,7 +1355,9 @@ for a file, defaulting to the file defined by variable
                ((eq 'nospecial bookmark-version-control) version-control)
                (t
                 t))))
-         (write-file file)
+          (condition-case nil
+              (write-file file)
+            (file-error (message "Can't write %s" file)))
          (kill-buffer (current-buffer))
          (if (>= baud-rate 9600)
              (message "Saving bookmarks to file %s...done" file)))))))
@@ -2109,12 +2113,12 @@ strings returned are not."
     (define-key map [write]    '("Save Bookmarks As..." . bookmark-write))
     (define-key map [save]     '("Save Bookmarks" . bookmark-save))
     (define-key map [edit]     '("Edit Bookmark List" . bookmark-bmenu-list))
-    (define-key map [delete]   '("Delete Bookmark" . bookmark-delete))
-    (define-key map [rename]   '("Rename Bookmark" . bookmark-rename))
-    (define-key map [locate]   '("Insert Location" . bookmark-locate))
-    (define-key map [insert]   '("Insert Contents" . bookmark-insert))
-    (define-key map [set]      '("Set Bookmark" . bookmark-set))
-    (define-key map [jump]     '("Jump to Bookmark" . bookmark-jump))
+    (define-key map [delete]   '("Delete Bookmark..." . bookmark-delete))
+    (define-key map [rename]   '("Rename Bookmark..." . bookmark-rename))
+    (define-key map [locate]   '("Insert Location..." . bookmark-locate))
+    (define-key map [insert]   '("Insert Contents..." . bookmark-insert))
+    (define-key map [set]      '("Set Bookmark..." . bookmark-set))
+    (define-key map [jump]     '("Jump to Bookmark..." . bookmark-jump))
     map))
 
 ;;;###autoload