annotate lisp/indent.el @ 83109:1707638677c9

Fix one more case of the previous error. lisp/server.el (server-delete-client): Added noframe parameter. (server-handle-delete-frame): Use it. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-149
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 19 Apr 2004 14:21:37 +0000
parents 695cf19ef79e
children a6ed4f895b79 375f2633d815
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
660
08eb386dd0f3 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 269
diff changeset
1 ;;; indent.el --- indentation commands for Emacs
08eb386dd0f3 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 269
diff changeset
2
37367
160182fbcbbf (indent-for-tab-command): Call indent-line-function
Gerd Moellmann <gerd@gnu.org>
parents: 32242
diff changeset
3 ;; Copyright (C) 1985, 1995, 2001 Free Software Foundation, Inc.
845
213978acbc1e entered into RCS
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 807
diff changeset
4
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 732
diff changeset
5 ;; Maintainer: FSF
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
7 ;; This file is part of GNU Emacs.
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
8
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
9 ;; GNU Emacs is free software; you can redistribute it and/or modify
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
10 ;; it under the terms of the GNU General Public License as published by
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 732
diff changeset
11 ;; the Free Software Foundation; either version 2, or (at your option)
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
12 ;; any later version.
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
13
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
14 ;; GNU Emacs is distributed in the hope that it will be useful,
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
17 ;; GNU General Public License for more details.
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
18
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
19 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13577
diff changeset
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13577
diff changeset
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13577
diff changeset
22 ;; Boston, MA 02111-1307, USA.
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
23
2307
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2201
diff changeset
24 ;;; Commentary:
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2201
diff changeset
25
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2201
diff changeset
26 ;; Commands for making and changing indentation in text. These are
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2201
diff changeset
27 ;; described in the Emacs manual.
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2201
diff changeset
28
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 732
diff changeset
29 ;;; Code:
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
30
19420
681823a203b6 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 17155
diff changeset
31 (defgroup indent nil
681823a203b6 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 17155
diff changeset
32 "Indentation commands"
681823a203b6 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 17155
diff changeset
33 :group 'editing)
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
34
19420
681823a203b6 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 17155
diff changeset
35 (defcustom standard-indent 4
681823a203b6 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 17155
diff changeset
36 "*Default number of columns for margin-changing functions to indent."
681823a203b6 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 17155
diff changeset
37 :group 'indent
681823a203b6 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 17155
diff changeset
38 :type 'integer)
681823a203b6 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 17155
diff changeset
39
41845
23120b6a0225 (indent-line-function): Default is indent-relative again.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41762
diff changeset
40 (defvar indent-line-function 'indent-relative
40482
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
41 "Function to indent the current line.
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
42 This function will be called with no arguments.
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
43 If it is called somewhere where auto-indentation cannot be done
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
44 \(f.ex. inside a string), the function should simply return `noindent'.
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
45 Setting this function is all you need to make TAB indent appropriately.
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
46 Don't rebind TAB unless you really need to.")
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
47
32242
6da78b4b7be2 (tab-always-indent): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31593
diff changeset
48 (defcustom tab-always-indent t
6da78b4b7be2 (tab-always-indent): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31593
diff changeset
49 "*Controls the operation of the TAB key.
6da78b4b7be2 (tab-always-indent): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31593
diff changeset
50 If t, hitting TAB always just indents the current line.
6da78b4b7be2 (tab-always-indent): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31593
diff changeset
51 If nil, hitting TAB indents the current line if point is at the left margin
50140
f94aa8667875 (indent-for-tab-command): If tab-always-indent is non-nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49597
diff changeset
52 or in the line's indentation, otherwise it insert a \"real\" tab character."
32242
6da78b4b7be2 (tab-always-indent): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31593
diff changeset
53 :group 'indent
40636
1b4d4e638a5b (tab-always-indent, indent-for-tab-command):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40482
diff changeset
54 :type '(choice (const nil) (const t) (const always)))
32242
6da78b4b7be2 (tab-always-indent): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31593
diff changeset
55
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
56 (defun indent-according-to-mode ()
48581
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
57 "Indent line in proper way for current major mode.
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
58 The buffer-local variable `indent-line-function' determines how to do this,
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
59 but the functions `indent-relative' and `indent-relative-maybe' are
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
60 special; we don't actually use them here."
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
61 (interactive)
40482
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
62 (if (memq indent-line-function
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
63 '(indent-relative indent-relative-maybe))
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
64 ;; These functions are used for tabbing, but can't be used for
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
65 ;; indenting. Replace with something ad-hoc.
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
66 (let ((column (save-excursion
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
67 (beginning-of-line)
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
68 (skip-chars-backward "\n \t")
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
69 (beginning-of-line)
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
70 (current-indentation))))
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
71 (if (<= (current-column) (current-indentation))
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
72 (indent-line-to column)
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
73 (save-excursion (indent-line-to column))))
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
74 ;; The normal case.
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
75 (funcall indent-line-function)))
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
76
40482
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
77 (defun indent-for-tab-command (&optional arg)
32242
6da78b4b7be2 (tab-always-indent): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31593
diff changeset
78 "Indent line in proper way for current major mode or insert a tab.
6da78b4b7be2 (tab-always-indent): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31593
diff changeset
79 Depending on `tab-always-indent', either insert a tab or indent.
31593
833ec296540e (indent-for-tab-command): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 30690
diff changeset
80 If initial point was within line's indentation, position after
833ec296540e (indent-for-tab-command): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 30690
diff changeset
81 the indentation. Else stay at same point in text.
32242
6da78b4b7be2 (tab-always-indent): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31593
diff changeset
82 The function actually called to indent is determined by the value of
30690
e666b7ea99a9 (indent-for-tab-command): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 26169
diff changeset
83 `indent-line-function'."
13035
b8453eab5114 (indent-for-tab-command): Get the prefix arg
Richard M. Stallman <rms@gnu.org>
parents: 12778
diff changeset
84 (interactive "P")
40482
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
85 (cond
40636
1b4d4e638a5b (tab-always-indent, indent-for-tab-command):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40482
diff changeset
86 ((or ;; indent-to-left-margin is only meant for indenting,
40482
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
87 ;; so we force it to always insert a tab here.
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
88 (eq indent-line-function 'indent-to-left-margin)
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
89 (and (not tab-always-indent)
50140
f94aa8667875 (indent-for-tab-command): If tab-always-indent is non-nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49597
diff changeset
90 (or (> (current-column) (current-indentation))
f94aa8667875 (indent-for-tab-command): If tab-always-indent is non-nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49597
diff changeset
91 (eq this-command last-command))))
40482
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
92 (insert-tab arg))
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
93 ;; Those functions are meant specifically for tabbing and not for
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
94 ;; indenting, so we can't pass them to indent-according-to-mode.
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
95 ((memq indent-line-function '(indent-relative indent-relative-maybe))
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
96 (funcall indent-line-function))
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
97 (t ;; The normal case.
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
98 (indent-according-to-mode))))
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
99
40482
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
100 (defun insert-tab (&optional arg)
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
101 (let ((count (prefix-numeric-value arg)))
19508
c86800208845 (indent-relative, insert-tab):
Richard M. Stallman <rms@gnu.org>
parents: 19420
diff changeset
102 (if (and abbrev-mode
c86800208845 (indent-relative, insert-tab):
Richard M. Stallman <rms@gnu.org>
parents: 19420
diff changeset
103 (eq (char-syntax (preceding-char)) ?w))
15106
83b8438fa1a4 (indent-for-tab-command): Pass prefix arg to indent-tab.
Richard M. Stallman <rms@gnu.org>
parents: 14770
diff changeset
104 (expand-abbrev))
83b8438fa1a4 (indent-for-tab-command): Pass prefix arg to indent-tab.
Richard M. Stallman <rms@gnu.org>
parents: 14770
diff changeset
105 (if indent-tabs-mode
15113
8db176b73c9f (insert-tab): fix previous change
Erik Naggum <erik@naggum.no>
parents: 15106
diff changeset
106 (insert-char ?\t count)
15106
83b8438fa1a4 (indent-for-tab-command): Pass prefix arg to indent-tab.
Richard M. Stallman <rms@gnu.org>
parents: 14770
diff changeset
107 (indent-to (* tab-width (+ count (/ (current-column) tab-width)))))))
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
108
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
109 (defun indent-rigidly (start end arg)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
110 "Indent all lines starting in the region sideways by ARG columns.
45438
7a6c116b0d4a (indent-rigidly): Mention how to remove all indentation.
Eli Zaretskii <eliz@gnu.org>
parents: 45367
diff changeset
111 Called from a program, takes three arguments, START, END and ARG.
7a6c116b0d4a (indent-rigidly): Mention how to remove all indentation.
Eli Zaretskii <eliz@gnu.org>
parents: 45367
diff changeset
112 You can remove all indentation from a region by giving a large negative ARG."
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
113 (interactive "r\np")
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
114 (save-excursion
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
115 (goto-char end)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
116 (setq end (point-marker))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
117 (goto-char start)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
118 (or (bolp) (forward-line 1))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
119 (while (< (point) end)
8642
ae3b75bae5d7 (indent-rigidly): Insert new indent, then delete old.
Richard M. Stallman <rms@gnu.org>
parents: 8208
diff changeset
120 (let ((indent (current-indentation))
ae3b75bae5d7 (indent-rigidly): Insert new indent, then delete old.
Richard M. Stallman <rms@gnu.org>
parents: 8208
diff changeset
121 eol-flag)
ae3b75bae5d7 (indent-rigidly): Insert new indent, then delete old.
Richard M. Stallman <rms@gnu.org>
parents: 8208
diff changeset
122 (save-excursion
ae3b75bae5d7 (indent-rigidly): Insert new indent, then delete old.
Richard M. Stallman <rms@gnu.org>
parents: 8208
diff changeset
123 (skip-chars-forward " \t")
ae3b75bae5d7 (indent-rigidly): Insert new indent, then delete old.
Richard M. Stallman <rms@gnu.org>
parents: 8208
diff changeset
124 (setq eol-flag (eolp)))
ae3b75bae5d7 (indent-rigidly): Insert new indent, then delete old.
Richard M. Stallman <rms@gnu.org>
parents: 8208
diff changeset
125 (or eol-flag
ae3b75bae5d7 (indent-rigidly): Insert new indent, then delete old.
Richard M. Stallman <rms@gnu.org>
parents: 8208
diff changeset
126 (indent-to (max 0 (+ indent arg)) 0))
ae3b75bae5d7 (indent-rigidly): Insert new indent, then delete old.
Richard M. Stallman <rms@gnu.org>
parents: 8208
diff changeset
127 (delete-region (point) (progn (skip-chars-forward " \t") (point))))
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
128 (forward-line 1))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
129 (move-marker end nil)))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
130
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
131 (defun indent-line-to (column)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
132 "Indent current line to COLUMN.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
133 This function removes or adds spaces and tabs at beginning of line
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
134 only if necessary. It leaves point at end of indentation."
11043
4c0a98538670 (indent-line-to): move to end of indentation, even if it didn't change.
Boris Goldowsky <boris@gnu.org>
parents: 10812
diff changeset
135 (back-to-indentation)
4c0a98538670 (indent-line-to): move to end of indentation, even if it didn't change.
Boris Goldowsky <boris@gnu.org>
parents: 10812
diff changeset
136 (let ((cur-col (current-column)))
4c0a98538670 (indent-line-to): move to end of indentation, even if it didn't change.
Boris Goldowsky <boris@gnu.org>
parents: 10812
diff changeset
137 (cond ((< cur-col column)
17155
d8e2f7cfb2b7 (indent-line-to): Fix off-by-one bug when deciding
Karl Heuer <kwzh@gnu.org>
parents: 15113
diff changeset
138 (if (>= (- column (* (/ cur-col tab-width) tab-width)) tab-width)
13545
1418ed733e9d (indent-line-to): Delete spaces before inserting a tab.
Richard M. Stallman <rms@gnu.org>
parents: 13035
diff changeset
139 (delete-region (point)
1418ed733e9d (indent-line-to): Delete spaces before inserting a tab.
Richard M. Stallman <rms@gnu.org>
parents: 13035
diff changeset
140 (progn (skip-chars-backward " ") (point))))
11043
4c0a98538670 (indent-line-to): move to end of indentation, even if it didn't change.
Boris Goldowsky <boris@gnu.org>
parents: 10812
diff changeset
141 (indent-to column))
4c0a98538670 (indent-line-to): move to end of indentation, even if it didn't change.
Boris Goldowsky <boris@gnu.org>
parents: 10812
diff changeset
142 ((> cur-col column) ; too far right (after tab?)
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
143 (delete-region (progn (move-to-column column t) (point))
11043
4c0a98538670 (indent-line-to): move to end of indentation, even if it didn't change.
Boris Goldowsky <boris@gnu.org>
parents: 10812
diff changeset
144 (progn (back-to-indentation) (point)))))))
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
145
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
146 (defun current-left-margin ()
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
147 "Return the left margin to use for this line.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
148 This is the value of the buffer-local variable `left-margin' plus the value
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
149 of the `left-margin' text-property at the start of the line."
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
150 (save-excursion
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
151 (back-to-indentation)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
152 (max 0
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
153 (+ left-margin (or (get-text-property
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
154 (if (and (eobp) (not (bobp)))
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
155 (1- (point)) (point))
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
156 'left-margin) 0)))))
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
157
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
158 (defun move-to-left-margin (&optional n force)
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
159 "Move to the left margin of the current line.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
160 With optional argument, move forward N-1 lines first.
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
161 The column moved to is the one given by the `current-left-margin' function.
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
162 If the line's indentation appears to be wrong, and this command is called
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
163 interactively or with optional argument FORCE, it will be fixed."
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
164 (interactive (list (prefix-numeric-value current-prefix-arg) t))
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
165 (beginning-of-line n)
13577
d88cdc4a0cfe (move-to-left-margin): Removed left-over code that
Richard M. Stallman <rms@gnu.org>
parents: 13545
diff changeset
166 (skip-chars-forward " \t")
d88cdc4a0cfe (move-to-left-margin): Removed left-over code that
Richard M. Stallman <rms@gnu.org>
parents: 13545
diff changeset
167 (let ((lm (current-left-margin))
d88cdc4a0cfe (move-to-left-margin): Removed left-over code that
Richard M. Stallman <rms@gnu.org>
parents: 13545
diff changeset
168 (cc (current-column)))
d88cdc4a0cfe (move-to-left-margin): Removed left-over code that
Richard M. Stallman <rms@gnu.org>
parents: 13545
diff changeset
169 (cond ((> cc lm)
d88cdc4a0cfe (move-to-left-margin): Removed left-over code that
Richard M. Stallman <rms@gnu.org>
parents: 13545
diff changeset
170 (if (> (move-to-column lm force) lm)
d88cdc4a0cfe (move-to-left-margin): Removed left-over code that
Richard M. Stallman <rms@gnu.org>
parents: 13545
diff changeset
171 ;; If lm is in a tab and we are not forcing, move before tab
d88cdc4a0cfe (move-to-left-margin): Removed left-over code that
Richard M. Stallman <rms@gnu.org>
parents: 13545
diff changeset
172 (backward-char 1)))
d88cdc4a0cfe (move-to-left-margin): Removed left-over code that
Richard M. Stallman <rms@gnu.org>
parents: 13545
diff changeset
173 ((and force (< cc lm))
d88cdc4a0cfe (move-to-left-margin): Removed left-over code that
Richard M. Stallman <rms@gnu.org>
parents: 13545
diff changeset
174 (indent-to-left-margin)))))
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
175
50140
f94aa8667875 (indent-for-tab-command): If tab-always-indent is non-nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49597
diff changeset
176 ;; This used to be the default indent-line-function,
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
177 ;; used in Fundamental Mode, Text Mode, etc.
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
178 (defun indent-to-left-margin ()
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
179 "Indent current line to the column given by `current-left-margin'."
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
180 (indent-line-to (current-left-margin)))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
181
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
182 (defun delete-to-left-margin (&optional from to)
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
183 "Remove left margin indentation from a region.
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
184 This deletes to the column given by `current-left-margin'.
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
185 In no case will it delete non-whitespace.
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
186 Args FROM and TO are optional; default is the whole buffer."
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
187 (save-excursion
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
188 (goto-char (or to (point-max)))
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
189 (setq to (point-marker))
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
190 (goto-char (or from (point-min)))
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
191 (or (bolp) (forward-line 1))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
192 (while (< (point) to)
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
193 (delete-region (point) (progn (move-to-left-margin nil t) (point)))
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
194 (forward-line 1))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
195 (move-marker to nil)))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
196
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
197 (defun set-left-margin (from to lm)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
198 "Set the left margin of the region to WIDTH.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
199 If `auto-fill-mode' is active, re-fill the region to fit the new margin."
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
200 (interactive "r\nNSet left margin to column: ")
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
201 (if (interactive-p) (setq lm (prefix-numeric-value lm)))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
202 (save-excursion
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
203 ;; If inside indentation, start from BOL.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
204 (goto-char from)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
205 (skip-chars-backward " \t")
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
206 (if (bolp) (setq from (point)))
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
207 ;; Place end after whitespace
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
208 (goto-char to)
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
209 (skip-chars-forward " \t")
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
210 (setq to (point-marker)))
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
211 ;; Delete margin indentation first, but keep paragraph indentation.
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
212 (delete-to-left-margin from to)
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
213 (put-text-property from to 'left-margin lm)
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
214 (indent-rigidly from to lm)
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
215 (if auto-fill-function (save-excursion (fill-region from to nil t t)))
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
216 (move-marker to nil))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
217
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
218 (defun set-right-margin (from to lm)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
219 "Set the right margin of the region to WIDTH.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
220 If `auto-fill-mode' is active, re-fill the region to fit the new margin."
11281
10f9cf00c770 (set-right-margin): Fix prompt.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
221 (interactive "r\nNSet right margin to width: ")
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
222 (if (interactive-p) (setq lm (prefix-numeric-value lm)))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
223 (save-excursion
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
224 (goto-char from)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
225 (skip-chars-backward " \t")
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
226 (if (bolp) (setq from (point))))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
227 (put-text-property from to 'right-margin lm)
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
228 (if auto-fill-function (save-excursion (fill-region from to nil t t))))
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
229
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
230 (defun alter-text-property (from to prop func &optional object)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
231 "Programmatically change value of a text-property.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
232 For each region between FROM and TO that has a single value for PROPERTY,
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
233 apply FUNCTION to that value and sets the property to the function's result.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
234 Optional fifth argument OBJECT specifies the string or buffer to operate on."
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
235 (let ((begin from)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
236 end val)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
237 (while (setq val (get-text-property begin prop object)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
238 end (text-property-not-all begin to prop val object))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
239 (put-text-property begin end prop (funcall func val) object)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
240 (setq begin end))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
241 (if (< begin to)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
242 (put-text-property begin to prop (funcall func val) object))))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
243
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
244 (defun increase-left-margin (from to inc)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
245 "Increase or decrease the left-margin of the region.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
246 With no prefix argument, this adds `standard-indent' of indentation.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
247 A prefix arg (optional third arg INC noninteractively) specifies the amount
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
248 to change the margin by, in characters.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
249 If `auto-fill-mode' is active, re-fill the region to fit the new margin."
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
250 (interactive "*r\nP")
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
251 (setq inc (if inc (prefix-numeric-value inc) standard-indent))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
252 (save-excursion
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
253 (goto-char from)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
254 (skip-chars-backward " \t")
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
255 (if (bolp) (setq from (point)))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
256 (goto-char to)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
257 (setq to (point-marker)))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
258 (alter-text-property from to 'left-margin
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
259 (lambda (v) (max (- left-margin) (+ inc (or v 0)))))
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
260 (indent-rigidly from to inc)
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
261 (if auto-fill-function (save-excursion (fill-region from to nil t t)))
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
262 (move-marker to nil))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
263
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
264 (defun decrease-left-margin (from to inc)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
265 "Make the left margin of the region smaller.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
266 With no prefix argument, decrease the indentation by `standard-indent'.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
267 A prefix arg (optional third arg INC noninteractively) specifies the amount
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
268 to change the margin by, in characters.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
269 If `auto-fill-mode' is active, re-fill the region to fit the new margin."
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
270 (interactive "*r\nP")
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
271 (setq inc (if inc (prefix-numeric-value inc) standard-indent))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
272 (increase-left-margin from to (- inc)))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
273
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
274 (defun increase-right-margin (from to inc)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
275 "Increase the right-margin of the region.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
276 With no prefix argument, increase the right margin by `standard-indent'.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
277 A prefix arg (optional third arg INC noninteractively) specifies the amount
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
278 to change the margin by, in characters. A negative argument decreases
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
279 the right margin width.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
280 If `auto-fill-mode' is active, re-fill the region to fit the new margin."
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
281 (interactive "r\nP")
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
282 (if (interactive-p)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
283 (setq inc (if inc (prefix-numeric-value current-prefix-arg)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
284 standard-indent)))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
285 (save-excursion
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
286 (alter-text-property from to 'right-margin
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
287 (lambda (v) (+ inc (or v 0))))
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
288 (if auto-fill-function
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
289 (fill-region from to nil t t))))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
290
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
291 (defun decrease-right-margin (from to inc)
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
292 "Make the right margin of the region smaller.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
293 With no prefix argument, decrease the right margin by `standard-indent'.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
294 A prefix arg (optional third arg INC noninteractively) specifies the amount
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
295 of width to remove, in characters. A negative argument increases
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
296 the right margin width.
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
297 If `auto-fill-mode' is active, re-fills region to fit in new margin."
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
298 (interactive "*r\nP")
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
299 (setq inc (if inc (prefix-numeric-value inc) standard-indent))
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
300 (increase-right-margin from to (- inc)))
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
301
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
302 (defun beginning-of-line-text (&optional n)
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
303 "Move to the beginning of the text on this line.
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
304 With optional argument, move forward N-1 lines first.
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
305 From the beginning of the line, moves past the left-margin indentation, the
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
306 fill-prefix, and any indentation used for centering or right-justifying the
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48581
diff changeset
307 line, but does not move past any whitespace that was explicitly inserted
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
308 \(such as a tab used to indent the first line of a paragraph)."
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
309 (interactive "p")
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
310 (beginning-of-line n)
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
311 (skip-chars-forward " \t")
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
312 ;; Skip over fill-prefix.
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48581
diff changeset
313 (if (and fill-prefix
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
314 (not (string-equal fill-prefix "")))
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
315 (if (equal fill-prefix
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48581
diff changeset
316 (buffer-substring
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
317 (point) (min (point-max) (+ (length fill-prefix) (point)))))
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
318 (forward-char (length fill-prefix)))
14770
e3567339daa7 (beginning-of-line-text): Check adaptive-fill-regexp is non-nil.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
319 (if (and adaptive-fill-mode adaptive-fill-regexp
10812
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
320 (looking-at adaptive-fill-regexp))
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
321 (goto-char (match-end 0))))
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
322 ;; Skip centering or flushright indentation
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
323 (if (memq (current-justification) '(center right))
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
324 (skip-chars-forward " \t")))
cd0a341fd620 (current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents: 10470
diff changeset
325
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
326 (defvar indent-region-function nil
12683
0e9d2009e609 (indent-region-function): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 11281
diff changeset
327 "Short cut function to indent region using `indent-according-to-mode'.
0e9d2009e609 (indent-region-function): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 11281
diff changeset
328 A value of nil means really run `indent-according-to-mode' on each line.")
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
329
45367
2a9743cfbeab (indent-region): Make COLUMN arg optional.
Richard M. Stallman <rms@gnu.org>
parents: 43053
diff changeset
330 (defun indent-region (start end &optional column)
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
331 "Indent each nonblank line in the region.
48581
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
332 A numeric prefix argument specifies a column: indent each line to that column.
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
333
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
334 With no prefix argument, the command chooses one of these methods and
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
335 indents all the lines with it:
26169
c24dd11dad46 (indent-region): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 25498
diff changeset
336
48581
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
337 1) If `fill-prefix' is non-nil, insert `fill-prefix' at the
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
338 beginning of each line in the region that does not already begin
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
339 with it.
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
340 2) If `indent-region-function' is non-nil, call that function
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
341 to indent the region.
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
342 3) Indent each line as specified by the variable `indent-line-function'.
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
343
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
344 Called from a program, START and END specify the region to indent.
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
345 If the third argument COLUMN is an integer, it specifies the
023f680b7cfe (indent-according-to-mode, indent-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45438
diff changeset
346 column to indent to; if it is nil, use one of the three methods above."
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
347 (interactive "r\nP")
4465
794498c64928 (indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
348 (if (null column)
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
349 (if fill-prefix
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
350 (save-excursion
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
351 (goto-char end)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
352 (setq end (point-marker))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
353 (goto-char start)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
354 (let ((regexp (regexp-quote fill-prefix)))
4465
794498c64928 (indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
355 (while (< (point) end)
794498c64928 (indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
356 (or (looking-at regexp)
794498c64928 (indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
357 (and (bolp) (eolp))
794498c64928 (indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
358 (insert fill-prefix))
794498c64928 (indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
359 (forward-line 1))))
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
360 (if indent-region-function
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
361 (funcall indent-region-function start end)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
362 (save-excursion
40482
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
363 (setq end (copy-marker end))
4465
794498c64928 (indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
364 (goto-char start)
794498c64928 (indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
365 (while (< (point) end)
4473
600d0d832d99 (indent-region): Fix paren error in last change.
Richard M. Stallman <rms@gnu.org>
parents: 4465
diff changeset
366 (or (and (bolp) (eolp))
4465
794498c64928 (indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
367 (funcall indent-line-function))
794498c64928 (indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
368 (forward-line 1))
794498c64928 (indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
369 (move-marker end nil))))
794498c64928 (indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
370 (setq column (prefix-numeric-value column))
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
371 (save-excursion
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
372 (goto-char end)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
373 (setq end (point-marker))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
374 (goto-char start)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
375 (or (bolp) (forward-line 1))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
376 (while (< (point) end)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
377 (delete-region (point) (progn (skip-chars-forward " \t") (point)))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
378 (or (eolp)
10467
b8053ce05ab5 (standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8642
diff changeset
379 (indent-to column 0))
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
380 (forward-line 1))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
381 (move-marker end nil))))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
382
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
383 (defun indent-relative-maybe ()
38151
9fb3fc20b9b0 (indent-relative-maybe, indent-relative): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 37367
diff changeset
384 "Indent a new line like previous nonblank line.
9fb3fc20b9b0 (indent-relative-maybe, indent-relative): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 37367
diff changeset
385 If the previous nonblank line has no indent points beyond the
9fb3fc20b9b0 (indent-relative-maybe, indent-relative): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 37367
diff changeset
386 column point starts at, this command does nothing.
9fb3fc20b9b0 (indent-relative-maybe, indent-relative): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 37367
diff changeset
387
9fb3fc20b9b0 (indent-relative-maybe, indent-relative): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 37367
diff changeset
388 See also `indent-relative'."
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
389 (interactive)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
390 (indent-relative t))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
391
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
392 (defun indent-relative (&optional unindented-ok)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
393 "Space out to under next indent point in previous nonblank line.
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
394 An indent point is a non-whitespace character following whitespace.
25498
611af07c47c2 (indent-relative): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 19895
diff changeset
395 The following line shows the indentation points in this line.
611af07c47c2 (indent-relative): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 19895
diff changeset
396 ^ ^ ^ ^ ^ ^ ^ ^ ^
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
397 If the previous nonblank line has no indent points beyond the
38151
9fb3fc20b9b0 (indent-relative-maybe, indent-relative): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 37367
diff changeset
398 column point starts at, `tab-to-tab-stop' is done instead, unless
9fb3fc20b9b0 (indent-relative-maybe, indent-relative): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 37367
diff changeset
399 this command is invoked with a numeric argument, in which case it
9fb3fc20b9b0 (indent-relative-maybe, indent-relative): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 37367
diff changeset
400 does nothing.
9fb3fc20b9b0 (indent-relative-maybe, indent-relative): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 37367
diff changeset
401
9fb3fc20b9b0 (indent-relative-maybe, indent-relative): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 37367
diff changeset
402 See also `indent-relative-maybe'."
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
403 (interactive "P")
19508
c86800208845 (indent-relative, insert-tab):
Richard M. Stallman <rms@gnu.org>
parents: 19420
diff changeset
404 (if (and abbrev-mode
c86800208845 (indent-relative, insert-tab):
Richard M. Stallman <rms@gnu.org>
parents: 19420
diff changeset
405 (eq (char-syntax (preceding-char)) ?w))
c86800208845 (indent-relative, insert-tab):
Richard M. Stallman <rms@gnu.org>
parents: 19420
diff changeset
406 (expand-abbrev))
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
407 (let ((start-column (current-column))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
408 indent)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
409 (save-excursion
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
410 (beginning-of-line)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
411 (if (re-search-backward "^[^\n]" nil t)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
412 (let ((end (save-excursion (forward-line 1) (point))))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
413 (move-to-column start-column)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
414 ;; Is start-column inside a tab on this line?
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
415 (if (> (current-column) start-column)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
416 (backward-char 1))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
417 (or (looking-at "[ \t]")
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
418 unindented-ok
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
419 (skip-chars-forward "^ \t" end))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
420 (skip-chars-forward " \t" end)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
421 (or (= (point) end) (setq indent (current-column))))))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
422 (if indent
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
423 (let ((opoint (point-marker)))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
424 (indent-to indent 0)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
425 (if (> opoint (point))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
426 (goto-char opoint))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
427 (move-marker opoint nil))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
428 (tab-to-tab-stop))))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
429
19420
681823a203b6 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 17155
diff changeset
430 (defcustom tab-stop-list
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
431 '(8 16 24 32 40 48 56 64 72 80 88 96 104 112 120)
19895
bff4ed62d00a (tab-stop-list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 19508
diff changeset
432 "*List of tab stop positions used by `tab-to-tab-stop'.
19420
681823a203b6 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 17155
diff changeset
433 This should be a list of integers, ordered from smallest to largest."
681823a203b6 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 17155
diff changeset
434 :group 'indent
681823a203b6 Customized.
Richard M. Stallman <rms@gnu.org>
parents: 17155
diff changeset
435 :type '(repeat integer))
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
436
40482
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
437 (defvar edit-tab-stops-map
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
438 (let ((map (make-sparse-keymap)))
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
439 (define-key map "\C-x\C-s" 'edit-tab-stops-note-changes)
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
440 (define-key map "\C-c\C-c" 'edit-tab-stops-note-changes)
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
441 map)
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
442 "Keymap used in `edit-tab-stops'.")
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
443
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
444 (defvar edit-tab-stops-buffer nil
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
445 "Buffer whose tab stops are being edited--in case
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
446 the variable `tab-stop-list' is local in that buffer.")
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
447
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
448 (defun edit-tab-stops ()
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
449 "Edit the tab stops used by `tab-to-tab-stop'.
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
450 Creates a buffer *Tab Stops* containing text describing the tab stops.
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
451 A colon indicates a column where there is a tab stop.
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
452 You can add or remove colons and then do \\<edit-tab-stops-map>\\[edit-tab-stops-note-changes] to make changes take effect."
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
453 (interactive)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
454 (setq edit-tab-stops-buffer (current-buffer))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
455 (switch-to-buffer (get-buffer-create "*Tab Stops*"))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
456 (use-local-map edit-tab-stops-map)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
457 (make-local-variable 'indent-tabs-mode)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
458 (setq indent-tabs-mode nil)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
459 (overwrite-mode 1)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
460 (setq truncate-lines t)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
461 (erase-buffer)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
462 (let ((tabs tab-stop-list))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
463 (while tabs
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
464 (indent-to (car tabs) 0)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
465 (insert ?:)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
466 (setq tabs (cdr tabs))))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
467 (let ((count 0))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
468 (insert ?\n)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
469 (while (< count 8)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
470 (insert (+ count ?0))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
471 (insert " ")
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
472 (setq count (1+ count)))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
473 (insert ?\n)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
474 (while (> count 0)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
475 (insert "0123456789")
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
476 (setq count (1- count))))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
477 (insert "\nTo install changes, type C-c C-c")
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
478 (goto-char (point-min)))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
479
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
480 (defun edit-tab-stops-note-changes ()
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
481 "Put edited tab stops into effect."
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
482 (interactive)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
483 (let (tabs)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
484 (save-excursion
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
485 (goto-char 1)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
486 (end-of-line)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
487 (while (search-backward ":" nil t)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
488 (setq tabs (cons (current-column) tabs))))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
489 (bury-buffer (prog1 (current-buffer)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
490 (switch-to-buffer edit-tab-stops-buffer)))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
491 (setq tab-stop-list tabs))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
492 (message "Tab stops installed"))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
493
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
494 (defun tab-to-tab-stop ()
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
495 "Insert spaces or tabs to next defined tab-stop column.
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
496 The variable `tab-stop-list' is a list of columns at which there are tab stops.
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
497 Use \\[edit-tab-stops] to edit them interactively."
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
498 (interactive)
12778
657be7aaa043 (tab-to-tab-stop): Expand abbrevs only after a word-char.
Richard M. Stallman <rms@gnu.org>
parents: 12683
diff changeset
499 (and abbrev-mode (= (char-syntax (preceding-char)) ?w)
657be7aaa043 (tab-to-tab-stop): Expand abbrevs only after a word-char.
Richard M. Stallman <rms@gnu.org>
parents: 12683
diff changeset
500 (expand-abbrev))
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
501 (let ((tabs tab-stop-list))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
502 (while (and tabs (>= (current-column) (car tabs)))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
503 (setq tabs (cdr tabs)))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
504 (if tabs
7973
b7ea350590a7 (tab-to-tab-stop): Combine new indentation with previous.
Richard M. Stallman <rms@gnu.org>
parents: 7813
diff changeset
505 (let ((opoint (point)))
41758
581ab0e31090 (tab-to-tab-stop): Use delete-horizontal-space.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40636
diff changeset
506 (delete-horizontal-space t)
7973
b7ea350590a7 (tab-to-tab-stop): Combine new indentation with previous.
Richard M. Stallman <rms@gnu.org>
parents: 7813
diff changeset
507 (indent-to (car tabs)))
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
508 (insert ?\ ))))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
509
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
510 (defun move-to-tab-stop ()
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
511 "Move point to next defined tab-stop column.
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
512 The variable `tab-stop-list' is a list of columns at which there are tab stops.
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
513 Use \\[edit-tab-stops] to edit them interactively."
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
514 (interactive)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
515 (let ((tabs tab-stop-list))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
516 (while (and tabs (>= (current-column) (car tabs)))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
517 (setq tabs (cdr tabs)))
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
518 (if tabs
8037
fd5fb80a940d (move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents: 7984
diff changeset
519 (let ((before (point)))
fd5fb80a940d (move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents: 7984
diff changeset
520 (move-to-column (car tabs) t)
fd5fb80a940d (move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents: 7984
diff changeset
521 (save-excursion
fd5fb80a940d (move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents: 7984
diff changeset
522 (goto-char before)
fd5fb80a940d (move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents: 7984
diff changeset
523 ;; If we just added a tab, or moved over one,
fd5fb80a940d (move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents: 7984
diff changeset
524 ;; delete any superfluous spaces before the old point.
fd5fb80a940d (move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents: 7984
diff changeset
525 (if (and (eq (preceding-char) ?\ )
fd5fb80a940d (move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents: 7984
diff changeset
526 (eq (following-char) ?\t))
fd5fb80a940d (move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents: 7984
diff changeset
527 (let ((tabend (* (/ (current-column) tab-width) tab-width)))
fd5fb80a940d (move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents: 7984
diff changeset
528 (while (and (> (current-column) tabend)
fd5fb80a940d (move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents: 7984
diff changeset
529 (eq (preceding-char) ?\ ))
fd5fb80a940d (move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents: 7984
diff changeset
530 (forward-char -1))
fd5fb80a940d (move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents: 7984
diff changeset
531 (delete-region (point) before))))))))
fd5fb80a940d (move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents: 7984
diff changeset
532
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
533 (define-key global-map "\t" 'indent-for-tab-command)
40482
ec3016b59706 (indent-line-function): Change default to indent-relative.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38151
diff changeset
534 (define-key esc-map "\C-\\" 'indent-region)
263
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
535 (define-key ctl-x-map "\t" 'indent-rigidly)
57bcc096ab9c Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
536 (define-key esc-map "i" 'tab-to-tab-stop)
660
08eb386dd0f3 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 269
diff changeset
537
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 50140
diff changeset
538 ;;; arch-tag: f402b2a7-e44f-492f-b5b8-38996020b7c3
660
08eb386dd0f3 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 269
diff changeset
539 ;;; indent.el ends here