Mercurial > emacs
changeset 107137:cb0891567332
Merge from trunk
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Wed, 10 Feb 2010 10:34:18 +0100 |
| parents | c7c70f9fa3d7 (current diff) 12a12a93b1a3 (diff) |
| children | 57518784c193 |
| files | |
| diffstat | 3 files changed, 16 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Feb 10 10:29:28 2010 +0100 +++ b/lisp/ChangeLog Wed Feb 10 10:34:18 2010 +0100 @@ -1,3 +1,13 @@ +2010-02-10 Chong Yidong <cyd@stupidchicken.com> + + * iswitchb.el (iswitchb-completions): Revert last change. + +2010-02-10 Michael Albinus <michael.albinus@gmx.de> + + * ls-lisp.el (ls-lisp-insert-directory): Wen WILDCARD-REGEXP and + FULL-DIRECTORY-P are nil, and FILE is absolute, expand it. This + prevents file names like "~/" been listed literally. + 2010-02-10 Dan Nicolaescu <dann@ics.uci.edu> * term/xterm.el (xterm-maybe-set-dark-background-mode): Remove
--- a/lisp/iswitchb.el Wed Feb 10 10:29:28 2010 +0100 +++ b/lisp/iswitchb.el Wed Feb 10 10:34:18 2010 +0100 @@ -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) - (or recentf-list bookmark-alist)) + recentf-list) (setq iswitchb-virtual-buffers nil) (let ((head recentf-list) name) (while head @@ -1289,30 +1289,15 @@ (setq iswitchb-virtual-buffers (cons (cons name (car head)) 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)) + (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/ls-lisp.el Wed Feb 10 10:29:28 2010 +0100 +++ b/lisp/ls-lisp.el Wed Feb 10 10:34:18 2010 +0100 @@ -400,6 +400,7 @@ ;; If not full-directory-p, FILE *must not* end in /, as ;; file-attributes will not recognize a symlink to a directory, ;; so must make it a relative filename as ls does: + (if (file-name-absolute-p file) (setq file (expand-file-name file))) (if (eq (aref file (1- (length file))) ?/) (setq file (substring file 0 -1))) (let ((fattr (file-attributes file 'string)))