annotate lisp/prim/simple.el @ 8:4b173ad71786 r19-15b5

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