nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

emacs: Return nil instead of "" in completing readers. 

* emacs/guix-utils.el (guix-completing-read): New procedure.
  (guix-define-readers): Use it.
This commit is contained in:
Alex Kost 2015-12-11 12:36:56 +03:00
parent ddf6948b22
commit dc690c445e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
emacs/guix-utils.el
View File

@ -214,6 +214,15 @@ If NO-MESSAGE? is non-nil, do not display a message about it."
See also `guix-copy-as-kill'." See also `guix-copy-as-kill'."
(guix-copy-as-kill (guix-command-string args) no-message?)) (guix-copy-as-kill (guix-command-string args) no-message?))
(defun guix-completing-read (prompt table &optional predicate
require-match initial-input
hist def inherit-input-method)
"Same as `completing-read' but return nil instead of an empty string."
(let ((res (completing-read prompt table predicate
require-match initial-input
hist def inherit-input-method)))
(unless (string= "" res) res)))
(defun guix-completing-read-multiple (prompt table &optional predicate (defun guix-completing-read-multiple (prompt table &optional predicate
require-match initial-input require-match initial-input
hist def inherit-input-method) hist def inherit-input-method)
@ -460,7 +469,7 @@ keywords are available:
`(defvar ,completions-var nil)) `(defvar ,completions-var nil))
,(when single-reader ,(when single-reader
`(guix-define-reader ,single-reader completing-read `(guix-define-reader ,single-reader guix-completing-read
,completions ,single-prompt)) ,completions ,single-prompt))
,(when multiple-reader ,(when multiple-reader