[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/indent.el [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/indent.el [emacs-unicode-2] |
Date: |
Tue, 21 Sep 2004 06:13:35 -0400 |
Index: emacs/lisp/indent.el
diff -c emacs/lisp/indent.el:1.54.4.2 emacs/lisp/indent.el:1.54.4.3
*** emacs/lisp/indent.el:1.54.4.2 Sat Sep 4 09:14:25 2004
--- emacs/lisp/indent.el Tue Sep 21 09:34:09 2004
***************
*** 164,177 ****
(interactive (list (prefix-numeric-value current-prefix-arg) t))
(beginning-of-line n)
(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 used to be the default indent-line-function,
;; used in Fundamental Mode, Text Mode, etc.
--- 164,181 ----
(interactive (list (prefix-numeric-value current-prefix-arg) t))
(beginning-of-line n)
(skip-chars-forward " \t")
! (if (minibufferp (current-buffer))
! (if (save-excursion (beginning-of-line) (bobp))
! (goto-char (minibuffer-prompt-end))
! (beginning-of-line))
! (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 used to be the default indent-line-function,
;; used in Fundamental Mode, Text Mode, etc.