diff options
| -rw-r--r-- | lisp/bookmark.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 58e490ff3ec..0e068746ac1 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el | |||
| @@ -82,7 +82,7 @@ | |||
| 82 | 82 | ||
| 83 | (require 'pp) | 83 | (require 'pp) |
| 84 | 84 | ||
| 85 | (defconst bookmark-version "2.6.3" | 85 | (defconst bookmark-version "2.6.4" |
| 86 | "Version number of bookmark.el. This is not related to the version | 86 | "Version number of bookmark.el. This is not related to the version |
| 87 | of Emacs bookmark comes with; it is used solely by bookmark's | 87 | of Emacs bookmark comes with; it is used solely by bookmark's |
| 88 | maintainers to avoid version confusion.") | 88 | maintainers to avoid version confusion.") |
| @@ -1167,7 +1167,7 @@ minibuffer history list `bookmark-history'." | |||
| 1167 | (or no-history (bookmark-maybe-historicize-string bookmark)) | 1167 | (or no-history (bookmark-maybe-historicize-string bookmark)) |
| 1168 | (insert (bookmark-location bookmark))) | 1168 | (insert (bookmark-location bookmark))) |
| 1169 | 1169 | ||
| 1170 | ;;; old name for above: | 1170 | ;;;###autoload |
| 1171 | (defalias 'bookmark-locate 'bookmark-insert-location) | 1171 | (defalias 'bookmark-locate 'bookmark-insert-location) |
| 1172 | 1172 | ||
| 1173 | (defun bookmark-location (bookmark) | 1173 | (defun bookmark-location (bookmark) |
| @@ -1428,9 +1428,11 @@ explicitly." | |||
| 1428 | (define-key bookmark-bmenu-mode-map "2" 'bookmark-bmenu-2-window) | 1428 | (define-key bookmark-bmenu-mode-map "2" 'bookmark-bmenu-2-window) |
| 1429 | (define-key bookmark-bmenu-mode-map "1" 'bookmark-bmenu-1-window) | 1429 | (define-key bookmark-bmenu-mode-map "1" 'bookmark-bmenu-1-window) |
| 1430 | (define-key bookmark-bmenu-mode-map "j" 'bookmark-bmenu-this-window) | 1430 | (define-key bookmark-bmenu-mode-map "j" 'bookmark-bmenu-this-window) |
| 1431 | (define-key bookmark-bmenu-mode-map "\C-c\C-c" 'bookmark-bmenu-this-window) | ||
| 1431 | (define-key bookmark-bmenu-mode-map "f" 'bookmark-bmenu-this-window) | 1432 | (define-key bookmark-bmenu-mode-map "f" 'bookmark-bmenu-this-window) |
| 1432 | (define-key bookmark-bmenu-mode-map "o" 'bookmark-bmenu-other-window) | 1433 | (define-key bookmark-bmenu-mode-map "o" 'bookmark-bmenu-other-window) |
| 1433 | (define-key bookmark-bmenu-mode-map "\C-o" 'bookmark-bmenu-switch-other-window) | 1434 | (define-key bookmark-bmenu-mode-map "\C-o" |
| 1435 | 'bookmark-bmenu-switch-other-window) | ||
| 1434 | (define-key bookmark-bmenu-mode-map "s" 'bookmark-bmenu-save) | 1436 | (define-key bookmark-bmenu-mode-map "s" 'bookmark-bmenu-save) |
| 1435 | (define-key bookmark-bmenu-mode-map "k" 'bookmark-bmenu-delete) | 1437 | (define-key bookmark-bmenu-mode-map "k" 'bookmark-bmenu-delete) |
| 1436 | (define-key bookmark-bmenu-mode-map "\C-d" 'bookmark-bmenu-delete-backwards) | 1438 | (define-key bookmark-bmenu-mode-map "\C-d" 'bookmark-bmenu-delete-backwards) |