(gdb-flush-pending-output): New variable.

[gnu-emacs] / lisp / delim-col.el

diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index 1cac7ce3ed1078a9cf96ba26a14db8b9b8a22929..b5be7ff4ebc9a2942fcae65035a2398c4c5abdb3 100644 (file)
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -1,13 +1,13 @@
-;;; delim-col.el --- Prettify all columns in a region or rectangle.
+;;; delim-col.el --- prettify all columns in a region or rectangle
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
-;; Author:     Vinicius Jose Latorre <vinicius@cpqd.com.br>
-;; Maintainer: Vinicius Jose Latorre <vinicius@cpqd.com.br>
-;; Time-stamp: <2000/10/23 10:51:25 vinicius>
-;; Version:    2.0
-;; Keywords:   internal
-;; X-URL:      http://www.cpqd.com.br/~vinicius/emacs/
+;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
+;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
+;; Time-stamp: <2004/03/09 21:32:06 vinicius>
+;; Version: 2.1
+;; Keywords: internal
+;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
 
 ;; This file is part of GNU 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))
@@ -293,7 +287,7 @@ START and END delimits the text region."
        (goto-char start)
        (beginning-of-line)
        ;; get maximum length for each column
-       (and delimit-columns-align-columns
+       (and delimit-columns-format
             (save-excursion
               (while (< (point) the-end)
                 (delimit-columns-rectangle-max
@@ -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))
@@ -356,7 +340,7 @@ START and END delimits the corners of text rectangle."
        delimit-columns-max)
     (when (<= delimit-columns-start delimit-columns-end)
       ;; get maximum length for each column
-      (and delimit-columns-align-columns
+      (and delimit-columns-format
           (save-excursion
             (operate-on-rectangle 'delimit-columns-rectangle-max
                                   start the-end nil)))
@@ -378,7 +362,7 @@ START and END delimits the corners of text rectangle."
 (defvar delimit-columns-limit nil)
 
 
-(defun delimit-columns-rectangle-max (startpos &optional ignore ignore)
+(defun delimit-columns-rectangle-max (startpos &optional ignore1 ignore2)
   (set-marker delimit-columns-limit (point))
   (goto-char startpos)
   (let ((ncol 1)
@@ -411,7 +395,7 @@ START and END delimits the corners of text rectangle."
       (setq values (cdr values)))))
 
 
-(defun delimit-columns-rectangle-line (startpos &optional ignore ignore)
+(defun delimit-columns-rectangle-line (startpos &optional ignore1 ignore2)
   (let ((len  (length delimit-columns-max))
        (ncol 0)
        origin)
@@ -495,4 +479,5 @@ START and END delimits the corners of text rectangle."
 (provide 'delim-col)
 
 
+;;; arch-tag: 1cc0c5c5-1b2a-43e4-9ba5-bf9441cfd1a9
 ;;; delim-col.el ends here