(rlogin): make comint-output-filter-functions local before adding hooks.

[bpt/emacs.git] / lisp / tabify.el

diff --git a/lisp/tabify.el b/lisp/tabify.el
index ac2004d..c5d76fc 100644 (file)
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -1,6 +1,6 @@
 ;;; tabify.el --- tab conversion commands for Emacs
 
-;; Copyright (C) 1985 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1994 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
@@ -17,8 +17,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
@@ -39,11 +40,11 @@ The variable `tab-width' controls the spacing of tab stops."
       (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
@@ -57,7 +58,11 @@ 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))