X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/3f715d17fef56ee78a3df7ebb00d4e8b1aec37de..a3dae87a1b5405d2bffde7c2d829a5dbfc7ff274:/lisp/delim-col.el diff --git a/lisp/delim-col.el b/lisp/delim-col.el index 92e4fe1593..d9f8634fb5 100644 --- a/lisp/delim-col.el +++ b/lisp/delim-col.el @@ -1,7 +1,6 @@ ;;; delim-col.el --- prettify all columns in a region or rectangle -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1999-2011 Free Software Foundation, Inc. ;; Author: Vinicius Jose Latorre ;; Maintainer: Vinicius Jose Latorre @@ -126,40 +125,40 @@ "Prettify columns." :link '(emacs-library-link :tag "Source Lisp File" "delim-col.el") :prefix "delimit-columns-" - :group 'internal) + :group 'wp) (defcustom delimit-columns-str-before "" - "*Specify a string to be inserted before all columns." + "Specify a string to be inserted before all columns." :type '(string :tag "Before All Columns") :group 'columns) (defcustom delimit-columns-str-separator ", " - "*Specify a string to be inserted between each column." + "Specify a string to be inserted between each column." :type '(string :tag "Between Each Column") :group 'columns) (defcustom delimit-columns-str-after "" - "*Specify a string to be inserted after all columns." + "Specify a string to be inserted after all columns." :type '(string :tag "After All Columns") :group 'columns) (defcustom delimit-columns-before "" - "*Specify a string to be inserted before each column." + "Specify a string to be inserted before each column." :type '(string :tag "Before Each Column") :group 'columns) (defcustom delimit-columns-after "" - "*Specify a string to be inserted after each column." + "Specify a string to be inserted after each column." :type '(string :tag "After Each Column") :group 'columns) (defcustom delimit-columns-separator "\t" - "*Specify a regexp which separates each column." + "Specify a regexp which separates each column." :type '(regexp :tag "Column Separator") :group 'columns) (defcustom delimit-columns-format t - "*Specify how to format columns. + "Specify how to format columns. For examples below, consider: @@ -200,14 +199,14 @@ Any other value is treated as t." :group 'columns) (defcustom delimit-columns-extra t - "*Non-nil means that lines will have the same number of columns. + "Non-nil means that lines will have the same number of columns. This has effect only when there are lines with different number of columns." :type '(boolean :tag "Lines With Same Number Of Column") :group 'columns) (defcustom delimit-columns-start 0 - "*Specify column number to start prettifing. + "Specify column number to start prettifing. See also `delimit-columns-end' for documentation. @@ -222,7 +221,7 @@ column (column 0) is located at left corner." :group 'columns) (defcustom delimit-columns-end 1000000 - "*Specify column number to end prettifing. + "Specify column number to end prettifing. See also `delimit-columns-start' for documentation. @@ -241,6 +240,11 @@ column (column 0) is located at left corner." ;; User Commands: +;; to avoid compilation gripes +(defvar delimit-columns-max nil) +(defvar delimit-columns-limit nil) + + ;;;###autoload (defun delimit-columns-customize () "Customization of `columns' group." @@ -355,12 +359,7 @@ START and END delimits the corners of text rectangle." ;; Internal Variables and Functions: -;; to avoid compilation gripes -(defvar delimit-columns-max nil) -(defvar delimit-columns-limit nil) - - -(defun delimit-columns-rectangle-max (startpos &optional ignore1 ignore2) +(defun delimit-columns-rectangle-max (startpos &optional _ignore1 _ignore2) (set-marker delimit-columns-limit (point)) (goto-char startpos) (let ((ncol 1) @@ -393,7 +392,7 @@ START and END delimits the corners of text rectangle." (setq values (cdr values))))) -(defun delimit-columns-rectangle-line (startpos &optional ignore1 ignore2) +(defun delimit-columns-rectangle-line (startpos &optional _ignore1 _ignore2) (let ((len (length delimit-columns-max)) (ncol 0) origin) @@ -477,5 +476,4 @@ START and END delimits the corners of text rectangle." (provide 'delim-col) -;; arch-tag: 1cc0c5c5-1b2a-43e4-9ba5-bf9441cfd1a9 ;;; delim-col.el ends here