Merge from emacs-23; up to 2010-06-10T05:17:21Z!rgm@gnu.org.

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

diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index 1fe184a84c4d0c887a9711cc8669f120d501edac..d9f8634fb54dfe6a2f1c37cf59c99a89cdcff524 100644 (file)
--- 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 <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
@@ -126,7 +125,7 @@
   "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."
@@ -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