Mercurial > emacs
changeset 107270:444ecbd20d25
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Wed, 03 Feb 2010 21:56:48 +0000 |
| parents | 19af79cef24d (current diff) 25a0d9b486ba (diff) |
| children | af8dcc16162f |
| files | |
| diffstat | 4 files changed, 38 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Feb 02 23:25:16 2010 +0000 +++ b/lisp/ChangeLog Wed Feb 03 21:56:48 2010 +0000 @@ -1,3 +1,19 @@ +2010-02-03 John Wiegley <jwiegley@gmail.com> + + * iswitchb.el (iswitchb-completions): Add bookmark files to the + list of files considered for "virtual buffer" completions. + +2010-02-03 Michael Albinus <michael.albinus@gmx.de> + + * net/ange-ftp.el (ange-ftp-insert-directory): Parse directory + also in case of (and (not full) (not wildcard)). This is needed, + when dired is called with a list of files, which are not in + `default-directory'. (Bug#5478) + +2010-02-03 Stefan Monnier <monnier@iro.umontreal.ca> + + * vc-hooks.el (vc-path): Make it an obsolete var, rather than function. + 2010-02-02 Juri Linkov <juri@jurta.org> * textmodes/ispell.el (ispell-message-text-end): Remove final newline
--- a/lisp/iswitchb.el Tue Feb 02 23:25:16 2010 +0000 +++ b/lisp/iswitchb.el Wed Feb 03 21:56:48 2010 +0000 @@ -1274,7 +1274,7 @@ ;; consult the list of past visited files, to see if we can find ;; the file which the user might thought was still open. (when (and iswitchb-use-virtual-buffers (null comps) - recentf-list) + (or recentf-list bookmark-alist)) (setq iswitchb-virtual-buffers nil) (let ((head recentf-list) name) (while head @@ -1289,15 +1289,30 @@ (setq iswitchb-virtual-buffers (cons (cons name (car head)) iswitchb-virtual-buffers))) - (setq head (cdr head))) - (setq iswitchb-virtual-buffers (nreverse iswitchb-virtual-buffers) - comps (mapcar 'car iswitchb-virtual-buffers)) + (setq head (cdr head)))) + (let ((head bookmark-alist) name path) + (while head + (if (and (setq path (cdr (assq 'filename (cdar head)))) + (setq name (file-name-nondirectory path)) + (string-match (if iswitchb-regexp + iswitchb-text + (regexp-quote iswitchb-text)) name) + (null (get-file-buffer path)) + (not (assoc name iswitchb-virtual-buffers)) + (not (iswitchb-ignore-buffername-p name)) + (file-exists-p path)) + (setq iswitchb-virtual-buffers + (cons (cons name path) + iswitchb-virtual-buffers))) + (setq head (cdr head)))) + (setq iswitchb-virtual-buffers (nreverse iswitchb-virtual-buffers) + comps (mapcar 'car iswitchb-virtual-buffers)) (let ((comp comps)) (while comp (put-text-property 0 (length (car comp)) 'face 'iswitchb-virtual-matches (car comp)) - (setq comp (cdr comp)))))) + (setq comp (cdr comp))))) (cond ((null comps) (format " %sNo match%s" open-bracket-determined
--- a/lisp/net/ange-ftp.el Tue Feb 02 23:25:16 2010 +0000 +++ b/lisp/net/ange-ftp.el Wed Feb 03 21:56:48 2010 +0000 @@ -4534,7 +4534,7 @@ ;; Remove "d" which dired added to `switches'. (setq switches (substring switches 0 (match-beginning 0)))) (let* ((dirlist (ange-ftp-ls (or (file-name-directory file) ".") - switches nil)) + switches 'parse)) (filename (file-name-nondirectory (directory-file-name file))) (case-fold-search nil)) ;; FIXME: This presumes a particular output format, which is
--- a/lisp/vc-hooks.el Tue Feb 02 23:25:16 2010 +0000 +++ b/lisp/vc-hooks.el Wed Feb 03 21:56:48 2010 +0000 @@ -89,7 +89,7 @@ :type '(repeat directory) :group 'vc) -(make-obsolete 'vc-path "should not be necessary anymore." "23.2") +(make-obsolete-variable 'vc-path "should not be necessary anymore." "23.2") (defcustom vc-make-backup-files nil "If non-nil, backups of registered files are made as with other files.