~ruther/guix-local: emacs: Allow list functions to deal with nil values.

abc5b82971c1ab74c3e7df87bb1a49f63502f922 — Alex Kost 11 years ago b3bb82f

emacs: Allow list functions to deal with nil values.

* emacs/guix-list.el (guix-list-get-tabulated-entry): Call functions returning
  column value even for nil values.
  (guix-list-get-one-line): Adjust for accepting nil argument.

patch browse .tar.gz

1 files changed, 7 insertions(+), 4 deletions(-)

M emacs/guix-list.el

M emacs/guix-list.el => emacs/guix-list.el +7 -4

@@ 182,13 182,16 @@ Parameters are taken from ENTRY of ENTRY-TYPE."
      (let ((val (guix-get-key-val entry param))
            (fun (guix-get-key-val guix-list-column-value-methods
                                   entry-type param)))
-       (if (and val fun)
+       (if fun
            (funcall fun val entry)
          (guix-get-string val))))))
 
-(defun guix-list-get-one-line (str &optional _)
-  "Return one-line string from a multi-line STR."
-  (guix-get-one-line str))
+(defun guix-list-get-one-line (val &optional _)
+  "Return one-line string from a multi-line string VAL.
+VAL may be nil."
+  (if val
+      (guix-get-one-line val)
+    (guix-get-string nil)))
 
 (defun guix-list-get-time (seconds &optional _)
   "Return formatted time string from SECONDS."