HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make url-queue not kill a random buffer on error
[bpt/emacs.git]
/
lisp
/
bookmark.el
diff --git
a/lisp/bookmark.el
b/lisp/bookmark.el
index
cd946e4
..
20a4e52
100644
(file)
--- a/
lisp/bookmark.el
+++ b/
lisp/bookmark.el
@@
-1,6
+1,6
@@
;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later
;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later
-;; Copyright (C) 1993-1997, 2001-201
1
Free Software Foundation, Inc.
+;; Copyright (C) 1993-1997, 2001-201
2
Free Software Foundation, Inc.
;; Author: Karl Fogel <kfogel@red-bean.com>
;; Maintainer: Karl Fogel <kfogel@red-bean.com>
;; Author: Karl Fogel <kfogel@red-bean.com>
;; Maintainer: Karl Fogel <kfogel@red-bean.com>
@@
-83,7
+83,7
@@
To specify the file in which to save them, modify the variable
"The `.emacs.bmk' file used to be called this name.")
"The `.emacs.bmk' file used to be called this name.")
-;; defvar
r
ed to avoid a compilation warning:
+;; defvared to avoid a compilation warning:
(defvar bookmark-file nil
"Old name for `bookmark-default-file'.")
(defvar bookmark-file nil
"Old name for `bookmark-default-file'.")
@@
-1504,9
+1504,7
@@
method buffers use to resolve name collisions."
(define-key map "a" 'bookmark-bmenu-show-annotation)
(define-key map "A" 'bookmark-bmenu-show-all-annotations)
(define-key map "e" 'bookmark-bmenu-edit-annotation)
(define-key map "a" 'bookmark-bmenu-show-annotation)
(define-key map "A" 'bookmark-bmenu-show-all-annotations)
(define-key map "e" 'bookmark-bmenu-edit-annotation)
- ;; The original binding of M-g hides the M-g prefix map.
- ;; If someone has a better idea than M-g s, I'm open to suggestions.
- (define-key map [?\M-g ?s] 'bookmark-bmenu-search)
+ (define-key map "/" 'bookmark-bmenu-search)
(define-key map [mouse-2] 'bookmark-bmenu-other-window-with-mouse)
map))
(define-key map [mouse-2] 'bookmark-bmenu-other-window-with-mouse)
map))
@@
-1541,9
+1539,7
@@
deletion, or > if it is flagged for displaying."
(bookmark-maybe-load-default-file)
(let ((buf (get-buffer-create "*Bookmark List*")))
(if (called-interactively-p 'interactive)
(bookmark-maybe-load-default-file)
(let ((buf (get-buffer-create "*Bookmark List*")))
(if (called-interactively-p 'interactive)
- (if (or (window-dedicated-p) (window-minibuffer-p))
- (pop-to-buffer buf)
- (switch-to-buffer buf))
+ (switch-to-buffer buf)
(set-buffer buf)))
(let ((inhibit-read-only t))
(erase-buffer)
(set-buffer buf)))
(let ((inhibit-read-only t))
(erase-buffer)
@@
-1845,7
+1841,7
@@
With a prefix arg, prompts for a file to save them in."
(menu (current-buffer))
(pop-up-windows t))
(delete-other-windows)
(menu (current-buffer))
(pop-up-windows t))
(delete-other-windows)
- (switch-to-buffer (other-buffer))
+ (switch-to-buffer (other-buffer)
nil t
)
(bookmark--jump-via bmrk 'pop-to-buffer)
(bury-buffer menu)))
(bookmark--jump-via bmrk 'pop-to-buffer)
(bury-buffer menu)))
@@
-2181,7
+2177,8
@@
This also runs `bookmark-exit-hook'."
(bookmark-time-to-save-p t)
(bookmark-save)))
(bookmark-time-to-save-p t)
(bookmark-save)))
-(add-hook 'kill-emacs-hook 'bookmark-exit-hook-internal)
+(unless noninteractive
+ (add-hook 'kill-emacs-hook 'bookmark-exit-hook-internal))
(defun bookmark-unload-function ()
"Unload the Bookmark library."
(defun bookmark-unload-function ()
"Unload the Bookmark library."