Mercurial > emacs
diff lisp/indent.el @ 89983:0796fc36c2bd
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-43
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-553
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-557
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-558
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-559
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-561
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-30
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 21 Sep 2004 09:34:12 +0000 |
parents | 3219f94257bc 11b507f888a6 |
children | 58db929d96c6 |
line wrap: on
line diff
--- a/lisp/indent.el Sun Sep 19 04:06:19 2004 +0000 +++ b/lisp/indent.el Tue Sep 21 09:34:12 2004 +0000 @@ -164,14 +164,18 @@ (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))))) + (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.