Replaced a few ternary if statements returning nil with when statements.

Author: Jason Duncan

TODO.org

@@ -20,7 +20,7 @@
 *** NOTE  The version using `and' is slightly more concise, but I believe the compromise I made between the two suggestions to be more readable.
 *** NOTE2 I'm wary of going all the way to string-blank-p as I wouldn't want to break potential compatibility with a table format which uses whitespace in a way I hadn't thought of.
 
-** TODO Could the last conditional in format-table-remove-noise be written with (when ret ...) instead of (if (not ret) nil ...)?
+** DONE Could the last conditional in format-table-remove-noise be written with (when ret ...) instead of (if (not ret) nil ...)?
 ** TODO Rather than
 
 #+BEGIN_SRC emacs-lisp

format-table.el

@@ -95,13 +95,13 @@
 (defun format-table-remove-noise (lines input-mode)
   "Given the set of table LINES and some extra information in INPUT-MODE, filter out any empty lines or lines which otherwise do not belong to the table of values."
   (let* ((row-count-format (plist-get input-mode :row-count-format))
-         (regexp (if (not row-count-format) nil (format row-count-format "[[:digit:]]+")))
+         (regexp (when row-count-format (format row-count-format "[[:digit:]]+")))
          ret)
     (dolist (cur-line (reverse lines) ret)
       (unless (or (string-empty-p cur-line)
                   (and regexp (string-match regexp cur-line)))
         (push cur-line ret)))
-    (if (not ret) nil
+    (when ret
       (setq ret (if (plist-get input-mode :top-border-fn) (-slice ret 1) ret))
       (if (plist-get input-mode :top-border-fn)
           (-slice ret 0 (1- (length ret))) ret))))
@@ -247,7 +247,7 @@ otherwise values will be padded to the right with spaces."
     (let* ((lines (split-string str "[
 ]+"))
            (lines (format-table-remove-noise lines input-mode)))
-      (if (not lines) nil
+      (when lines
         (let* ((col-widths (format-table-get-col-widths (car (cdr lines)) input-mode)))
           (format-table-parse-table lines col-widths input-mode))))))