annotate lisp/prim/simple.el @ 2:ac2d302a0011 r19-15b2

Import from CVS: tag r19-15b2
author cvs
date Mon, 13 Aug 2007 08:46:35 +0200
parents 376386a54a3c
children b82b59fe008d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 ;;; simple.el --- basic editing commands for XEmacs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 ;; Copyright (C) 1985, 1986, 1987, 1993-1995 Free Software Foundation, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 ;; Copyright (C) 1995 Tinker Systems and INS Engineering Corp.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 ;; This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 ;; XEmacs is free software; you can redistribute it and/or modify it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 ;; under the terms of the GNU General Public License as published by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 ;; the Free Software Foundation; either version 2, or (at your option)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 ;; any later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 ;; XEmacs is distributed in the hope that it will be useful, but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 ;; General Public License for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 ;; You should have received a copy of the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 ;; along with XEmacs; see the file COPYING. If not, write to the Free
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 ;; Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22 ;;; Synched up with: FSF 19.30.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24 ;;; Commentary:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 ;; A grab-bag of basic XEmacs commands not specifically related to some
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 ;; major mode or to file-handling.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 ;;; Changes for zmacs-style active-regions:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 ;;; beginning-of-buffer, end-of-buffer, count-lines-region,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 ;;; count-lines-buffer, what-line, what-cursor-position, set-goal-column,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 ;;; set-fill-column, prefix-arg-internal, and line-move (which is used by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 ;;; next-line and previous-line) set zmacs-region-stays to t, so that they
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 ;;; don't affect the current region-hilighting state.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 ;;; mark-whole-buffer, mark-word, exchange-point-and-mark, and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 ;;; set-mark-command (without an argument) call zmacs-activate-region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 ;;; mark takes an optional arg like the new Fmark_marker() does. When
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 ;;; the region is not active, mark returns nil unless the optional arg is true.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 ;;; push-mark, pop-mark, exchange-point-and-mark, and set-marker, and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 ;;; set-mark-command use (mark t) so that they can access the mark whether
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 ;;; the region is active or not.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 ;;; shell-command, shell-command-on-region, yank, and yank-pop (which all
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 ;;; push a mark) have been altered to call exchange-point-and-mark with an
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 ;;; argument, meaning "don't activate the region". These commands only use
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 ;;; exchange-point-and-mark to position the newly-pushed mark correctly, so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 ;;; this isn't a user-visible change. These functions have also been altered
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 ;;; to use (mark t) for the same reason.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 ;;; Code:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 (defun newline (&optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 "Insert a newline, and move to left margin of the new line if it's blank.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 The newline is marked with the text-property `hard'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 With arg, insert that many newlines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 In Auto Fill mode, if no numeric arg, break the preceding line if it's long."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 (interactive "*P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62 (barf-if-buffer-read-only nil (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63 ;; Inserting a newline at the end of a line produces better redisplay in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 ;; try_window_id than inserting at the beginning of a line, and the textual
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 ;; result is the same. So, if we're at beginning of line, pretend to be at
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 ;; the end of the previous line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 (let ((flag (and (not (bobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 (bolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 (< (or (previous-extent-change (point)) -2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 (- (point) 2))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 (was-page-start (and (bolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 (looking-at page-delimiter)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 (beforepos (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 (if flag (backward-char 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 ;; Call self-insert so that auto-fill, abbrev expansion etc. happens.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 ;; Set last-command-char to tell self-insert what to insert.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 (let ((last-command-char ?\n)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 ;; Don't auto-fill if we have a numeric argument.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 ;; Also not if flag is true (it would fill wrong line);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 ;; there is no need to since we're at BOL.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 (auto-fill-function (if (or arg flag) nil auto-fill-function)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 (unwind-protect
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 (self-insert-command (prefix-numeric-value arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 ;; If we get an error in self-insert-command, put point at right place.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 (if flag (forward-char 1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 ;; If we did *not* get an error, cancel that forward-char.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 (if flag (backward-char 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 ;; Mark the newline(s) `hard'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 (if use-hard-newlines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 (let* ((from (- (point) (if arg (prefix-numeric-value arg) 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 (sticky (get-text-property from 'end-open)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 (put-text-property from (point) 'hard 't)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 ;; If end-open is not "t", add 'hard to end-open list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 (if (and (listp sticky) (not (memq 'hard sticky)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 (put-text-property from (point) 'end-open
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 (cons 'hard sticky)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 ;; If the newline leaves the previous line blank,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 ;; and we have a left margin, delete that from the blank line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 (or flag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 (goto-char beforepos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 (and (looking-at "[ \t]$")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 (> (current-left-margin) 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 (delete-region (point) (progn (end-of-line) (point))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 (if flag (forward-char 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 ;; Indent the line after the newline, except in one case:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 ;; when we added the newline at the beginning of a line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 ;; which starts a page.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110 (or was-page-start
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111 (move-to-left-margin nil t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114 (defun open-line (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 "Insert a newline and leave point before it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 If there is a fill prefix and/or a left-margin, insert them on the new line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 if the line would have been blank.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118 With arg N, insert N newlines."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119 ;; "Insert a newline and leave point before it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120 ;; If there is a fill prefix, insert the fill prefix on the new line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 ;; if the line would have been empty.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 ;; With arg N, insert N newlines."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 (interactive "*p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 (let* ((do-fill-prefix (and fill-prefix (bolp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 ;well, I'm going to re-enable this. --ben
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 ;(do-fill-prefix nil) ;; screw this -- says JWZ
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 (do-left-margin (and (bolp) (> (current-left-margin) 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 (loc (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 (newline arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 (goto-char loc)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 (while (> arg 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 (cond ((bolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 (if do-left-margin (indent-to (current-left-margin)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
134 (if do-fill-prefix (insert fill-prefix))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135 (forward-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136 (setq arg (1- arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 (goto-char loc)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138 (end-of-line)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 (defun split-line ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141 "Split current line, moving portion beyond point vertically down."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
142 (interactive "*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
143 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
144 (let ((col (current-column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145 (pos (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146 (newline 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
147 (indent-to col 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 (goto-char pos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150 (defun quoted-insert (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151 "Read next input character and insert it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
152 This is useful for inserting control characters.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153 You may also type up to 3 octal digits, to insert a character with that code.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
155 In overwrite mode, this function inserts the character anyway, and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
156 does not handle octal digits specially. This means that if you use
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 overwrite as your normal editing mode, you can use this function to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158 insert characters when necessary.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 In binary overwrite mode, this function does overwrite, and octal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 digits are interpreted as a character code. This is supposed to make
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 this function useful in editing binary files."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 (interactive "*p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 (let ((char (if (or (not overwrite-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 (eq overwrite-mode 'overwrite-mode-binary))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 (read-quoted-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167 (read-char))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168 (if (> arg 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 (if (eq overwrite-mode 'overwrite-mode-binary)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 (delete-char arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 (while (> arg 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 (insert char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173 (setq arg (1- arg)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
174
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
175 (defun delete-indentation (&optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176 "Join this line to previous and fix up whitespace at join.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177 If there is a fill prefix, delete it from the beginning of this line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 With argument, join this line to following line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179 (interactive "*P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181 (if arg (forward-line 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182 (if (eq (preceding-char) ?\n)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 (delete-region (point) (1- (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185 ;; If the second line started with the fill prefix,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 ;; delete the prefix.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 (if (and fill-prefix
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 (<= (+ (point) (length fill-prefix)) (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 (string= fill-prefix
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 (buffer-substring (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 (+ (point) (length fill-prefix)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 (delete-region (point) (+ (point) (length fill-prefix))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193 (fixup-whitespace))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195 (defun fixup-whitespace ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 "Fixup white space between objects around point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 Leave one space or none, according to the context."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 (interactive "*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200 (delete-horizontal-space)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 (if (or (looking-at "^\\|\\s)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202 (save-excursion (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203 (looking-at "$\\|\\s(\\|\\s'")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 (insert ?\ ))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
207 (defun delete-horizontal-space ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 "Delete all spaces and tabs around point."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
209 (interactive "*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
210 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211 (delete-region (point) (progn (skip-chars-forward " \t") (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 (defun just-one-space ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214 "Delete all spaces and tabs around point, leaving one space."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
215 (interactive "*")
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
216 (if abbrev-mode
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
217 (expand-abbrev))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
218 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219 (if (= (following-char) ? )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221 (insert ? ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
222 (delete-region (point) (progn (skip-chars-forward " \t") (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224 (defun delete-blank-lines ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
225 "On blank line, delete all surrounding blank lines, leaving just one.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
226 On isolated blank line, delete that one.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
227 On nonblank line, delete any immediately following blank lines."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
228 (interactive "*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 (let (thisblank singleblank)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232 (setq thisblank (looking-at "[ \t]*$"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 ;; Set singleblank if there is just one blank line here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234 (setq singleblank
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235 (and thisblank
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236 (not (looking-at "[ \t]*\n[ \t]*$"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 (or (bobp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 (progn (forward-line -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 (not (looking-at "[ \t]*$")))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
240 ;; Delete preceding blank lines, and this one too if it's the only one.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241 (if thisblank
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
244 (if singleblank (forward-line 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 (delete-region (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246 (if (re-search-backward "[^ \t\n]" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 (progn (forward-line 1) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
248 (point-min)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
249 ;; Delete following blank lines, unless the current line is blank
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250 ;; and there are no following blank lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 (if (not (and thisblank singleblank))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 (forward-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 (delete-region (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 (if (re-search-forward "[^ \t\n]" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 (progn (beginning-of-line) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258 (point-max)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
259 ;; Handle the special case where point is followed by newline and eob.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
260 ;; Delete the line, leaving point at eob.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261 (if (looking-at "^[ \t]*\n\\'")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 (delete-region (point) (point-max)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 (defun back-to-indentation ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 "Move point to the first non-whitespace character on this line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266 (interactive "_")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267 (beginning-of-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268 (skip-chars-forward " \t"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
269
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270 (defun newline-and-indent ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271 "Insert a newline, then indent according to major mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 Indentation is done using the value of `indent-line-function'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273 In programming language modes, this is the same as TAB.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274 In some text modes, where TAB inserts a tab, this command indents to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 column specified by the function `current-left-margin'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 (interactive "*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277 (delete-region (point) (progn (skip-chars-backward " \t") (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 (newline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279 (indent-according-to-mode))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 (defun reindent-then-newline-and-indent ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 "Reindent current line, insert newline, then indent the new line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 Indentation of both lines is done according to the current major mode,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 which means calling the current value of `indent-line-function'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 In programming language modes, this is the same as TAB.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 In some text modes, where TAB inserts a tab, this indents to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287 column specified by the function `current-left-margin'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 (interactive "*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 (delete-region (point) (progn (skip-chars-backward " \t") (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 (indent-according-to-mode))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 (newline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293 (indent-according-to-mode))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295 ;; Internal subroutine of delete-char
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296 (defun kill-forward-chars (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297 (if (listp arg) (setq arg (car arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298 (if (eq arg '-) (setq arg -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299 (kill-region (point) (+ (point) arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301 ;; Internal subroutine of backward-delete-char
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302 (defun kill-backward-chars (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303 (if (listp arg) (setq arg (car arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 (if (eq arg '-) (setq arg -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305 (kill-region (point) (- (point) arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
306
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
307 (defun backward-delete-char-untabify (arg &optional killp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308 "Delete characters backward, changing tabs into spaces.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309 Delete ARG chars, and kill (save in kill ring) if KILLP is non-nil.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310 Interactively, ARG is the prefix arg (default 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 and KILLP is t if a prefix arg was specified."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312 (interactive "*p\nP")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 (let ((count arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 (while (and (> count 0) (not (bobp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316 (if (= (preceding-char) ?\t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317 (let ((col (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318 (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319 (setq col (- col (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320 (insert-char ?\ col)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321 (delete-char 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322 (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323 (setq count (1- count)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
324 (delete-backward-char arg killp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325 ;; In overwrite mode, back over columns while clearing them out,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
326 ;; unless at end of line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327 (and overwrite-mode (not (eolp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328 (save-excursion (insert-char ?\ arg))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
329
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330 (defun zap-to-char (arg char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331 "Kill up to and including ARG'th occurrence of CHAR.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332 Goes backward if ARG is negative; error if CHAR not found."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333 (interactive "*p\ncZap to char: ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
334 (kill-region (point) (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335 (search-forward (char-to-string char) nil nil arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 ; (goto-char (if (> arg 0) (1- (point)) (1+ (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 (defun beginning-of-buffer (&optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340 "Move point to the beginning of the buffer; leave mark at previous position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
341 With arg N, put point N/10 of the way from the beginning.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 If the buffer is narrowed, this command uses the beginning and size
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 of the accessible part of the buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 Don't use this command in Lisp programs!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347 \(goto-char (point-min)) is faster and avoids clobbering the mark."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
348 (interactive "_P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
349 (push-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
350 (let ((size (- (point-max) (point-min))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
351 (goto-char (if arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352 (+ (point-min)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353 (if (> size 10000)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354 ;; Avoid overflow for large buffer sizes!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 (* (prefix-numeric-value arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356 (/ size 10))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357 (/ (+ 10 (* size (prefix-numeric-value arg))) 10)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 (point-min))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359 (if arg (forward-line 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
360
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361 (defun end-of-buffer (&optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362 "Move point to the end of the buffer; leave mark at previous position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
363 With arg N, put point N/10 of the way from the end.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
364
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365 If the buffer is narrowed, this command uses the beginning and size
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
366 of the accessible part of the buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 Don't use this command in Lisp programs!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369 \(goto-char (point-max)) is faster and avoids clobbering the mark."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 (interactive "_P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371 (push-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 ;; XEmacs changes here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373 (let ((scroll-to-end (not (pos-visible-in-window-p (point-max))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374 (size (- (point-max) (point-min))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375 (goto-char (if arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 (- (point-max)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377 (if (> size 10000)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378 ;; Avoid overflow for large buffer sizes!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 (* (prefix-numeric-value arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 (/ size 10))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381 (/ (* size (prefix-numeric-value arg)) 10)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 (point-max)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383 (cond (arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384 ;; If we went to a place in the middle of the buffer,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385 ;; adjust it to the beginning of a line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386 (forward-line 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 (scroll-to-end
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388 ;; If the end of the buffer is not already on the screen,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389 ;; then scroll specially to put it near, but not at, the bottom.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390 (recenter -3)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392 (defun mark-beginning-of-buffer (&optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393 "Push a mark at the beginning of the buffer; leave point where it is.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 With arg N, push mark N/10 of the way from the true beginning."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396 (push-mark (if arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397 (if (> (buffer-size) 10000)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 ;; Avoid overflow for large buffer sizes!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399 (* (prefix-numeric-value arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400 (/ (buffer-size) 10))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 (/ (+ 10 (* (buffer-size) (prefix-numeric-value arg))) 10))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405 (define-function 'mark-bob 'mark-beginning-of-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407 (defun mark-end-of-buffer (&optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408 "Push a mark at the end of the buffer; leave point where it is.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 With arg N, push mark N/10 of the way from the true end."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411 (push-mark (if arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 (- (1+ (buffer-size))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413 (if (> (buffer-size) 10000)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 ;; Avoid overflow for large buffer sizes!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 (* (prefix-numeric-value arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 (/ (buffer-size) 10))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 (/ (* (buffer-size) (prefix-numeric-value arg)) 10)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418 (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421 (define-function 'mark-eob 'mark-end-of-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423 (defun mark-whole-buffer ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424 "Put point at beginning and mark at end of buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 You probably should not use this function in Lisp programs;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 it is usually a mistake for a Lisp function to use any subroutine
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 that uses or sets the mark."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 (push-mark (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 (push-mark (point-max) nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 (goto-char (point-min)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 (defun eval-current-buffer (&optional printflag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434 "Evaluate the current buffer as Lisp code.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 Programs can pass argument PRINTFLAG which controls printing of output:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436 nil means discard it; anything else is stream for print."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 (eval-buffer (current-buffer) printflag))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 (defun count-words-buffer (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 (interactive "b")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 (let ((buf (or b (current-buffer))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 (set-buffer buf)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 (message "Buffer has %d words"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 (count-words-region (point-min) (point-max))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448 (defun count-words-region (start end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449 (interactive "r")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 (let ((n 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 (goto-char start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 (while (< (point) end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 (if (forward-word 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 (setq n (1+ n))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 (message "Region has %d words" n)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457 n)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459 (defun count-lines-region (start end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460 "Print number of lines and characters in the region."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461 (interactive "_r")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 (let ((n (count-lines start end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 (message "Region has %d lines, %d characters"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 n (- end start))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465 n))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 (defun count-lines-buffer (b)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 "Print number of lines and charcters in the specified buffer."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 (interactive "_b")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 (let ((buf (or b (current-buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 cnt)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 (set-buffer buf)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474 (setq cnt (count-lines (point-min) (point-max)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 (message "Region has %d lines, %d characters"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476 cnt (- (point-max) (point-min)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 cnt)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479 (defun what-line ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480 "Print the current buffer line number and narrowed line number of point."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 (interactive "_")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 (let ((opoint (point)) start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486 (widen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488 (setq start (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489 (goto-char opoint)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
490 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491 (if (/= start 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492 (message "line %d (narrowed line %d)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493 (1+ (count-lines 1 (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 (1+ (count-lines start (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 (message "Line %d" (1+ (count-lines 1 (point)))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498 (defun count-lines (start end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 "Return number of lines between START and END.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500 This is usually the number of newlines between them,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501 but can be one more if START is not equal to END
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502 and the greater of them is not at the start of a line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 (narrow-to-region start end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507 (if (eq selective-display t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 (save-match-data
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509 (let ((done 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 (while (re-search-forward "[\n\C-m]" nil t 40)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 (setq done (+ 40 done)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 (while (re-search-forward "[\n\C-m]" nil t 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 (setq done (+ 1 done)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 (goto-char (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 (if (and (/= start end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 (not (bolp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 (1+ done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518 done)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 (- (buffer-size) (forward-line (buffer-size)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 (defun what-cursor-position ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 "Print info on cursor position (on screen and within buffer)."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 (interactive "_")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 (let* ((char (following-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 (beg (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 (end (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 (pos (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 (total (buffer-size))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 (percent (if (> total 50000)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 ;; Avoid overflow from multiplying by 100!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 (/ (+ (/ total 200) (1- pos)) (max (/ total 100) 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 (/ (+ (/ total 2) (* 100 (1- pos))) (max total 1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533 (hscroll (if (= (window-hscroll) 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 (format " Hscroll=%d" (window-hscroll))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 (col (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 (if (= pos end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 (if (or (/= beg 1) (/= end (1+ total)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 (message "point=%d of %d(%d%%) <%d - %d> column %d %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 pos total percent beg end col hscroll)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 (message "point=%d of %d(%d%%) column %d %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 pos total percent col hscroll))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 (if (or (/= beg 1) (/= end (1+ total)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 (message "Char: %s (0%o, %d, 0x%x) point=%d of %d(%d%%) <%d - %d> column %d %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 (text-char-description char) char char char pos total
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 percent beg end col hscroll)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 (message "Char: %s (0%o, %d, 0x%x) point=%d of %d(%d%%) column %d %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 (text-char-description char) char char char pos total
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 percent col hscroll)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 (defun fundamental-mode ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 "Major mode not specialized for anything in particular.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 Other major modes are defined by comparison with this one."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 (kill-all-local-variables))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558 ;; We define this, rather than making `eval' interactive,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 ;; for the sake of completion of names like eval-region, eval-current-buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 (defun eval-expression (expression)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 "Evaluate EXPRESSION and print value in minibuffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 Value is also consed on to front of the variable `values'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563 (interactive "xEval: ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564 (setq values (cons (eval expression) values))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565 (prin1 (car values) t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 (defun edit-and-eval-command (prompt command &optional history)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 "Prompting with PROMPT, let user edit COMMAND and eval result.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 COMMAND is a Lisp expression. Let user edit that expression in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 the minibuffer, then read and evaluate the result."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 (let ((command (read-expression prompt
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572 ;; first try to format the thing readably;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 ;; and if that fails, print it normally.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 (condition-case ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 (let ((print-readably t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 (prin1-to-string command))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577 (error (prin1-to-string command)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 (or history '(command-history . 1)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 (or history (setq history 'command-history))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580 (if (consp history)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 (setq history (car history)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582 (if (eq history t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584 ;; If command was added to the history as a string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585 ;; get rid of that. We want only evallable expressions there.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586 (if (stringp (car (symbol-value history)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
587 (set history (cdr (symbol-value history))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
589 ;; If command to be redone does not match front of history,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590 ;; add it to the history.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591 (or (equal command (car (symbol-value history)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592 (set history (cons command (symbol-value history)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593 (eval command)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
595 (defun repeat-complex-command (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596 "Edit and re-evaluate last complex command, or ARGth from last.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597 A complex command is one which used the minibuffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598 The command is placed in the minibuffer as a Lisp form for editing.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 The result is executed, repeating the command as changed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600 If the command has been changed or is not the most recent previous command
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 it is added to the front of the command history.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 You can use the minibuffer history commands \\<minibuffer-local-map>\\[next-history-element] and \\[previous-history-element]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 to get different commands to edit and resubmit."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 (let ((print-level nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606 (edit-and-eval-command "Redo: "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 (or (nth (1- arg) command-history)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 (error ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 (cons 'command-history arg))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611 (defun goto-line (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 "Goto line ARG, counting from line 1 at beginning of buffer."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 (interactive "NGoto line: ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 (setq arg (prefix-numeric-value arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616 (widen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 (goto-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 (if (eq selective-display t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619 (re-search-forward "[\n\C-m]" nil 'end (1- arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620 (forward-line (1- arg)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 ;Put this on C-x u, so we can force that rather than C-_ into startup msg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 (define-function 'advertised-undo 'undo)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 (defun undo (&optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626 "Undo some previous changes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 Repeat this command to undo more changes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628 A numeric argument serves as a repeat count."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629 (interactive "*p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 ;; If we don't get all the way through, make last-command indicate that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631 ;; for the following command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632 (setq this-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 (let ((modified (buffer-modified-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634 (recent-save (recent-auto-save-p)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
635 (or (eq (selected-window) (minibuffer-window))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 (message "Undo!"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
637 (or (and (eq last-command 'undo)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638 (eq (current-buffer) last-undo-buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 (progn (undo-start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640 (undo-more 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641 (undo-more (or arg 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 ;; Don't specify a position in the undo record for the undo command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643 ;; Instead, undoing this should move point to where the change is.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644 (let ((tail buffer-undo-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645 done)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646 (while (and tail (not done) (not (null (car tail))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 (if (integerp (car tail))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649 (setq done t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650 (setq buffer-undo-list (delq (car tail) buffer-undo-list))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651 (setq tail (cdr tail))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652 (and modified (not (buffer-modified-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653 (delete-auto-save-file-if-necessary recent-save)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
654 ;; If we do get all the way through, make this-command indicate that.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655 (setq this-command 'undo))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
656
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 (defvar pending-undo-list nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 "Within a run of consecutive undo commands, list remaining to be undone.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
660 (defvar last-undo-buffer nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
662 (defun undo-start ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663 "Set `pending-undo-list' to the front of the undo list.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664 The next call to `undo-more' will undo the most recently made change."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
665 (if (eq buffer-undo-list t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 (error "No undo information in this buffer"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667 (setq pending-undo-list buffer-undo-list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669 (defun undo-more (count)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 "Undo back N undo-boundaries beyond what was already undone recently.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671 Call `undo-start' to get ready to undo recent changes,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 then call `undo-more' one or more times to undo them."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673 (or pending-undo-list
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 (error "No further undo information"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 (setq pending-undo-list (primitive-undo count pending-undo-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 last-undo-buffer (current-buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 (defun call-with-transparent-undo (fn &rest args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679 "Apply FN to ARGS, and then undo all changes made by FN to the current
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680 buffer. The undo records are processed even if FN returns non-locally.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681 There is no trace of the changes made by FN in the buffer's undo history.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 You can use this in a write-file-hooks function with continue-save-buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684 to make the contents of a disk file differ from its in-memory buffer."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685 (let ((buffer-undo-list nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686 ;; Kludge to prevent undo list truncation:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 (undo-high-threshold -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688 (undo-threshold -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689 (obuffer (current-buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690 (unwind-protect
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691 (apply fn args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 ;; Go to the buffer we will restore and make it writable:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 (set-buffer obuffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695 (let ((buffer-read-only nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697 (widen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698 ;; Perform all undos, with further undo logging disabled:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699 (let ((tail buffer-undo-list))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
700 (setq buffer-undo-list t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
701 (while tail
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
702 (setq tail (primitive-undo (length tail) tail))))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
703
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 (defconst universal-argument-map
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706 (let ((map (make-sparse-keymap)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707 (set-keymap-default-binding map 'universal-argument-other-key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708 ;FSFmacs (define-key map [switch-frame] nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709 (define-key map [(control u)] 'universal-argument-more)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710 (define-key map ?- 'universal-argument-minus)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 (define-key map ?0 'digit-argument)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712 (define-key map ?1 'digit-argument)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713 (define-key map ?2 'digit-argument)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714 (define-key map ?3 'digit-argument)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 (define-key map ?4 'digit-argument)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
716 (define-key map ?5 'digit-argument)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
717 (define-key map ?6 'digit-argument)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
718 (define-key map ?7 'digit-argument)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719 (define-key map ?8 'digit-argument)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720 (define-key map ?9 'digit-argument)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721 map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722 "Keymap used while processing \\[universal-argument].")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
723
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
724 (defvar universal-argument-num-events nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 "Number of argument-specifying events read by `universal-argument'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
726 `universal-argument-other-key' uses this to discard those events
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
727 from (this-command-keys), and reread only the final command.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 (defun universal-argument ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730 "Begin a numeric argument for the following command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
731 Digits or minus sign following \\[universal-argument] make up the numeric argument.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732 \\[universal-argument] following the digits or minus sign ends the argument.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733 \\[universal-argument] without digits or minus sign provides 4 as argument.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734 Repeating \\[universal-argument] without digits or minus sign
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735 multiplies the argument by 4 each time."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
736 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
737 (setq prefix-arg (list 4))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
738 (setq zmacs-region-stays t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 (setq universal-argument-num-events (length (this-command-keys)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
740 (setq overriding-terminal-local-map universal-argument-map))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
741
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742 ;; A subsequent C-u means to multiply the factor by 4 if we've typed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743 ;; nothing but C-u's; otherwise it means to terminate the prefix arg.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
744 (defun universal-argument-more (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
745 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746 (if (consp arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747 (setq prefix-arg (list (* 4 (car arg))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748 (setq prefix-arg arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749 (setq overriding-terminal-local-map nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750 (setq zmacs-region-stays t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751 (setq universal-argument-num-events (length (this-command-keys))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
752
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
753 (defun negative-argument (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
754 "Begin a negative numeric argument for the next command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
755 \\[universal-argument] following digits or minus sign ends the argument."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
756 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
757 (cond ((integerp arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
758 (setq prefix-arg (- arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
759 ((eq arg '-)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
760 (setq prefix-arg nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
761 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
762 (setq prefix-arg '-)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763 (setq zmacs-region-stays t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
764 (setq universal-argument-num-events (length (this-command-keys)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765 (setq overriding-terminal-local-map universal-argument-map))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767 (defun digit-argument (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
768 "Part of the numeric argument for the next command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
769 \\[universal-argument] following digits or minus sign ends the argument."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
771 (let* ((event last-command-event)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772 (key (and (key-press-event-p event)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773 (event-key event)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774 (digit (and key (characterp key) (>= key ?0) (<= key ?9)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
775 (- key ?0))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
776 (if (null digit)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
777 (universal-argument-other-key arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778 (cond ((integerp arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779 (setq prefix-arg (+ (* arg 10)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780 (if (< arg 0) (- digit) digit))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
781 ((eq arg '-)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
782 ;; Treat -0 as just -, so that -01 will work.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
783 (setq prefix-arg (if (zerop digit) '- (- digit))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
784 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
785 (setq prefix-arg digit)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786 (setq zmacs-region-stays t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
787 (setq universal-argument-num-events (length (this-command-keys)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
788 (setq overriding-terminal-local-map universal-argument-map))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
789
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
790 ;; For backward compatibility, minus with no modifiers is an ordinary
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
791 ;; command if digits have already been entered.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
792 (defun universal-argument-minus (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
793 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
794 (if (integerp arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
795 (universal-argument-other-key arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
796 (negative-argument arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
797
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
798 ;; Anything else terminates the argument and is left in the queue to be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
799 ;; executed as a command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
800 (defun universal-argument-other-key (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
801 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
802 (setq prefix-arg arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
803 (setq zmacs-region-stays t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
804 (let* ((key (this-command-keys))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
805 ;; FSF calls silly function `listify-key-sequence' here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806 (keylist (append key nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807 (setq unread-command-events
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808 (append (nthcdr universal-argument-num-events keylist)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809 unread-command-events)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810 (reset-this-command-lengths)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811 (setq overriding-terminal-local-map nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
814 (defun forward-to-indentation (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815 "Move forward ARG lines and position at first nonblank character."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
816 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 (forward-line arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818 (skip-chars-forward " \t"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820 (defun backward-to-indentation (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
821 "Move backward ARG lines and position at first nonblank character."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
822 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823 (forward-line (- arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824 (skip-chars-forward " \t"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826 (defvar kill-whole-line nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827 "*If non-nil, `kill-line' with no arg at beg of line kills the whole line.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
828
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829 (defun kill-line (&optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830 "Kill the rest of the current line; if no nonblanks there, kill thru newline.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 With prefix argument, kill that many lines from point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
832 Negative arguments kill lines backward.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
833
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834 When calling from a program, nil means \"no arg\",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 a number counts as a prefix arg.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837 If `kill-whole-line' is non-nil, then kill the whole line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838 when given no argument at the beginning of a line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839 (interactive "*P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 (kill-region (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841 ;; Don't shift point before doing the delete; that way,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 ;; undo will record the right position of point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 (if arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
845 (forward-line (prefix-numeric-value arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
846 (if (eobp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
847 (signal 'end-of-buffer nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848 (if (or (looking-at "[ \t]*$") (and kill-whole-line (bolp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
849 (forward-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 (end-of-line)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851 (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
853 (defun backward-kill-line nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
854 "Kill back to the beginning of the line."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856 (let ((point (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
857 (beginning-of-line nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858 (kill-region (point) point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861 ;;;; Window system cut and paste hooks.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 ;;; I think that kill-hooks is a better name and more general mechanism
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 ;;; than interprogram-cut-function (from FSFmacs). I don't like the behavior
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
865 ;;; of interprogram-paste-function: ^Y should always come from the kill ring,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866 ;;; not the X selection. But if that were provided, it should be called (and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867 ;;; behave as) yank-hooks instead. -- jwz
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
869 ;(defvar interprogram-cut-function nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870 ; "Function to call to make a killed region available to other programs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 ;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
872 ;Most window systems provide some sort of facility for cutting and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
873 ;pasting text between the windows of different programs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
874 ;This variable holds a function that XEmacs calls whenever text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875 ;is put in the kill ring, to make the new kill available to other
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876 ;programs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877 ;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 ;The function takes one or two arguments.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 ;The first argument, TEXT, is a string containing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 ;the text which should be made available.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 ;The second, PUSH, if non-nil means this is a \"new\" kill;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882 ;nil means appending to an \"old\" kill.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883 ;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
884 ;(defvar interprogram-paste-function nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885 ; "Function to call to get text cut from other programs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886 ;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887 ;Most window systems provide some sort of facility for cutting and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888 ;pasting text between the windows of different programs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 ;This variable holds a function that Emacs calls to obtain
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 ;text that other programs have provided for pasting.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
891 ;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
892 ;The function should be called with no arguments. If the function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
893 ;returns nil, then no other program has provided such text, and the top
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
894 ;of the Emacs kill ring should be used. If the function returns a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
895 ;string, that string should be put in the kill ring as the latest kill.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896 ;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
897 ;Note that the function should return a string only if a program other
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
898 ;than Emacs has provided a string for pasting; if Emacs provided the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 ;most recent string, the function should return nil. If it is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900 ;difficult to tell whether Emacs or some other program provided the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901 ;current string, it is probably good enough to return nil if the string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 ;is equal (according to `string=') to the last text Emacs provided.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
903
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
904 (defvar kill-hooks nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
905 "Functions run when something is added to the XEmacs kill ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
906 These functions are called with one argument, the string most recently
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
907 cut or copied. You can use this to, for example, make the most recent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 kill become the X Clipboard selection.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
911 ;;;; The kill ring data structure.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
912
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913 (defvar kill-ring nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
914 "List of killed text sequences.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 In order to maintain correct interaction with cut-and-paste facilities
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 offered by window systems, the functions `kill-new', `kill-append', and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 `current-kill' should be used to access the kill ring, instead of using
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 this variable directly.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 (defvar kill-ring-max 30
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921 "*Maximum length of kill ring before oldest elements are thrown away.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 (defvar kill-ring-yank-pointer nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924 "The tail of the kill ring whose car is the last thing yanked.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926 (defun kill-new (string &optional replace)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
927 "Make STRING the latest kill in the kill ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 Set the kill-ring-yank pointer to point to it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929 Run `kill-hooks'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 Optional second argument REPLACE non-nil means that STRING will replace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931 the front of the kill ring, rather than being added to the list."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932 ; (and (fboundp 'menu-bar-update-yank-menu)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
933 ; (menu-bar-update-yank-menu string (and replace (car kill-ring))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934 (if replace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935 (setcar kill-ring string)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936 (setq kill-ring (cons string kill-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 (if (> (length kill-ring) kill-ring-max)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
938 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
939 (setq kill-ring-yank-pointer kill-ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
940 ; (if interprogram-cut-function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941 ; (funcall interprogram-cut-function string (not replace)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 (run-hook-with-args 'kill-hooks string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944 (defun kill-append (string before-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945 "Append STRING to the end of the latest kill in the kill ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946 If BEFORE-P is non-nil, prepend STRING to the kill.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
947 Run `kill-hooks'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 (kill-new (if before-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949 (concat string (car kill-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950 (concat (car kill-ring) string)) t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
951
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952 (defun current-kill (n &optional do-not-move)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 "Rotate the yanking point by N places, and then return that kill.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 If optional arg DO-NOT-MOVE is non-nil, then don't actually move the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955 yanking point\; just return the Nth kill forward."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956 (or kill-ring (error "Kill ring is empty"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 (let* ((tem (nthcdr (mod (- n (length kill-ring-yank-pointer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958 (length kill-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959 kill-ring)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960 (or do-not-move
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961 (setq kill-ring-yank-pointer tem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 (car tem)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
966 ;;;; Commands for manipulating the kill ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 ;;FSFmacs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 ;(defvar kill-read-only-ok nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970 ; "*Non-nil means don't signal an error for killing read-only text.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972 (defun kill-region (beg end &optional verbose) ; verbose is XEmacs addition
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
973 "Kill between point and mark.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
974 The text is deleted but saved in the kill ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975 The command \\[yank] can retrieve it from there.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976 \(If you want to kill and then yank immediately, use \\[copy-region-as-kill].)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
977
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978 This is the primitive for programs to kill text (as opposed to deleting it).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979 Supply two arguments, character numbers indicating the stretch of text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
980 to be killed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981 Any command that calls this function is a \"kill command\".
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982 If the previous command was also a kill command,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 the text killed this time appends to the text killed last time
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984 to make one entry in the kill ring."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985 (interactive "*r\np")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986 ; (interactive
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987 ; (let ((region-hack (and zmacs-regions (eq last-command 'yank))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 ; ;; This lets "^Y^W" work. I think this is dumb, but zwei did it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989 ; (if region-hack (zmacs-activate-region))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 ; (prog1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991 ; (list (point) (mark) current-prefix-arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992 ; (if region-hack (zmacs-deactivate-region)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 ;; beg and end can be markers but the rest of this function is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994 ;; written as if they are only integers
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995 (if (markerp beg) (setq beg (marker-position beg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 (if (markerp end) (setq end (marker-position end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997 (or (and beg end) (if zmacs-regions ;; rewritten for I18N3 snarfing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
998 (error "The region is not active now")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999 (error "The mark is not set now")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000 (if verbose (if buffer-read-only
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 (message "Copying %d characters"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1002 (- (max beg end) (min beg end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 (message "Killing %d characters"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004 (- (max beg end) (min beg end)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007 ;; I don't like this large change in behavior -- jwz
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 ;; If the buffer is read-only, we should beep, in case the person
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009 ;; just isn't aware of this. However, there's no harm in putting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010 ;; the region's text in the kill ring, anyway.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1011 ;;((or (and buffer-read-only (not inhibit-read-only))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012 ;; (text-property-not-all beg end 'read-only nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1013 ;; (if verbose (message "Copying %d characters"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014 ;; (- (max beg end) (min beg end))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 ;; (copy-region-as-kill beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016 ;; ;; This should always barf, and give us the correct error.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017 ;; (if kill-read-only-ok
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018 ;; (message "Read only text copied to kill ring")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019 ;; (setq this-command 'kill-region)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020 ;; (barf-if-buffer-read-only)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022 ;; In certain cases, we can arrange for the undo list and the kill
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023 ;; ring to share the same string object. This code does that.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1024 ((not (or (eq buffer-undo-list t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1025 (eq last-command 'kill-region)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1026 ;; Use = since positions may be numbers or markers.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1027 (= beg end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1028 ;; Don't let the undo list be truncated before we can even access it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1029 (let ((undo-high-threshold (+ (- (max beg end) (min beg end)) 100))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1030 ;(old-list buffer-undo-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1031 tail)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1032 (delete-region beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1033 ;; Search back in buffer-undo-list for this string,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034 ;; in case a change hook made property changes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1035 (setq tail buffer-undo-list)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1036 (while (not (stringp (car-safe (car-safe tail))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1037 (setq tail (cdr tail)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1038 ;; Take the same string recorded for undo
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1039 ;; and put it in the kill-ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1040 (kill-new (car (car tail)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1041
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1042 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1043 ;; if undo is not kept, grab the string then delete it (which won't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1044 ;; add another string to the undo list).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1045 (copy-region-as-kill beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1046 (delete-region beg end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1047 (setq this-command 'kill-region))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1048
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1049 ;; copy-region-as-kill no longer sets this-command, because it's confusing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1050 ;; to get two copies of the text when the user accidentally types M-w and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1051 ;; then corrects it with the intended C-w.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1052 (defun copy-region-as-kill (beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 "Save the region as if killed, but don't kill it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1054 Run `kill-hooks'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1055 (interactive "r")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1056 (if (eq last-command 'kill-region)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1057 (kill-append (buffer-substring beg end) (< end beg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1058 (kill-new (buffer-substring beg end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1059 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1060
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1061 (defun kill-ring-save (beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1062 "Save the region as if killed, but don't kill it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1063 This command is similar to `copy-region-as-kill', except that it gives
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1064 visual feedback indicating the extent of the region being copied."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1065 (interactive "r")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1066 (copy-region-as-kill beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1067 ;; copy before delay, for xclipboard's benefit
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1068 (if (interactive-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1069 (let ((other-end (if (= (point) beg) end beg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1070 (opoint (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1071 ;; Inhibit quitting so we can make a quit here
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1072 ;; look like a C-g typed as a command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1073 (inhibit-quit t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074 (if (pos-visible-in-window-p other-end (selected-window))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1076 (goto-char other-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1077 (sit-for 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1078 (goto-char opoint)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1079 ;; If user quit, deactivate the mark
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1080 ;; as C-g would as a command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1081 (and quit-flag (mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1082 (zmacs-deactivate-region)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1083 ;; too noisy. -- jwz
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084 ; (let* ((killed-text (current-kill 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 ; (message-len (min (length killed-text) 40)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086 ; (if (= (point) beg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087 ; ;; Don't say "killed"; that is misleading.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 ; (message "Saved text until \"%s\""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089 ; (substring killed-text (- message-len)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090 ; (message "Saved text from \"%s\""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1091 ; (substring killed-text 0 message-len))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1092 ))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094 (defun append-next-kill ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095 "Cause following command, if it kills, to append to previous kill."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096 (interactive "_")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097 (if (interactive-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099 (setq this-command 'kill-region)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1100 (message "If the next command is a kill, it will append"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1101 (setq last-command 'kill-region)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1103 (defun yank-pop (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1104 "Replace just-yanked stretch of killed text with a different stretch.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1105 This command is allowed only immediately after a `yank' or a `yank-pop'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1106 At such a time, the region contains a stretch of reinserted
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1107 previously-killed text. `yank-pop' deletes that text and inserts in its
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1108 place a different stretch of killed text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1109
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1110 With no argument, the previous kill is inserted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1111 With argument N, insert the Nth previous kill.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 If N is negative, this is a more recent kill.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 The sequence of kills wraps around, so that after the oldest one
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115 comes the newest one."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116 (interactive "*p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1117 (if (not (eq last-command 'yank))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1118 (error "Previous command was not a yank"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119 (setq this-command 'yank)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120 (let ((before (< (point) (mark t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 (delete-region (point) (mark t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1122 (set-mark (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1123 (insert (current-kill arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1124 (if before (exchange-point-and-mark t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1125
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1126 (defun yank (&optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1127 "Reinsert the last stretch of killed text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1128 More precisely, reinsert the stretch of killed text most recently
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1129 killed OR yanked. Put point at end, and set mark at beginning.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1130 With just C-u as argument, same but put point at beginning (and mark at end).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131 With argument N, reinsert the Nth most recently killed stretch of killed text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1132 See also the command \\[yank-pop]."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1133 (interactive "*P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1134 ;; If we don't get all the way through, make last-command indicate that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1135 ;; for the following command.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1136 (setq this-command t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137 (push-mark (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1138 (insert (current-kill (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1139 ((listp arg) 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1140 ((eq arg '-) -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1141 (t (1- arg)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142 (if (consp arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1143 (exchange-point-and-mark t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1144 ;; If we do get all the way through, make this-command indicate that.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1145 (setq this-command 'yank))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1146
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1147 (defun rotate-yank-pointer (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1148 "Rotate the yanking point in the kill ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1149 With argument, rotate that many kills forward (or backward, if negative)."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1150 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1151 (current-kill arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1152
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154 (defun insert-buffer (buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1155 "Insert after point the contents of BUFFER.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1156 Puts mark after the inserted text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1157 BUFFER may be a buffer or a buffer name."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1158 (interactive (list (progn (barf-if-buffer-read-only)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 (read-buffer "Insert buffer: "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1160 ;; XEmacs: we have different args
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161 (other-buffer (current-buffer) nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162 t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163 (or (bufferp buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164 (setq buffer (get-buffer buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165 (let (start end newmark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1167 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168 (set-buffer buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1169 (setq start (point-min) end (point-max)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1170 (insert-buffer-substring buffer start end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1171 (setq newmark (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1172 (push-mark newmark))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1173 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1174
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1175 (defun append-to-buffer (buffer start end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1176 "Append to specified buffer the text of the region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1177 It is inserted into that buffer before its point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1178
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1179 When calling from a program, give three arguments:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1180 BUFFER (or buffer name), START and END.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1181 START and END specify the portion of the current buffer to be copied."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1182 (interactive
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1183 ;; XEmacs: we have different args to other-buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184 (list (read-buffer "Append to buffer: " (other-buffer (current-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1185 nil t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1186 (region-beginning) (region-end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1187 (let ((oldbuf (current-buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1188 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1189 (set-buffer (get-buffer-create buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1190 (insert-buffer-substring oldbuf start end))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1191
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1192 (defun prepend-to-buffer (buffer start end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1193 "Prepend to specified buffer the text of the region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1194 It is inserted into that buffer after its point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1195
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1196 When calling from a program, give three arguments:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1197 BUFFER (or buffer name), START and END.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1198 START and END specify the portion of the current buffer to be copied."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1199 (interactive "BPrepend to buffer: \nr")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1200 (let ((oldbuf (current-buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1201 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1202 (set-buffer (get-buffer-create buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1203 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1204 (insert-buffer-substring oldbuf start end)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1205
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1206 (defun copy-to-buffer (buffer start end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1207 "Copy to specified buffer the text of the region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1208 It is inserted into that buffer, replacing existing text there.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1209
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1210 When calling from a program, give three arguments:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1211 BUFFER (or buffer name), START and END.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1212 START and END specify the portion of the current buffer to be copied."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1213 (interactive "BCopy to buffer: \nr")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1214 (let ((oldbuf (current-buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216 (set-buffer (get-buffer-create buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1217 (erase-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1218 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219 (insert-buffer-substring oldbuf start end)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1220
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221 ;FSFmacs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222 ;(define-error 'mark-inactive "The mark is not active now")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1223
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1224 (defun mark (&optional force buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1225 "Return this buffer's mark value as integer, or nil if no mark.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1226
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1227 If `zmacs-regions' is true, then this returns nil unless the region is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1228 currently in the active (highlighted) state. With an argument of t, this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1229 returns the mark (if there is one) regardless of the active-region state.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1230 You should *generally* not use the mark unless the region is active, if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1231 the user has expressed a preference for the active-region model.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1232
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1233 If you are using this in an editing command, you are most likely making
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1234 a mistake; see the documentation of `set-mark'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1235 (setq buffer (decode-buffer buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1236 ;FSFmacs version:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1237 ; (if (or force (not transient-mark-mode) mark-active mark-even-if-inactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1238 ; (marker-position (mark-marker))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1239 ; (signal 'mark-inactive nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1240 (let ((m (mark-marker force buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1241 (and m (marker-position m))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1242
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1243 ;;;#### FSFmacs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1244 ;;; Many places set mark-active directly, and several of them failed to also
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1245 ;;; run deactivate-mark-hook. This shorthand should simplify.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1246 ;(defsubst deactivate-mark ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1247 ; "Deactivate the mark by setting `mark-active' to nil.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1248 ;\(That makes a difference only in Transient Mark mode.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1249 ;Also runs the hook `deactivate-mark-hook'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1250 ; (if transient-mark-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1251 ; (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1252 ; (setq mark-active nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1253 ; (run-hooks 'deactivate-mark-hook))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1254
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1255 (defun set-mark (pos &optional buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1256 "Set this buffer's mark to POS. Don't use this function!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1257 That is to say, don't use this function unless you want
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1258 the user to see that the mark has moved, and you want the previous
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1259 mark position to be lost.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1260
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1261 Normally, when a new mark is set, the old one should go on the stack.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1262 This is why most applications should use push-mark, not set-mark.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1263
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1264 Novice Emacs Lisp programmers often try to use the mark for the wrong
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1265 purposes. The mark saves a location for the user's convenience.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1266 Most editing commands should not alter the mark.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1267 To remember a location for internal use in the Lisp program,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1268 store it in a Lisp variable. Example:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1269
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1270 (let ((beg (point))) (forward-line 1) (delete-region beg (point)))."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1271
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1272 (setq buffer (decode-buffer buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1273 (set-marker (mark-marker t buffer) pos buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1274
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1275 (defvar mark-ring nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1276 "The list of former marks of the current buffer, most recent first.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1277 (make-variable-buffer-local 'mark-ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1278 (put 'mark-ring 'permanent-local t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1279
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1280 (defvar mark-ring-max 16
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1281 "*Maximum size of mark ring. Start discarding off end if gets this big.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1282
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1283 (defvar global-mark-ring nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1284 "The list of saved global marks, most recent first.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1285
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1286 (defconst global-mark-ring-max 16
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1287 "*Maximum size of global mark ring. \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1288 Start discarding off end if gets this big.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1289
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1290 (defun set-mark-command (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1291 "Set mark at where point is, or jump to mark.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1292 With no prefix argument, set mark, push old mark position on local mark
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1293 ring, and push mark on global mark ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1294 With argument, jump to mark, and pop a new position for mark off the ring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1295 \(does not affect global mark ring\).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1296
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1297 Novice Emacs Lisp programmers often try to use the mark for the wrong
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1298 purposes. See the documentation of `set-mark' for more information."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1299 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1300 (if (null arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1301 (push-mark nil nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1302 (if (null (mark t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1303 (error "No mark set in this buffer")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1304 (goto-char (mark t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1305 (pop-mark))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1306
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1307 (defun push-mark (&optional location nomsg activate-region buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1308 "Set mark at LOCATION (point, by default) and push old mark on mark ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1309 If the last global mark pushed was not in the current buffer,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1310 also push LOCATION on the global mark ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1311 Display `Mark set' unless the optional second arg NOMSG is non-nil.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1312 Activate mark if optional third arg ACTIVATE-REGION non-nil.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1313
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1314 Novice Emacs Lisp programmers often try to use the mark for the wrong
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1315 purposes. See the documentation of `set-mark' for more information."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1316 (setq buffer (decode-buffer buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1317 (if (null (mark t buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1318 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1319 ;; The save-excursion / set-buffer is necessary because mark-ring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1320 ;; is a buffer local variable
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1321 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1322 (set-buffer buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1323 (setq mark-ring (cons (copy-marker (mark-marker t buffer)) mark-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1324 (if (> (length mark-ring) mark-ring-max)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1325 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1326 (move-marker (car (nthcdr mark-ring-max mark-ring)) nil buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1327 (setcdr (nthcdr (1- mark-ring-max) mark-ring) nil)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1328 (set-mark (or location (point buffer)) buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1329 ;; Now push the mark on the global mark ring.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1330 (if (or (null global-mark-ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1331 (not (eq (marker-buffer (car global-mark-ring)) buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1332 ;; The last global mark pushed wasn't in this same buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1333 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1334 (setq global-mark-ring (cons (copy-marker (mark-marker t buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1335 global-mark-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1336 (if (> (length global-mark-ring) global-mark-ring-max)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1337 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1338 (move-marker (car (nthcdr global-mark-ring-max global-mark-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1339 nil buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1340 (setcdr (nthcdr (1- global-mark-ring-max) global-mark-ring) nil)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1341 (or nomsg executing-kbd-macro (> (minibuffer-depth) 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1342 (message "Mark set"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1343 (if activate-region
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1344 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1345 (setq zmacs-region-stays t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1346 (zmacs-activate-region)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1347 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1348
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1349 (defun pop-mark ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1350 "Pop off mark ring into the buffer's actual mark.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1351 Does not set point. Does nothing if mark ring is empty."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1352 (if mark-ring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1353 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1354 (setq mark-ring (nconc mark-ring (list (copy-marker (mark-marker t)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1355 (set-mark (car mark-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1356 (move-marker (car mark-ring) nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1357 (if (null (mark t)) (ding))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1358 (setq mark-ring (cdr mark-ring)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1359
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1360 (define-function 'exchange-dot-and-mark 'exchange-point-and-mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1361 (defun exchange-point-and-mark (&optional dont-activate-region)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1362 "Put the mark where point is now, and point where the mark is now.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1363 The mark is activated unless DONT-ACTIVATE-REGION is non-nil."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1364 (interactive nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1365 (let ((omark (mark t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1366 (if (null omark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1367 (error "No mark set in this buffer"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1368 (set-mark (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1369 (goto-char omark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1370 (or dont-activate-region (zmacs-activate-region))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1371 nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1372
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1373 (defun mark-something (mark-fn movement-fn arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1374 "internal function used by mark-sexp, mark-word, etc."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1375 (let (newmark (pushp t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1376 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1377 (if (and (eq last-command mark-fn) (mark))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1378 ;; Extend the previous state in the same direction:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1379 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1380 (if (< (mark) (point)) (setq arg (- arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1381 (goto-char (mark))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1382 (setq pushp nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1383 (funcall movement-fn arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1384 (setq newmark (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1385 (if pushp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1386 (push-mark newmark nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1387 ;; Do not mess with the mark stack, but merely adjust the previous state:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1388 (set-mark newmark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1389 (activate-region))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1390
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1391 ;(defun transient-mark-mode (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1392 ; "Toggle Transient Mark mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1393 ;With arg, turn Transient Mark mode on if arg is positive, off otherwise.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1394 ;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1395 ;In Transient Mark mode, when the mark is active, the region is highlighted.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1396 ;Changing the buffer \"deactivates\" the mark.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1397 ;So do certain other operations that set the mark
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1398 ;but whose main purpose is something else--for example,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1399 ;incremental search, \\[beginning-of-buffer], and \\[end-of-buffer]."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1400 ; (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1401 ; (setq transient-mark-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1402 ; (if (null arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1403 ; (not transient-mark-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1404 ; (> (prefix-numeric-value arg) 0))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1405
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1406 (defun pop-global-mark ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1407 "Pop off global mark ring and jump to the top location."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1408 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1409 ;; Pop entries which refer to non-existent buffers.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1410 (while (and global-mark-ring (not (marker-buffer (car global-mark-ring))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1411 (setq global-mark-ring (cdr global-mark-ring)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1412 (or global-mark-ring
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1413 (error "No global mark set"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1414 (let* ((marker (car global-mark-ring))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1415 (buffer (marker-buffer marker))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1416 (position (marker-position marker)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1417 (setq global-mark-ring (nconc (cdr global-mark-ring)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1418 (list (car global-mark-ring))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1419 (set-buffer buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1420 (or (and (>= position (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1421 (<= position (point-max)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1422 (widen))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1423 (goto-char position)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1424 (switch-to-buffer buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1425
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1426
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1427 (defvar next-line-add-newlines t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1428 "*If non-nil, `next-line' inserts newline to avoid `end of buffer' error.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1429
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1430 (defun next-line (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1431 "Move cursor vertically down ARG lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1432 If there is no character in the target line exactly under the current column,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1433 the cursor is positioned after the character in that line which spans this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1434 column, or at the end of the line if it is not long enough.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1435
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1436 If there is no line in the buffer after this one, behavior depends on the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1437 value of `next-line-add-newlines'. If non-nil, it inserts a newline character
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1438 to create a line, and moves the cursor to that line. Otherwise it moves the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1439 cursor to the end of the buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1440
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1441 The command \\[set-goal-column] can be used to create
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1442 a semipermanent goal column to which this command always moves.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1443 Then it does not try to move vertically. This goal column is stored
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1444 in `goal-column', which is nil when there is none.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1445
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1446 If you are thinking of using this in a Lisp program, consider
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1447 using `forward-line' instead. It is usually easier to use
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1448 and more reliable (no dependence on goal column, etc.)."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1449 (interactive "_p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1450 (if (and next-line-add-newlines (= arg 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1451 (let ((opoint (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1452 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1453 (if (eobp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1454 (newline 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1455 (goto-char opoint)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1456 (line-move arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1457 (if (interactive-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1458 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1459 (line-move arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1460 ((beginning-of-buffer end-of-buffer) (ding nil 'buffer-bound)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1461 (line-move arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1462 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1463
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1464 (defun previous-line (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1465 "Move cursor vertically up ARG lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1466 If there is no character in the target line exactly over the current column,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1467 the cursor is positioned after the character in that line which spans this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1468 column, or at the end of the line if it is not long enough.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1469
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1470 The command \\[set-goal-column] can be used to create
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1471 a semipermanent goal column to which this command always moves.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1472 Then it does not try to move vertically.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1473
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1474 If you are thinking of using this in a Lisp program, consider using
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1475 `forward-line' with a negative argument instead. It is usually easier
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1476 to use and more reliable (no dependence on goal column, etc.)."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1477 (interactive "_p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1478 (if (interactive-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1479 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1480 (line-move (- arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1481 ((beginning-of-buffer end-of-buffer) (ding nil 'buffer-bound)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1482 (line-move (- arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1483 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1484
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1485 (defvar track-eol nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1486 "*Non-nil means vertical motion starting at end of line keeps to ends of lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1487 This means moving to the end of each line moved onto.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1488 The beginning of a blank line does not count as the end of a line.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1489
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1490 (defvar goal-column nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1491 "*Semipermanent goal column for vertical motion, as set by \\[set-goal-column], or nil.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1492 (make-variable-buffer-local 'goal-column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1493
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1494 (defvar temporary-goal-column 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1495 "Current goal column for vertical motion.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1496 It is the column where point was
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1497 at the start of current run of vertical motion commands.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1498 When the `track-eol' feature is doing its job, the value is 9999.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1499
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1500 ;XEmacs: not yet ported, so avoid compiler warnings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1501 (eval-when-compile
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1502 (defvar inhibit-point-motion-hooks))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1503
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1504 (defvar line-move-ignore-invisible nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1505 "*Non-nil means \\[next-line] and \\[previous-line] ignore invisible lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1506 Outline mode sets this.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1507
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1508 ;; This is the guts of next-line and previous-line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1509 ;; Arg says how many lines to move.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1510 (defun line-move (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1511 ;; Don't run any point-motion hooks, and disregard intangibility,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1512 ;; for intermediate positions.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1513 (let ((inhibit-point-motion-hooks t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1514 (opoint (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1515 new)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1516 (unwind-protect
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1517 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1518 (if (not (or (eq last-command 'next-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1519 (eq last-command 'previous-line)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1520 (setq temporary-goal-column
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1521 (if (and track-eol (eolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1522 ;; Don't count beg of empty line as end of line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1523 ;; unless we just did explicit end-of-line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1524 (or (not (bolp)) (eq last-command 'end-of-line)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1525 9999
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1526 (current-column))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1527 (if (and (not (integerp selective-display))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1528 (not line-move-ignore-invisible))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1529 ;; Use just newline characters.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1530 (or (if (> arg 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1531 (progn (if (> arg 1) (forward-line (1- arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1532 ;; This way of moving forward ARG lines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1533 ;; verifies that we have a newline after the last one.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1534 ;; It doesn't get confused by intangible text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1535 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1536 (zerop (forward-line 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1537 (and (zerop (forward-line arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1538 (bolp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1539 (signal (if (< arg 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1540 'beginning-of-buffer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1541 'end-of-buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1542 nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1543 ;; Move by arg lines, but ignore invisible ones.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1544 (while (> arg 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1545 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1546 (and (zerop (vertical-motion 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1547 (signal 'end-of-buffer nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1548 ;; If the following character is currently invisible,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1549 ;; skip all characters with that same `invisible' property value.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1550 (while (and (not (eobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1551 (let ((prop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1552 (get-char-property (point) 'invisible)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1553 (if (eq buffer-invisibility-spec t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1554 prop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1555 (or (memq prop buffer-invisibility-spec)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1556 (assq prop buffer-invisibility-spec)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1557 (if (get-text-property (point) 'invisible)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1558 (goto-char (next-single-property-change (point) 'invisible))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1559 (goto-char (next-extent-change (point)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1560 (setq arg (1- arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1561 (while (< arg 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1562 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1563 (and (zerop (vertical-motion -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1564 (signal 'beginning-of-buffer nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1565 (while (and (not (bobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1566 (let ((prop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1567 (get-char-property (1- (point)) 'invisible)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1568 (if (eq buffer-invisibility-spec t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1569 prop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1570 (or (memq prop buffer-invisibility-spec)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1571 (assq prop buffer-invisibility-spec)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1572 (if (get-text-property (1- (point)) 'invisible)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1573 (goto-char (previous-single-property-change (point) 'invisible))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1574 (goto-char (previous-extent-change (point)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1575 (setq arg (1+ arg))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1576 (move-to-column (or goal-column temporary-goal-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1577 ;; Remember where we moved to, go back home,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1578 ;; then do the motion over again
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1579 ;; in just one step, with intangibility and point-motion hooks
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1580 ;; enabled this time.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1581 (setq new (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1582 (goto-char opoint)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1583 (setq inhibit-point-motion-hooks nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1584 (goto-char new)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1585 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1586
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1587 ;;; Many people have said they rarely use this feature, and often type
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1588 ;;; it by accident. Maybe it shouldn't even be on a key.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1589 (put 'set-goal-column 'disabled t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1590
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1591 (defun set-goal-column (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1592 "Set the current horizontal position as a goal for \\[next-line] and \\[previous-line].
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1593 Those commands will move to this position in the line moved to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1594 rather than trying to keep the same horizontal position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1595 With a non-nil argument, clears out the goal column
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1596 so that \\[next-line] and \\[previous-line] resume vertical motion.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1597 The goal column is stored in the variable `goal-column'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1598 (interactive "_P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1599 (if arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1600 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1601 (setq goal-column nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1602 (message "No goal column"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1603 (setq goal-column (current-column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1604 (message (substitute-command-keys
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1605 "Goal column %d (use \\[set-goal-column] with an arg to unset it)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1606 goal-column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1607 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1608
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1609
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1610 ;;; deleted FSFmacs terminal randomness hscroll-point-visible stuff.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1611
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1612 (defun scroll-other-window-down (lines)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1613 "Scroll the \"other window\" down.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1614 For more details, see the documentation for `scroll-other-window'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1615 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1616 (scroll-other-window
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1617 ;; Just invert the argument's meaning.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1618 ;; We can do that without knowing which window it will be.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1619 (if (eq lines '-) nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1620 (if (null lines) '-
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1621 (- (prefix-numeric-value lines))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1622
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1623 (defun beginning-of-buffer-other-window (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1624 "Move point to the beginning of the buffer in the other window.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1625 Leave mark at previous position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1626 With arg N, put point N/10 of the way from the true beginning."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1627 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1628 (let ((orig-window (selected-window))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1629 (window (other-window-for-scrolling)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1630 ;; We use unwind-protect rather than save-window-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1631 ;; because the latter would preserve the things we want to change.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1632 (unwind-protect
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1633 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1634 (select-window window)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1635 ;; Set point and mark in that window's buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1636 (beginning-of-buffer arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1637 ;; Set point accordingly.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1638 (recenter '(t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1639 (select-window orig-window))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1640
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1641 (defun end-of-buffer-other-window (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1642 "Move point to the end of the buffer in the other window.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1643 Leave mark at previous position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1644 With arg N, put point N/10 of the way from the true end."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1645 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1646 ;; See beginning-of-buffer-other-window for comments.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1647 (let ((orig-window (selected-window))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1648 (window (other-window-for-scrolling)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1649 (unwind-protect
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1650 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1651 (select-window window)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1652 (end-of-buffer arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1653 (recenter '(t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1654 (select-window orig-window))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1655
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1656 (defun transpose-chars (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1657 "Interchange characters around point, moving forward one character.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1658 With prefix arg ARG, effect is to take character before point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1659 and drag it forward past ARG other characters (backward if ARG negative).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1660 If no argument and at end of line, the previous two chars are exchanged."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1661 (interactive "*P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1662 (and (null arg) (eolp) (forward-char -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1663 (transpose-subr 'forward-char (prefix-numeric-value arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1664
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1665 (defun transpose-words (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1666 "Interchange words around point, leaving point at end of them.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1667 With prefix arg ARG, effect is to take word before or around point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1668 and drag it forward past ARG other words (backward if ARG negative).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1669 If ARG is zero, the words around or after point and around or after mark
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1670 are interchanged."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1671 (interactive "*p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1672 (transpose-subr 'forward-word arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1673
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1674 (defun transpose-sexps (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1675 "Like \\[transpose-words] but applies to sexps.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1676 Does not work on a sexp that point is in the middle of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1677 if it is a list or string."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1678 (interactive "*p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1679 (transpose-subr 'forward-sexp arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1680
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1681 (defun transpose-lines (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1682 "Exchange current line and previous line, leaving point after both.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1683 With argument ARG, takes previous line and moves it past ARG lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1684 With argument 0, interchanges line point is in with line mark is in."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1685 (interactive "*p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1686 (transpose-subr #'(lambda (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1687 (if (= arg 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1688 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1689 ;; Move forward over a line,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1690 ;; but create a newline if none exists yet.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1691 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1692 (if (eobp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1693 (newline)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1694 (forward-char 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1695 (forward-line arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1696 arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1697
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1698 (eval-when-compile
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1699 ;; avoid byte-compiler warnings...
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1700 (defvar start1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1701 (defvar start2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1702 (defvar end1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1703 (defvar end2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1704
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1705 ; start[12] and end[12] used in transpose-subr-1 below
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1706 (defun transpose-subr (mover arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1707 (let (start1 end1 start2 end2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1708 (if (= arg 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1709 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1710 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1711 (funcall mover 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1712 (setq end2 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1713 (funcall mover -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1714 (setq start2 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1715 (goto-char (mark t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1716 (funcall mover 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1717 (setq end1 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1718 (funcall mover -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1719 (setq start1 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1720 (transpose-subr-1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1721 (exchange-point-and-mark t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1722 (while (> arg 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1723 (funcall mover -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1724 (setq start1 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1725 (funcall mover 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1726 (setq end1 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1727 (funcall mover 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1728 (setq end2 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1729 (funcall mover -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1730 (setq start2 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1731 (transpose-subr-1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1732 (goto-char end2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1733 (setq arg (1- arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1734 (while (< arg 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1735 (funcall mover -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1736 (setq start2 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1737 (funcall mover -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1738 (setq start1 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1739 (funcall mover 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1740 (setq end1 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1741 (funcall mover 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1742 (setq end2 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1743 (transpose-subr-1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1744 (setq arg (1+ arg)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1745
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1746 ; start[12] and end[12] used free
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1747 (defun transpose-subr-1 ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1748 (if (> (min end1 end2) (max start1 start2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1749 (error "Don't have two things to transpose"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1750 (let ((word1 (buffer-substring start1 end1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1751 (word2 (buffer-substring start2 end2)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1752 (delete-region start2 end2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1753 (goto-char start2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1754 (insert word1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1755 (goto-char (if (< start1 start2) start1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1756 (+ start1 (- (length word1) (length word2)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1757 (delete-char (length word1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1758 (insert word2)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1759
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1760 (defvar comment-column 32
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1761 "*Column to indent right-margin comments to.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1762 Setting this variable automatically makes it local to the current buffer.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1763 Each mode establishes a different default value for this variable; you
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1764 can set the value for a particular mode using that mode's hook.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1765 (make-variable-buffer-local 'comment-column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1766
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1767 (defvar comment-start nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1768 "*String to insert to start a new comment, or nil if no comment syntax.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1769
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1770 (defvar comment-start-skip nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1771 "*Regexp to match the start of a comment plus everything up to its body.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1772 If there are any \\(...\\) pairs, the comment delimiter text is held to begin
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1773 at the place matched by the close of the first pair.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1774
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1775 (defvar comment-end ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1776 "*String to insert to end a new comment.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1777 Should be an empty string if comments are terminated by end-of-line.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1778
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1779 (defconst comment-indent-hook nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1780 "Obsolete variable for function to compute desired indentation for a comment.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1781 Use `comment-indent-function' instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1782 This function is called with no args with point at the beginning of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1783 the comment's starting delimiter.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1784
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1785 (defvar comment-indent-function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1786 ;; XEmacs - add at least one space after the end of the text on the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1787 ;; current line...
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1788 #'(lambda ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1789 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1790 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1791 (let ((eol (save-excursion (end-of-line) (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1792 (and comment-start-skip
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1793 (re-search-forward comment-start-skip eol t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1794 (setq eol (match-beginning 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1795 (goto-char eol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1796 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1797 (max comment-column (1+ (current-column))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1798 "Function to compute desired indentation for a comment.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1799 This function is called with no args with point at the beginning of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1800 the comment's starting delimiter.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1801
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1802 (defconst block-comment-start nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1803 "*String to insert to start a new comment on a line by itself.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1804 If nil, use `comment-start' instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1805 Note that the regular expression `comment-start-skip' should skip this string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1806 as well as the `comment-start' string.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1807
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1808 (defconst block-comment-end nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1809 "*String to insert to end a new comment on a line by itself.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1810 Should be an empty string if comments are terminated by end-of-line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1811 If nil, use `comment-end' instead.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1812
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1813 (defun indent-for-comment ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1814 "Indent this line's comment to comment column, or insert an empty comment."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1815 (interactive "*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1816 (let* ((empty (save-excursion (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1817 (looking-at "[ \t]*$")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1818 (starter (or (and empty block-comment-start) comment-start))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1819 (ender (or (and empty block-comment-end) comment-end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1820 (if (null starter)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1821 (error "No comment syntax defined")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1822 (let* ((eolpos (save-excursion (end-of-line) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1823 cpos indent begpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1824 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1825 (if (re-search-forward comment-start-skip eolpos 'move)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1826 (progn (setq cpos (point-marker))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1827 ;; Find the start of the comment delimiter.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1828 ;; If there were paren-pairs in comment-start-skip,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1829 ;; position at the end of the first pair.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1830 (if (match-end 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1831 (goto-char (match-end 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1832 ;; If comment-start-skip matched a string with
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1833 ;; internal whitespace (not final whitespace) then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1834 ;; the delimiter start at the end of that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1835 ;; whitespace. Otherwise, it starts at the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1836 ;; beginning of what was matched.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1837 (skip-syntax-backward " " (match-beginning 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1838 (skip-syntax-backward "^ " (match-beginning 0)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1839 (setq begpos (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1840 ;; Compute desired indent.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1841 (if (= (current-column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1842 (setq indent (if comment-indent-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1843 (funcall comment-indent-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1844 (funcall comment-indent-function))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1845 (goto-char begpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1846 ;; If that's different from current, change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1847 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1848 (delete-region (point) begpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1849 (indent-to indent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1850 ;; An existing comment?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1851 (if cpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1852 (progn (goto-char cpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1853 (set-marker cpos nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1854 ;; No, insert one.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1855 (insert starter)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1856 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1857 (insert ender)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1858
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1859 (defun set-comment-column (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1860 "Set the comment column based on point.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1861 With no arg, set the comment column to the current column.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1862 With just minus as arg, kill any comment on this line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1863 With any other arg, set comment column to indentation of the previous comment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1864 and then align or create a comment on this line at that column."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1865 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1866 (if (eq arg '-)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1867 (kill-comment nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1868 (if arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1869 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1870 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1871 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1872 (re-search-backward comment-start-skip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1873 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1874 (re-search-forward comment-start-skip)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1875 (goto-char (match-beginning 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1876 (setq comment-column (current-column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1877 (message "Comment column set to %d" comment-column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1878 (indent-for-comment))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1879 (setq comment-column (current-column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1880 (message "Comment column set to %d" comment-column))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1881
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1882 (defun kill-comment (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1883 "Kill the comment on this line, if any.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1884 With argument, kill comments on that many lines starting with this one."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1885 ;; this function loses in a lot of situations. it incorrectly recognises
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1886 ;; comment delimiters sometimes (ergo, inside a string), doesn't work
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1887 ;; with multi-line comments, can kill extra whitespace if comment wasn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1888 ;; through end-of-line, et cetera.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1889 (interactive "*P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1890 (or comment-start-skip (error "No comment syntax defined"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1891 (let ((count (prefix-numeric-value arg)) endc)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1892 (while (> count 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1893 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1894 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1895 (setq endc (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1896 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1897 (and (string< "" comment-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1898 (setq endc
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1899 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1900 (re-search-forward (regexp-quote comment-end) endc 'move)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1901 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1902 (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1903 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1904 (if (re-search-forward comment-start-skip endc t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1905 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1906 (goto-char (match-beginning 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1907 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1908 (kill-region (point) endc)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1909 ;; to catch comments a line beginnings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1910 (indent-according-to-mode))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1911 (if arg (forward-line 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1912 (setq count (1- count)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1913
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1914 (defun comment-region (beg end &optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1915 "Comment or uncomment each line in the region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1916 With just C-u prefix arg, uncomment each line in region.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1917 Numeric prefix arg ARG means use ARG comment characters.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1918 If ARG is negative, delete that many comment characters instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1919 Comments are terminated on each line, even for syntax in which newline does
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1920 not end the comment. Blank lines do not get comments."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1921 ;; if someone wants it to only put a comment-start at the beginning and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1922 ;; comment-end at the end then typing it, C-x C-x, closing it, C-x C-x
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1923 ;; is easy enough. No option is made here for other than commenting
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1924 ;; every line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1925 (interactive "r\nP")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1926 (or comment-start (error "No comment syntax is defined"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1927 (if (> beg end) (let (mid) (setq mid beg beg end end mid)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1928 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1929 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1930 (let ((cs comment-start) (ce comment-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1931 numarg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1932 (if (consp arg) (setq numarg t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1933 (setq numarg (prefix-numeric-value arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1934 ;; For positive arg > 1, replicate the comment delims now,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1935 ;; then insert the replicated strings just once.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1936 (while (> numarg 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1937 (setq cs (concat cs comment-start)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1938 ce (concat ce comment-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1939 (setq numarg (1- numarg))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1940 ;; Loop over all lines from BEG to END.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1941 (narrow-to-region beg end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1942 (goto-char beg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1943 (while (not (eobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1944 (if (or (eq numarg t) (< numarg 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1945 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1946 ;; Delete comment start from beginning of line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1947 (if (eq numarg t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1948 (while (looking-at (regexp-quote cs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1949 (delete-char (length cs)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1950 (let ((count numarg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1951 (while (and (> 1 (setq count (1+ count)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1952 (looking-at (regexp-quote cs)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1953 (delete-char (length cs)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1954 ;; Delete comment end from end of line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1955 (if (string= "" ce)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1956 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1957 (if (eq numarg t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1958 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1959 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1960 ;; This is questionable if comment-end ends in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1961 ;; whitespace. That is pretty brain-damaged,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1962 ;; though.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1963 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1964 (if (and (>= (- (point) (point-min)) (length ce))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1965 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1966 (backward-char (length ce))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1967 (looking-at (regexp-quote ce))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1968 (delete-char (- (length ce)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1969 (let ((count numarg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1970 (while (> 1 (setq count (1+ count)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1971 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1972 ;; This is questionable if comment-end ends in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1973 ;; whitespace. That is pretty brain-damaged though
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1974 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1975 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1976 (backward-char (length ce))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1977 (if (looking-at (regexp-quote ce))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1978 (delete-char (length ce))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1979 (forward-line 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1980 ;; Insert at beginning and at end.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1981 (if (looking-at "[ \t]*$") ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1982 (insert cs)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1983 (if (string= "" ce) ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1984 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1985 (insert ce)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1986 (search-forward "\n" nil 'move)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1987
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1988 (defun prefix-region (prefix)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1989 "Add a prefix string to each line between mark and point."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1990 (interactive "sPrefix string: ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1991 (if prefix
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1992 (let ((count (count-lines (mark) (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1993 (goto-char (min (mark) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1994 (while (> count 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1995 (setq count (1- count))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1996 (beginning-of-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1997 (insert prefix)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1998 (end-of-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1999 (forward-char 1)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2001
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2002 (defun backward-word (arg &optional buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2003 "Move backward until encountering the end of a word.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2004 With argument, do this that many times.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2005 In programs, it is faster to call `forward-word' with negative arg."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2006 (interactive "_p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2007 (forward-word (- arg) buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2008
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2009 (defun mark-word (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2010 "Set mark arg words away from point."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2011 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2012 (mark-something 'mark-word 'forward-word arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2013
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2014 (defun kill-word (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2015 "Kill characters forward until encountering the end of a word.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2016 With argument, do this that many times."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2017 (interactive "*p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2018 (kill-region (point) (save-excursion (forward-word arg) (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2019
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2020 (defun backward-kill-word (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2021 "Kill characters backward until encountering the end of a word.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2022 With argument, do this that many times."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2023 (interactive "*p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2024 (kill-word (- arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2025
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2026 (defun current-word (&optional strict)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2027 "Return the word point is on (or a nearby word) as a string.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2028 If optional arg STRICT is non-nil, return nil unless point is within
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2029 or adjacent to a word.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2030 If point is not between two word-constituent characters, but immediately
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2031 follows one, move back first.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2032 Otherwise, if point precedes a word constituent, move forward first.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2033 Otherwise, move backwards until a word constituent is found and get that word;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2034 if you a newlines is reached first, move forward instead."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2035 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2036 (let ((oldpoint (point)) (start (point)) (end (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2037 (skip-syntax-backward "w_") (setq start (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2038 (goto-char oldpoint)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2039 (skip-syntax-forward "w_") (setq end (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2040 (if (and (eq start oldpoint) (eq end oldpoint))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2041 ;; Point is neither within nor adjacent to a word.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2042 (and (not strict)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2043 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2044 ;; Look for preceding word in same line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2045 (skip-syntax-backward "^w_"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2046 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2047 (beginning-of-line) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2048 (if (bolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2049 ;; No preceding word in same line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2050 ;; Look for following word in same line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2051 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2052 (skip-syntax-forward "^w_"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2053 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2054 (end-of-line) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2055 (setq start (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2056 (skip-syntax-forward "w_")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2057 (setq end (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2058 (setq end (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2059 (skip-syntax-backward "w_")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2060 (setq start (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2061 (buffer-substring start end)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2062 (buffer-substring start end)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2063
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2064 (defvar fill-prefix nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2065 "*String for filling to insert at front of new line, or nil for none.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2066 Setting this variable automatically makes it local to the current buffer.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2067 (make-variable-buffer-local 'fill-prefix)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2068
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2069 (defvar auto-fill-inhibit-regexp nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2070 "*Regexp to match lines which should not be auto-filled.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2071
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2072 (defun do-auto-fill ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2073 (let (give-up)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2074 (or (and auto-fill-inhibit-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2075 (save-excursion (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2076 (looking-at auto-fill-inhibit-regexp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2077 (while (and (not give-up) (> (current-column) fill-column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2078 ;; Determine where to split the line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2079 (let ((fill-prefix fill-prefix)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2080 (fill-point
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2081 (let ((opoint (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2082 bounce
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2083 (first t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2084 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2085 (move-to-column (1+ fill-column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2086 ;; Move back to a word boundary.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2087 (while (or first
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2088 ;; If this is after period and a single space,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2089 ;; move back once more--we don't want to break
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2090 ;; the line there and make it look like a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2091 ;; sentence end.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2092 (and (not (bobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2093 (not bounce)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2094 sentence-end-double-space
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2095 (save-excursion (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2096 (and (looking-at "\\. ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2097 (not (looking-at "\\. "))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2098 (setq first nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2099 (skip-chars-backward "^ \t\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2100 ;; If we find nowhere on the line to break it,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2101 ;; break after one word. Set bounce to t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2102 ;; so we will not keep going in this while loop.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2103 (if (bolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2104 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2105 (re-search-forward "[ \t]" opoint t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2106 (setq bounce t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2107 (skip-chars-backward " \t"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2108 ;; Let fill-point be set to the place where we end up.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2109 (point)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2111 ;; I'm not sure why Stig made this change but it breaks
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2112 ;; auto filling in at least C mode so I'm taking it back
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2113 ;; out. --cet
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2114 ;; XEmacs - adaptive fill.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2115 ;;(maybe-adapt-fill-prefix
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2116 ;; (or from (setq from (save-excursion (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2117 ;; (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2118 ;; (or to (setq to (save-excursion (beginning-of-line 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2119 ;; (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2120 ;; t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2121
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2122 ;; If that place is not the beginning of the line,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2123 ;; break the line there.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2124 (if (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2125 (goto-char fill-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2126 (not (bolp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2127 (let ((prev-column (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2128 ;; If point is at the fill-point, do not `save-excursion'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2129 ;; Otherwise, if a comment prefix or fill-prefix is inserted,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2130 ;; point will end up before it rather than after it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2131 (if (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2132 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2133 (= (point) fill-point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2134 (indent-new-comment-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2135 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2136 (goto-char fill-point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2137 (indent-new-comment-line)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2138 ;; If making the new line didn't reduce the hpos of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2139 ;; the end of the line, then give up now;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2140 ;; trying again will not help.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2141 (if (>= (current-column) prev-column)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2142 (setq give-up t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2143 ;; No place to break => stop trying.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2144 (setq give-up t)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2145
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2146 (defvar comment-multi-line t ; XEmacs - this works well with adaptive fill
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2147 "*Non-nil means \\[indent-new-comment-line] should continue same comment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2148 on new line, with no new terminator or starter.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2149 This is obsolete because you might as well use \\[newline-and-indent].")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2150
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2151 (defun indent-new-comment-line (&optional soft)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2152 "Break line at point and indent, continuing comment if within one.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2153 This indents the body of the continued comment
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2154 under the previous comment line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2155
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2156 This command is intended for styles where you write a comment per line,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2157 starting a new comment (and terminating it if necessary) on each line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2158 If you want to continue one comment across several lines, use \\[newline-and-indent].
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2159
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2160 If a fill column is specified, it overrides the use of the comment column
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2161 or comment indentation.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2162
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2163 The inserted newline is marked hard if `use-hard-newlines' is true,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2164 unless optional argument SOFT is non-nil."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2165 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2166 (let (comcol comstart)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2167 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2168 (delete-region (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2169 (progn (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2170 (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2171 (if soft (insert ?\n) (newline 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2172 (if fill-prefix
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2173 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2174 (indent-to-left-margin)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2175 (insert fill-prefix))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2176 ;; #### - Eric Eide reverts to v18 semantics for this function in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2177 ;; fa-extras, which I'm not gonna do. His changes are to (1) execute
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2178 ;; the save-excursion below unconditionally, and (2) uncomment the check
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2179 ;; for (not comment-multi-line) further below. --Stig
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2180 (if (not comment-multi-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2181 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2182 (if (and comment-start-skip
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2183 (let ((opoint (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2184 (forward-line -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2185 (re-search-forward comment-start-skip opoint t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2186 ;; The old line is a comment.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2187 ;; Set WIN to the pos of the comment-start.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2188 ;; But if the comment is empty, look at preceding lines
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2189 ;; to find one that has a nonempty comment.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2190
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2191 ;; If comment-start-skip contains a \(...\) pair,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2192 ;; the real comment delimiter starts at the end of that pair.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2193 (let ((win (or (match-end 1) (match-beginning 0))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2194 (while (and (eolp) (not (bobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2195 (let (opoint)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2196 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2197 (setq opoint (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2198 (forward-line -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2199 (re-search-forward comment-start-skip opoint t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2200 (setq win (or (match-end 1) (match-beginning 0))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2201 ;; Indent this line like what we found.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2202 (goto-char win)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2203 (setq comcol (current-column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2204 (setq comstart
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2205 (buffer-substring (point) (match-end 0)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2206 (if (and comcol (not fill-prefix)) ; XEmacs - (ENE) from fa-extras.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2207 (let ((comment-column comcol)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2208 (comment-start comstart)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2209 (comment-end comment-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2210 (and comment-end (not (equal comment-end ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2211 ; (if (not comment-multi-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2212 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2213 (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2214 (insert comment-end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2215 (forward-char 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2216 ; (setq comment-column (+ comment-column (length comment-start))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2217 ; comment-start "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2218 ; )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2219 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2220 (if (not (eolp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2221 (setq comment-end ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2222 (insert ?\n)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2223 (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2224 (indent-for-comment)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2225 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2226 ;; Make sure we delete the newline inserted above.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2227 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2228 (delete-char 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2229 (indent-according-to-mode)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2230
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2231 (defun auto-fill-mode (&optional arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2232 "Toggle auto-fill mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2233 With arg, turn auto-fill mode on if and only if arg is positive.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2234 In Auto-Fill mode, inserting a space at a column beyond `current-fill-column'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2235 automatically breaks the line at a previous space."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2236 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2237 (prog1 (setq auto-fill-function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2238 (if (if (null arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2239 (not auto-fill-function)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2240 (> (prefix-numeric-value arg) 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2241 'do-auto-fill
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2242 nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2243 (redraw-modeline)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2244
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2245 ;; This holds a document string used to document auto-fill-mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2246 (defun auto-fill-function ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2247 "Automatically break line at a previous space, in insertion of text."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2248 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2249
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2250 (defun turn-on-auto-fill ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2251 "Unconditionally turn on Auto Fill mode."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2252 (auto-fill-mode 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2253
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2254 (defun set-fill-column (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2255 "Set `fill-column' to current column, or to argument if given.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2256 The variable `fill-column' has a separate value for each buffer."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2257 (interactive "_P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2258 (setq fill-column (if (integerp arg) arg (current-column)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2259 (message "fill-column set to %d" fill-column))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2260
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2261 (defun set-selective-display (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2262 "Set `selective-display' to ARG; clear it if no arg.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2263 When the value of `selective-display' is a number > 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2264 lines whose indentation is >= that value are not displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2265 The variable `selective-display' has a separate value for each buffer."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2266 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2267 (if (eq selective-display t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2268 (error "selective-display already in use for marked lines"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2269 (let ((current-vpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2270 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2271 (narrow-to-region (point-min) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2272 (goto-char (window-start))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2273 (vertical-motion (window-height)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2274 (setq selective-display
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2275 (and arg (prefix-numeric-value arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2276 (recenter current-vpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2277 (set-window-start (selected-window) (window-start (selected-window)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2278 ;; #### doesn't localize properly:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2279 (princ "selective-display set to " t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2280 (prin1 selective-display t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2281 (princ "." t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2282
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2283 (defun nuke-selective-display ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2284 "Ensure that the buffer is not in selective-display mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2285 If `selective-display' is t, then restore the buffer text to it's original
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2286 state before disabling selective display."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2287 ;; by Stig@hackvan.com
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2288 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2289 (and (eq t selective-display)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2290 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2291 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2292 (widen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2293 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2294 (let ((mod-p (buffer-modified-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2295 (buffer-read-only nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2296 (while (search-forward "\r" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2297 (delete-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2298 (insert "\n"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2299 (set-buffer-modified-p mod-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2300 ))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2301 (setq selective-display nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2302
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2303 (add-hook 'change-major-mode-hook 'nuke-selective-display)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2304
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2305 (defvar overwrite-mode-textual (purecopy " Ovwrt")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2306 "The string displayed in the modeline when in overwrite mode.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2307 (defvar overwrite-mode-binary (purecopy " Bin Ovwrt")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2308 "The string displayed in the modeline when in binary overwrite mode.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2309
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2310 (defun overwrite-mode (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2311 "Toggle overwrite mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2312 With arg, turn overwrite mode on iff arg is positive.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2313 In overwrite mode, printing characters typed in replace existing text
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2314 on a one-for-one basis, rather than pushing it to the right. At the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2315 end of a line, such characters extend the line. Before a tab,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2316 such characters insert until the tab is filled in.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2317 \\[quoted-insert] still inserts characters in overwrite mode; this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2318 is supposed to make it easier to insert characters when necessary."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2319 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2320 (setq overwrite-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2321 (if (if (null arg) (not overwrite-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2322 (> (prefix-numeric-value arg) 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2323 'overwrite-mode-textual))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2324 (redraw-modeline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2325
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2326 (defun binary-overwrite-mode (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2327 "Toggle binary overwrite mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2328 With arg, turn binary overwrite mode on iff arg is positive.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2329 In binary overwrite mode, printing characters typed in replace
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2330 existing text. Newlines are not treated specially, so typing at the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2331 end of a line joins the line to the next, with the typed character
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2332 between them. Typing before a tab character simply replaces the tab
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2333 with the character typed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2334 \\[quoted-insert] replaces the text at the cursor, just as ordinary
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2335 typing characters do.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2336
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2337 Note that binary overwrite mode is not its own minor mode; it is a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2338 specialization of overwrite-mode, entered by setting the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2339 `overwrite-mode' variable to `overwrite-mode-binary'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2340 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2341 (setq overwrite-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2342 (if (if (null arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2343 (not (eq overwrite-mode 'overwrite-mode-binary))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2344 (> (prefix-numeric-value arg) 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2345 'overwrite-mode-binary))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2346 (redraw-modeline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2347
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2348 (defvar line-number-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2349 "*Non-nil means display line number in modeline.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2350
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2351 (defun line-number-mode (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2352 "Toggle Line Number mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2353 With arg, turn Line Number mode on iff arg is positive.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2354 When Line Number mode is enabled, the line number appears
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2355 in the modeline."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2356 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2357 (setq line-number-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2358 (if (null arg) (not line-number-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2359 (> (prefix-numeric-value arg) 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2360 (redraw-modeline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2361
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2362 (defvar column-number-mode nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2363 "*Non-nil means display column number in modeline.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2364
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2365 (defun column-number-mode (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2366 "Toggle Column Number mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2367 With arg, turn Column Number mode on iff arg is positive.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2368 When Column Number mode is enabled, the column number appears
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2369 in the modeline."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2370 (interactive "P")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2371 (setq column-number-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2372 (if (null arg) (not column-number-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2373 (> (prefix-numeric-value arg) 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2374 (redraw-modeline))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2375
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2376
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2377 (defvar blink-matching-paren t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2378 "*Non-nil means show matching open-paren when close-paren is inserted.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2379
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2380 (defvar blink-matching-paren-distance 12000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2381 "*If non-nil, is maximum distance to search for matching open-paren.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2382
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2383 (defconst blink-matching-delay 1
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2384 "*The number of seconds that `blink-matching-open' will delay at a match.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2385
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2386 (defconst blink-matching-paren-dont-ignore-comments nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2387 "*Non-nil means `blink-matching-paren' should not ignore comments.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2388
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2389 (defun blink-matching-open ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2390 "Move cursor momentarily to the beginning of the sexp before point."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2391 (interactive "_")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2392 (and (> (point) (1+ (point-min)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2393 blink-matching-paren
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2394 ;; Verify an even number of quoting characters precede the close.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2395 (= 1 (logand 1 (- (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2396 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2397 (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2398 (skip-syntax-backward "/\\")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2399 (point)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2400 (let* ((oldpos (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2401 (parse-sexp-ignore-comments t) ; to avoid C++ lossage
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2402 (blinkpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2403 (mismatch))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2404 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2405 (save-restriction
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2406 (if blink-matching-paren-distance
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2407 (narrow-to-region (max (point-min)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2408 (- (point) blink-matching-paren-distance))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2409 oldpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2410 (condition-case ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2411 (let ((parse-sexp-ignore-comments
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2412 (and parse-sexp-ignore-comments
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2413 (not blink-matching-paren-dont-ignore-comments))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2414 (setq blinkpos (scan-sexps oldpos -1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2415 (error nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2416 (and blinkpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2417 (/= (char-syntax (char-after blinkpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2418 ?\$)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2419 (setq mismatch
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2420 (or (null (matching-paren (char-after blinkpos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2421 (/= (char-after (1- oldpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2422 (matching-paren (char-after blinkpos))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2423 (if mismatch (setq blinkpos nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2424 (if blinkpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2425 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2426 (goto-char blinkpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2427 (if (pos-visible-in-window-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2428 (sit-for blink-matching-delay)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2429 (goto-char blinkpos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2430 (message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2431 "Matches %s"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2432 ;; Show what precedes the open in its line, if anything.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2433 (if (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2434 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2435 (not (bolp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2436 (buffer-substring (progn (beginning-of-line) (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2437 (1+ blinkpos))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2438 ;; Show what follows the open in its line, if anything.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2439 (if (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2440 (forward-char 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2441 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2442 (not (eolp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2443 (buffer-substring blinkpos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2444 (progn (end-of-line) (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2445 ;; Otherwise show the previous nonblank line,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2446 ;; if there is one.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2447 (if (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2448 (skip-chars-backward "\n \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2449 (not (bobp)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2450 (concat
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2451 (buffer-substring (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2452 (skip-chars-backward "\n \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2453 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2454 (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2455 (progn (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2456 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2457 (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2458 ;; Replace the newline and other whitespace with `...'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2459 "..."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2460 (buffer-substring blinkpos (1+ blinkpos)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2461 ;; There is nothing to show except the char itself.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2462 (buffer-substring blinkpos (1+ blinkpos))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2463 (cond (mismatch
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2464 (message "Mismatched parentheses"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2465 ((not blink-matching-paren-distance)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2466 (message "Unmatched parenthesis"))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2467
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2468 ;Turned off because it makes dbx bomb out.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2469 (setq blink-paren-function 'blink-matching-open)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2470
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2471 (eval-when-compile (defvar myhelp)) ; suppress compiler warning
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2472
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2473 (defun set-variable (var val)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2474 "Set VARIABLE to VALUE. VALUE is a Lisp object.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2475 When using this interactively, supply a Lisp expression for VALUE.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2476 If you want VALUE to be a string, you must surround it with doublequotes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2477
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2478 If VARIABLE has a `variable-interactive' property, that is used as if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2479 it were the arg to `interactive' (which see) to interactively read the value."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2480 (interactive
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2481 (let* ((var (read-variable "Set variable: "))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2482 ;; #### - yucky code replication here. This should use something
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2483 ;; from help.el or hyper-apropos.el
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2484 (minibuffer-help-form
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2485 '(funcall myhelp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2486 (myhelp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2487 #'(lambda ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2488 (with-output-to-temp-buffer "*Help*"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2489 (prin1 var)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2490 (princ "\nDocumentation:\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2491 (princ (substring (documentation-property var 'variable-documentation)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2492 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2493 (if (boundp var)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2494 (let ((print-length 20))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2495 (princ "\n\nCurrent value: ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2496 (prin1 (symbol-value var))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2497 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2498 (set-buffer standard-output)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2499 (help-mode))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2500 nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2501 (list var
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2502 (let ((prop (get var 'variable-interactive)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2503 (if prop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2504 ;; Use VAR's `variable-interactive' property
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2505 ;; as an interactive spec for prompting.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2506 (call-interactively (list 'lambda '(arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2507 (list 'interactive prop)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2508 'arg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2509 (eval-minibuffer (format "Set %s to value: " var)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2510 (set var val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2511
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2512 (defun activate-region ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2513 "Activate the region, if `zmacs-regions' is true.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2514 Setting `zmacs-regions' to true causes LISPM-style active regions to be used.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2515 This function has no effect if `zmacs-regions' is false."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2516 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2517 (and zmacs-regions (zmacs-activate-region)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2518
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2519 (defsubst region-exists-p ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2520 "Non-nil iff the region exists.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2521 If active regions are in use (i.e. `zmacs-regions' is true), this means that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2522 the region is active. Otherwise, this means that the user has pushed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2523 a mark in this buffer at some point in the past.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2524 The functions `region-beginning' and `region-end' can be used to find the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2525 limits of the region."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2526 (not (null (mark))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2527
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2528 (defun region-active-p ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2529 "Non-nil iff the region is active.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2530 If `zmacs-regions' is true, this is equivalent to `region-exists-p'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2531 Otherwise, this function always returns false."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2532 (and zmacs-regions zmacs-region-extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2533
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2534 (defun capitalize-region-or-word (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2535 "Capitalize the selected region or the following word (or ARG words)."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2536 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2537 (if (region-active-p) (capitalize-region (region-beginning) (region-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2538 (capitalize-word arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2539
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2540 (defun upcase-region-or-word (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2541 "Upcase the selected region or the following word (or ARG words)."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2542 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2543 (if (region-active-p) (upcase-region (region-beginning) (region-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2544 (upcase-word arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2546 (defun downcase-region-or-word (arg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2547 "Downcase the selected region or the following word (or ARG words)."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2548 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2549 (if (region-active-p) (downcase-region (region-beginning) (region-end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2550 (downcase-word arg)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2551
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2552 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2553 ;;; Most of the zmacs code is now in elisp. The only thing left in C
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2554 ;;; are the variables zmacs-regions, zmacs-region-active-p and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2555 ;;; zmacs-region-stays plus the function zmacs_update_region which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2556 ;;; calls the lisp level zmacs-update-region. It must remain since it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2557 ;;; must be called by core C code.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2558 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2559
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2560 (defvar zmacs-activate-region-hook nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2561 "Function or functions called when the region becomes active;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2562 see the variable `zmacs-regions'.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2563
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2564 (defvar zmacs-deactivate-region-hook nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2565 "Function or functions called when the region becomes inactive;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2566 see the variable `zmacs-regions'.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2567
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2568 (defvar zmacs-update-region-hook nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2569 "Function or functions called when the active region changes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2570 This is called after each command that sets `zmacs-region-stays' to t.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2571 See the variable `zmacs-regions'.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2572
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2573 (defvar zmacs-region-extent nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2574 "The extent of the zmacs region; don't use this.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2575
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2576 (defvar zmacs-region-rectangular-p nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2577 "Whether the zmacs region is a rectangle; don't use this.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2578
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2579 (defun zmacs-make-extent-for-region (region)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2580 ;; Given a region, this makes an extent in the buffer which holds that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2581 ;; region, for highlighting purposes. If the region isn't associated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2582 ;; with a buffer, this does nothing.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2583 (let ((buffer nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2584 (valid (and (extentp zmacs-region-extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2585 (extent-object zmacs-region-extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2586 (buffer-live-p (extent-object zmacs-region-extent))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2587 start end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2588 (cond ((consp region)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2589 (setq start (min (car region) (cdr region))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2590 end (max (car region) (cdr region))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2591 valid (and valid
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2592 (eq (marker-buffer (car region))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2593 (extent-object zmacs-region-extent)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2594 buffer (marker-buffer (car region))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2595 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2596 (signal 'error (list "invalid region" region))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2597
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2598 (if valid
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2599 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2600 ;; The condition case is in case any of the extents are dead or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2601 ;; otherwise incapacitated.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2602 (condition-case ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2603 (if (listp zmacs-region-extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2604 (mapcar 'delete-extent zmacs-region-extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2605 (delete-extent zmacs-region-extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2606 (error nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2607
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2608 (if valid
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2609 (set-extent-endpoints zmacs-region-extent start end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2610 (setq zmacs-region-extent (make-extent start end buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2611
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2612 ;; Make the extent be closed on the right, which means that if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2613 ;; characters are inserted exactly at the end of the extent, the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2614 ;; extent will grow to cover them. This is important for shell
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2615 ;; buffers - suppose one makes a region, and one end is at point-max.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2616 ;; If the shell produces output, that marker will remain at point-max
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2617 ;; (its position will increase). So it's important that the extent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2618 ;; exhibit the same behavior, lest the region covered by the extent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2619 ;; (the visual indication), and the region between point and mark
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2620 ;; (the actual region value) become different!
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2621 (set-extent-property zmacs-region-extent 'end-open nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2622
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2623 ;; use same priority as mouse-highlighting so that conflicts between
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2624 ;; the region extent and a mouse-highlighted extent are resolved by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2625 ;; the usual size-and-endpoint-comparison method.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2626 (set-extent-priority zmacs-region-extent mouse-highlight-priority)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2627 (set-extent-face zmacs-region-extent 'zmacs-region)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2628
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2629 ;; #### It might be better to actually break
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2630 ;; default-mouse-track-next-move-rect out of mouse.el so that we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2631 ;; can use its logic here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2632 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2633 (zmacs-region-rectangular-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2634 (setq zmacs-region-extent (list zmacs-region-extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2635 (default-mouse-track-next-move-rect start end zmacs-region-extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2636 ))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2637
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2638 zmacs-region-extent)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2639
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2640 (defun zmacs-region-buffer ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2641 "Return the buffer containing the zmacs region, or nil."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2642 ;; #### this is horrible and kludgy! This stuff needs to be rethought.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2643 (and zmacs-regions zmacs-region-active-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2644 (or (marker-buffer (mark-marker t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2645 (and (extent-live-p zmacs-region-extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2646 (buffer-live-p (extent-object zmacs-region-extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2647 (extent-object zmacs-region-extent)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2648
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2649 (defun zmacs-activate-region ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2650 "Make the region between `point' and `mark' be active (highlighted),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2651 if `zmacs-regions' is true. Only a very small number of commands
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2652 should ever do this. Calling this function will call the hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2653 `zmacs-activate-region-hook', if the region was previously inactive.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2654 Calling this function ensures that the region stays active after the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2655 current command terminates, even if `zmacs-region-stays' is not set.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2656 Returns t if the region was activated (i.e. if `zmacs-regions' if t)."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2657 (if (not zmacs-regions)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2658 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2659 (setq zmacs-region-active-p t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2660 zmacs-region-stays t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2661 zmacs-region-rectangular-p (and (boundp 'mouse-track-rectangle-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2662 mouse-track-rectangle-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2663 (if (marker-buffer (mark-marker t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2664 (zmacs-make-extent-for-region (cons (point-marker t) (mark-marker t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2665 (run-hooks 'zmacs-activate-region-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2666 t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2667
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2668 (defun zmacs-deactivate-region ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2669 "Make the region between `point' and `mark' no longer be active,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2670 if `zmacs-regions' is true. You shouldn't need to call this; the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2671 command loop calls it when appropriate. Calling this function will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2672 call the hook `zmacs-deactivate-region-hook', if the region was
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2673 previously active. Returns t if the region had been active, nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2674 otherwise."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2675 (if (not zmacs-region-active-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2676 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2677 (setq zmacs-region-active-p nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2678 zmacs-region-stays nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2679 zmacs-region-rectangular-p nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2680 (if zmacs-region-extent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2681 (let ((inhibit-quit t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2682 (if (listp zmacs-region-extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2683 (mapcar 'delete-extent zmacs-region-extent)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2684 (delete-extent zmacs-region-extent))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2685 (setq zmacs-region-extent nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2686 (run-hooks 'zmacs-deactivate-region-hook)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2687 t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2688
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2689 (defun zmacs-update-region ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2690 "Update the highlighted region between `point' and `mark'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2691 You shouldn't need to call this; the command loop calls it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2692 when appropriate. Calling this function will call the hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2693 `zmacs-update-region-hook', if the region is active."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2694 (if zmacs-region-active-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2695 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2696 (if (marker-buffer (mark-marker t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2697 (zmacs-make-extent-for-region (cons (point-marker t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2698 (mark-marker t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2699 (run-hooks 'zmacs-update-region-hook))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2700
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2701 ;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2702 ;;;;;; echo area stuff
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2703 ;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2704
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2705 ;;; The `message-stack' is an alist of labels with messages; the first
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2706 ;;; message in this list is always in the echo area. A call to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2707 ;;; `display-message' inserts a label/message pair at the head of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2708 ;;; list, and removes any other pairs with that label. Calling
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2709 ;;; `clear-message' causes any pair with matching label to be removed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2710 ;;; and this may cause the displayed message to change or vanish. If
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2711 ;;; the label arg is nil, the entire message stack is cleared.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2712 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2713 ;;; Message/error filtering will be a little tricker to implement than
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2714 ;;; logging, since messages can be built up incrementally
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2715 ;;; using clear-message followed by repeated calls to append-message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2716 ;;; (this happens with error messages). For messages which aren't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2717 ;;; created this way, filtering could be implemented at display-message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2718 ;;; very easily.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2719 ;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2720 ;;; Bits of the logging code are borrowed from log-messages.el by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2721 ;;; Robert Potter (rpotter@grip.cis.upenn.edu).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2722
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2723 ;; need this to terminate the currently-displayed message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2724 ;; ("Loading simple ...")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2725 (or (fboundp 'display-message) (send-string-to-terminal "\n"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2726
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2727 (defvar message-stack nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2728 "An alist of label/string pairs representing active echo-area messages.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2729 The first element in the list is currently displayed in the echo area.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2730 Do not modify this directly--use the `message' or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2731 `display-message'/`clear-message' functions.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2732
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2733 (defvar remove-message-hook 'log-message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2734 "A function or list of functions to be called when a message is removed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2735 from the echo area at the bottom of the frame. The label of the removed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2736 message is passed as the first argument, and the text of the message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2737 as the second argument.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2738
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2739 (defvar log-message-max-size 50000
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2740 "Maximum size of the \" *Message-Log*\" buffer. See `log-message'.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2741
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2742 (defvar log-message-ignore-regexps
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2743 '("^Mark set$"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2744 "^Undo!$"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2745 "^Quit$"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2746 "^\\(Beginning\\|End\\) of buffer$"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2747 "^Fontifying"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2748 "^\\(Failing \\)?\\([Ww]rapped \\)?\\([Rr]egexp \\)?I-search\\( backward\\)?:"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2749 "^Mark saved where search started$"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2750 "^Making completion list"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2751 "^Matches " ; paren-matching message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2752 "^Type .* to \\(remove help\\|restore the other\\) window."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2753 "^M-x .* (bound to key" ; teach-extended-commands
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2754 "^(No changes need to be saved)$"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2755 "^(No files need saving)$"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2756 "^\\(Parsing messages\\|Reading attributes\\|Generating summary\\|Building threads\\|Converting\\)\\.\\.\\. [0-9]+$" ; vm
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2757 "^End of message \d+" ; vm
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2758 "^Parsing error messages\\.\\.\\.[0-9]+" ; compile
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2759 "^Parsed [0-9]+ of [0-9]+ ([0-9]+%)$" ; w3
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2760 "^\\(Formatting Summary\\|Reading active file\\|Checking new news\\|Looking for crossposts\\|Marking crossposts\\|MHSPOOL:\\|NNSPOOL:\\|NNTP:\\|\\(Uns\\|S\\)ubscribing new newsgroups\\)\\.\\.\\. *[0-9]+%$" ; gnus
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2761 "^Adding glyphs\\.\\.\\. ([0-9]+%)\\( done\\)?$" ; outl-mouse
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2762 "^->" ; bbdb prompt
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2763 )
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2764 "List of regular expressions matching messages which shouldn't be logged.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2765 See `log-message'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2766
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2767 Ideally, packages which generate messages which might need to be ignored
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2768 should label them with 'progress, 'prompt, or 'no-log, so they can be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2769 filtered by the log-message-ignore-labels.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2770
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2771 (defvar log-message-ignore-labels
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2772 '(help-echo command progress prompt no-log garbage-collecting auto-saving)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2773 "List of symbols indicating labels of messages which shouldn't be logged.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2774 See `display-message' for some common labels. See also `log-message'.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2775
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2776 ;Subsumed by view-lossage
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2777 ;(defun show-message-log ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2778 ; "Show the \" *Message-Log*\" buffer, which contains old messages and errors."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2779 ; (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2780 ; (pop-to-buffer " *Message-Log*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2781
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2782 (defvar log-message-filter-function 'log-message-filter
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2783 "Value must be a function of two arguments: a symbol (label) and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2784 a string (messsage). It should return non-nil to indicate a message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2785 should be logged. Possible values include 'log-message-filter and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2786 'log-message-filter-errors-only.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2787
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2788 (defun log-message-filter (label message)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2789 "Default value of log-message-filter-function.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2790 Mesages whose text matches one of the log-message-ignore-regexps
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2791 or whose label appears in log-message-ignore-labels are not saved."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2792 (let ((r log-message-ignore-regexps)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2793 (ok (not (memq label log-message-ignore-labels))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2794 (while (and r ok)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2795 (if (save-match-data (string-match (car r) message))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2796 (setq ok nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2797 (setq r (cdr r)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2798 ok))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2799
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2800 (defun log-message-filter-errors-only (label message)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2801 "For use as the log-message-filter-function. Only logs error messages."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2802 (eq label 'error))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2803
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2804 (defun log-message (label message)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2805 "Stuff a copy of the message into the \" *Message-Log*\" buffer,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2806 if it satisfies the log-message-filter-function.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2807
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2808 For use on remove-message-hook."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2809 (if (and (not noninteractive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2810 (funcall log-message-filter-function label message))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2811 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2812 (set-buffer (get-buffer-create " *Message-Log*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2813 (goto-char (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2814 ;; (insert (concat (upcase (symbol-name label)) ": " message "\n"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2815 (insert message "\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2816 (if (> (point-max) (max log-message-max-size (point-min)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2817 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2818 ;; trim log to ~90% of max size
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2819 (goto-char (max (- (point-max)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2820 (truncate (* 0.9 log-message-max-size)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2821 (point-min)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2822 (forward-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2823 (delete-region (point-min) (point)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2824
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2825 (defun message-displayed-p (&optional return-string frame)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2826 "Return a non-nil value if a message is presently displayed in the\n\
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2827 minibuffer's echo area. If optional argument RETURN-STRING is non-nil,\n\
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2828 return a string containing the message, otherwise just return t."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2829 ;; by definition, a message is displayed if the echo area buffer is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2830 ;; non-empty (see also echo_area_active()). It had better also
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2831 ;; be the case that message-stack is nil exactly when the echo area
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2832 ;; is non-empty.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2833 (let ((buffer (get-buffer " *Echo Area*")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2834 (and (< (point-min buffer) (point-max buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2835 (if return-string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2836 (buffer-substring nil nil buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2837 t))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2838
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2839 ;;; Returns the string which remains in the echo area, or nil if none.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2840 ;;; If label is nil, the whole message stack is cleared.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2841 (defun clear-message (&optional label frame stdout-p no-restore)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2842 "Remove any message with the given LABEL from the message-stack,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2843 erasing it from the echo area if it's currently displayed there.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2844 If a message remains at the head of the message-stack and NO-RESTORE
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2845 is nil, it will be displayed. The string which remains in the echo
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2846 area will be returned, or nil if the message-stack is now empty.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2847 If LABEL is nil, the entire message-stack is cleared.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2848
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2849 Unless you need the return value or you need to specify a lable,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2850 you should just use (message nil)."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2851 (or frame (setq frame (selected-frame)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2852 (let ((clear-stream (and message-stack (eq 'stream (frame-type frame)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2853 (remove-message label frame)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2854 (let ((buffer (get-buffer " *Echo Area*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2855 (zmacs-region-stays zmacs-region-stays)) ; preserve from change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2856 (erase-buffer buffer))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2857 (if clear-stream
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2858 (send-string-to-terminal ?\n stdout-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2859 (if no-restore
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2860 nil ; just preparing to put another msg up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2861 (if message-stack
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2862 (let ((oldmsg (cdr (car message-stack))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2863 (raw-append-message oldmsg frame stdout-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2864 oldmsg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2865 ;; ### should we (redisplay-echo-area) here? messes some things up.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2866 nil))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2867
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2868 (defun remove-message (&optional label frame)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2869 ;; If label is nil, we want to remove all matching messages.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2870 ;; Must reverse the stack first to log them in the right order.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2871 (let ((log nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2872 (while (and message-stack
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2873 (or (null label) ; null label means clear whole stack
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2874 (eq label (car (car message-stack)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2875 (setq log (cons (car message-stack) log))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2876 (setq message-stack (cdr message-stack)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2877 (let ((s message-stack))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2878 (while (cdr s)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2879 (let ((msg (car (cdr s))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2880 (if (eq label (car msg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2881 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2882 (setq log (cons msg log))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2883 (setcdr s (cdr (cdr s))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2884 (setq s (cdr s))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2885 ;; (possibly) log each removed message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2886 (while log
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2887 (condition-case e
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2888 (run-hook-with-args 'remove-message-hook
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2889 (car (car log)) (cdr (car log)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2890 (error (setq remove-message-hook nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2891 (message "remove-message-hook error: %s" e)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2892 (sit-for 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2893 (erase-buffer (get-buffer " *Echo Area*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2894 (signal (car e) (cdr e))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2895 (setq log (cdr log)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2896
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2897 (defun append-message (label message &optional frame stdout-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2898 (or frame (setq frame (selected-frame)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2899 ;; add a new entry to the message-stack, or modify an existing one
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2900 (let ((top (car message-stack)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2901 (if (eq label (car top))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2902 (setcdr top (concat (cdr top) message))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2903 (setq message-stack (cons (cons label message) message-stack))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2904 (raw-append-message message frame stdout-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2905
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2906 ;; really append the message to the echo area. no fiddling with message-stack.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2907 (defun raw-append-message (message &optional frame stdout-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2908 (if (eq message "") nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2909 (let ((buffer (get-buffer " *Echo Area*"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2910 (zmacs-region-stays zmacs-region-stays)) ; preserve from change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2911 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2912 (set-buffer buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2913 (insert message))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2914 ;; Conditionalizing on the device type in this way is not that clean,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2915 ;; but neither is having a device method, as I originally implemented
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2916 ;; it: all non-stream devices behave in the same way. Perhaps
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2917 ;; the cleanest way is to make the concept of a "redisplayable"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2918 ;; device, which stream devices are not. Look into this more if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2919 ;; we ever create another non-redisplayable device type (e.g.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2920 ;; processes? printers?).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2921
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2922 ;; Don't redisplay the echo area if we are executing a macro.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2923 (if (not executing-kbd-macro)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2924 (if (eq 'stream (frame-type frame))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2925 (send-string-to-terminal message stdout-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2926 (redisplay-echo-area))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2927
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2928 (defun display-message (label message &optional frame stdout-p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2929 "Print a one-line message at the bottom of the frame. First argument
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2930 LABEL is an identifier for this message. MESSAGE is the string to display.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2931 Use `clear-message' to remove a labelled message.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2932
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2933 Here are some standard labels (those marked with `*' are not logged
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2934 by default--see the `log-message-ignore-labels' variable):
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2935 message default label used by the `message' function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2936 error default label used for reporting errors
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2937 * progress progress indicators like \"Converting... 45%\"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2938 * prompt prompt-like messages like \"I-search: foo\"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2939 * no-log messages that should never be logged"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2940 (clear-message label frame stdout-p t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2941 (append-message label message frame stdout-p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2942
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2943 ;;; may eventually be frame-dependent
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2944 (defun current-message-label (frame)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2945 (if message-stack
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2946 (car (car message-stack))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2947 nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2948
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2949 (defun message (fmt &rest args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2950 "Print a one-line message at the bottom of the frame.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2951 The arguments are the same as to `format'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2952
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2953 If the only argument is nil, clear any existing message; let the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2954 minibuffer contents show."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2955 ;; questionable junk in the C code
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2956 ;; (if (framep default-minibuffer-frame)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2957 ;; (make-frame-visible default-minibuffer-frame))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2958 (if (and (null fmt) (null args))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2959 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2960 (clear-message nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2961 nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2962 (let ((str (apply 'format fmt args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2963 (display-message 'message str)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2964 str)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2965
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2966 ;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2967 ;;;;;; warning stuff
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2968 ;;;;;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2969
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2970 (defvar log-warning-minimum-level 'info
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2971 "Minimum level of warnings that should be logged.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2972 The warnings in levels below this are completely ignored, as if they never
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2973 happened.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2974
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2975 The recognized warning levels, in decreasing order of priority, are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2976 'emergency, 'alert, 'critical, 'error, 'warning, 'notice, 'info, and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2977 'debug.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2978
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2979 See also `display-warning-minimum-level'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2980
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2981 You can also control which warnings are displayed on a class-by-class
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2982 basis. See `display-warning-suppressed-classes' and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2983 `log-warning-suppressed-classes'.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2984
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2985 (defvar display-warning-minimum-level 'info
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2986 "Minimum level of warnings that should be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2987 The warnings in levels below this are completely ignored, as if they never
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2988 happened.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2989
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2990 The recognized warning levels, in decreasing order of priority, are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2991 'emergency, 'alert, 'critical, 'error, 'warning, 'notice, 'info, and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2992 'debug.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2993
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2994 See also `log-warning-minimum-level'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2995
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2996 You can also control which warnings are displayed on a class-by-class
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2997 basis. See `display-warning-suppressed-classes' and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2998 `log-warning-suppressed-classes'.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2999
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3000 (defvar log-warning-suppressed-classes nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3001 "List of classes of warnings that shouldn't be logged or displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3002 If any of the CLASS symbols associated with a warning is the same as
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3003 any of the symbols listed here, the warning will be completely ignored,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3004 as it they never happened.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3005
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3006 NOTE: In most circumstances, you should *not* set this variable.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3007 Set `display-warning-suppressed-classes' instead. That way the suppressed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3008 warnings are not displayed but are still unobtrusively logged.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3009
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3010 See also `log-warning-minimum-level' and `display-warning-minimum-level'.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3011
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3012 (defvar display-warning-suppressed-classes nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3013 "List of classes of warnings that shouldn't be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3014 If any of the CLASS symbols associated with a warning is the same as
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3015 any of the symbols listed here, the warning will not be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3016 The warning will still logged in the *Warnings* buffer (unless also
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3017 contained in `log-warning-suppressed-classes'), but the buffer will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3018 not be automatically popped up.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3019
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3020 See also `log-warning-minimum-level' and `display-warning-minimum-level'.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3021
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3022 (defvar warning-count 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3023 "Count of the number of warning messages displayed so far.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3024
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3025 (defconst warning-level-alist '((emergency . 8)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3026 (alert . 7)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3027 (critical . 6)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3028 (error . 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3029 (warning . 4)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3030 (notice . 3)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3031 (info . 2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3032 (debug . 1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3033
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3034 (defun warning-level-p (level)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3035 "Non-nil if LEVEL specifies a warning level."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3036 (and (symbolp level) (assq level warning-level-alist)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3037
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3038 ;; If you're interested in rewriting this function, be aware that it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3039 ;; could be called at arbitrary points in a Lisp program (when a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3040 ;; built-in function wants to issue a warning, it will call out to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3041 ;; this function the next time some Lisp code is evaluated). Therefore,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3042 ;; this function *must* not permanently modify any global variables
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3043 ;; (e.g. the current buffer) except those that specifically apply
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3044 ;; to the warning system.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3045
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3046 (defvar before-init-deferred-warnings nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3047
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3048 (defun after-init-display-warnings ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3049 "Display warnings deferred till after the init file is run.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3050 Warnings that occur before then are deferred so that warning
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3051 suppression in the .emacs file will be honored."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3052 (while before-init-deferred-warnings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3053 (apply 'display-warning (car before-init-deferred-warnings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3054 (setq before-init-deferred-warnings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3055 (cdr before-init-deferred-warnings))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3056
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3057 (add-hook 'after-init-hook 'after-init-display-warnings)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3058
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3059 (defun display-warning (class message &optional level)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3060 "Display a warning message.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3061 CLASS should be a symbol describing what sort of warning this is, such
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3062 as `resource' or `key-mapping'. A list of such symbols is also
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3063 accepted. (Individual classes can be suppressed; see
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3064 `display-warning-suppressed-classes'.) Optional argument LEVEL can
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3065 be used to specify a priority for the warning, other than default priority
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3066 `warning'. (See `display-warning-minimum-level'). The message is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3067 inserted into the *Warnings* buffer, which is made visible at appropriate
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3068 times."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3069 (or level (setq level 'warning))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3070 (or (listp class) (setq class (list class)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3071 (check-argument-type 'warning-level-p level)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3072 (if (not init-file-loaded)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3073 (setq before-init-deferred-warnings
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3074 (cons (list class message level) before-init-deferred-warnings))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3075 (catch 'ignored
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3076 (let ((display-p t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3077 (level-num (cdr (assq level warning-level-alist))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3078 (if (< level-num (cdr (assq log-warning-minimum-level
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3079 warning-level-alist)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3080 (throw 'ignored nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3081 (if (intersection class log-warning-suppressed-classes)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3082 (throw 'ignored nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3083
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3084 (if (< level-num (cdr (assq display-warning-minimum-level
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3085 warning-level-alist)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3086 (setq display-p nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3087 (if (and display-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3088 (intersection class display-warning-suppressed-classes))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3089 (setq display-p nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3090 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3091 (let ((buffer (get-buffer-create "*Warnings*")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3092 (if display-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3093 ;; The C code looks at display-warning-tick to determine
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3094 ;; when it should call `display-warning-buffer'. Change it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3095 ;; to get the C code's attention.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3096 (setq display-warning-tick (1+ display-warning-tick)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3097 (set-buffer buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3098 (goto-char (point-max))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3099 (setq warning-count (1+ warning-count))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3100 (princ (format "(%d) (%s/%s) "
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3101 warning-count
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3102 (mapconcat 'symbol-name class ",")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3103 level) buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3104 (princ message buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3105 (terpri buffer)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3106 (terpri buffer)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3107
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3108 (defun warn (&rest args)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3109 "Display a warning message.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3110 The message is constructed by passing all args to `format'. The message
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3111 is placed in the *Warnings* buffer, which will be popped up at the next
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3112 redisplay. The class of the warning is `warning'. See also
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3113 `display-warning'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3114 (display-warning 'warning (apply 'format args)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3115
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3116 (defvar warning-marker nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3117
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3118 ;; When this function is called by the C code, all non-local exits are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3119 ;; trapped and C-g is inhibited; therefore, it would be a very, very
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3120 ;; bad idea for this function to get into an infinite loop.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3121
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3122 (defun display-warning-buffer ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3123 "Make the buffer that contains the warnings be visible.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3124 The C code calls this periodically, right before redisplay."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3125 (let ((buffer (get-buffer-create "*Warnings*")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3126 (if (or (not warning-marker) (not (eq (marker-buffer warning-marker)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3127 buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3128 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3129 (setq warning-marker (make-marker))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3130 (set-marker warning-marker 1 buffer)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3131 (set-window-start (display-buffer buffer) warning-marker)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3132 (set-marker warning-marker (point-max buffer) buffer)))