From 9a08a6173c251e20bb8aeb7482ec7e429e863a4d Mon Sep 17 00:00:00 2001 From: Matthias Meulien Date: Tue, 18 Jun 2013 10:17:01 +0200 Subject: [PATCH] lisp/tabify.el (untabify, tabify): With prefix, apply to entire buffer. --- lisp/ChangeLog | 4 ++++ lisp/tabify.el | 18 ++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ab8868d600c..bcfb24f0d19 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-06-18 Matthias Meulien + + * tabify.el (untabify, tabify): With prefix, apply to entire buffer. + 2013-06-18 Glenn Morris * generic-x.el (bat-generic-mode, rc-generic-mode, rul-generic-mode): diff --git a/lisp/tabify.el b/lisp/tabify.el index 6bf45b36886..a90bf801bcf 100644 --- a/lisp/tabify.el +++ b/lisp/tabify.el @@ -28,12 +28,17 @@ ;;; Code: ;;;###autoload -(defun untabify (start end) +(defun untabify (start end &optional arg) "Convert all tabs in region to multiple spaces, preserving columns. +If called interactively with prefix ARG, convert for the entire +buffer. + 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") + (interactive (if current-prefix-arg + (list (point-min) (point-max) current-prefix-arg) + (list (region-beginning) (region-end) nil))) (let ((c (current-column))) (save-excursion (save-restriction @@ -56,14 +61,19 @@ Usually this will be \" [ \\t]+\" to match a space followed by whitespace. \"^\\t* [ \\t]+\" is also useful, for tabifying only initial whitespace.") ;;;###autoload -(defun tabify (start end) +(defun tabify (start end &optional arg) "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. +If called interactively with prefix ARG, convert for the entire +buffer. + 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") + (interactive (if current-prefix-arg + (list (point-min) (point-max) current-prefix-arg) + (list (region-beginning) (region-end) nil))) (save-excursion (save-restriction ;; Include the beginning of the line in the narrowing -- 2.11.4.GIT