diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-01-13 17:50:17 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-01-13 18:18:48 +0100 |
| commit | 8c986ab12034d67db836a881f57c69754d8073ae (patch) | |
| tree | bf5183011119695ac549d4cfff4dc2175e659397 /emacs/guix-pcomplete.el | |
| parent | 203795aceaabec0e0e5818e1650ad407d825d1b3 (diff) | |
| parent | 7a2eed3aac1ecd0bdf293e33a234fad58f2e5f9e (diff) | |
| download | patches-8c986ab12034d67db836a881f57c69754d8073ae.tar patches-8c986ab12034d67db836a881f57c69754d8073ae.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'emacs/guix-pcomplete.el')
| -rw-r--r-- | emacs/guix-pcomplete.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/emacs/guix-pcomplete.el b/emacs/guix-pcomplete.el index 85b267a78d..785e54ef6d 100644 --- a/emacs/guix-pcomplete.el +++ b/emacs/guix-pcomplete.el @@ -262,7 +262,8 @@ INPUT is the current partially completed string." (complete (guix-pcomplete-all-packages))) ((option? "-p" "--profile") (complete* (pcomplete-dirs))) - ((option? "-m" "--manifest") + ((or (option? "-f" "--install-from-file") + (option? "-m" "--manifest")) (complete* (pcomplete-entries))))) ((and (command? "archive" "build" "size") @@ -270,7 +271,9 @@ INPUT is the current partially completed string." (complete* guix-help-system-types)) ((and (command? "build") - (option? "-r" "--root")) + (or (option? "-f" "--file") + (option? "-r" "--root") + (string= "--with-source" option))) (complete* (pcomplete-entries))) ((and (command? "graph") |