(find-file-noselect): If after-find-file switches buffers,

[gnu-emacs] / lisp / indent.el

diff --git a/lisp/indent.el b/lisp/indent.el
index 9aaaf299423b8f61acec3f91fedfdea3688d121d..2690d2f86d48bcfb7e404ffc68e716225c7264f9 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:
 
@@ -38,12 +39,14 @@ Function to indent current line.")
   (interactive)
   (funcall indent-line-function))
 
-(defun indent-for-tab-command ()
+(defun indent-for-tab-command (&optional prefix-arg)
   "Indent line in proper way for current major mode."
-  (interactive)
+  (interactive "P")
   (if (eq indent-line-function 'indent-to-left-margin)
       (insert-tab)
-    (funcall indent-line-function)))
+    (if prefix-arg
+       (funcall indent-line-function prefix-arg)
+      (funcall indent-line-function))))
 
 (defun insert-tab ()
   (if abbrev-mode
@@ -80,6 +83,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))
@@ -105,17 +111,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.
@@ -419,7 +423,8 @@ You can add or remove colons and then do \\<edit-tab-stops-map>\\[edit-tab-stops
 The variable `tab-stop-list' is a list of columns at which there are tab stops.
 Use \\[edit-tab-stops] to edit them interactively."
   (interactive)
-  (if abbrev-mode (expand-abbrev))
+  (and abbrev-mode (= (char-syntax (preceding-char)) ?w)
+       (expand-abbrev))
   (let ((tabs tab-stop-list))
     (while (and tabs (>= (current-column) (car tabs)))
       (setq tabs (cdr tabs)))