X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/22a89ee866d6fd7fe735e28d36d6e5739e6eb434..4a6fd75f1db43176d8c6228f83876196bf4fc02a:/lisp/tabify.el

diff --git a/lisp/tabify.el b/lisp/tabify.el
index ab28397ab0..62d50aa033 100644
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -1,15 +1,14 @@
 ;;; tabify.el --- tab conversion commands for Emacs
 
-;; Maintainer: FSF
-;; Last-Modified: 9 May 1991
+;; Copyright (C) 1985, 1994 Free Software Foundation, Inc.
 
-;; Copyright (C) 1985 Free Software Foundation, Inc.
+;; Maintainer: FSF
 
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -21,23 +20,30 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Commentary:
+
+;; Commands to optimize spaces to tabs or expand tabs to spaces in a region
+;; (`tabify' and `untabify').  The variable tab-width does the obvious.
+
 ;;; Code:
 
 ;;;###autoload
 (defun untabify (start end)
   "Convert all tabs in region to multiple spaces, preserving columns.
-The variable tab-width controls the action."
+Called non-interactively, the region is specified by arguments
+START and END, rather than by the position of point and mark.
+The variable `tab-width' controls the spacing of tab stops."
   (interactive "r")
   (save-excursion
     (save-restriction
-      (narrow-to-region start end)
+      (narrow-to-region (point-min) end)
       (goto-char start)
       (while (search-forward "\t" nil t)	; faster than re-search
-	(let ((start (point))
+	(let ((tab-beg (point))
 	      (column (current-column))
 	      (indent-tabs-mode nil))
-	  (skip-chars-backward "\t")
-	  (delete-region start (point))
+	  (skip-chars-backward "\t" start)
+	  (delete-region tab-beg (point))
 	  (indent-to column))))))
 
 ;;;###autoload
@@ -45,11 +51,17 @@ The variable tab-width controls the action."
   "Convert multiple spaces in region to tabs when possible.
 A group of spaces is partially replaced by tabs
 when this can be done without changing the column they end at.
-The variable tab-width controls the action."
+Called non-interactively, the region is specified by arguments
+START and END, rather than by the position of point and mark.
+The variable `tab-width' controls the spacing of tab stops."
   (interactive "r")
   (save-excursion
     (save-restriction
-      (narrow-to-region start end)
+      ;; Include the beginning of the line in the narrowing
+      ;; since otherwise it will throw off current-column.
+      (goto-char start)
+      (beginning-of-line)
+      (narrow-to-region (point) end)
       (goto-char start)
       (while (re-search-forward "[ \t][ \t][ \t]*" nil t)
 	(let ((column (current-column))
@@ -57,4 +69,6 @@ The variable tab-width controls the action."
 	  (delete-region (match-beginning 0) (point))
 	  (indent-to column))))))
 
+(provide 'tabify)
+
 ;;; tabify.el ends here