Mercurial > emacs
comparison lisp/align.el @ 90044:cb7f41387eb3
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-70
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-669
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-678
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-679
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-680
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-688
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-689
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-690
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-691
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-69
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-70
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-71
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 12 Nov 2004 02:53:04 +0000 |
parents | 68c22ea6027c fc790bd5db8f |
children | 29e773288013 |
comparison
equal
deleted
inserted
replaced
90043:e24e2e78deda | 90044:cb7f41387eb3 |
---|---|
1210 (setq gocol (- col (- ecol (current-column)))))) | 1210 (setq gocol (- col (- ecol (current-column)))))) |
1211 (setq cur (current-column)) | 1211 (setq cur (current-column)) |
1212 (cond ((< gocol 0) t) ; don't do anything | 1212 (cond ((< gocol 0) t) ; don't do anything |
1213 ((= cur gocol) t) ; don't need to | 1213 ((= cur gocol) t) ; don't need to |
1214 ((< cur gocol) ; just add space | 1214 ((< cur gocol) ; just add space |
1215 ;; FIXME: It is stated above that "...the | |
1216 ;; whitespace to be modified was already | |
1217 ;; deleted by `align-region', all we have | |
1218 ;; to do here is indent." However, this | |
1219 ;; doesn't seem to be true, so we first | |
1220 ;; delete the whitespace to avoid tabs | |
1221 ;; after spaces. | |
1222 (delete-horizontal-space t) | |
1215 (indent-to gocol)) | 1223 (indent-to gocol)) |
1216 (t | 1224 (t |
1217 ;; This code works around an oddity in the | 1225 ;; This code works around an oddity in the |
1218 ;; FORCE argument of `move-to-column', which | 1226 ;; FORCE argument of `move-to-column', which |
1219 ;; tends to screw up markers if there is any | 1227 ;; tends to screw up markers if there is any |