aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-04-20 15:56:59 -0400
committerStefan Monnier2012-04-20 15:56:59 -0400
commited571ccb1d14abc788a29c3b3bbf08aa4b951ab8 (patch)
treeaf1b22cc8aad2570c917cd44c4dde62a8a8eb514
parent61bb069e8c230357017be65d59ccea36c3cd91b1 (diff)
downloademacs-ed571ccb1d14abc788a29c3b3bbf08aa4b951ab8.tar.gz
emacs-ed571ccb1d14abc788a29c3b3bbf08aa4b951ab8.zip
* lisp/minibuffer.el (completion-file-name-table): Complete user names.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/minibuffer.el6
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b9e85ef29c..132aee66a9f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-04-20 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * minibuffer.el (completion-file-name-table): Complete user names.
4
12012-04-20 Leo Liu <sdl.web@gmail.com> 52012-04-20 Leo Liu <sdl.web@gmail.com>
2 6
3 * font-lock.el (lisp-font-lock-keywords-2): Add pcase, pcase-let 7 * font-lock.el (lisp-font-lock-keywords-2): Add pcase, pcase-let
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index c7e14ca481b..5a990f6ab35 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1817,6 +1817,12 @@ same as `substitute-in-file-name'."
1817 (condition-case nil 1817 (condition-case nil
1818 (cond 1818 (cond
1819 ((eq action 'metadata) '(metadata (category . file))) 1819 ((eq action 'metadata) '(metadata (category . file)))
1820 ((string-match-p "\\`~[^/\\]*\\'" string)
1821 (completion-table-with-context "~"
1822 (mapcar (lambda (u) (concat u "/"))
1823 (system-users))
1824 (substring string 1)
1825 pred action))
1820 ((eq (car-safe action) 'boundaries) 1826 ((eq (car-safe action) 'boundaries)
1821 (let ((start (length (file-name-directory string))) 1827 (let ((start (length (file-name-directory string)))
1822 (end (string-match-p "/" (cdr action)))) 1828 (end (string-match-p "/" (cdr action))))