From 9e20722fecc2b1b633ad92ebfea2bd5eb3b29e4f Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Tue, 31 Oct 2000 11:57:12 +0000 Subject: [PATCH] Little programming improvement. (delimit-columns-str): New macro. (delimit-columns-region, delimit-columns-rectangle): Code fix. --- lisp/ChangeLog | 4 ++++ lisp/delim-col.el | 46 +++++++++++++++------------------------------- 2 files changed, 19 insertions(+), 31 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 32ed0642210..98f2beb8ddf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -19,6 +19,10 @@ (ps-print-preprint, ps-output, ps-begin-file, ps-begin-page) (ps-plot-region, ps-generate, ps-end-job): Code fix. + * delim-col.el: Little programming improvement. + (delimit-columns-str): New macro. + (delimit-columns-region, delimit-columns-rectangle): Code fix. + 2000-10-31 Kenichi Handa * term/mac-win.el: (decode-mac-roman, encode-mac-roman, diff --git a/lisp/delim-col.el b/lisp/delim-col.el index 749130c2a04..f24e187ba3c 100644 --- a/lisp/delim-col.el +++ b/lisp/delim-col.el @@ -4,7 +4,7 @@ ;; Author: Vinicius Jose Latorre ;; Maintainer: Vinicius Jose Latorre -;; Time-stamp: <2000/10/24 10:35:58 vinicius> +;; Time-stamp: <2000/10/28 09:34:15 Vinicius> ;; Version: 2.1 ;; Keywords: internal ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/ @@ -250,6 +250,10 @@ column (column 0) is located at left corner." (customize-group 'columns)) +(defmacro delimit-columns-str (str) + `(if (stringp ,str) ,str "")) + + ;;;###autoload (defun delimit-columns-region (start end) "Prettify all columns in a text region. @@ -257,25 +261,15 @@ column (column 0) is located at left corner." START and END delimits the text region." (interactive "*r") (let ((delimit-columns-str-before - (if (stringp delimit-columns-str-before) - delimit-columns-str-before - "")) + (delimit-columns-str delimit-columns-str-before)) (delimit-columns-str-separator - (if (stringp delimit-columns-str-separator) - delimit-columns-str-separator - " ")) + (delimit-columns-str delimit-columns-str-separator)) (delimit-columns-str-after - (if (stringp delimit-columns-str-after) - delimit-columns-str-after - "")) + (delimit-columns-str delimit-columns-str-after)) (delimit-columns-before - (if (stringp delimit-columns-before) - delimit-columns-before - "")) + (delimit-columns-str delimit-columns-before)) (delimit-columns-after - (if (stringp delimit-columns-after) - delimit-columns-after - "")) + (delimit-columns-str delimit-columns-after)) (delimit-columns-start (if (and (integerp delimit-columns-start) (>= delimit-columns-start 0)) @@ -323,25 +317,15 @@ START and END delimits the text region." START and END delimits the corners of text rectangle." (interactive "*r") (let ((delimit-columns-str-before - (if (stringp delimit-columns-str-before) - delimit-columns-str-before - "")) + (delimit-columns-str delimit-columns-str-before)) (delimit-columns-str-separator - (if (stringp delimit-columns-str-separator) - delimit-columns-str-separator - " ")) + (delimit-columns-str delimit-columns-str-separator)) (delimit-columns-str-after - (if (stringp delimit-columns-str-after) - delimit-columns-str-after - "")) + (delimit-columns-str delimit-columns-str-after)) (delimit-columns-before - (if (stringp delimit-columns-before) - delimit-columns-before - "")) + (delimit-columns-str delimit-columns-before)) (delimit-columns-after - (if (stringp delimit-columns-after) - delimit-columns-after - "")) + (delimit-columns-str delimit-columns-after)) (delimit-columns-start (if (and (integerp delimit-columns-start) (>= delimit-columns-start 0)) -- 2.39.5