[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
33/35: emacs: Return nil instead of "" in completing readers.
From: |
Alex Kost |
Subject: |
33/35: emacs: Return nil instead of "" in completing readers. |
Date: |
Fri, 11 Dec 2015 11:42:44 +0000 |
alezost pushed a commit to branch wip-refactor-emacs-ui
in repository guix.
commit 2070a2f2faa02267c0df7f0ddb1166ee55848148
Author: Alex Kost <address@hidden>
Date: Fri Dec 11 12:36:56 2015 +0300
emacs: Return nil instead of "" in completing readers.
* emacs/guix-utils.el (guix-completing-read): New procedure.
(guix-define-readers): Use it.
---
emacs/guix-utils.el | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/emacs/guix-utils.el b/emacs/guix-utils.el
index a67d0e7..a8942f6 100644
--- a/emacs/guix-utils.el
+++ b/emacs/guix-utils.el
@@ -212,6 +212,15 @@ If NO-MESSAGE? is non-nil, do not display a message about
it."
See also `guix-copy-as-kill'."
(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
require-match initial-input
hist def inherit-input-method)
@@ -458,7 +467,7 @@ keywords are available:
`(defvar ,completions-var nil))
,(when single-reader
- `(guix-define-reader ,single-reader completing-read
+ `(guix-define-reader ,single-reader guix-completing-read
,completions ,single-prompt))
,(when multiple-reader
- 24/35: emacs: Improve messages for packages found by ID., (continued)
- 24/35: emacs: Improve messages for packages found by ID., Alex Kost, 2015/12/11
- 21/35: emacs: Split 'guix-root-map' keymap., Alex Kost, 2015/12/11
- 23/35: emacs: Generalize buffer reverting., Alex Kost, 2015/12/11
- 25/35: emacs: info: Buttonize package name heading., Alex Kost, 2015/12/11
- 22/35: emacs: Generalize buffer redisplaying., Alex Kost, 2015/12/11
- 27/35: emacs: info: Get rid of syntactic fontification., Alex Kost, 2015/12/11
- 18/35: emacs: info: Split 'guix-info-format' variable., Alex Kost, 2015/12/11
- 17/35: emacs: Factorize macros for defining interfaces., Alex Kost, 2015/12/11
- 29/35: emacs: Reorganize 'readers' code., Alex Kost, 2015/12/11
- 31/35: emacs: Add 'list-single' variables., Alex Kost, 2015/12/11
- 33/35: emacs: Return nil instead of "" in completing readers.,
Alex Kost <=
- 26/35: emacs: Generalize buffer naming., Alex Kost, 2015/12/11
- 32/35: emacs: Add 'guix-list-get-display-entries'., Alex Kost, 2015/12/11
- 16/35: emacs: info: Generalize inserting and formatting., Alex Kost, 2015/12/11
- 35/35: emacs: Add "B" key to display latest builds., Alex Kost, 2015/12/11
- 34/35: emacs: Add Hydra interface., Alex Kost, 2015/12/11
- 28/35: emacs: Generalize buffer interface., Alex Kost, 2015/12/11
- 30/35: emacs: Reorganize package/generation UI code., Alex Kost, 2015/12/11