[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: |
Mon, 05 Oct 2009 02:38:39 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Karl Fogel <kfogel> 09/10/05 02:38:38
Modified files:
lisp : bookmark.el ChangeLog
Log message:
* bookmark.el (bookmark-handle-bookmark): When relocating a bookmark,
don't use a file dialog, because they usually don't know how to read
a directory target from the user. (Bug#4230)
Also, make sure the prompt can display directories as well as files.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/bookmark.el?cvsroot=emacs&r1=1.129&r2=1.130
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16355&r2=1.16356
Patches:
Index: bookmark.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/bookmark.el,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- bookmark.el 5 Oct 2009 01:47:00 -0000 1.129
+++ bookmark.el 5 Oct 2009 02:38:35 -0000 1.130
@@ -1075,14 +1075,20 @@
;; `bookmark' can either be a bookmark name (found in
;; `bookmark-alist') or a bookmark object. If it's an object, we
;; assume it's a bookmark used internally by some other package.
- (let ((file (bookmark-get-filename bookmark)))
+ (let* ((file (bookmark-get-filename bookmark))
+ ;; If file is not a directory, this should be a no-op.
+ (display-name (directory-file-name file)))
(when file ;Don't know how to relocate if there's no `file'.
- (setq file (expand-file-name file))
(ding)
- (if (y-or-n-p (concat (file-name-nondirectory file)
- " nonexistent. Relocate \""
- bookmark
- "\"? "))
+ ;; Dialog boxes can accept a file target, but usually don't
+ ;; know how to accept a directory target (at least, this
+ ;; was true in Gnome on GNU/Linux, and Bug#4230 says it's
+ ;; true on Windows as well). Thus, suppress file dialogs
+ ;; when relocating.
+ (let ((use-dialog-box nil)
+ (use-file-dialog nil))
+ (if (y-or-n-p (concat display-name " nonexistent. Relocate \""
+ bookmark "\"? "))
(progn
(bookmark-relocate bookmark)
;; Try again.
@@ -1091,7 +1097,7 @@
(bookmark-get-bookmark bookmark)))
(message
"Bookmark not relocated; consider removing it \(%s\)." bookmark)
- (signal (car err) (cdr err))))))))
+ (signal (car err) (cdr err)))))))))
;; Added by db.
(when (stringp bookmark)
(setq bookmark-current-bookmark bookmark))
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16355
retrieving revision 1.16356
diff -u -b -r1.16355 -r1.16356
--- ChangeLog 5 Oct 2009 01:47:00 -0000 1.16355
+++ ChangeLog 5 Oct 2009 02:38:35 -0000 1.16356
@@ -1,5 +1,12 @@
2009-10-04 Karl Fogel <address@hidden>
+ * bookmark.el (bookmark-handle-bookmark): When relocating a bookmark,
+ don't use a file dialog, because they usually don't know how to read
+ a directory target from the user. (Bug#4230)
+ Also, make sure the prompt can display directories as well as files.
+
+2009-10-04 Karl Fogel <address@hidden>
+
* bookmark.el (bookmark-set, bookmark-buffer-name):
Improve doc strings. (Bug#1193)
- [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 <=
- [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, 2009/10/10
- [Emacs-diffs] emacs/lisp bookmark.el ChangeLog, Karl Fogel, 2009/10/10
- [Emacs-diffs] emacs/lisp bookmark.el ChangeLog, Karl Fogel, 2009/10/24