From fb11575f3cfe90b409a6ff364ba4c70777537499 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sat, 11 Dec 2021 06:50:58 +0100 Subject: [PATCH] Improve sqlite-mode--tablify tables * lisp/sqlite-mode.el (sqlite-mode--tablify): Tweak column widths and sanitize newlines. --- lisp/sqlite-mode.el | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lisp/sqlite-mode.el b/lisp/sqlite-mode.el index 9edb85b61ab..e33a040f7ed 100644 --- a/lisp/sqlite-mode.el +++ b/lisp/sqlite-mode.el @@ -76,7 +76,7 @@ (when prefix (insert prefix)) (dotimes (i (length widths)) - (insert (propertize (format (format "%%-%ds" (nth i widths)) + (insert (propertize (format (format "%%-%ds " (nth i widths)) (nth i columns)) 'face 'header-line))) (insert "\n") @@ -85,11 +85,14 @@ (when prefix (insert prefix)) (dotimes (i (length widths)) - (insert (format (format "%%%s%ds" - (if (numberp (nth i row)) - "" "-") - (nth i widths)) - (or (nth i row) "")))) + (let ((elem (nth i row))) + (insert (format (format "%%%s%ds " + (if (numberp elem) + "" "-") + (nth i widths)) + (if (numberp elem) + (nth i row) + (string-replace "\n" " " (or elem ""))))))) (put-text-property start (point) 'sqlite--row row) (insert "\n"))))) -- 2.39.5