Commit 752665dd authored by David Kågedal's avatar David Kågedal
Browse files

* completing-read.el (lyskom-read-conf-no): Hantera även en

conf-stat.
(lyskom-read-conf-stat): Dito.
(lyskom-read-conf-name): Dito.
parent 9a101e06
...@@ -117,6 +117,7 @@ See lyskom-read-conf for a description of the parameters." ...@@ -117,6 +117,7 @@ See lyskom-read-conf for a description of the parameters."
(let ((conf-z-info (lyskom-read-conf prompt type empty initial mustmatch))) (let ((conf-z-info (lyskom-read-conf prompt type empty initial mustmatch)))
(cond ((null conf-z-info) 0) (cond ((null conf-z-info) 0)
((stringp conf-z-info) 0) ((stringp conf-z-info) 0)
((lyskom-conf-stat-p conf-z-info) (conf-stat->conf-no conf-z-info))
(t (conf-z-info->conf-no conf-z-info))))) (t (conf-z-info->conf-no conf-z-info)))))
(defun lyskom-read-conf-stat (prompt type &optional empty initial mustmatch) (defun lyskom-read-conf-stat (prompt type &optional empty initial mustmatch)
...@@ -127,6 +128,7 @@ See lyskom-read-conf for a description of the parameters." ...@@ -127,6 +128,7 @@ See lyskom-read-conf for a description of the parameters."
(let ((conf-z-info (lyskom-read-conf prompt type empty initial mustmatch))) (let ((conf-z-info (lyskom-read-conf prompt type empty initial mustmatch)))
(cond ((null conf-z-info) nil) (cond ((null conf-z-info) nil)
((stringp conf-z-info) nil) ((stringp conf-z-info) nil)
((lyskom-conf-stat-p conf-z-info) conf-z-info)
(t (blocking-do 'get-conf-stat (t (blocking-do 'get-conf-stat
(conf-z-info->conf-no conf-z-info)))))) (conf-z-info->conf-no conf-z-info))))))
...@@ -138,6 +140,7 @@ See lyskom-read-conf for a description of the parameters." ...@@ -138,6 +140,7 @@ See lyskom-read-conf for a description of the parameters."
(let ((conf-z-info (lyskom-read-conf prompt type empty initial mustmatch))) (let ((conf-z-info (lyskom-read-conf prompt type empty initial mustmatch)))
(cond ((null conf-z-info) "") (cond ((null conf-z-info) "")
((stringp conf-z-info) conf-z-info) ((stringp conf-z-info) conf-z-info)
((lyskom-conf-stat-p conf-z-info) (conf-stat->name conf-z-info)
(t (conf-z-info->name conf-z-info))))) (t (conf-z-info->name conf-z-info)))))
(defun lyskom-read-conf (prompt type &optional empty initial mustmatch) (defun lyskom-read-conf (prompt type &optional empty initial mustmatch)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment