(make-coding-system): Create -with-esc variant coding system.

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

diff --git a/lisp/indent.el b/lisp/indent.el
index 47ef23d..8d20fb2 100644 (file)
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -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:
 
@@ -27,11 +28,17 @@
 
 ;;; Code:
 
-(defvar standard-indent 4 "\
-Default number of columns for margin-changing functions to indent.")
+(defgroup indent nil
+  "Indentation commands"
+  :group 'editing)
 
-(defvar indent-line-function 'indent-to-left-margin "\
-Function to indent current line.")
+(defcustom standard-indent 4
+  "*Default number of columns for margin-changing functions to indent."
+  :group 'indent
+  :type 'integer)
+
+(defvar indent-line-function 'indent-to-left-margin
+  "Function to indent current line.")
 
 (defun indent-according-to-mode ()
   "Indent line in proper way for current major mode."
@@ -42,17 +49,19 @@ Function to indent current line.")
   "Indent line in proper way for current major mode."
   (interactive "P")
   (if (eq indent-line-function 'indent-to-left-margin)
-      (insert-tab)
+      (insert-tab prefix-arg)
     (if prefix-arg
        (funcall indent-line-function prefix-arg)
       (funcall indent-line-function))))
 
-(defun insert-tab ()
-  (if abbrev-mode
-      (expand-abbrev))
-  (if indent-tabs-mode
-      (insert ?\t)
-    (indent-to (* tab-width (1+ (/ (current-column) tab-width))))))
+(defun insert-tab (&optional prefix-arg)
+  (let ((count (prefix-numeric-value prefix-arg)))
+    (if (and abbrev-mode
+            (eq (char-syntax (preceding-char)) ?w))
+       (expand-abbrev))
+    (if indent-tabs-mode
+       (insert-char ?\t count)
+      (indent-to (* tab-width (+ count (/ (current-column) tab-width)))))))
 
 (defun indent-rigidly (start end arg)
   "Indent all lines starting in the region sideways by ARG columns.
@@ -82,6 +91,9 @@ only if necessary.  It leaves point at end of indentation."
   (back-to-indentation)
   (let ((cur-col (current-column)))
     (cond ((< cur-col column)
+          (if (>= (- column (* (/ cur-col tab-width) tab-width)) tab-width)
+              (delete-region (point)
+                             (progn (skip-chars-backward " ") (point))))
           (indent-to column))
          ((> cur-col column) ; too far right (after tab?)
           (delete-region (progn (move-to-column column t) (point))
@@ -107,17 +119,15 @@ If the line's indentation appears to be wrong, and this command is called
 interactively or with optional argument FORCE, it will be fixed."
   (interactive (list (prefix-numeric-value current-prefix-arg) t))
   (beginning-of-line n)
-  (let ((lm (current-left-margin)))
-    (if (memq (current-justification) '(right center))
-       (move-to-column lm)
-      (skip-chars-forward " \t"))
-    (let ((cc (current-column)))
-      (cond ((> cc lm)
-            (if (> (move-to-column lm force) lm)
-                ;; If lm is in a tab and we are not forcing, move before tab
-                (backward-char 1)))
-           ((and force (< cc lm))
-            (indent-to-left-margin))))))
+  (skip-chars-forward " \t")
+  (let ((lm (current-left-margin))
+       (cc (current-column)))
+    (cond ((> cc lm)
+          (if (> (move-to-column lm force) lm)
+              ;; If lm is in a tab and we are not forcing, move before tab
+              (backward-char 1)))
+         ((and force (< cc lm))
+          (indent-to-left-margin)))))
 
 ;; This is the default indent-line-function,
 ;; used in Fundamental Mode, Text Mode, etc.
@@ -262,7 +272,7 @@ line, but does not move past any whitespace that was explicitly inserted
                 (buffer-substring 
                  (point) (min (point-max) (+ (length fill-prefix) (point)))))
          (forward-char (length fill-prefix)))
-    (if (and adaptive-fill-mode 
+    (if (and adaptive-fill-mode adaptive-fill-regexp
             (looking-at adaptive-fill-regexp))
        (goto-char (match-end 0))))
   ;; Skip centering or flushright indentation
@@ -329,7 +339,9 @@ An indent point is a non-whitespace character following whitespace.
 If the previous nonblank line has no indent points beyond the
 column point starts at, `tab-to-tab-stop' is done instead."
   (interactive "P")
-  (if abbrev-mode (expand-abbrev))
+  (if (and abbrev-mode
+          (eq (char-syntax (preceding-char)) ?w))
+      (expand-abbrev))
   (let ((start-column (current-column))
        indent)
     (save-excursion
@@ -354,10 +366,12 @@ column point starts at, `tab-to-tab-stop' is done instead."
          (move-marker opoint nil))
       (tab-to-tab-stop))))
 
-(defvar tab-stop-list
+(defcustom tab-stop-list
   '(8 16 24 32 40 48 56 64 72 80 88 96 104 112 120)
-  "*List of tab stop positions used by `tab-to-tab-stops'.
-This should be a list of integers, ordered from smallest to largest.")
+  "*List of tab stop positions used by `tab-to-tab-stop'.
+This should be a list of integers, ordered from smallest to largest."
+  :group 'indent
+  :type '(repeat integer))
 
 (defvar edit-tab-stops-map nil "Keymap used in `edit-tab-stops'.")
 (if edit-tab-stops-map