Mercurial > emacs
annotate lisp/indent.el @ 17499:77604d2454dc libc-970418 libc-970419 libc-970420 libc-970421 libc-970422 libc-970423 libc-970424 libc-970425 libc-970426 libc-970427 libc-970428 libc-970429 libc-970430 libc-970501 libc-970502 libc-970503 libc-970504 libc-970505
Fixes for MIPS OpenBSD systems (from Per Fogelstrom
<pefo@openbsd.org>)
author | Ian Lance Taylor <ian@cygnus.com> |
---|---|
date | Thu, 17 Apr 1997 18:00:12 +0000 |
parents | d8e2f7cfb2b7 |
children | 681823a203b6 |
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 |
11235 | 3 ;; Copyright (C) 1985, 1995 Free Software Foundation, Inc. |
845 | 4 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
732
diff
changeset
|
5 ;; Maintainer: FSF |
263 | 6 |
7 ;; This file is part of GNU Emacs. | |
8 | |
9 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
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 | 12 ;; any later version. |
13 | |
14 ;; GNU Emacs is distributed in the hope that it will be useful, | |
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 ;; GNU General Public License for more details. | |
18 | |
19 ;; You should have received a copy of the GNU General Public License | |
14169 | 20 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
22 ;; Boston, MA 02111-1307, USA. | |
263 | 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 | 30 |
10467
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
31 (defvar standard-indent 4 "\ |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
32 Default number of columns for margin-changing functions to indent.") |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
33 |
269 | 34 (defvar indent-line-function 'indent-to-left-margin "\ |
2192
96adb71c61ec
* indent.el (indent-line-function): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
845
diff
changeset
|
35 Function to indent current line.") |
263 | 36 |
37 (defun indent-according-to-mode () | |
38 "Indent line in proper way for current major mode." | |
39 (interactive) | |
40 (funcall indent-line-function)) | |
41 | |
13035
b8453eab5114
(indent-for-tab-command): Get the prefix arg
Richard M. Stallman <rms@gnu.org>
parents:
12778
diff
changeset
|
42 (defun indent-for-tab-command (&optional prefix-arg) |
263 | 43 "Indent line in proper way for current major mode." |
13035
b8453eab5114
(indent-for-tab-command): Get the prefix arg
Richard M. Stallman <rms@gnu.org>
parents:
12778
diff
changeset
|
44 (interactive "P") |
263 | 45 (if (eq indent-line-function 'indent-to-left-margin) |
15106
83b8438fa1a4
(indent-for-tab-command): Pass prefix arg to indent-tab.
Richard M. Stallman <rms@gnu.org>
parents:
14770
diff
changeset
|
46 (insert-tab prefix-arg) |
13035
b8453eab5114
(indent-for-tab-command): Get the prefix arg
Richard M. Stallman <rms@gnu.org>
parents:
12778
diff
changeset
|
47 (if prefix-arg |
b8453eab5114
(indent-for-tab-command): Get the prefix arg
Richard M. Stallman <rms@gnu.org>
parents:
12778
diff
changeset
|
48 (funcall indent-line-function prefix-arg) |
b8453eab5114
(indent-for-tab-command): Get the prefix arg
Richard M. Stallman <rms@gnu.org>
parents:
12778
diff
changeset
|
49 (funcall indent-line-function)))) |
263 | 50 |
15106
83b8438fa1a4
(indent-for-tab-command): Pass prefix arg to indent-tab.
Richard M. Stallman <rms@gnu.org>
parents:
14770
diff
changeset
|
51 (defun insert-tab (&optional prefix-arg) |
83b8438fa1a4
(indent-for-tab-command): Pass prefix arg to indent-tab.
Richard M. Stallman <rms@gnu.org>
parents:
14770
diff
changeset
|
52 (let ((count (prefix-numeric-value prefix-arg))) |
83b8438fa1a4
(indent-for-tab-command): Pass prefix arg to indent-tab.
Richard M. Stallman <rms@gnu.org>
parents:
14770
diff
changeset
|
53 (if abbrev-mode |
83b8438fa1a4
(indent-for-tab-command): Pass prefix arg to indent-tab.
Richard M. Stallman <rms@gnu.org>
parents:
14770
diff
changeset
|
54 (expand-abbrev)) |
83b8438fa1a4
(indent-for-tab-command): Pass prefix arg to indent-tab.
Richard M. Stallman <rms@gnu.org>
parents:
14770
diff
changeset
|
55 (if indent-tabs-mode |
15113
8db176b73c9f
(insert-tab): fix previous change
Erik Naggum <erik@naggum.no>
parents:
15106
diff
changeset
|
56 (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
|
57 (indent-to (* tab-width (+ count (/ (current-column) tab-width))))))) |
263 | 58 |
59 (defun indent-rigidly (start end arg) | |
60 "Indent all lines starting in the region sideways by ARG columns. | |
61 Called from a program, takes three arguments, START, END and ARG." | |
62 (interactive "r\np") | |
63 (save-excursion | |
64 (goto-char end) | |
65 (setq end (point-marker)) | |
66 (goto-char start) | |
67 (or (bolp) (forward-line 1)) | |
68 (while (< (point) end) | |
8642
ae3b75bae5d7
(indent-rigidly): Insert new indent, then delete old.
Richard M. Stallman <rms@gnu.org>
parents:
8208
diff
changeset
|
69 (let ((indent (current-indentation)) |
ae3b75bae5d7
(indent-rigidly): Insert new indent, then delete old.
Richard M. Stallman <rms@gnu.org>
parents:
8208
diff
changeset
|
70 eol-flag) |
ae3b75bae5d7
(indent-rigidly): Insert new indent, then delete old.
Richard M. Stallman <rms@gnu.org>
parents:
8208
diff
changeset
|
71 (save-excursion |
ae3b75bae5d7
(indent-rigidly): Insert new indent, then delete old.
Richard M. Stallman <rms@gnu.org>
parents:
8208
diff
changeset
|
72 (skip-chars-forward " \t") |
ae3b75bae5d7
(indent-rigidly): Insert new indent, then delete old.
Richard M. Stallman <rms@gnu.org>
parents:
8208
diff
changeset
|
73 (setq eol-flag (eolp))) |
ae3b75bae5d7
(indent-rigidly): Insert new indent, then delete old.
Richard M. Stallman <rms@gnu.org>
parents:
8208
diff
changeset
|
74 (or eol-flag |
ae3b75bae5d7
(indent-rigidly): Insert new indent, then delete old.
Richard M. Stallman <rms@gnu.org>
parents:
8208
diff
changeset
|
75 (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
|
76 (delete-region (point) (progn (skip-chars-forward " \t") (point)))) |
263 | 77 (forward-line 1)) |
78 (move-marker end nil))) | |
79 | |
10467
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
80 (defun indent-line-to (column) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
81 "Indent current line to COLUMN. |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
82 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
|
83 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
|
84 (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
|
85 (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
|
86 (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
|
87 (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
|
88 (delete-region (point) |
1418ed733e9d
(indent-line-to): Delete spaces before inserting a tab.
Richard M. Stallman <rms@gnu.org>
parents:
13035
diff
changeset
|
89 (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
|
90 (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
|
91 ((> 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
|
92 (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
|
93 (progn (back-to-indentation) (point))))))) |
10467
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
94 |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
95 (defun current-left-margin () |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
96 "Return the left margin to use for this line. |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
97 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
|
98 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
|
99 (save-excursion |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
100 (back-to-indentation) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
101 (max 0 |
10812
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
102 (+ left-margin (or (get-text-property |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
103 (if (and (eobp) (not (bobp))) |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
104 (1- (point)) (point)) |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
105 'left-margin) 0))))) |
10467
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
106 |
10812
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
107 (defun move-to-left-margin (&optional n force) |
10467
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
108 "Move to the left margin of the current line. |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
109 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
|
110 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
|
111 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
|
112 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
|
113 (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
|
114 (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
|
115 (skip-chars-forward " \t") |
d88cdc4a0cfe
(move-to-left-margin): Removed left-over code that
Richard M. Stallman <rms@gnu.org>
parents:
13545
diff
changeset
|
116 (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
|
117 (cc (current-column))) |
d88cdc4a0cfe
(move-to-left-margin): Removed left-over code that
Richard M. Stallman <rms@gnu.org>
parents:
13545
diff
changeset
|
118 (cond ((> cc lm) |
d88cdc4a0cfe
(move-to-left-margin): Removed left-over code that
Richard M. Stallman <rms@gnu.org>
parents:
13545
diff
changeset
|
119 (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
|
120 ;; 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
|
121 (backward-char 1))) |
d88cdc4a0cfe
(move-to-left-margin): Removed left-over code that
Richard M. Stallman <rms@gnu.org>
parents:
13545
diff
changeset
|
122 ((and force (< cc lm)) |
d88cdc4a0cfe
(move-to-left-margin): Removed left-over code that
Richard M. Stallman <rms@gnu.org>
parents:
13545
diff
changeset
|
123 (indent-to-left-margin))))) |
10467
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
124 |
263 | 125 ;; This is the default indent-line-function, |
126 ;; used in Fundamental Mode, Text Mode, etc. | |
127 (defun indent-to-left-margin () | |
10812
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
128 "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
|
129 (indent-line-to (current-left-margin))) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
130 |
10812
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
131 (defun delete-to-left-margin (&optional from to) |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
132 "Remove left margin indentation from a region. |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
133 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
|
134 In no case will it delete non-whitespace. |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
135 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
|
136 (save-excursion |
10812
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
137 (goto-char (or to (point-max))) |
10467
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
138 (setq to (point-marker)) |
10812
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
139 (goto-char (or from (point-min))) |
10467
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
140 (or (bolp) (forward-line 1)) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
141 (while (< (point) to) |
10812
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
142 (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
|
143 (forward-line 1)) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
144 (move-marker to nil))) |
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 set-left-margin (from to lm) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
147 "Set the left margin of the region to WIDTH. |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
148 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
|
149 (interactive "r\nNSet left margin to column: ") |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
150 (if (interactive-p) (setq lm (prefix-numeric-value lm))) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
151 (save-excursion |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
152 ;; If inside indentation, start from BOL. |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
153 (goto-char from) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
154 (skip-chars-backward " \t") |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
155 (if (bolp) (setq from (point))) |
10812
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
156 ;; Place end after whitespace |
10467
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
157 (goto-char to) |
10812
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
158 (skip-chars-forward " \t") |
10467
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
159 (setq to (point-marker))) |
10812
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
160 ;; Delete margin indentation first, but keep paragraph indentation. |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
161 (delete-to-left-margin from to) |
10467
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
162 (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
|
163 (indent-rigidly from to lm) |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
164 (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
|
165 (move-marker to nil)) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
166 |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
167 (defun set-right-margin (from to lm) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
168 "Set the right margin of the region to WIDTH. |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
169 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
|
170 (interactive "r\nNSet right margin to width: ") |
10467
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
171 (if (interactive-p) (setq lm (prefix-numeric-value lm))) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
172 (save-excursion |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
173 (goto-char from) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
174 (skip-chars-backward " \t") |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
175 (if (bolp) (setq from (point)))) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
176 (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
|
177 (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
|
178 |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
179 (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
|
180 "Programmatically change value of a text-property. |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
181 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
|
182 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
|
183 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
|
184 (let ((begin from) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
185 end val) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
186 (while (setq val (get-text-property begin prop object) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
187 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
|
188 (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
|
189 (setq begin end)) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
190 (if (< begin to) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
191 (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
|
192 |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
193 (defun increase-left-margin (from to inc) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
194 "Increase or decrease the left-margin of the region. |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
195 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
|
196 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
|
197 to change the margin by, in characters. |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
198 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
|
199 (interactive "*r\nP") |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
200 (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
|
201 (save-excursion |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
202 (goto-char from) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
203 (skip-chars-backward " \t") |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
204 (if (bolp) (setq from (point))) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
205 (goto-char to) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
206 (setq to (point-marker))) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
207 (alter-text-property from to 'left-margin |
10812
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
208 (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
|
209 (indent-rigidly from to inc) |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
210 (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
|
211 (move-marker to nil)) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
212 |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
213 (defun decrease-left-margin (from to inc) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
214 "Make the left margin of the region smaller. |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
215 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
|
216 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
|
217 to change the margin by, in characters. |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
218 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
|
219 (interactive "*r\nP") |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
220 (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
|
221 (increase-left-margin from to (- inc))) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
222 |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
223 (defun increase-right-margin (from to inc) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
224 "Increase the right-margin of the region. |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
225 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
|
226 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
|
227 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
|
228 the right margin width. |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
229 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
|
230 (interactive "r\nP") |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
231 (if (interactive-p) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
232 (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
|
233 standard-indent))) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
234 (save-excursion |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
235 (alter-text-property from to 'right-margin |
10812
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
236 (lambda (v) (+ inc (or v 0)))) |
10467
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
237 (if auto-fill-function |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
238 (fill-region from to nil t t)))) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
239 |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
240 (defun decrease-right-margin (from to inc) |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
241 "Make the right margin of the region smaller. |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
242 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
|
243 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
|
244 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
|
245 the right margin width. |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
246 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
|
247 (interactive "*r\nP") |
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
248 (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
|
249 (increase-right-margin from to (- inc))) |
263 | 250 |
10812
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
251 (defun beginning-of-line-text (&optional n) |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
252 "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
|
253 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
|
254 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
|
255 fill-prefix, and any indentation used for centering or right-justifying the |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
256 line, but does not move past any whitespace that was explicitly inserted |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
257 \(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
|
258 (interactive "p") |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
259 (beginning-of-line n) |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
260 (skip-chars-forward " \t") |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
261 ;; Skip over fill-prefix. |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
262 (if (and fill-prefix |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
263 (not (string-equal fill-prefix ""))) |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
264 (if (equal fill-prefix |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
265 (buffer-substring |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
266 (point) (min (point-max) (+ (length fill-prefix) (point))))) |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
267 (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
|
268 (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
|
269 (looking-at adaptive-fill-regexp)) |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
270 (goto-char (match-end 0)))) |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
271 ;; Skip centering or flushright indentation |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
272 (if (memq (current-justification) '(center right)) |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
273 (skip-chars-forward " \t"))) |
cd0a341fd620
(current-left-margin): careful of EOB.
Boris Goldowsky <boris@gnu.org>
parents:
10470
diff
changeset
|
274 |
263 | 275 (defvar indent-region-function nil |
12683
0e9d2009e609
(indent-region-function): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
11281
diff
changeset
|
276 "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
|
277 A value of nil means really run `indent-according-to-mode' on each line.") |
263 | 278 |
4465
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
279 (defun indent-region (start end column) |
263 | 280 "Indent each nonblank line in the region. |
4465
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
281 With no argument, indent each line using `indent-according-to-mode', |
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
282 or use `indent-region-function' to do the whole region if that's non-nil. |
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
283 If there is a fill prefix, make each line start with the fill prefix. |
263 | 284 With argument COLUMN, indent each line to that column. |
285 Called from a program, takes three args: START, END and COLUMN." | |
286 (interactive "r\nP") | |
4465
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
287 (if (null column) |
263 | 288 (if fill-prefix |
289 (save-excursion | |
290 (goto-char end) | |
291 (setq end (point-marker)) | |
292 (goto-char start) | |
293 (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
|
294 (while (< (point) end) |
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
295 (or (looking-at regexp) |
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
296 (and (bolp) (eolp)) |
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
297 (insert fill-prefix)) |
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
298 (forward-line 1)))) |
263 | 299 (if indent-region-function |
300 (funcall indent-region-function start end) | |
301 (save-excursion | |
4465
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
302 (goto-char end) |
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
303 (setq end (point-marker)) |
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
304 (goto-char start) |
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
305 (or (bolp) (forward-line 1)) |
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
306 (while (< (point) end) |
4473
600d0d832d99
(indent-region): Fix paren error in last change.
Richard M. Stallman <rms@gnu.org>
parents:
4465
diff
changeset
|
307 (or (and (bolp) (eolp)) |
4465
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
308 (funcall indent-line-function)) |
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
309 (forward-line 1)) |
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
310 (move-marker end nil)))) |
794498c64928
(indent-region): Rename arg ARG to COLUMN.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
311 (setq column (prefix-numeric-value column)) |
263 | 312 (save-excursion |
313 (goto-char end) | |
314 (setq end (point-marker)) | |
315 (goto-char start) | |
316 (or (bolp) (forward-line 1)) | |
317 (while (< (point) end) | |
318 (delete-region (point) (progn (skip-chars-forward " \t") (point))) | |
319 (or (eolp) | |
10467
b8053ce05ab5
(standard-indent): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8642
diff
changeset
|
320 (indent-to column 0)) |
263 | 321 (forward-line 1)) |
322 (move-marker end nil)))) | |
323 | |
324 (defun indent-relative-maybe () | |
325 "Indent a new line like previous nonblank line." | |
326 (interactive) | |
327 (indent-relative t)) | |
328 | |
329 (defun indent-relative (&optional unindented-ok) | |
330 "Space out to under next indent point in previous nonblank line. | |
331 An indent point is a non-whitespace character following whitespace. | |
332 If the previous nonblank line has no indent points beyond the | |
333 column point starts at, `tab-to-tab-stop' is done instead." | |
334 (interactive "P") | |
335 (if abbrev-mode (expand-abbrev)) | |
336 (let ((start-column (current-column)) | |
337 indent) | |
338 (save-excursion | |
339 (beginning-of-line) | |
340 (if (re-search-backward "^[^\n]" nil t) | |
341 (let ((end (save-excursion (forward-line 1) (point)))) | |
342 (move-to-column start-column) | |
343 ;; Is start-column inside a tab on this line? | |
344 (if (> (current-column) start-column) | |
345 (backward-char 1)) | |
346 (or (looking-at "[ \t]") | |
347 unindented-ok | |
348 (skip-chars-forward "^ \t" end)) | |
349 (skip-chars-forward " \t" end) | |
350 (or (= (point) end) (setq indent (current-column)))))) | |
351 (if indent | |
352 (let ((opoint (point-marker))) | |
353 (delete-region (point) (progn (skip-chars-backward " \t") (point))) | |
354 (indent-to indent 0) | |
355 (if (> opoint (point)) | |
356 (goto-char opoint)) | |
357 (move-marker opoint nil)) | |
358 (tab-to-tab-stop)))) | |
359 | |
360 (defvar tab-stop-list | |
361 '(8 16 24 32 40 48 56 64 72 80 88 96 104 112 120) | |
7813
1fa576a274b5
(tab-stop-list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4473
diff
changeset
|
362 "*List of tab stop positions used by `tab-to-tab-stops'. |
1fa576a274b5
(tab-stop-list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4473
diff
changeset
|
363 This should be a list of integers, ordered from smallest to largest.") |
263 | 364 |
365 (defvar edit-tab-stops-map nil "Keymap used in `edit-tab-stops'.") | |
366 (if edit-tab-stops-map | |
367 nil | |
368 (setq edit-tab-stops-map (make-sparse-keymap)) | |
369 (define-key edit-tab-stops-map "\C-x\C-s" 'edit-tab-stops-note-changes) | |
370 (define-key edit-tab-stops-map "\C-c\C-c" 'edit-tab-stops-note-changes)) | |
371 | |
372 (defvar edit-tab-stops-buffer nil | |
373 "Buffer whose tab stops are being edited--in case | |
374 the variable `tab-stop-list' is local in that buffer.") | |
375 | |
376 (defun edit-tab-stops () | |
377 "Edit the tab stops used by `tab-to-tab-stop'. | |
378 Creates a buffer *Tab Stops* containing text describing the tab stops. | |
379 A colon indicates a column where there is a tab stop. | |
380 You can add or remove colons and then do \\<edit-tab-stops-map>\\[edit-tab-stops-note-changes] to make changes take effect." | |
381 (interactive) | |
382 (setq edit-tab-stops-buffer (current-buffer)) | |
383 (switch-to-buffer (get-buffer-create "*Tab Stops*")) | |
384 (use-local-map edit-tab-stops-map) | |
385 (make-local-variable 'indent-tabs-mode) | |
386 (setq indent-tabs-mode nil) | |
387 (overwrite-mode 1) | |
388 (setq truncate-lines t) | |
389 (erase-buffer) | |
390 (let ((tabs tab-stop-list)) | |
391 (while tabs | |
392 (indent-to (car tabs) 0) | |
393 (insert ?:) | |
394 (setq tabs (cdr tabs)))) | |
395 (let ((count 0)) | |
396 (insert ?\n) | |
397 (while (< count 8) | |
398 (insert (+ count ?0)) | |
399 (insert " ") | |
400 (setq count (1+ count))) | |
401 (insert ?\n) | |
402 (while (> count 0) | |
403 (insert "0123456789") | |
404 (setq count (1- count)))) | |
405 (insert "\nTo install changes, type C-c C-c") | |
406 (goto-char (point-min))) | |
407 | |
408 (defun edit-tab-stops-note-changes () | |
409 "Put edited tab stops into effect." | |
410 (interactive) | |
411 (let (tabs) | |
412 (save-excursion | |
413 (goto-char 1) | |
414 (end-of-line) | |
415 (while (search-backward ":" nil t) | |
416 (setq tabs (cons (current-column) tabs)))) | |
417 (bury-buffer (prog1 (current-buffer) | |
418 (switch-to-buffer edit-tab-stops-buffer))) | |
419 (setq tab-stop-list tabs)) | |
420 (message "Tab stops installed")) | |
421 | |
422 (defun tab-to-tab-stop () | |
423 "Insert spaces or tabs to next defined tab-stop column. | |
424 The variable `tab-stop-list' is a list of columns at which there are tab stops. | |
425 Use \\[edit-tab-stops] to edit them interactively." | |
426 (interactive) | |
12778
657be7aaa043
(tab-to-tab-stop): Expand abbrevs only after a word-char.
Richard M. Stallman <rms@gnu.org>
parents:
12683
diff
changeset
|
427 (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
|
428 (expand-abbrev)) |
263 | 429 (let ((tabs tab-stop-list)) |
430 (while (and tabs (>= (current-column) (car tabs))) | |
431 (setq tabs (cdr tabs))) | |
432 (if tabs | |
7973
b7ea350590a7
(tab-to-tab-stop): Combine new indentation with previous.
Richard M. Stallman <rms@gnu.org>
parents:
7813
diff
changeset
|
433 (let ((opoint (point))) |
b7ea350590a7
(tab-to-tab-stop): Combine new indentation with previous.
Richard M. Stallman <rms@gnu.org>
parents:
7813
diff
changeset
|
434 (skip-chars-backward " \t") |
b7ea350590a7
(tab-to-tab-stop): Combine new indentation with previous.
Richard M. Stallman <rms@gnu.org>
parents:
7813
diff
changeset
|
435 (delete-region (point) opoint) |
b7ea350590a7
(tab-to-tab-stop): Combine new indentation with previous.
Richard M. Stallman <rms@gnu.org>
parents:
7813
diff
changeset
|
436 (indent-to (car tabs))) |
263 | 437 (insert ?\ )))) |
438 | |
439 (defun move-to-tab-stop () | |
440 "Move point to next defined tab-stop column. | |
441 The variable `tab-stop-list' is a list of columns at which there are tab stops. | |
442 Use \\[edit-tab-stops] to edit them interactively." | |
443 (interactive) | |
444 (let ((tabs tab-stop-list)) | |
445 (while (and tabs (>= (current-column) (car tabs))) | |
446 (setq tabs (cdr tabs))) | |
447 (if tabs | |
8037
fd5fb80a940d
(move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents:
7984
diff
changeset
|
448 (let ((before (point))) |
fd5fb80a940d
(move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents:
7984
diff
changeset
|
449 (move-to-column (car tabs) t) |
fd5fb80a940d
(move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents:
7984
diff
changeset
|
450 (save-excursion |
fd5fb80a940d
(move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents:
7984
diff
changeset
|
451 (goto-char before) |
fd5fb80a940d
(move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents:
7984
diff
changeset
|
452 ;; 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
|
453 ;; 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
|
454 (if (and (eq (preceding-char) ?\ ) |
fd5fb80a940d
(move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents:
7984
diff
changeset
|
455 (eq (following-char) ?\t)) |
fd5fb80a940d
(move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents:
7984
diff
changeset
|
456 (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
|
457 (while (and (> (current-column) tabend) |
fd5fb80a940d
(move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents:
7984
diff
changeset
|
458 (eq (preceding-char) ?\ )) |
fd5fb80a940d
(move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents:
7984
diff
changeset
|
459 (forward-char -1)) |
fd5fb80a940d
(move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents:
7984
diff
changeset
|
460 (delete-region (point) before)))))))) |
fd5fb80a940d
(move-to-tab-stop): Delete unnecessary spaces
Richard M. Stallman <rms@gnu.org>
parents:
7984
diff
changeset
|
461 |
263 | 462 (define-key global-map "\t" 'indent-for-tab-command) |
463 (define-key esc-map "\034" 'indent-region) | |
464 (define-key ctl-x-map "\t" 'indent-rigidly) | |
465 (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
|
466 |
08eb386dd0f3
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
269
diff
changeset
|
467 ;;; indent.el ends here |