annotate lisp/simple.el @ 253:157b30c96d03 r20-5b25

Import from CVS: tag r20-5b25
author cvs
date Mon, 13 Aug 2007 10:20:27 +0200
parents f220cc83d72e
children 11cf20601dec
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1 ;;; simple.el --- basic editing commands for XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3 ;; Copyright (C) 1985-7, 1993-5, 1997 Free Software Foundation, Inc.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
4 ;; Copyright (C) 1995 Tinker Systems and INS Engineering Corp.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
5
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
6 ;; Maintainer: XEmacs Development Team
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
7 ;; Keywords: lisp, extensions, internal, dumped
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
8
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
9 ;; This file is part of XEmacs.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
10
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
11 ;; XEmacs is free software; you can redistribute it and/or modify it
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
12 ;; under the terms of the GNU General Public License as published by
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
13 ;; the Free Software Foundation; either version 2, or (at your option)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
14 ;; any later version.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
15
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
16 ;; XEmacs is distributed in the hope that it will be useful, but
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
17 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
19 ;; General Public License for more details.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
20
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
22 ;; along with XEmacs; see the file COPYING. If not, write to the Free
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
23 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
24 ;; 02111-1307, USA.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
25
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
26 ;;; Synched up with: FSF 19.34 [But not very closely].
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
27
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
28 ;;; Commentary:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
29
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
30 ;; This file is dumped with XEmacs.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
31
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
32 ;; A grab-bag of basic XEmacs commands not specifically related to some
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
33 ;; major mode or to file-handling.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
34
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
35 ;; Changes for zmacs-style active-regions:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
36 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
37 ;; beginning-of-buffer, end-of-buffer, count-lines-region,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
38 ;; count-lines-buffer, what-line, what-cursor-position, set-goal-column,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
39 ;; set-fill-column, prefix-arg-internal, and line-move (which is used by
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
40 ;; next-line and previous-line) set zmacs-region-stays to t, so that they
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
41 ;; don't affect the current region-hilighting state.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
42 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
43 ;; mark-whole-buffer, mark-word, exchange-point-and-mark, and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
44 ;; set-mark-command (without an argument) call zmacs-activate-region.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
45 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
46 ;; mark takes an optional arg like the new Fmark_marker() does. When
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
47 ;; the region is not active, mark returns nil unless the optional arg is true.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
48 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
49 ;; push-mark, pop-mark, exchange-point-and-mark, and set-marker, and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
50 ;; set-mark-command use (mark t) so that they can access the mark whether
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
51 ;; the region is active or not.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
52 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
53 ;; shell-command, shell-command-on-region, yank, and yank-pop (which all
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
54 ;; push a mark) have been altered to call exchange-point-and-mark with an
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
55 ;; argument, meaning "don't activate the region". These commands only use
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
56 ;; exchange-point-and-mark to position the newly-pushed mark correctly, so
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
57 ;; this isn't a user-visible change. These functions have also been altered
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
58 ;; to use (mark t) for the same reason.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
59
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
60 ;; 97/3/14 Jareth Hein (jhod@po.iijnet.or.jp) added kinsoku processing (support
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
61 ;; for filling of Asian text) into the fill code. This was ripped bleeding from
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
62 ;; Mule-2.3, and could probably use some feature additions (like additional wrap
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
63 ;; styles, etc)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
64
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
65 ;; 97/06/11 Steve Baur (steve@altair.xemacs.org) Convert use of
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
66 ;; (preceding|following)-char to char-(after|before).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
67
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
68 ;;; Code:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
69
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
70 (defgroup editing-basics nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
71 "Most basic editing variables."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
72 :group 'editing)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
73
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
74 (defgroup killing nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
75 "Killing and yanking commands."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
76 :group 'editing)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
77
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
78 (defgroup fill-comments nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
79 "Indenting and filling of comments."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
80 :prefix "comment-"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
81 :group 'fill)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
82
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
83 (defgroup paren-matching nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
84 "Highlight (un)matching of parens and expressions."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
85 :prefix "paren-"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
86 :group 'matching)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
87
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
88 (defgroup log-message nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
89 "Messages logging and display customizations."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
90 :group 'minibuffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
91
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
92 (defgroup warnings nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
93 "Warnings customizations."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
94 :group 'minibuffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
95
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
96
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
97 (defun newline (&optional arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
98 "Insert a newline, and move to left margin of the new line if it's blank.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
99 The newline is marked with the text-property `hard'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
100 With arg, insert that many newlines.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
101 In Auto Fill mode, if no numeric arg, break the preceding line if it's long."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
102 (interactive "*P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
103 (barf-if-buffer-read-only nil (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
104 ;; Inserting a newline at the end of a line produces better redisplay in
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
105 ;; try_window_id than inserting at the beginning of a line, and the textual
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
106 ;; result is the same. So, if we're at beginning of line, pretend to be at
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
107 ;; the end of the previous line.
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
108 ;; #### Does this have any relevance in XEmacs?
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
109 (let ((flag (and (not (bobp))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
110 (bolp)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
111 ;; Make sure the newline before point isn't intangible.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
112 (not (get-char-property (1- (point)) 'intangible))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
113 ;; Make sure the newline before point isn't read-only.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
114 (not (get-char-property (1- (point)) 'read-only))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
115 ;; Make sure the newline before point isn't invisible.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
116 (not (get-char-property (1- (point)) 'invisible))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
117 ;; This should probably also test for the previous char
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
118 ;; being the *last* character too.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
119 (not (get-char-property (1- (point)) 'end-open))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
120 ;; Make sure the newline before point has the same
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
121 ;; properties as the char before it (if any).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
122 (< (or (previous-extent-change (point)) -2)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
123 (- (point) 2))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
124 (was-page-start (and (bolp)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
125 (looking-at page-delimiter)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
126 (beforepos (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
127 (if flag (backward-char 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
128 ;; Call self-insert so that auto-fill, abbrev expansion etc. happens.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
129 ;; Set last-command-char to tell self-insert what to insert.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
130 (let ((last-command-char ?\n)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
131 ;; Don't auto-fill if we have a numeric argument.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
132 ;; Also not if flag is true (it would fill wrong line);
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
133 ;; there is no need to since we're at BOL.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
134 (auto-fill-function (if (or arg flag) nil auto-fill-function)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
135 (unwind-protect
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
136 (self-insert-command (prefix-numeric-value arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
137 ;; If we get an error in self-insert-command, put point at right place.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
138 (if flag (forward-char 1))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
139 ;; If we did *not* get an error, cancel that forward-char.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
140 (if flag (backward-char 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
141 ;; Mark the newline(s) `hard'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
142 (if use-hard-newlines
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
143 (let* ((from (- (point) (if arg (prefix-numeric-value arg) 1)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
144 (sticky (get-text-property from 'end-open))) ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
145 (put-text-property from (point) 'hard 't)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
146 ;; If end-open is not "t", add 'hard to end-open list
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
147 (if (and (listp sticky) (not (memq 'hard sticky)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
148 (put-text-property from (point) 'end-open ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
149 (cons 'hard sticky)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
150 ;; If the newline leaves the previous line blank,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
151 ;; and we have a left margin, delete that from the blank line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
152 (or flag
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
153 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
154 (goto-char beforepos)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
155 (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
156 (and (looking-at "[ \t]$")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
157 (> (current-left-margin) 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
158 (delete-region (point) (progn (end-of-line) (point))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
159 (if flag (forward-char 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
160 ;; Indent the line after the newline, except in one case:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
161 ;; when we added the newline at the beginning of a line
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
162 ;; which starts a page.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
163 (or was-page-start
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
164 (move-to-left-margin nil t)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
165 nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
166
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 209
diff changeset
167 (defun set-hard-newline-properties (from to)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 209
diff changeset
168 (let ((sticky (get-text-property from 'rear-nonsticky)))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 209
diff changeset
169 (put-text-property from to 'hard 't)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 209
diff changeset
170 ;; If rear-nonsticky is not "t", add 'hard to rear-nonsticky list
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 209
diff changeset
171 (if (and (listp sticky) (not (memq 'hard sticky)))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 209
diff changeset
172 (put-text-property from (point) 'rear-nonsticky
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 209
diff changeset
173 (cons 'hard sticky)))))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 209
diff changeset
174
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
175 (defun open-line (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
176 "Insert a newline and leave point before it.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
177 If there is a fill prefix and/or a left-margin, insert them on the new line
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
178 if the line would have been blank.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
179 With arg N, insert N newlines."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
180 (interactive "*p")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
181 (let* ((do-fill-prefix (and fill-prefix (bolp)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
182 (do-left-margin (and (bolp) (> (current-left-margin) 0)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
183 (loc (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
184 (newline arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
185 (goto-char loc)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
186 (while (> arg 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
187 (cond ((bolp)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
188 (if do-left-margin (indent-to (current-left-margin)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
189 (if do-fill-prefix (insert fill-prefix))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
190 (forward-line 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
191 (setq arg (1- arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
192 (goto-char loc)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
193 (end-of-line)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
194
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
195 (defun split-line ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
196 "Split current line, moving portion beyond point vertically down."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
197 (interactive "*")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
198 (skip-chars-forward " \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
199 (let ((col (current-column))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
200 (pos (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
201 (newline 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
202 (indent-to col 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
203 (goto-char pos)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
204
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
205 (defun quoted-insert (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
206 "Read next input character and insert it.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
207 This is useful for inserting control characters.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
208 You may also type up to 3 octal digits, to insert a character with that code.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
210 In overwrite mode, this function inserts the character anyway, and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
211 does not handle octal digits specially. This means that if you use
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
212 overwrite as your normal editing mode, you can use this function to
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
213 insert characters when necessary.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
214
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
215 In binary overwrite mode, this function does overwrite, and octal
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
216 digits are interpreted as a character code. This is supposed to make
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
217 this function useful in editing binary files."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
218 (interactive "*p")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
219 (let ((char (if (or (not overwrite-mode)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
220 (eq overwrite-mode 'overwrite-mode-binary))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
221 (read-quoted-char)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
222 (read-char))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
223 (if (> arg 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
224 (if (eq overwrite-mode 'overwrite-mode-binary)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
225 (delete-char arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
226 (while (> arg 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
227 (insert char)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
228 (setq arg (1- arg)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
229
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
230 (defun delete-indentation (&optional arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
231 "Join this line to previous and fix up whitespace at join.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
232 If there is a fill prefix, delete it from the beginning of this line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
233 With argument, join this line to following line."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
234 (interactive "*P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
235 (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
236 (if arg (forward-line 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
237 (if (eq (char-before (point)) ?\n)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
238 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
239 (delete-region (point) (1- (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
240 ;; If the second line started with the fill prefix,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
241 ;; delete the prefix.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
242 (if (and fill-prefix
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
243 (<= (+ (point) (length fill-prefix)) (point-max))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
244 (string= fill-prefix
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
245 (buffer-substring (point)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
246 (+ (point) (length fill-prefix)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
247 (delete-region (point) (+ (point) (length fill-prefix))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
248 (fixup-whitespace))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
249
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
250 (defun fixup-whitespace ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
251 "Fixup white space between objects around point.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
252 Leave one space or none, according to the context."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
253 (interactive "*")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
254 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
255 (delete-horizontal-space)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
256 (if (or (looking-at "^\\|\\s)")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
257 (save-excursion (forward-char -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
258 (looking-at "$\\|\\s(\\|\\s'")))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
259 nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
260 (insert ?\ ))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
261
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
262 (defun delete-horizontal-space ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
263 "Delete all spaces and tabs around point."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
264 (interactive "*")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
265 (skip-chars-backward " \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
266 (delete-region (point) (progn (skip-chars-forward " \t") (point))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
267
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
268 (defun just-one-space ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
269 "Delete all spaces and tabs around point, leaving one space."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
270 (interactive "*")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
271 (if abbrev-mode ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
272 (expand-abbrev))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
273 (skip-chars-backward " \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
274 (if (eq (char-after (point)) ? ) ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
275 (forward-char 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
276 (insert ? ))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
277 (delete-region (point) (progn (skip-chars-forward " \t") (point))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
278
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
279 (defun delete-blank-lines ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
280 "On blank line, delete all surrounding blank lines, leaving just one.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
281 On isolated blank line, delete that one.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
282 On nonblank line, delete any immediately following blank lines."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
283 (interactive "*")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
284 (let (thisblank singleblank)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
285 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
286 (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
287 (setq thisblank (looking-at "[ \t]*$"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
288 ;; Set singleblank if there is just one blank line here.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
289 (setq singleblank
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
290 (and thisblank
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
291 (not (looking-at "[ \t]*\n[ \t]*$"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
292 (or (bobp)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
293 (progn (forward-line -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
294 (not (looking-at "[ \t]*$")))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
295 ;; Delete preceding blank lines, and this one too if it's the only one.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
296 (if thisblank
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
297 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
298 (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
299 (if singleblank (forward-line 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
300 (delete-region (point)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
301 (if (re-search-backward "[^ \t\n]" nil t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
302 (progn (forward-line 1) (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
303 (point-min)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
304 ;; Delete following blank lines, unless the current line is blank
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
305 ;; and there are no following blank lines.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
306 (if (not (and thisblank singleblank))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
307 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
308 (end-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
309 (forward-line 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
310 (delete-region (point)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
311 (if (re-search-forward "[^ \t\n]" nil t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
312 (progn (beginning-of-line) (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
313 (point-max)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
314 ;; Handle the special case where point is followed by newline and eob.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
315 ;; Delete the line, leaving point at eob.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
316 (if (looking-at "^[ \t]*\n\\'")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
317 (delete-region (point) (point-max)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
318
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
319 (defun back-to-indentation ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
320 "Move point to the first non-whitespace character on this line."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
321 ;; XEmacs change
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
322 (interactive "_")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
323 (beginning-of-line 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
324 (skip-chars-forward " \t"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
325
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
326 (defun newline-and-indent ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
327 "Insert a newline, then indent according to major mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
328 Indentation is done using the value of `indent-line-function'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
329 In programming language modes, this is the same as TAB.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
330 In some text modes, where TAB inserts a tab, this command indents to the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
331 column specified by the function `current-left-margin'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
332 (interactive "*")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
333 (delete-region (point) (progn (skip-chars-backward " \t") (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
334 (newline)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
335 (indent-according-to-mode))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
336
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
337 (defun reindent-then-newline-and-indent ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
338 "Reindent current line, insert newline, then indent the new line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
339 Indentation of both lines is done according to the current major mode,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
340 which means calling the current value of `indent-line-function'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
341 In programming language modes, this is the same as TAB.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
342 In some text modes, where TAB inserts a tab, this indents to the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
343 column specified by the function `current-left-margin'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
344 (interactive "*")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
345 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
346 (delete-region (point) (progn (skip-chars-backward " \t") (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
347 (indent-according-to-mode))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
348 (newline)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
349 (indent-according-to-mode))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
350
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
351 ;; Internal subroutine of delete-char
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
352 (defun kill-forward-chars (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
353 (if (listp arg) (setq arg (car arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
354 (if (eq arg '-) (setq arg -1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
355 (kill-region (point) (+ (point) arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
356
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
357 ;; Internal subroutine of backward-delete-char
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
358 (defun kill-backward-chars (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
359 (if (listp arg) (setq arg (car arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
360 (if (eq arg '-) (setq arg -1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
361 (kill-region (point) (- (point) arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
362
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
363 (defun backward-delete-char-untabify (arg &optional killp)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
364 "Delete characters backward, changing tabs into spaces.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
365 Delete ARG chars, and kill (save in kill ring) if KILLP is non-nil.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
366 Interactively, ARG is the prefix arg (default 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
367 and KILLP is t if a prefix arg was specified."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
368 (interactive "*p\nP")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
369 (let ((count arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
370 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
371 (while (and (> count 0) (not (bobp)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
372 (if (eq (char-before (point)) ?\t) ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
373 (let ((col (current-column)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
374 (forward-char -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
375 (setq col (- col (current-column)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
376 (insert-char ?\ col)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
377 (delete-char 1)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
378 (forward-char -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
379 (setq count (1- count)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
380 (delete-backward-char arg killp)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
381 ;; XEmacs: In overwrite mode, back over columns while clearing them out,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
382 ;; unless at end of line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
383 (and overwrite-mode (not (eolp))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
384 (save-excursion (insert-char ?\ arg))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
385
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
386 (defcustom delete-key-deletes-forward nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
387 "*If non-nil, the DEL key will erase one character forwards.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
388 If nil, the DEL key will erase one character backwards."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
389 :type 'boolean
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
390 :group 'editing-basics)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
391
239
41f2f0e326e9 Import from CVS: tag r20-5b18
cvs
parents: 235
diff changeset
392 (defcustom backward-delete-function 'backward-delete-char
41f2f0e326e9 Import from CVS: tag r20-5b18
cvs
parents: 235
diff changeset
393 "*Function called to delete backwards on a delete keypress.
41f2f0e326e9 Import from CVS: tag r20-5b18
cvs
parents: 235
diff changeset
394 If `delete-key-deletes-forward' is nil, `backward-or-forward-delete-char'
41f2f0e326e9 Import from CVS: tag r20-5b18
cvs
parents: 235
diff changeset
395 calls this function to erase one character backwards. Default value
41f2f0e326e9 Import from CVS: tag r20-5b18
cvs
parents: 235
diff changeset
396 is 'backward-delete-char, with 'backward-delete-char-untabify being a
41f2f0e326e9 Import from CVS: tag r20-5b18
cvs
parents: 235
diff changeset
397 popular alternate setting."
41f2f0e326e9 Import from CVS: tag r20-5b18
cvs
parents: 235
diff changeset
398 :type 'function
41f2f0e326e9 Import from CVS: tag r20-5b18
cvs
parents: 235
diff changeset
399 :group 'editing-basics)
41f2f0e326e9 Import from CVS: tag r20-5b18
cvs
parents: 235
diff changeset
400
253
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
401 (eval-when-compile
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
402 (defmacro delete-forward-p ()
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
403 '(and delete-key-deletes-forward
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
404 (or (eq 'tty (device-type))
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
405 (x-keysym-on-keyboard-sans-modifiers-p 'backspace)))))
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
406
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
407 (defun backward-or-forward-delete-char (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
408 "Delete either one character backwards or one character forwards.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
409 Controlled by the state of `delete-key-deletes-forward' and whether the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
410 BackSpace keysym even exists on your keyboard. If you don't have a
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
411 BackSpace keysym, the delete key should always delete one character
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
412 backwards."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
413 (interactive "*p")
253
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
414 (if (delete-forward-p)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
415 (delete-char arg)
239
41f2f0e326e9 Import from CVS: tag r20-5b18
cvs
parents: 235
diff changeset
416 (funcall backward-delete-function arg)))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
417
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
418 (defun backward-or-forward-kill-word (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
419 "Delete either one word backwards or one word forwards.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
420 Controlled by the state of `delete-key-deletes-forward' and whether the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
421 BackSpace keysym even exists on your keyboard. If you don't have a
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
422 BackSpace keysym, the delete key should always delete one character
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
423 backwards."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
424 (interactive "*p")
253
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
425 (if (delete-forward-p)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
426 (kill-word arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
427 (backward-kill-word arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
428
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
429 (defun backward-or-forward-kill-sentence (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
430 "Delete either one sentence backwards or one sentence forwards.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
431 Controlled by the state of `delete-key-deletes-forward' and whether the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
432 BackSpace keysym even exists on your keyboard. If you don't have a
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
433 BackSpace keysym, the delete key should always delete one character
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
434 backwards."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
435 (interactive "*P")
253
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
436 (if (delete-forward-p)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
437 (kill-sentence arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
438 (backward-kill-sentence (prefix-numeric-value arg))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
439
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
440 (defun backward-or-forward-kill-sexp (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
441 "Delete either one sexpr backwards or one sexpr forwards.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
442 Controlled by the state of `delete-key-deletes-forward' and whether the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
443 BackSpace keysym even exists on your keyboard. If you don't have a
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
444 BackSpace keysym, the delete key should always delete one character
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
445 backwards."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
446 (interactive "*p")
253
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
447 (if (delete-forward-p)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
448 (kill-sexp arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
449 (backward-kill-sexp arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
450
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
451 (defun zap-to-char (arg char)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
452 "Kill up to and including ARG'th occurrence of CHAR.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
453 Goes backward if ARG is negative; error if CHAR not found."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
454 (interactive "*p\ncZap to char: ")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
455 (kill-region (point) (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
456 (search-forward (char-to-string char) nil nil arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
457 ; (goto-char (if (> arg 0) (1- (point)) (1+ (point))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
458 (point))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
459
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
460 (defun beginning-of-buffer (&optional arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
461 "Move point to the beginning of the buffer; leave mark at previous position.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
462 With arg N, put point N/10 of the way from the beginning.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
463
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
464 If the buffer is narrowed, this command uses the beginning and size
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
465 of the accessible part of the buffer.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
466
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
467 Don't use this command in Lisp programs!
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
468 \(goto-char (point-min)) is faster and avoids clobbering the mark."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
469 ;; XEmacs change
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
470 (interactive "_P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
471 (push-mark)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
472 (let ((size (- (point-max) (point-min))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
473 (goto-char (if arg
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
474 (+ (point-min)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
475 (if (> size 10000)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
476 ;; Avoid overflow for large buffer sizes!
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
477 (* (prefix-numeric-value arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
478 (/ size 10))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
479 (/ (+ 10 (* size (prefix-numeric-value arg))) 10)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
480 (point-min))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
481 (if arg (forward-line 1)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
482
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
483 (defun end-of-buffer (&optional arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
484 "Move point to the end of the buffer; leave mark at previous position.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
485 With arg N, put point N/10 of the way from the end.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
486
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
487 If the buffer is narrowed, this command uses the beginning and size
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
488 of the accessible part of the buffer.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
489
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
490 Don't use this command in Lisp programs!
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
491 \(goto-char (point-max)) is faster and avoids clobbering the mark."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
492 ;; XEmacs change
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
493 (interactive "_P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
494 (push-mark)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
495 ;; XEmacs changes here.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
496 (let ((scroll-to-end (not (pos-visible-in-window-p (point-max))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
497 (size (- (point-max) (point-min))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
498 (goto-char (if arg
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
499 (- (point-max)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
500 (if (> size 10000)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
501 ;; Avoid overflow for large buffer sizes!
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
502 (* (prefix-numeric-value arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
503 (/ size 10))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
504 (/ (* size (prefix-numeric-value arg)) 10)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
505 (point-max)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
506 (cond (arg
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
507 ;; If we went to a place in the middle of the buffer,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
508 ;; adjust it to the beginning of a line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
509 (forward-line 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
510 ;; XEmacs change
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
511 (scroll-to-end
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
512 ;; If the end of the buffer is not already on the screen,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
513 ;; then scroll specially to put it near, but not at, the bottom.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
514 (recenter -3)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
515
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
516 ;; XEmacs (not in FSF)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
517 (defun mark-beginning-of-buffer (&optional arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
518 "Push a mark at the beginning of the buffer; leave point where it is.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
519 With arg N, push mark N/10 of the way from the true beginning."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
520 (interactive "P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
521 (push-mark (if arg
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
522 (if (> (buffer-size) 10000)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
523 ;; Avoid overflow for large buffer sizes!
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
524 (* (prefix-numeric-value arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
525 (/ (buffer-size) 10))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
526 (/ (+ 10 (* (buffer-size) (prefix-numeric-value arg))) 10))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
527 (point-min))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
528 nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
529 t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
530 (define-function 'mark-bob 'mark-beginning-of-buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
531
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
532 ;; XEmacs (not in FSF)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
533 (defun mark-end-of-buffer (&optional arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
534 "Push a mark at the end of the buffer; leave point where it is.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
535 With arg N, push mark N/10 of the way from the true end."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
536 (interactive "P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
537 (push-mark (if arg
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
538 (- (1+ (buffer-size))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
539 (if (> (buffer-size) 10000)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
540 ;; Avoid overflow for large buffer sizes!
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
541 (* (prefix-numeric-value arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
542 (/ (buffer-size) 10))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
543 (/ (* (buffer-size) (prefix-numeric-value arg)) 10)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
544 (point-max))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
545 nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
546 t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
547 (define-function 'mark-eob 'mark-end-of-buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
548
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
549 (defun mark-whole-buffer ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
550 "Put point at beginning and mark at end of buffer.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
551 You probably should not use this function in Lisp programs;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
552 it is usually a mistake for a Lisp function to use any subroutine
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
553 that uses or sets the mark."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
554 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
555 (push-mark (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
556 (push-mark (point-max) nil t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
557 (goto-char (point-min)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
558
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
559 ;; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
560 (defun eval-current-buffer (&optional printflag)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
561 "Evaluate the current buffer as Lisp code.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
562 Programs can pass argument PRINTFLAG which controls printing of output:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
563 nil means discard it; anything else is stream for print."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
564 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
565 (eval-buffer (current-buffer) printflag))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
566
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
567 ;; XEmacs
253
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
568 (defun count-words-buffer (buffer)
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
569 "Print the number of words in BUFFER.
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
570 If called noninteractively, the value is returned rather than printed.
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
571 BUFFER defaults to the current buffer."
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
572 (interactive "bBuffer: ")
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
573 (let ((words (count-words-region (point-min) (point-max) buffer)))
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
574 (when (interactive-p)
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
575 (message "Buffer has %d words" words))
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
576 words))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
577
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
578 ;; XEmacs
253
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
579 (defun count-words-region (start end &optional buffer)
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
580 "Print the number of words in region between START and END in BUFFER.
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
581 If called noninteractively, the value is returned rather than printed.
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
582 BUFFER defaults to the current buffer."
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
583 (interactive "r")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
584 (save-excursion
253
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
585 (set-buffer (or buffer (current-buffer)))
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
586 (let ((words 0))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
587 (goto-char start)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
588 (while (< (point) end)
253
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
589 (when (forward-word 1)
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
590 (incf words)))
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
591 (when (interactive-p)
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
592 (message "Region has %d words" words))
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
593 words)))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
594
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
595 (defun count-lines-region (start end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
596 "Print number of lines and characters in the region."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
597 ;; XEmacs change
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
598 (interactive "_r")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
599 (message "Region has %d lines, %d characters"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
600 (count-lines start end) (- end start)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
601
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
602 ;; XEmacs
253
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
603 (defun count-lines-buffer (buffer)
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
604 "Print number of lines and characters in BUFFER."
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
605 (interactive "_bBuffer: ")
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
606 (save-excursion
253
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
607 (set-buffer (or buffer (current-buffer)))
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
608 (let ((cnt (count-lines (point-min) (point-max))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
609 (message "Buffer has %d lines, %d characters"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
610 cnt (- (point-max) (point-min)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
611 cnt)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
612
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
613 (defun what-line ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
614 "Print the current buffer line number and narrowed line number of point."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
615 ;; XEmacs change
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
616 (interactive "_")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
617 (let ((opoint (point)) start)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
618 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
619 (save-restriction
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
620 (goto-char (point-min))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
621 (widen)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
622 (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
623 (setq start (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
624 (goto-char opoint)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
625 (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
626 (if (/= start 1)
253
157b30c96d03 Import from CVS: tag r20-5b25
cvs
parents: 243
diff changeset
627 (message "Line %d (narrowed line %d)"
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
628 (1+ (count-lines 1 (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
629 (1+ (count-lines start (point))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
630 (message "Line %d" (1+ (count-lines 1 (point)))))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
631
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
632
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
633 (defun count-lines (start end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
634 "Return number of lines between START and END.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
635 This is usually the number of newlines between them,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
636 but can be one more if START is not equal to END
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
637 and the greater of them is not at the start of a line."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
638 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
639 (save-restriction
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
640 (narrow-to-region start end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
641 (goto-char (point-min))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
642 (if (eq selective-display t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
643 (save-match-data
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
644 (let ((done 0))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
645 (while (re-search-forward "[\n\C-m]" nil t 40)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
646 (setq done (+ 40 done)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
647 (while (re-search-forward "[\n\C-m]" nil t 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
648 (setq done (+ 1 done)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
649 (goto-char (point-max))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
650 (if (and (/= start end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
651 (not (bolp)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
652 (1+ done)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
653 done)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
654 (- (buffer-size) (forward-line (buffer-size)))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
655
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
656 (defun what-cursor-position ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
657 "Print info on cursor position (on screen and within buffer)."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
658 ;; XEmacs change
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
659 (interactive "_")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
660 (let* ((char (char-after (point))) ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
661 (beg (point-min))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
662 (end (point-max))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
663 (pos (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
664 (total (buffer-size))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
665 (percent (if (> total 50000)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
666 ;; Avoid overflow from multiplying by 100!
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
667 (/ (+ (/ total 200) (1- pos)) (max (/ total 100) 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
668 (/ (+ (/ total 2) (* 100 (1- pos))) (max total 1))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
669 (hscroll (if (= (window-hscroll) 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
670 ""
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
671 (format " Hscroll=%d" (window-hscroll))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
672 (col (current-column)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
673 (if (= pos end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
674 (if (or (/= beg 1) (/= end (1+ total)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
675 (message "point=%d of %d(%d%%) <%d - %d> column %d %s"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
676 pos total percent beg end col hscroll)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
677 (message "point=%d of %d(%d%%) column %d %s"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
678 pos total percent col hscroll))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
679 ;; XEmacs: don't use single-key-description
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
680 (if (or (/= beg 1) (/= end (1+ total)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
681 (message "Char: %s (0%o, %d, 0x%x) point=%d of %d(%d%%) <%d - %d> column %d %s"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
682 (text-char-description char) char char char pos total
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
683 percent beg end col hscroll)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
684 (message "Char: %s (0%o, %d, 0x%x) point=%d of %d(%d%%) column %d %s"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
685 (text-char-description char) char char char pos total
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
686 percent col hscroll)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
687
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
688 (defun fundamental-mode ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
689 "Major mode not specialized for anything in particular.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
690 Other major modes are defined by comparison with this one."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
691 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
692 (kill-all-local-variables))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
693
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
694 ;; XEmacs the following are declared elsewhere
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
695 ;(defvar read-expression-map (cons 'keymap minibuffer-local-map)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
696 ; "Minibuffer keymap used for reading Lisp expressions.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
697 ;(define-key read-expression-map "\M-\t" 'lisp-complete-symbol)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
698
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
699 ;(put 'eval-expression 'disabled t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
700
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
701 ;(defvar read-expression-history nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
702
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
703 ;; We define this, rather than making `eval' interactive,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
704 ;; for the sake of completion of names like eval-region, eval-current-buffer.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
705 (defun eval-expression (expression)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
706 "Evaluate EXPRESSION and print value in minibuffer.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
707 Value is also consed on to front of the variable `values'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
708 ;(interactive "xEval: ")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
709 (interactive
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
710 (list (read-from-minibuffer "Eval: "
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
711 nil read-expression-map t
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
712 'read-expression-history)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
713 (setq values (cons (eval expression) values))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
714 (prin1 (car values) t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
715
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
716 ;; XEmacs -- extra parameter (variant, but equivalent logic)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
717 (defun edit-and-eval-command (prompt command &optional history)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
718 "Prompting with PROMPT, let user edit COMMAND and eval result.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
719 COMMAND is a Lisp expression. Let user edit that expression in
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
720 the minibuffer, then read and evaluate the result."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
721 (let ((command (read-expression prompt
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
722 ;; first try to format the thing readably;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
723 ;; and if that fails, print it normally.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
724 (condition-case ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
725 (let ((print-readably t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
726 (prin1-to-string command))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
727 (error (prin1-to-string command)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
728 (or history '(command-history . 1)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
729 (or history (setq history 'command-history))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
730 (if (consp history)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
731 (setq history (car history)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
732 (if (eq history t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
733 nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
734 ;; If command was added to the history as a string,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
735 ;; get rid of that. We want only evallable expressions there.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
736 (if (stringp (car (symbol-value history)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
737 (set history (cdr (symbol-value history))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
738
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
739 ;; If command to be redone does not match front of history,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
740 ;; add it to the history.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
741 (or (equal command (car (symbol-value history)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
742 (set history (cons command (symbol-value history)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
743 (eval command)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
744
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
745 (defun repeat-complex-command (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
746 "Edit and re-evaluate last complex command, or ARGth from last.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
747 A complex command is one which used the minibuffer.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
748 The command is placed in the minibuffer as a Lisp form for editing.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
749 The result is executed, repeating the command as changed.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
750 If the command has been changed or is not the most recent previous command
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
751 it is added to the front of the command history.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
752 You can use the minibuffer history commands \\<minibuffer-local-map>\\[next-history-element] and \\[previous-history-element]
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
753 to get different commands to edit and resubmit."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
754 (interactive "p")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
755 ;; XEmacs: It looks like our version is better -sb
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
756 (let ((print-level nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
757 (edit-and-eval-command "Redo: "
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
758 (or (nth (1- arg) command-history)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
759 (error ""))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
760 (cons 'command-history arg))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
761
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
762 ;; XEmacs: Functions moved to minibuf.el
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
763 ;; previous-matching-history-element
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
764 ;; next-matching-history-element
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
765 ;; next-history-element
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
766 ;; previous-history-element
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
767 ;; next-complete-history-element
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
768 ;; previous-complete-history-element
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
769
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
770 (defun goto-line (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
771 "Goto line ARG, counting from line 1 at beginning of buffer."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
772 (interactive "NGoto line: ")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
773 (setq arg (prefix-numeric-value arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
774 (save-restriction
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
775 (widen)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
776 (goto-char 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
777 (if (eq selective-display t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
778 (re-search-forward "[\n\C-m]" nil 'end (1- arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
779 (forward-line (1- arg)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
780
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
781 ;Put this on C-x u, so we can force that rather than C-_ into startup msg
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
782 (define-function 'advertised-undo 'undo)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
783
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
784 (defun undo (&optional arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
785 "Undo some previous changes.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
786 Repeat this command to undo more changes.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
787 A numeric argument serves as a repeat count."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
788 (interactive "*p")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
789 ;; If we don't get all the way through, make last-command indicate that
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
790 ;; for the following command.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
791 (setq this-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
792 (let ((modified (buffer-modified-p))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
793 (recent-save (recent-auto-save-p)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
794 (or (eq (selected-window) (minibuffer-window))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
795 (display-message 'command "Undo!"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
796 (or (and (eq last-command 'undo)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
797 (eq (current-buffer) last-undo-buffer)) ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
798 (progn (undo-start)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
799 (undo-more 1)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
800 (undo-more (or arg 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
801 ;; Don't specify a position in the undo record for the undo command.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
802 ;; Instead, undoing this should move point to where the change is.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
803 (let ((tail buffer-undo-list)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
804 done)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
805 (while (and tail (not done) (not (null (car tail))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
806 (if (integerp (car tail))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
807 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
808 (setq done t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
809 (setq buffer-undo-list (delq (car tail) buffer-undo-list))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
810 (setq tail (cdr tail))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
811 (and modified (not (buffer-modified-p))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
812 (delete-auto-save-file-if-necessary recent-save)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
813 ;; If we do get all the way through, make this-command indicate that.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
814 (setq this-command 'undo))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
815
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
816 (defvar pending-undo-list nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
817 "Within a run of consecutive undo commands, list remaining to be undone.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
818
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
819 (defvar last-undo-buffer nil) ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
820
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
821 (defun undo-start ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
822 "Set `pending-undo-list' to the front of the undo list.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
823 The next call to `undo-more' will undo the most recently made change."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
824 (if (eq buffer-undo-list t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
825 (error "No undo information in this buffer"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
826 (setq pending-undo-list buffer-undo-list))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
827
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
828 (defun undo-more (count)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
829 "Undo back N undo-boundaries beyond what was already undone recently.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
830 Call `undo-start' to get ready to undo recent changes,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
831 then call `undo-more' one or more times to undo them."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
832 (or pending-undo-list
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
833 (error "No further undo information"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
834 (setq pending-undo-list (primitive-undo count pending-undo-list)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
835 last-undo-buffer (current-buffer))) ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
836
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
837 ;; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
838 (defun call-with-transparent-undo (fn &rest args)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
839 "Apply FN to ARGS, and then undo all changes made by FN to the current
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
840 buffer. The undo records are processed even if FN returns non-locally.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
841 There is no trace of the changes made by FN in the buffer's undo history.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
842
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
843 You can use this in a write-file-hooks function with continue-save-buffer
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
844 to make the contents of a disk file differ from its in-memory buffer."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
845 (let ((buffer-undo-list nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
846 ;; Kludge to prevent undo list truncation:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
847 (undo-high-threshold -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
848 (undo-threshold -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
849 (obuffer (current-buffer)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
850 (unwind-protect
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
851 (apply fn args)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
852 ;; Go to the buffer we will restore and make it writable:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
853 (set-buffer obuffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
854 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
855 (let ((buffer-read-only nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
856 (save-restriction
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
857 (widen)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
858 ;; Perform all undos, with further undo logging disabled:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
859 (let ((tail buffer-undo-list))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
860 (setq buffer-undo-list t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
861 (while tail
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
862 (setq tail (primitive-undo (length tail) tail))))))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
863
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
864 ;; XEmacs: The following are in other files
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
865 ;; shell-command-history
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
866 ;; shell-command-switch
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
867 ;; shell-command
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
868 ;; shell-command-sentinel
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
869
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
870
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
871 (defconst universal-argument-map
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
872 (let ((map (make-sparse-keymap)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
873 (set-keymap-default-binding map 'universal-argument-other-key)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
874 ;FSFmacs (define-key map [switch-frame] nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
875 (define-key map [(t)] 'universal-argument-other-key)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
876 (define-key map [(meta t)] 'universal-argument-other-key)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
877 (define-key map [(control u)] 'universal-argument-more)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
878 (define-key map [?-] 'universal-argument-minus)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
879 (define-key map [?0] 'digit-argument)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
880 (define-key map [?1] 'digit-argument)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
881 (define-key map [?2] 'digit-argument)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
882 (define-key map [?3] 'digit-argument)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
883 (define-key map [?4] 'digit-argument)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
884 (define-key map [?5] 'digit-argument)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
885 (define-key map [?6] 'digit-argument)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
886 (define-key map [?7] 'digit-argument)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
887 (define-key map [?8] 'digit-argument)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
888 (define-key map [?9] 'digit-argument)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
889 map)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
890 "Keymap used while processing \\[universal-argument].")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
891
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
892 (defvar universal-argument-num-events nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
893 "Number of argument-specifying events read by `universal-argument'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
894 `universal-argument-other-key' uses this to discard those events
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
895 from (this-command-keys), and reread only the final command.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
896
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
897 (defun universal-argument ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
898 "Begin a numeric argument for the following command.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
899 Digits or minus sign following \\[universal-argument] make up the numeric argument.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
900 \\[universal-argument] following the digits or minus sign ends the argument.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
901 \\[universal-argument] without digits or minus sign provides 4 as argument.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
902 Repeating \\[universal-argument] without digits or minus sign
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
903 multiplies the argument by 4 each time."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
904 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
905 (setq prefix-arg (list 4))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
906 (setq zmacs-region-stays t) ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
907 (setq universal-argument-num-events (length (this-command-keys)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
908 (setq overriding-terminal-local-map universal-argument-map))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
909
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
910 ;; A subsequent C-u means to multiply the factor by 4 if we've typed
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
911 ;; nothing but C-u's; otherwise it means to terminate the prefix arg.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
912 (defun universal-argument-more (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
913 (interactive "_P") ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
914 (if (consp arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
915 (setq prefix-arg (list (* 4 (car arg))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
916 (setq prefix-arg arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
917 (setq overriding-terminal-local-map nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
918 (setq universal-argument-num-events (length (this-command-keys))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
919
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
920 (defun negative-argument (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
921 "Begin a negative numeric argument for the next command.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
922 \\[universal-argument] following digits or minus sign ends the argument."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
923 (interactive "_P") ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
924 (cond ((integerp arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
925 (setq prefix-arg (- arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
926 ((eq arg '-)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
927 (setq prefix-arg nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
928 (t
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
929 (setq prefix-arg '-)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
930 (setq universal-argument-num-events (length (this-command-keys)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
931 (setq overriding-terminal-local-map universal-argument-map))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
932
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
933 ;; XEmacs: This function not synched with FSF
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
934 (defun digit-argument (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
935 "Part of the numeric argument for the next command.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
936 \\[universal-argument] following digits or minus sign ends the argument."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
937 (interactive "_P") ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
938 (let* ((event last-command-event)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
939 (key (and (key-press-event-p event)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
940 (event-key event)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
941 (digit (and key (characterp key) (>= key ?0) (<= key ?9)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
942 (- key ?0))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
943 (if (null digit)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
944 (universal-argument-other-key arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
945 (cond ((integerp arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
946 (setq prefix-arg (+ (* arg 10)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
947 (if (< arg 0) (- digit) digit))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
948 ((eq arg '-)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
949 ;; Treat -0 as just -, so that -01 will work.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
950 (setq prefix-arg (if (zerop digit) '- (- digit))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
951 (t
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
952 (setq prefix-arg digit)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
953 (setq universal-argument-num-events (length (this-command-keys)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
954 (setq overriding-terminal-local-map universal-argument-map))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
955
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
956 ;; For backward compatibility, minus with no modifiers is an ordinary
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
957 ;; command if digits have already been entered.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
958 (defun universal-argument-minus (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
959 (interactive "_P") ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
960 (if (integerp arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
961 (universal-argument-other-key arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
962 (negative-argument arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
963
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
964 ;; Anything else terminates the argument and is left in the queue to be
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
965 ;; executed as a command.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
966 (defun universal-argument-other-key (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
967 (interactive "_P") ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
968 (setq prefix-arg arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
969 (let* ((key (this-command-keys))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
970 ;; FSF calls silly function `listify-key-sequence' here.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
971 (keylist (append key nil)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
972 (setq unread-command-events
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
973 (append (nthcdr universal-argument-num-events keylist)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
974 unread-command-events)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
975 (reset-this-command-lengths)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
976 (setq overriding-terminal-local-map nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
977
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
978
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
979 ;; XEmacs -- keep zmacs-region active.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
980 (defun forward-to-indentation (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
981 "Move forward ARG lines and position at first nonblank character."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
982 (interactive "_p")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
983 (forward-line arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
984 (skip-chars-forward " \t"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
985
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
986 (defun backward-to-indentation (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
987 "Move backward ARG lines and position at first nonblank character."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
988 (interactive "_p")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
989 (forward-line (- arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
990 (skip-chars-forward " \t"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
991
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
992 (defcustom kill-whole-line nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
993 "*If non-nil, `kill-line' with no arg at beg of line kills the whole line."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
994 :type 'boolean
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
995 :group 'killing)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
996
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
997 (defun kill-line (&optional arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
998 "Kill the rest of the current line; if no nonblanks there, kill thru newline.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
999 With prefix argument, kill that many lines from point.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1000 Negative arguments kill lines backward.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1001
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1002 When calling from a program, nil means \"no arg\",
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1003 a number counts as a prefix arg.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1004
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1005 If `kill-whole-line' is non-nil, then kill the whole line
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1006 when given no argument at the beginning of a line."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1007 (interactive "*P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1008 (kill-region (point)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1009 ;; Don't shift point before doing the delete; that way,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1010 ;; undo will record the right position of point.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1011 ;; FSF
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1012 ; ;; It is better to move point to the other end of the kill
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1013 ; ;; before killing. That way, in a read-only buffer, point
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1014 ; ;; moves across the text that is copied to the kill ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1015 ; ;; The choice has no effect on undo now that undo records
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1016 ; ;; the value of point from before the command was run.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1017 ; (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1018 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1019 (if arg
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1020 (forward-line (prefix-numeric-value arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1021 (if (eobp)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1022 (signal 'end-of-buffer nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1023 (if (or (looking-at "[ \t]*$") (and kill-whole-line (bolp)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1024 (forward-line 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1025 (end-of-line)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1026 (point))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1027
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1028 ;; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1029 (defun backward-kill-line nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1030 "Kill back to the beginning of the line."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1031 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1032 (let ((point (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1033 (beginning-of-line nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1034 (kill-region (point) point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1035
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1036
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1037 ;;;; Window system cut and paste hooks.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1038 ;;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1039 ;;; I think that kill-hooks is a better name and more general mechanism
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1040 ;;; than interprogram-cut-function (from FSFmacs). I don't like the behavior
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1041 ;;; of interprogram-paste-function: ^Y should always come from the kill ring,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1042 ;;; not the X selection. But if that were provided, it should be called (and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1043 ;;; behave as) yank-hooks instead. -- jwz
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1044
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1045 ;; [... code snipped ...]
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1046
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1047 (defcustom kill-hooks nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1048 "*Functions run when something is added to the XEmacs kill ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1049 These functions are called with one argument, the string most recently
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1050 cut or copied. You can use this to, for example, make the most recent
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1051 kill become the X Clipboard selection."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1052 :type 'hook
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1053 :group 'killing)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1054
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1055 ;;; `kill-hooks' seems not sufficient because
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1056 ;;; `interprogram-cut-function' requires more variable about to rotate
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1057 ;;; the cut buffers. I'm afraid to change interface of `kill-hooks',
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1058 ;;; so I add it. (1997-11-03 by MORIOKA Tomohiko)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1059
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1060 (defvar interprogram-cut-function nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1061 "Function to call to make a killed region available to other programs.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1062
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1063 Most window systems provide some sort of facility for cutting and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1064 pasting text between the windows of different programs.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1065 This variable holds a function that Emacs calls whenever text
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1066 is put in the kill ring, to make the new kill available to other
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1067 programs.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1068
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1069 The function takes one or two arguments.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1070 The first argument, TEXT, is a string containing
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1071 the text which should be made available.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1072 The second, PUSH, if non-nil means this is a \"new\" kill;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1073 nil means appending to an \"old\" kill.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1074
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1075 (defvar interprogram-paste-function nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1076 "Function to call to get text cut from other programs.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1077
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1078 Most window systems provide some sort of facility for cutting and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1079 pasting text between the windows of different programs.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1080 This variable holds a function that Emacs calls to obtain
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1081 text that other programs have provided for pasting.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1082
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1083 The function should be called with no arguments. If the function
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1084 returns nil, then no other program has provided such text, and the top
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1085 of the Emacs kill ring should be used. If the function returns a
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1086 string, that string should be put in the kill ring as the latest kill.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1087
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1088 Note that the function should return a string only if a program other
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1089 than Emacs has provided a string for pasting; if Emacs provided the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1090 most recent string, the function should return nil. If it is
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1091 difficult to tell whether Emacs or some other program provided the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1092 current string, it is probably good enough to return nil if the string
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1093 is equal (according to `string=') to the last text Emacs provided.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1094
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1095
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1096 ;;;; The kill ring data structure.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1097
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1098 (defvar kill-ring nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1099 "List of killed text sequences.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1100 Since the kill ring is supposed to interact nicely with cut-and-paste
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1101 facilities offered by window systems, use of this variable should
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1102 interact nicely with `interprogram-cut-function' and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1103 `interprogram-paste-function'. The functions `kill-new',
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1104 `kill-append', and `current-kill' are supposed to implement this
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1105 interaction; you may want to use them instead of manipulating the kill
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1106 ring directly.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1107
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1108 (defcustom kill-ring-max 30
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1109 "*Maximum length of kill ring before oldest elements are thrown away."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1110 :type 'integer
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1111 :group 'killing)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1112
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1113 (defvar kill-ring-yank-pointer nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1114 "The tail of the kill ring whose car is the last thing yanked.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1115
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1116 (defun kill-new (string &optional replace)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1117 "Make STRING the latest kill in the kill ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1118 Set the kill-ring-yank pointer to point to it.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1119 Run `kill-hooks'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1120 Optional second argument REPLACE non-nil means that STRING will replace
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1121 the front of the kill ring, rather than being added to the list."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1122 ; (and (fboundp 'menu-bar-update-yank-menu)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1123 ; (menu-bar-update-yank-menu string (and replace (car kill-ring))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1124 (if replace
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1125 (setcar kill-ring string)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1126 (setq kill-ring (cons string kill-ring))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1127 (if (> (length kill-ring) kill-ring-max)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1128 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1129 (setq kill-ring-yank-pointer kill-ring)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1130 (if interprogram-cut-function
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1131 (funcall interprogram-cut-function string (not replace)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1132 (run-hook-with-args 'kill-hooks string))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1133
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1134 (defun kill-append (string before-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1135 "Append STRING to the end of the latest kill in the kill ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1136 If BEFORE-P is non-nil, prepend STRING to the kill.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1137 Run `kill-hooks'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1138 (kill-new (if before-p
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1139 (concat string (car kill-ring))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1140 (concat (car kill-ring) string)) t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1141
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1142 (defun current-kill (n &optional do-not-move)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1143 "Rotate the yanking point by N places, and then return that kill.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1144 If N is zero, `interprogram-paste-function' is set, and calling it
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1145 returns a string, then that string is added to the front of the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1146 kill ring and returned as the latest kill.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1147 If optional arg DO-NOT-MOVE is non-nil, then don't actually move the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1148 yanking point\; just return the Nth kill forward."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1149 (let ((interprogram-paste (and (= n 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1150 interprogram-paste-function
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1151 (funcall interprogram-paste-function))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1152 (if interprogram-paste
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1153 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1154 ;; Disable the interprogram cut function when we add the new
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1155 ;; text to the kill ring, so Emacs doesn't try to own the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1156 ;; selection, with identical text.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1157 (let ((interprogram-cut-function nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1158 (kill-new interprogram-paste))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1159 interprogram-paste)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1160 (or kill-ring (error "Kill ring is empty"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1161 (let* ((tem (nthcdr (mod (- n (length kill-ring-yank-pointer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1162 (length kill-ring))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1163 kill-ring)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1164 (or do-not-move
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1165 (setq kill-ring-yank-pointer tem))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1166 (car tem)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1167
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1168
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1169
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1170 ;;;; Commands for manipulating the kill ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1171
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1172 ;; In FSF killing read-only text just pastes it into kill-ring. Which
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1173 ;; is a very bad idea -- see Jamie's comment below.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1174
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1175 ;(defvar kill-read-only-ok nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1176 ; "*Non-nil means don't signal an error for killing read-only text.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1177
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1178 (defun kill-region (beg end &optional verbose) ; verbose is XEmacs addition
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1179 "Kill between point and mark.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1180 The text is deleted but saved in the kill ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1181 The command \\[yank] can retrieve it from there.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1182 \(If you want to kill and then yank immediately, use \\[copy-region-as-kill].)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1183
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1184 This is the primitive for programs to kill text (as opposed to deleting it).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1185 Supply two arguments, character numbers indicating the stretch of text
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1186 to be killed.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1187 Any command that calls this function is a \"kill command\".
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1188 If the previous command was also a kill command,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1189 the text killed this time appends to the text killed last time
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1190 to make one entry in the kill ring."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1191 (interactive "*r\np")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1192 ; (interactive
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1193 ; (let ((region-hack (and zmacs-regions (eq last-command 'yank))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1194 ; ;; This lets "^Y^W" work. I think this is dumb, but zwei did it.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1195 ; (if region-hack (zmacs-activate-region))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1196 ; (prog1
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1197 ; (list (point) (mark) current-prefix-arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1198 ; (if region-hack (zmacs-deactivate-region)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1199 ;; beg and end can be markers but the rest of this function is
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1200 ;; written as if they are only integers
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1201 (if (markerp beg) (setq beg (marker-position beg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1202 (if (markerp end) (setq end (marker-position end)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1203 (or (and beg end) (if zmacs-regions ;; rewritten for I18N3 snarfing
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1204 (error "The region is not active now")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1205 (error "The mark is not set now")))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1206 (if verbose (if buffer-read-only
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
1207 (lmessage 'command "Copying %d characters"
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
1208 (- (max beg end) (min beg end)))
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
1209 (lmessage 'command "Killing %d characters"
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
1210 (- (max beg end) (min beg end)))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1211 (cond
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1212
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1213 ;; I don't like this large change in behavior -- jwz
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1214 ;; Read-Only text means it shouldn't be deleted, so I'm restoring
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1215 ;; this code, but only for text-properties and not full extents. -sb
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1216 ;; If the buffer is read-only, we should beep, in case the person
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1217 ;; just isn't aware of this. However, there's no harm in putting
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1218 ;; the region's text in the kill ring, anyway.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1219 ((or (and buffer-read-only (not inhibit-read-only))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1220 (text-property-not-all (min beg end) (max beg end) 'read-only nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1221 ;; This is redundant.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1222 ;; (if verbose (message "Copying %d characters"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1223 ;; (- (max beg end) (min beg end))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1224 (copy-region-as-kill beg end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1225 ;; ;; This should always barf, and give us the correct error.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1226 ;; (if kill-read-only-ok
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1227 ;; (message "Read only text copied to kill ring")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1228 (setq this-command 'kill-region)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1229 (barf-if-buffer-read-only)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1230 (signal 'buffer-read-only (list (current-buffer))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1231
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1232 ;; In certain cases, we can arrange for the undo list and the kill
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1233 ;; ring to share the same string object. This code does that.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1234 ((not (or (eq buffer-undo-list t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1235 (eq last-command 'kill-region)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1236 ;; Use = since positions may be numbers or markers.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1237 (= beg end)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1238 ;; Don't let the undo list be truncated before we can even access it.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1239 ;; FSF calls this `undo-strong-limit'
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1240 (let ((undo-high-threshold (+ (- end beg) 100))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1241 ;(old-list buffer-undo-list)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1242 tail)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1243 (delete-region beg end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1244 ;; Search back in buffer-undo-list for this string,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1245 ;; in case a change hook made property changes.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1246 (setq tail buffer-undo-list)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1247 (while (and tail
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1248 (not (stringp (car-safe (car-safe tail))))) ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1249 (pop tail))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1250 ;; Take the same string recorded for undo
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1251 ;; and put it in the kill-ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1252 (and tail
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1253 (kill-new (car (car tail))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1254
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1255 (t
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1256 ;; if undo is not kept, grab the string then delete it (which won't
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1257 ;; add another string to the undo list).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1258 (copy-region-as-kill beg end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1259 (delete-region beg end)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1260 (setq this-command 'kill-region))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1261
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1262 ;; copy-region-as-kill no longer sets this-command, because it's confusing
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1263 ;; to get two copies of the text when the user accidentally types M-w and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1264 ;; then corrects it with the intended C-w.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1265 (defun copy-region-as-kill (beg end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1266 "Save the region as if killed, but don't kill it.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1267 Run `kill-hooks'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1268 (interactive "r")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1269 (if (eq last-command 'kill-region)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1270 (kill-append (buffer-substring beg end) (< end beg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1271 (kill-new (buffer-substring beg end)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1272 nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1273
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1274 (defun kill-ring-save (beg end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1275 "Save the region as if killed, but don't kill it.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1276 This command is similar to `copy-region-as-kill', except that it gives
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1277 visual feedback indicating the extent of the region being copied."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1278 (interactive "r")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1279 (copy-region-as-kill beg end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1280 ;; copy before delay, for xclipboard's benefit
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1281 (if (interactive-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1282 (let ((other-end (if (= (point) beg) end beg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1283 (opoint (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1284 ;; Inhibit quitting so we can make a quit here
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1285 ;; look like a C-g typed as a command.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1286 (inhibit-quit t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1287 (if (pos-visible-in-window-p other-end (selected-window))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1288 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1289 ;; FSF (I'm not sure what this does -sb)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1290 ; ;; Swap point and mark.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1291 ; (set-marker (mark-marker) (point) (current-buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1292 (goto-char other-end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1293 (sit-for 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1294 ; ;; Swap back.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1295 ; (set-marker (mark-marker) other-end (current-buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1296 (goto-char opoint)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1297 ;; If user quit, deactivate the mark
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1298 ;; as C-g would as a command.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1299 (and quit-flag (mark)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1300 (zmacs-deactivate-region)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1301 ;; too noisy. -- jwz
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1302 ; (let* ((killed-text (current-kill 0))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1303 ; (message-len (min (length killed-text) 40)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1304 ; (if (= (point) beg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1305 ; ;; Don't say "killed"; that is misleading.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1306 ; (message "Saved text until \"%s\""
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1307 ; (substring killed-text (- message-len)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1308 ; (message "Saved text from \"%s\""
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1309 ; (substring killed-text 0 message-len))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1310 ))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1311
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1312 (defun append-next-kill ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1313 "Cause following command, if it kills, to append to previous kill."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1314 ;; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1315 (interactive "_")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1316 (if (interactive-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1317 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1318 (setq this-command 'kill-region)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1319 (display-message 'command
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
1320 "If the next command is a kill, it will append"))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1321 (setq last-command 'kill-region)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1322
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1323 (defun yank-pop (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1324 "Replace just-yanked stretch of killed text with a different stretch.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1325 This command is allowed only immediately after a `yank' or a `yank-pop'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1326 At such a time, the region contains a stretch of reinserted
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1327 previously-killed text. `yank-pop' deletes that text and inserts in its
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1328 place a different stretch of killed text.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1329
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1330 With no argument, the previous kill is inserted.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1331 With argument N, insert the Nth previous kill.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1332 If N is negative, this is a more recent kill.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1333
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1334 The sequence of kills wraps around, so that after the oldest one
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1335 comes the newest one."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1336 (interactive "*p")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1337 (if (not (eq last-command 'yank))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1338 (error "Previous command was not a yank"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1339 (setq this-command 'yank)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1340 (let ((inhibit-read-only t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1341 (before (< (point) (mark t))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1342 (delete-region (point) (mark t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1343 ;;(set-marker (mark-marker) (point) (current-buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1344 (set-mark (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1345 (insert (current-kill arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1346 (if before
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1347 ;; This is like exchange-point-and-mark, but doesn't activate the mark.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1348 ;; It is cleaner to avoid activation, even though the command
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1349 ;; loop would deactivate the mark because we inserted text.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1350 (goto-char (prog1 (mark t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1351 (set-marker (mark-marker t) (point) (current-buffer))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1352 nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1353
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1354
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1355 (defun yank (&optional arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1356 "Reinsert the last stretch of killed text.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1357 More precisely, reinsert the stretch of killed text most recently
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1358 killed OR yanked. Put point at end, and set mark at beginning.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1359 With just C-u as argument, same but put point at beginning (and mark at end).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1360 With argument N, reinsert the Nth most recently killed stretch of killed
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1361 text.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1362 See also the command \\[yank-pop]."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1363 (interactive "*P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1364 ;; If we don't get all the way through, make last-command indicate that
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1365 ;; for the following command.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1366 (setq this-command t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1367 (push-mark (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1368 (insert (current-kill (cond
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1369 ((listp arg) 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1370 ((eq arg '-) -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1371 (t (1- arg)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1372 (if (consp arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1373 ;; This is like exchange-point-and-mark, but doesn't activate the mark.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1374 ;; It is cleaner to avoid activation, even though the command
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1375 ;; loop would deactivate the mark because we inserted text.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1376 ;; (But it's an unnecessary kludge in XEmacs.)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1377 ;(goto-char (prog1 (mark t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1378 ;(set-marker (mark-marker) (point) (current-buffer)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1379 (exchange-point-and-mark t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1380 ;; If we do get all the way thru, make this-command indicate that.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1381 (setq this-command 'yank)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1382 nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1383
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1384 (defun rotate-yank-pointer (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1385 "Rotate the yanking point in the kill ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1386 With argument, rotate that many kills forward (or backward, if negative)."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1387 (interactive "p")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1388 (current-kill arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1389
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1390
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1391 (defun insert-buffer (buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1392 "Insert after point the contents of BUFFER.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1393 Puts mark after the inserted text.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1394 BUFFER may be a buffer or a buffer name."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1395 (interactive
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1396 (list
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1397 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1398 (barf-if-buffer-read-only)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1399 (read-buffer "Insert buffer: "
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1400 ;; XEmacs: we have different args
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1401 (other-buffer (current-buffer) nil t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1402 t))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1403 (or (bufferp buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1404 (setq buffer (get-buffer buffer)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1405 (let (start end newmark)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1406 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1407 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1408 (set-buffer buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1409 (setq start (point-min) end (point-max)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1410 (insert-buffer-substring buffer start end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1411 (setq newmark (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1412 (push-mark newmark))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1413 nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1414
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1415 (defun append-to-buffer (buffer start end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1416 "Append to specified buffer the text of the region.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1417 It is inserted into that buffer before its point.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1418
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1419 When calling from a program, give three arguments:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1420 BUFFER (or buffer name), START and END.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1421 START and END specify the portion of the current buffer to be copied."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1422 (interactive
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1423 ;; XEmacs: we have different args to other-buffer
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1424 (list (read-buffer "Append to buffer: " (other-buffer (current-buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1425 nil t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1426 (region-beginning) (region-end)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1427 (let ((oldbuf (current-buffer)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1428 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1429 (set-buffer (get-buffer-create buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1430 (insert-buffer-substring oldbuf start end))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1431
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1432 (defun prepend-to-buffer (buffer start end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1433 "Prepend to specified buffer the text of the region.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1434 It is inserted into that buffer after its point.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1435
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1436 When calling from a program, give three arguments:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1437 BUFFER (or buffer name), START and END.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1438 START and END specify the portion of the current buffer to be copied."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1439 (interactive "BPrepend to buffer: \nr")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1440 (let ((oldbuf (current-buffer)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1441 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1442 (set-buffer (get-buffer-create buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1443 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1444 (insert-buffer-substring oldbuf start end)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1445
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1446 (defun copy-to-buffer (buffer start end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1447 "Copy to specified buffer the text of the region.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1448 It is inserted into that buffer, replacing existing text there.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1449
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1450 When calling from a program, give three arguments:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1451 BUFFER (or buffer name), START and END.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1452 START and END specify the portion of the current buffer to be copied."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1453 (interactive "BCopy to buffer: \nr")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1454 (let ((oldbuf (current-buffer)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1455 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1456 (set-buffer (get-buffer-create buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1457 (erase-buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1458 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1459 (insert-buffer-substring oldbuf start end)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1460
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1461 ;FSFmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1462 ;(put 'mark-inactive 'error-conditions '(mark-inactive error))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1463 ;(put 'mark-inactive 'error-message "The mark is not active now")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1464
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1465 (defun mark (&optional force buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1466 "Return this buffer's mark value as integer, or nil if no mark.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1467
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1468 If `zmacs-regions' is true, then this returns nil unless the region is
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1469 currently in the active (highlighted) state. With an argument of t, this
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1470 returns the mark (if there is one) regardless of the active-region state.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1471 You should *generally* not use the mark unless the region is active, if
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1472 the user has expressed a preference for the active-region model.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1473
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1474 If you are using this in an editing command, you are most likely making
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1475 a mistake; see the documentation of `set-mark'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1476 (setq buffer (decode-buffer buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1477 ;FSFmacs version:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1478 ; (if (or force (not transient-mark-mode) mark-active mark-even-if-inactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1479 ; (marker-position (mark-marker))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1480 ; (signal 'mark-inactive nil)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1481 (let ((m (mark-marker force buffer)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1482 (and m (marker-position m))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1483
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1484 ;;;#### FSFmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1485 ;;; Many places set mark-active directly, and several of them failed to also
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1486 ;;; run deactivate-mark-hook. This shorthand should simplify.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1487 ;(defsubst deactivate-mark ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1488 ; "Deactivate the mark by setting `mark-active' to nil.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1489 ;\(That makes a difference only in Transient Mark mode.)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1490 ;Also runs the hook `deactivate-mark-hook'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1491 ; (if transient-mark-mode
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1492 ; (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1493 ; (setq mark-active nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1494 ; (run-hooks 'deactivate-mark-hook))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1495
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1496 (defun set-mark (pos &optional buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1497 "Set this buffer's mark to POS. Don't use this function!
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1498 That is to say, don't use this function unless you want
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1499 the user to see that the mark has moved, and you want the previous
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1500 mark position to be lost.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1501
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1502 Normally, when a new mark is set, the old one should go on the stack.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1503 This is why most applications should use push-mark, not set-mark.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1504
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1505 Novice Emacs Lisp programmers often try to use the mark for the wrong
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1506 purposes. The mark saves a location for the user's convenience.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1507 Most editing commands should not alter the mark.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1508 To remember a location for internal use in the Lisp program,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1509 store it in a Lisp variable. Example:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1510
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1511 (let ((beg (point))) (forward-line 1) (delete-region beg (point)))."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1512
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1513 (setq buffer (decode-buffer buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1514 (set-marker (mark-marker t buffer) pos buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1515 ;; FSF
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1516 ; (if pos
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1517 ; (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1518 ; (setq mark-active t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1519 ; (run-hooks 'activate-mark-hook)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1520 ; (set-marker (mark-marker) pos (current-buffer)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1521 ; ;; Normally we never clear mark-active except in Transient Mark mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1522 ; ;; But when we actually clear out the mark value too,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1523 ; ;; we must clear mark-active in any mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1524 ; (setq mark-active nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1525 ; (run-hooks 'deactivate-mark-hook)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1526 ; (set-marker (mark-marker) nil)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1527
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1528 (defvar mark-ring nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1529 "The list of former marks of the current buffer, most recent first.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1530 (make-variable-buffer-local 'mark-ring)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1531 (put 'mark-ring 'permanent-local t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1532
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1533 (defcustom mark-ring-max 16
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1534 "*Maximum size of mark ring. Start discarding off end if gets this big."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1535 :type 'integer
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1536 :group 'killing)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1537
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1538 (defvar global-mark-ring nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1539 "The list of saved global marks, most recent first.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1540
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1541 (defcustom global-mark-ring-max 16
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1542 "*Maximum size of global mark ring. \
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1543 Start discarding off end if gets this big."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1544 :type 'integer
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1545 :group 'killing)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1546
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1547 (defun set-mark-command (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1548 "Set mark at where point is, or jump to mark.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1549 With no prefix argument, set mark, push old mark position on local mark
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1550 ring, and push mark on global mark ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1551 With argument, jump to mark, and pop a new position for mark off the ring
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1552 \(does not affect global mark ring\).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1553
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1554 Novice Emacs Lisp programmers often try to use the mark for the wrong
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1555 purposes. See the documentation of `set-mark' for more information."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1556 (interactive "P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1557 (if (null arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1558 (push-mark nil nil t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1559 (if (null (mark t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1560 (error "No mark set in this buffer")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1561 (goto-char (mark t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1562 (pop-mark))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1563
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1564 ;; XEmacs: Extra parameter
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1565 (defun push-mark (&optional location nomsg activate-region buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1566 "Set mark at LOCATION (point, by default) and push old mark on mark ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1567 If the last global mark pushed was not in the current buffer,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1568 also push LOCATION on the global mark ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1569 Display `Mark set' unless the optional second arg NOMSG is non-nil.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1570 Activate mark if optional third arg ACTIVATE-REGION non-nil.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1571
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1572 Novice Emacs Lisp programmers often try to use the mark for the wrong
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1573 purposes. See the documentation of `set-mark' for more information."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1574 (setq buffer (decode-buffer buffer)) ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1575 (if (null (mark t buffer)) ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1576 nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1577 ;; The save-excursion / set-buffer is necessary because mark-ring
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1578 ;; is a buffer local variable
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1579 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1580 (set-buffer buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1581 (setq mark-ring (cons (copy-marker (mark-marker t buffer)) mark-ring))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1582 (if (> (length mark-ring) mark-ring-max)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1583 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1584 (move-marker (car (nthcdr mark-ring-max mark-ring)) nil buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1585 (setcdr (nthcdr (1- mark-ring-max) mark-ring) nil)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1586 (set-mark (or location (point buffer)) buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1587 ; (set-marker (mark-marker) (or location (point)) (current-buffer)) ; FSF
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1588 ;; Now push the mark on the global mark ring.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1589 (if (or (null global-mark-ring)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1590 (not (eq (marker-buffer (car global-mark-ring)) buffer)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1591 ;; The last global mark pushed wasn't in this same buffer.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1592 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1593 (setq global-mark-ring (cons (copy-marker (mark-marker t buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1594 global-mark-ring))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1595 (if (> (length global-mark-ring) global-mark-ring-max)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1596 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1597 (move-marker (car (nthcdr global-mark-ring-max global-mark-ring))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1598 nil buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1599 (setcdr (nthcdr (1- global-mark-ring-max) global-mark-ring) nil)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1600 (or nomsg executing-kbd-macro (> (minibuffer-depth) 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1601 (display-message 'command "Mark set"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1602 (if activate-region
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1603 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1604 (setq zmacs-region-stays t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1605 (zmacs-activate-region)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1606 ; (if (or activate (not transient-mark-mode)) ; FSF
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1607 ; (set-mark (mark t))) ; FSF
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1608 nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1609
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1610 (defun pop-mark ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1611 "Pop off mark ring into the buffer's actual mark.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1612 Does not set point. Does nothing if mark ring is empty."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1613 (if mark-ring
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1614 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1615 (setq mark-ring (nconc mark-ring (list (copy-marker (mark-marker t)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1616 (set-mark (car mark-ring))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1617 (move-marker (car mark-ring) nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1618 (if (null (mark t)) (ding))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1619 (setq mark-ring (cdr mark-ring)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1620
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1621 (define-function 'exchange-dot-and-mark 'exchange-point-and-mark)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1622 (defun exchange-point-and-mark (&optional dont-activate-region)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1623 "Put the mark where point is now, and point where the mark is now.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1624 The mark is activated unless DONT-ACTIVATE-REGION is non-nil."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1625 (interactive nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1626 (let ((omark (mark t)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1627 (if (null omark)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1628 (error "No mark set in this buffer"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1629 (set-mark (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1630 (goto-char omark)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1631 (or dont-activate-region (zmacs-activate-region)) ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1632 nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1633
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1634 ;; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1635 (defun mark-something (mark-fn movement-fn arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1636 "internal function used by mark-sexp, mark-word, etc."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1637 (let (newmark (pushp t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1638 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1639 (if (and (eq last-command mark-fn) (mark))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1640 ;; Extend the previous state in the same direction:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1641 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1642 (if (< (mark) (point)) (setq arg (- arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1643 (goto-char (mark))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1644 (setq pushp nil)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1645 (funcall movement-fn arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1646 (setq newmark (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1647 (if pushp
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1648 (push-mark newmark nil t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1649 ;; Do not mess with the mark stack, but merely adjust the previous state:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1650 (set-mark newmark)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1651 (activate-region))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1652
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1653 ;(defun transient-mark-mode (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1654 ; "Toggle Transient Mark mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1655 ;With arg, turn Transient Mark mode on if arg is positive, off otherwise.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1656 ;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1657 ;In Transient Mark mode, when the mark is active, the region is highlighted.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1658 ;Changing the buffer \"deactivates\" the mark.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1659 ;So do certain other operations that set the mark
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1660 ;but whose main purpose is something else--for example,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1661 ;incremental search, \\[beginning-of-buffer], and \\[end-of-buffer]."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1662 ; (interactive "P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1663 ; (setq transient-mark-mode
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1664 ; (if (null arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1665 ; (not transient-mark-mode)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1666 ; (> (prefix-numeric-value arg) 0))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1667
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1668 (defun pop-global-mark ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1669 "Pop off global mark ring and jump to the top location."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1670 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1671 ;; Pop entries which refer to non-existent buffers.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1672 (while (and global-mark-ring (not (marker-buffer (car global-mark-ring))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1673 (setq global-mark-ring (cdr global-mark-ring)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1674 (or global-mark-ring
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1675 (error "No global mark set"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1676 (let* ((marker (car global-mark-ring))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1677 (buffer (marker-buffer marker))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1678 (position (marker-position marker)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1679 (setq global-mark-ring (nconc (cdr global-mark-ring)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1680 (list (car global-mark-ring))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1681 (set-buffer buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1682 (or (and (>= position (point-min))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1683 (<= position (point-max)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1684 (widen))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1685 (goto-char position)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1686 (switch-to-buffer buffer)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1687
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1688
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1689 ;;; After 8 years of waiting ... -sb
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1690 (defcustom next-line-add-newlines nil ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1691 "*If non-nil, `next-line' inserts newline when the point is at end of buffer.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1692 This behavior used to be the default, and is still default in FSF Emacs.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1693 We think it is an unnecessary and unwanted side-effect."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1694 :type 'boolean
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1695 :group 'editing-basics)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1696
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1697 (defun next-line (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1698 "Move cursor vertically down ARG lines.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1699 If there is no character in the target line exactly under the current column,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1700 the cursor is positioned after the character in that line which spans this
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1701 column, or at the end of the line if it is not long enough.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1702
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1703 If there is no line in the buffer after this one, behavior depends on the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1704 value of `next-line-add-newlines'. If non-nil, it inserts a newline character
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1705 to create a line, and moves the cursor to that line. Otherwise it moves the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1706 cursor to the end of the buffer.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1707
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1708 The command \\[set-goal-column] can be used to create
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1709 a semipermanent goal column to which this command always moves.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1710 Then it does not try to move vertically. This goal column is stored
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1711 in `goal-column', which is nil when there is none.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1712
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1713 If you are thinking of using this in a Lisp program, consider
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1714 using `forward-line' instead. It is usually easier to use
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1715 and more reliable (no dependence on goal column, etc.)."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1716 (interactive "_p") ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1717 (if (and next-line-add-newlines (= arg 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1718 (let ((opoint (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1719 (end-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1720 (if (eobp)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1721 (newline 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1722 (goto-char opoint)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1723 (line-move arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1724 (if (interactive-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1725 ;; XEmacs: Not sure what to do about this. It's inconsistent. -sb
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1726 (condition-case nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1727 (line-move arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1728 ((beginning-of-buffer end-of-buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1729 (when signal-error-on-buffer-boundary
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1730 (ding nil 'buffer-bound))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1731 (line-move arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1732 nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1733
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1734 (defun previous-line (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1735 "Move cursor vertically up ARG lines.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1736 If there is no character in the target line exactly over the current column,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1737 the cursor is positioned after the character in that line which spans this
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1738 column, or at the end of the line if it is not long enough.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1739
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1740 The command \\[set-goal-column] can be used to create
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1741 a semipermanent goal column to which this command always moves.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1742 Then it does not try to move vertically.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1743
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1744 If you are thinking of using this in a Lisp program, consider using
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1745 `forward-line' with a negative argument instead. It is usually easier
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1746 to use and more reliable (no dependence on goal column, etc.)."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1747 (interactive "_p") ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1748 (if (interactive-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1749 (condition-case nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1750 (line-move (- arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1751 ((beginning-of-buffer end-of-buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1752 (when signal-error-on-buffer-boundary ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1753 (ding nil 'buffer-bound))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1754 (line-move (- arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1755 nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1756
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1757 (defcustom track-eol nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1758 "*Non-nil means vertical motion starting at end of line keeps to ends of lines.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1759 This means moving to the end of each line moved onto.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1760 The beginning of a blank line does not count as the end of a line."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1761 :type 'boolean
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1762 :group 'editing-basics)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1763
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1764 (defcustom goal-column nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1765 "*Semipermanent goal column for vertical motion, as set by \\[set-goal-column], or nil."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1766 :type '(choice integer (const :tag "None" nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1767 :group 'editing-basics)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1768 (make-variable-buffer-local 'goal-column)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1769
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1770 (defvar temporary-goal-column 0
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1771 "Current goal column for vertical motion.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1772 It is the column where point was
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1773 at the start of current run of vertical motion commands.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1774 When the `track-eol' feature is doing its job, the value is 9999.")
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
1775 (make-variable-buffer-local 'temporary-goal-column)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1776
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1777 ;XEmacs: not yet ported, so avoid compiler warnings
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1778 (eval-when-compile
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1779 (defvar inhibit-point-motion-hooks))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1780
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1781 (defcustom line-move-ignore-invisible nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1782 "*Non-nil means \\[next-line] and \\[previous-line] ignore invisible lines.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1783 Use with care, as it slows down movement significantly. Outline mode sets this."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1784 :type 'boolean
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1785 :group 'editing-basics)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1786
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1787 ;; This is the guts of next-line and previous-line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1788 ;; Arg says how many lines to move.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1789 (defun line-move (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1790 ;; Don't run any point-motion hooks, and disregard intangibility,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1791 ;; for intermediate positions.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1792 (let ((inhibit-point-motion-hooks t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1793 (opoint (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1794 new)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1795 (unwind-protect
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1796 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1797 (if (not (or (eq last-command 'next-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1798 (eq last-command 'previous-line)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1799 (setq temporary-goal-column
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1800 (if (and track-eol (eolp)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1801 ;; Don't count beg of empty line as end of line
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1802 ;; unless we just did explicit end-of-line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1803 (or (not (bolp)) (eq last-command 'end-of-line)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1804 9999
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1805 (current-column))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1806 (if (and (not (integerp selective-display))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1807 (not line-move-ignore-invisible))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1808 ;; Use just newline characters.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1809 (or (if (> arg 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1810 (progn (if (> arg 1) (forward-line (1- arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1811 ;; This way of moving forward ARG lines
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1812 ;; verifies that we have a newline after the last one.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1813 ;; It doesn't get confused by intangible text.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1814 (end-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1815 (zerop (forward-line 1)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1816 (and (zerop (forward-line arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1817 (bolp)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1818 (signal (if (< arg 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1819 'beginning-of-buffer
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1820 'end-of-buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1821 nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1822 ;; Move by arg lines, but ignore invisible ones.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1823 (while (> arg 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1824 (end-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1825 (and (zerop (vertical-motion 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1826 (signal 'end-of-buffer nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1827 ;; If the following character is currently invisible,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1828 ;; skip all characters with that same `invisible' property value.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1829 (while (and (not (eobp))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1830 (let ((prop
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1831 (get-char-property (point) 'invisible)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1832 (if (eq buffer-invisibility-spec t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1833 prop
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1834 (or (memq prop buffer-invisibility-spec)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1835 (assq prop buffer-invisibility-spec)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1836 (if (get-text-property (point) 'invisible)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1837 (goto-char (next-single-property-change (point) 'invisible))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1838 (goto-char (next-extent-change (point))))) ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1839 (setq arg (1- arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1840 (while (< arg 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1841 (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1842 (and (zerop (vertical-motion -1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1843 (signal 'beginning-of-buffer nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1844 (while (and (not (bobp))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1845 (let ((prop
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1846 (get-char-property (1- (point)) 'invisible)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1847 (if (eq buffer-invisibility-spec t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1848 prop
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1849 (or (memq prop buffer-invisibility-spec)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1850 (assq prop buffer-invisibility-spec)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1851 (if (get-text-property (1- (point)) 'invisible)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1852 (goto-char (previous-single-property-change (point) 'invisible))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1853 (goto-char (previous-extent-change (point))))) ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1854 (setq arg (1+ arg))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1855 (move-to-column (or goal-column temporary-goal-column)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1856 ;; Remember where we moved to, go back home,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1857 ;; then do the motion over again
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1858 ;; in just one step, with intangibility and point-motion hooks
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1859 ;; enabled this time.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1860 (setq new (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1861 (goto-char opoint)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1862 (setq inhibit-point-motion-hooks nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1863 (goto-char new)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1864 nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1865
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1866 ;;; Many people have said they rarely use this feature, and often type
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1867 ;;; it by accident. Maybe it shouldn't even be on a key.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1868 ;; It's not on a key, as of 20.2. So no need for this.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1869 ;(put 'set-goal-column 'disabled t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1870
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1871 (defun set-goal-column (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1872 "Set the current horizontal position as a goal for \\[next-line] and \\[previous-line].
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1873 Those commands will move to this position in the line moved to
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1874 rather than trying to keep the same horizontal position.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1875 With a non-nil argument, clears out the goal column
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1876 so that \\[next-line] and \\[previous-line] resume vertical motion.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1877 The goal column is stored in the variable `goal-column'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1878 (interactive "_P") ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1879 (if arg
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1880 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1881 (setq goal-column nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1882 (display-message 'command "No goal column"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1883 (setq goal-column (current-column))
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
1884 (lmessage 'command
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
1885 "Goal column %d (use %s with an arg to unset it)"
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
1886 goal-column
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
1887 (substitute-command-keys "\\[set-goal-column]")))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1888 nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1889
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1890 ;; deleted FSFmacs terminal randomness hscroll-point-visible stuff.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1891 ;; hscroll-step
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1892 ;; hscroll-point-visible
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1893 ;; hscroll-window-column
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1894 ;; right-arrow
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1895 ;; left-arrow
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1896
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1897 (defun scroll-other-window-down (lines)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1898 "Scroll the \"other window\" down.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1899 For more details, see the documentation for `scroll-other-window'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1900 (interactive "P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1901 (scroll-other-window
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1902 ;; Just invert the argument's meaning.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1903 ;; We can do that without knowing which window it will be.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1904 (if (eq lines '-) nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1905 (if (null lines) '-
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1906 (- (prefix-numeric-value lines))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1907 ;(define-key esc-map [?\C-\S-v] 'scroll-other-window-down)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1908
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1909 (defun beginning-of-buffer-other-window (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1910 "Move point to the beginning of the buffer in the other window.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1911 Leave mark at previous position.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1912 With arg N, put point N/10 of the way from the true beginning."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1913 (interactive "P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1914 (let ((orig-window (selected-window))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1915 (window (other-window-for-scrolling)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1916 ;; We use unwind-protect rather than save-window-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1917 ;; because the latter would preserve the things we want to change.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1918 (unwind-protect
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1919 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1920 (select-window window)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1921 ;; Set point and mark in that window's buffer.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1922 (beginning-of-buffer arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1923 ;; Set point accordingly.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1924 (recenter '(t)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1925 (select-window orig-window))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1926
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1927 (defun end-of-buffer-other-window (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1928 "Move point to the end of the buffer in the other window.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1929 Leave mark at previous position.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1930 With arg N, put point N/10 of the way from the true end."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1931 (interactive "P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1932 ;; See beginning-of-buffer-other-window for comments.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1933 (let ((orig-window (selected-window))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1934 (window (other-window-for-scrolling)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1935 (unwind-protect
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1936 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1937 (select-window window)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1938 (end-of-buffer arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1939 (recenter '(t)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1940 (select-window orig-window))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1941
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1942 (defun transpose-chars (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1943 "Interchange characters around point, moving forward one character.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1944 With prefix arg ARG, effect is to take character before point
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1945 and drag it forward past ARG other characters (backward if ARG negative).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1946 If no argument and at end of line, the previous two chars are exchanged."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1947 (interactive "*P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1948 (and (null arg) (eolp) (forward-char -1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1949 (transpose-subr 'forward-char (prefix-numeric-value arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1950
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1951 ;;; A very old implementation of transpose-chars from the old days ...
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1952 (defun transpose-preceding-chars (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1953 "Interchange characters before point.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1954 With prefix arg ARG, effect is to take character before point
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1955 and drag it forward past ARG other characters (backward if ARG negative).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1956 If no argument and not at start of line, the previous two chars are exchanged."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1957 (interactive "*P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1958 (and (null arg) (not (bolp)) (forward-char -1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1959 (transpose-subr 'forward-char (prefix-numeric-value arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1960
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1961
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1962 (defun transpose-words (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1963 "Interchange words around point, leaving point at end of them.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1964 With prefix arg ARG, effect is to take word before or around point
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1965 and drag it forward past ARG other words (backward if ARG negative).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1966 If ARG is zero, the words around or after point and around or after mark
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1967 are interchanged."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1968 (interactive "*p")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1969 (transpose-subr 'forward-word arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1970
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1971 (defun transpose-sexps (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1972 "Like \\[transpose-words] but applies to sexps.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1973 Does not work on a sexp that point is in the middle of
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1974 if it is a list or string."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1975 (interactive "*p")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1976 (transpose-subr 'forward-sexp arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1977
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1978 (defun transpose-lines (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1979 "Exchange current line and previous line, leaving point after both.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1980 With argument ARG, takes previous line and moves it past ARG lines.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1981 With argument 0, interchanges line point is in with line mark is in."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1982 (interactive "*p")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1983 (transpose-subr #'(lambda (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1984 (if (= arg 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1985 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1986 ;; Move forward over a line,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1987 ;; but create a newline if none exists yet.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1988 (end-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1989 (if (eobp)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1990 (newline)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1991 (forward-char 1)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1992 (forward-line arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1993 arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1994
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1995 (eval-when-compile
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1996 ;; avoid byte-compiler warnings...
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1997 (defvar start1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1998 (defvar start2)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
1999 (defvar end1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2000 (defvar end2))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2001
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2002 ; start[12] and end[12] used in transpose-subr-1 below
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2003 (defun transpose-subr (mover arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2004 (let (start1 end1 start2 end2)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2005 (if (= arg 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2006 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2007 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2008 (funcall mover 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2009 (setq end2 (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2010 (funcall mover -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2011 (setq start2 (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2012 (goto-char (mark t)) ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2013 (funcall mover 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2014 (setq end1 (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2015 (funcall mover -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2016 (setq start1 (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2017 (transpose-subr-1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2018 (exchange-point-and-mark t))) ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2019 (while (> arg 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2020 (funcall mover -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2021 (setq start1 (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2022 (funcall mover 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2023 (setq end1 (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2024 (funcall mover 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2025 (setq end2 (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2026 (funcall mover -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2027 (setq start2 (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2028 (transpose-subr-1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2029 (goto-char end2)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2030 (setq arg (1- arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2031 (while (< arg 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2032 (funcall mover -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2033 (setq start2 (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2034 (funcall mover -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2035 (setq start1 (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2036 (funcall mover 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2037 (setq end1 (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2038 (funcall mover 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2039 (setq end2 (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2040 (transpose-subr-1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2041 (setq arg (1+ arg)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2042
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2043 ; start[12] and end[12] used free
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2044 (defun transpose-subr-1 ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2045 (if (> (min end1 end2) (max start1 start2))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2046 (error "Don't have two things to transpose"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2047 (let ((word1 (buffer-substring start1 end1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2048 (word2 (buffer-substring start2 end2)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2049 (delete-region start2 end2)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2050 (goto-char start2)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2051 (insert word1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2052 (goto-char (if (< start1 start2) start1
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2053 (+ start1 (- (length word1) (length word2)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2054 (delete-char (length word1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2055 (insert word2)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2056
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2057 (defcustom comment-column 32
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2058 "*Column to indent right-margin comments to.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2059 Setting this variable automatically makes it local to the current buffer.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2060 Each mode establishes a different default value for this variable; you
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2061 can set the value for a particular mode using that mode's hook."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2062 :type 'integer
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2063 :group 'fill-comments)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2064 (make-variable-buffer-local 'comment-column)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2065
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2066 (defcustom comment-start nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2067 "*String to insert to start a new comment, or nil if no comment syntax."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2068 :type '(choice (const :tag "None" nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2069 string)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2070 :group 'fill-comments)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2071
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2072 (defcustom comment-start-skip nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2073 "*Regexp to match the start of a comment plus everything up to its body.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2074 If there are any \\(...\\) pairs, the comment delimiter text is held to begin
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2075 at the place matched by the close of the first pair."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2076 :type '(choice (const :tag "None" nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2077 regexp)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2078 :group 'fill-comments)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2079
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2080 (defcustom comment-end ""
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2081 "*String to insert to end a new comment.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2082 Should be an empty string if comments are terminated by end-of-line."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2083 :type 'string
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2084 :group 'fill-comments)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2085
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2086 (defconst comment-indent-hook nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2087 "Obsolete variable for function to compute desired indentation for a comment.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2088 Use `comment-indent-function' instead.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2089 This function is called with no args with point at the beginning of
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2090 the comment's starting delimiter.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2091
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2092 (defconst comment-indent-function
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2093 ;; XEmacs - add at least one space after the end of the text on the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2094 ;; current line...
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2095 (lambda ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2096 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2097 (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2098 (let ((eol (save-excursion (end-of-line) (point))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2099 (and comment-start-skip
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2100 (re-search-forward comment-start-skip eol t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2101 (setq eol (match-beginning 0)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2102 (goto-char eol)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2103 (skip-chars-backward " \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2104 (max comment-column (1+ (current-column))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2105 "Function to compute desired indentation for a comment.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2106 This function is called with no args with point at the beginning of
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2107 the comment's starting delimiter.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2108
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2109 (defcustom block-comment-start nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2110 "*String to insert to start a new comment on a line by itself.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2111 If nil, use `comment-start' instead.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2112 Note that the regular expression `comment-start-skip' should skip this string
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2113 as well as the `comment-start' string."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2114 :type '(choice (const :tag "Use `comment-start'" nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2115 string)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2116 :group 'fill-comments)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2117
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2118 (defcustom block-comment-end nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2119 "*String to insert to end a new comment on a line by itself.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2120 Should be an empty string if comments are terminated by end-of-line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2121 If nil, use `comment-end' instead."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2122 :type '(choice (const :tag "Use `comment-end'" nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2123 string)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2124 :group 'fill-comments)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2125
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2126 (defun indent-for-comment ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2127 "Indent this line's comment to comment column, or insert an empty comment."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2128 (interactive "*")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2129 (let* ((empty (save-excursion (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2130 (looking-at "[ \t]*$")))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2131 (starter (or (and empty block-comment-start) comment-start))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2132 (ender (or (and empty block-comment-end) comment-end)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2133 (if (null starter)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2134 (error "No comment syntax defined")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2135 (let* ((eolpos (save-excursion (end-of-line) (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2136 cpos indent begpos)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2137 (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2138 (if (re-search-forward comment-start-skip eolpos 'move)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2139 (progn (setq cpos (point-marker))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2140 ;; Find the start of the comment delimiter.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2141 ;; If there were paren-pairs in comment-start-skip,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2142 ;; position at the end of the first pair.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2143 (if (match-end 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2144 (goto-char (match-end 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2145 ;; If comment-start-skip matched a string with
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2146 ;; internal whitespace (not final whitespace) then
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2147 ;; the delimiter start at the end of that
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2148 ;; whitespace. Otherwise, it starts at the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2149 ;; beginning of what was matched.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2150 (skip-syntax-backward " " (match-beginning 0))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2151 (skip-syntax-backward "^ " (match-beginning 0)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2152 (setq begpos (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2153 ;; Compute desired indent.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2154 (if (= (current-column)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2155 (setq indent (funcall comment-indent-function)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2156 (goto-char begpos)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2157 ;; If that's different from current, change it.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2158 (skip-chars-backward " \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2159 (delete-region (point) begpos)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2160 (indent-to indent))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2161 ;; An existing comment?
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2162 (if cpos
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2163 (progn (goto-char cpos)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2164 (set-marker cpos nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2165 ;; No, insert one.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2166 (insert starter)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2167 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2168 (insert ender)))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2169
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2170 (defun set-comment-column (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2171 "Set the comment column based on point.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2172 With no arg, set the comment column to the current column.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2173 With just minus as arg, kill any comment on this line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2174 With any other arg, set comment column to indentation of the previous comment
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2175 and then align or create a comment on this line at that column."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2176 (interactive "P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2177 (if (eq arg '-)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2178 (kill-comment nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2179 (if arg
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2180 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2181 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2182 (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2183 (re-search-backward comment-start-skip)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2184 (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2185 (re-search-forward comment-start-skip)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2186 (goto-char (match-beginning 0))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2187 (setq comment-column (current-column))
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
2188 (lmessage 'command "Comment column set to %d" comment-column))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2189 (indent-for-comment))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2190 (setq comment-column (current-column))
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
2191 (lmessage 'command "Comment column set to %d" comment-column))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2192
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2193 (defun kill-comment (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2194 "Kill the comment on this line, if any.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2195 With argument, kill comments on that many lines starting with this one."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2196 ;; this function loses in a lot of situations. it incorrectly recognises
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2197 ;; comment delimiters sometimes (ergo, inside a string), doesn't work
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2198 ;; with multi-line comments, can kill extra whitespace if comment wasn't
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2199 ;; through end-of-line, et cetera.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2200 (interactive "*P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2201 (or comment-start-skip (error "No comment syntax defined"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2202 (let ((count (prefix-numeric-value arg)) endc)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2203 (while (> count 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2204 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2205 (end-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2206 (setq endc (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2207 (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2208 (and (string< "" comment-end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2209 (setq endc
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2210 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2211 (re-search-forward (regexp-quote comment-end) endc 'move)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2212 (skip-chars-forward " \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2213 (point))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2214 (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2215 (if (re-search-forward comment-start-skip endc t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2216 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2217 (goto-char (match-beginning 0))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2218 (skip-chars-backward " \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2219 (kill-region (point) endc)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2220 ;; to catch comments a line beginnings
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2221 (indent-according-to-mode))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2222 (if arg (forward-line 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2223 (setq count (1- count)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2224
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2225 (defun comment-region (beg end &optional arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2226 "Comment or uncomment each line in the region.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2227 With just C-u prefix arg, uncomment each line in region.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2228 Numeric prefix arg ARG means use ARG comment characters.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2229 If ARG is negative, delete that many comment characters instead.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2230 Comments are terminated on each line, even for syntax in which newline does
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2231 not end the comment. Blank lines do not get comments."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2232 ;; if someone wants it to only put a comment-start at the beginning and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2233 ;; comment-end at the end then typing it, C-x C-x, closing it, C-x C-x
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2234 ;; is easy enough. No option is made here for other than commenting
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2235 ;; every line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2236 (interactive "r\nP")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2237 (or comment-start (error "No comment syntax is defined"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2238 (if (> beg end) (let (mid) (setq mid beg beg end end mid)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2239 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2240 (save-restriction
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2241 (let ((cs comment-start) (ce comment-end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2242 numarg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2243 (if (consp arg) (setq numarg t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2244 (setq numarg (prefix-numeric-value arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2245 ;; For positive arg > 1, replicate the comment delims now,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2246 ;; then insert the replicated strings just once.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2247 (while (> numarg 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2248 (setq cs (concat cs comment-start)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2249 ce (concat ce comment-end))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2250 (setq numarg (1- numarg))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2251 ;; Loop over all lines from BEG to END.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2252 (narrow-to-region beg end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2253 (goto-char beg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2254 (while (not (eobp))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2255 (if (or (eq numarg t) (< numarg 0))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2256 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2257 ;; Delete comment start from beginning of line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2258 (if (eq numarg t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2259 (while (looking-at (regexp-quote cs))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2260 (delete-char (length cs)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2261 (let ((count numarg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2262 (while (and (> 1 (setq count (1+ count)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2263 (looking-at (regexp-quote cs)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2264 (delete-char (length cs)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2265 ;; Delete comment end from end of line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2266 (if (string= "" ce)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2267 nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2268 (if (eq numarg t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2269 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2270 (end-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2271 ;; This is questionable if comment-end ends in
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2272 ;; whitespace. That is pretty brain-damaged,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2273 ;; though.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2274 (skip-chars-backward " \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2275 (if (and (>= (- (point) (point-min)) (length ce))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2276 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2277 (backward-char (length ce))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2278 (looking-at (regexp-quote ce))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2279 (delete-char (- (length ce)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2280 (let ((count numarg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2281 (while (> 1 (setq count (1+ count)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2282 (end-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2283 ;; This is questionable if comment-end ends in
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2284 ;; whitespace. That is pretty brain-damaged though
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2285 (skip-chars-backward " \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2286 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2287 (backward-char (length ce))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2288 (if (looking-at (regexp-quote ce))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2289 (delete-char (length ce))))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2290 (forward-line 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2291 ;; Insert at beginning and at end.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2292 (if (looking-at "[ \t]*$") ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2293 (insert cs)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2294 (if (string= "" ce) ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2295 (end-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2296 (insert ce)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2297 (search-forward "\n" nil 'move)))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2298
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2299 ;; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2300 (defun prefix-region (prefix)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2301 "Add a prefix string to each line between mark and point."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2302 (interactive "sPrefix string: ")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2303 (if prefix
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2304 (let ((count (count-lines (mark) (point))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2305 (goto-char (min (mark) (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2306 (while (> count 0)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2307 (setq count (1- count))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2308 (beginning-of-line 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2309 (insert prefix)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2310 (end-of-line 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2311 (forward-char 1)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2312
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2313
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2314 ;; XEmacs - extra parameter
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2315 (defun backward-word (arg &optional buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2316 "Move backward until encountering the end of a word.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2317 With argument, do this that many times.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2318 In programs, it is faster to call `forward-word' with negative arg."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2319 (interactive "_p") ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2320 (forward-word (- arg) buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2321
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2322 (defun mark-word (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2323 "Set mark arg words away from point."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2324 (interactive "p")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2325 (mark-something 'mark-word 'forward-word arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2326
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2327 ;; XEmacs modified
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2328 (defun kill-word (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2329 "Kill characters forward until encountering the end of a word.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2330 With argument, do this that many times."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2331 (interactive "*p")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2332 (kill-region (point) (save-excursion (forward-word arg) (point))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2333
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2334 (defun backward-kill-word (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2335 "Kill characters backward until encountering the end of a word.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2336 With argument, do this that many times."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2337 (interactive "*p") ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2338 (kill-word (- arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2339
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2340 (defun current-word (&optional strict)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2341 "Return the word point is on (or a nearby word) as a string.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2342 If optional arg STRICT is non-nil, return nil unless point is within
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2343 or adjacent to a word.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2344 If point is not between two word-constituent characters, but immediately
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2345 follows one, move back first.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2346 Otherwise, if point precedes a word constituent, move forward first.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2347 Otherwise, move backwards until a word constituent is found and get that word;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2348 if you a newlines is reached first, move forward instead."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2349 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2350 (let ((oldpoint (point)) (start (point)) (end (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2351 (skip-syntax-backward "w_") (setq start (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2352 (goto-char oldpoint)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2353 (skip-syntax-forward "w_") (setq end (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2354 (if (and (eq start oldpoint) (eq end oldpoint))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2355 ;; Point is neither within nor adjacent to a word.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2356 (and (not strict)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2357 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2358 ;; Look for preceding word in same line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2359 (skip-syntax-backward "^w_"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2360 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2361 (beginning-of-line) (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2362 (if (bolp)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2363 ;; No preceding word in same line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2364 ;; Look for following word in same line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2365 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2366 (skip-syntax-forward "^w_"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2367 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2368 (end-of-line) (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2369 (setq start (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2370 (skip-syntax-forward "w_")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2371 (setq end (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2372 (setq end (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2373 (skip-syntax-backward "w_")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2374 (setq start (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2375 (buffer-substring start end)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2376 (buffer-substring start end)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2377
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2378 (defcustom fill-prefix nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2379 "*String for filling to insert at front of new line, or nil for none.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2380 Setting this variable automatically makes it local to the current buffer."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2381 :type '(choice (const :tag "None" nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2382 string)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2383 :group 'fill)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2384 (make-variable-buffer-local 'fill-prefix)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2385
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2386 (defcustom auto-fill-inhibit-regexp nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2387 "*Regexp to match lines which should not be auto-filled."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2388 :type '(choice (const :tag "None" nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2389 regexp)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2390 :group 'fill)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2391
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2392 (defvar comment-line-break-function 'indent-new-comment-line
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2393 "*Mode-specific function which line breaks and continues a comment.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2394
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2395 This function is only called during auto-filling of a comment section.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2396 The function should take a single optional argument which is a flag
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2397 indicating whether soft newlines should be inserted.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2398
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2399 ;; This function is the auto-fill-function of a buffer
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2400 ;; when Auto-Fill mode is enabled.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2401 ;; It returns t if it really did any work.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2402 ;; XEmacs: This function is totally different.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2403 (defun do-auto-fill ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2404 (let (give-up)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2405 (or (and auto-fill-inhibit-regexp
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2406 (save-excursion (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2407 (looking-at auto-fill-inhibit-regexp)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2408 (while (and (not give-up) (> (current-column) fill-column))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2409 ;; Determine where to split the line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2410 (let ((fill-prefix fill-prefix)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2411 (fill-point
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2412 (let ((opoint (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2413 bounce
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2414 ;; 97/3/14 jhod: Kinsoku
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2415 (re-break-point (if (featurep 'mule)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2416 (concat "[ \t\n]\\|" word-across-newline)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2417 "[ \t\n]"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2418 ;; end patch
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2419 (first t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2420 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2421 (move-to-column (1+ fill-column))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2422 ;; Move back to a word boundary.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2423 (while (or first
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2424 ;; If this is after period and a single space,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2425 ;; move back once more--we don't want to break
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2426 ;; the line there and make it look like a
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2427 ;; sentence end.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2428 (and (not (bobp))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2429 (not bounce)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2430 sentence-end-double-space
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2431 (save-excursion (forward-char -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2432 (and (looking-at "\\. ")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2433 (not (looking-at "\\. "))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2434 (setq first nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2435 ;; 97/3/14 jhod: Kinsoku
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2436 ; (skip-chars-backward "^ \t\n"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2437 (fill-move-backward-to-break-point re-break-point)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2438 ;; end patch
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2439 ;; If we find nowhere on the line to break it,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2440 ;; break after one word. Set bounce to t
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2441 ;; so we will not keep going in this while loop.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2442 (if (bolp)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2443 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2444 ;; 97/3/14 jhod: Kinsoku
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2445 ; (re-search-forward "[ \t]" opoint t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2446 (fill-move-forward-to-break-point re-break-point
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2447 opoint)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2448 ;; end patch
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2449 (setq bounce t)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2450 (skip-chars-backward " \t"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2451 (if (and (featurep 'mule)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2452 (or bounce (bolp))) (kinsoku-process)) ;; 97/3/14 jhod: Kinsoku
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2453 ;; Let fill-point be set to the place where we end up.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2454 (point)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2455
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2456 ;; I'm not sure why Stig made this change but it breaks
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2457 ;; auto filling in at least C mode so I'm taking it back
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2458 ;; out. --cet
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2459 ;; XEmacs - adaptive fill.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2460 ;;(maybe-adapt-fill-prefix
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2461 ;; (or from (setq from (save-excursion (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2462 ;; (point))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2463 ;; (or to (setq to (save-excursion (beginning-of-line 2)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2464 ;; (point))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2465 ;; t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2466
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2467 ;; If that place is not the beginning of the line,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2468 ;; break the line there.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2469 (if (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2470 (goto-char fill-point)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2471 (not (or (bolp) (eolp)))) ; 97/3/14 jhod: during kinsoku processing it is possible to move beyond
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2472 (let ((prev-column (current-column)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2473 ;; If point is at the fill-point, do not `save-excursion'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2474 ;; Otherwise, if a comment prefix or fill-prefix is inserted,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2475 ;; point will end up before it rather than after it.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2476 (if (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2477 (skip-chars-backward " \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2478 (= (point) fill-point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2479 ;; 97/3/14 jhod: Kinsoku processing
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2480 ;(indent-new-comment-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2481 (let ((spacep (memq (char-before (point)) '(?\ ?\t))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2482 (funcall comment-line-break-function)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2483 ;; if user type space explicitly, leave SPC
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2484 ;; even if there is no WAN.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2485 (if spacep
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2486 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2487 (goto-char fill-point)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2488 ;; put SPC except that there is SPC
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2489 ;; already or there is sentence end.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2490 (or (memq (char-after (point)) '(?\ ?\t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2491 (fill-end-of-sentence-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2492 (insert ?\ )))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2493 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2494 (goto-char fill-point)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2495 (funcall comment-line-break-function)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2496 ;; If making the new line didn't reduce the hpos of
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2497 ;; the end of the line, then give up now;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2498 ;; trying again will not help.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2499 (if (>= (current-column) prev-column)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2500 (setq give-up t)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2501 ;; No place to break => stop trying.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2502 (setq give-up t)))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2503
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2504 ;; Put FSF one in until I can one or the other working properly, then the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2505 ;; other one is history.
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2506 ;(defun fsf:do-auto-fill ()
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2507 ; (let (fc justify
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2508 ; ;; bol
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2509 ; give-up
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2510 ; (fill-prefix fill-prefix))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2511 ; (if (or (not (setq justify (current-justification)))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2512 ; (null (setq fc (current-fill-column)))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2513 ; (and (eq justify 'left)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2514 ; (<= (current-column) fc))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2515 ; (save-excursion (beginning-of-line)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2516 ; ;; (setq bol (point))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2517 ; (and auto-fill-inhibit-regexp
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2518 ; (looking-at auto-fill-inhibit-regexp))))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2519 ; nil ;; Auto-filling not required
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2520 ; (if (memq justify '(full center right))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2521 ; (save-excursion (unjustify-current-line)))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2522
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2523 ; ;; Choose a fill-prefix automatically.
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2524 ; (if (and adaptive-fill-mode
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2525 ; (or (null fill-prefix) (string= fill-prefix "")))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2526 ; (let ((prefix
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2527 ; (fill-context-prefix
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2528 ; (save-excursion (backward-paragraph 1) (point))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2529 ; (save-excursion (forward-paragraph 1) (point))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2530 ; ;; Don't accept a non-whitespace fill prefix
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2531 ; ;; from the first line of a paragraph.
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2532 ; "^[ \t]*$")))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2533 ; (and prefix (not (equal prefix ""))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2534 ; (setq fill-prefix prefix))))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2535
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2536 ; (while (and (not give-up) (> (current-column) fc))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2537 ; ;; Determine where to split the line.
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2538 ; (let ((fill-point
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2539 ; (let ((opoint (point))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2540 ; bounce
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2541 ; (first t))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2542 ; (save-excursion
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2543 ; (move-to-column (1+ fc))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2544 ; ;; Move back to a word boundary.
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2545 ; (while (or first
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2546 ; ;; If this is after period and a single space,
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2547 ; ;; move back once more--we don't want to break
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2548 ; ;; the line there and make it look like a
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2549 ; ;; sentence end.
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2550 ; (and (not (bobp))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2551 ; (not bounce)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2552 ; sentence-end-double-space
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2553 ; (save-excursion (forward-char -1)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2554 ; (and (looking-at "\\. ")
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2555 ; (not (looking-at "\\. "))))))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2556 ; (setq first nil)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2557 ; (skip-chars-backward "^ \t\n")
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2558 ; ;; If we find nowhere on the line to break it,
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2559 ; ;; break after one word. Set bounce to t
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2560 ; ;; so we will not keep going in this while loop.
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2561 ; (if (bolp)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2562 ; (progn
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2563 ; (re-search-forward "[ \t]" opoint t)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2564 ; (setq bounce t)))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2565 ; (skip-chars-backward " \t"))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2566 ; ;; Let fill-point be set to the place where we end up.
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2567 ; (point)))))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2568 ; ;; If that place is not the beginning of the line,
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2569 ; ;; break the line there.
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2570 ; (if (save-excursion
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2571 ; (goto-char fill-point)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2572 ; (not (bolp)))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2573 ; (let ((prev-column (current-column)))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2574 ; ;; If point is at the fill-point, do not `save-excursion'.
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2575 ; ;; Otherwise, if a comment prefix or fill-prefix is inserted,
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2576 ; ;; point will end up before it rather than after it.
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2577 ; (if (save-excursion
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2578 ; (skip-chars-backward " \t")
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2579 ; (= (point) fill-point))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2580 ; (funcall comment-line-break-function t)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2581 ; (save-excursion
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2582 ; (goto-char fill-point)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2583 ; (funcall comment-line-break-function t)))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2584 ; ;; Now do justification, if required
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2585 ; (if (not (eq justify 'left))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2586 ; (save-excursion
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2587 ; (end-of-line 0)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2588 ; (justify-current-line justify nil t)))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2589 ; ;; If making the new line didn't reduce the hpos of
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2590 ; ;; the end of the line, then give up now;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2591 ; ;; trying again will not help.
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2592 ; (if (>= (current-column) prev-column)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2593 ; (setq give-up t)))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2594 ; ;; No place to break => stop trying.
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2595 ; (setq give-up t))))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2596 ; ;; Justify last line.
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2597 ; (justify-current-line justify t t)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
2598 ; t)))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2599
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2600 (defvar normal-auto-fill-function 'do-auto-fill
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2601 "The function to use for `auto-fill-function' if Auto Fill mode is turned on.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2602 Some major modes set this.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2603
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2604 (defun auto-fill-mode (&optional arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2605 "Toggle auto-fill mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2606 With arg, turn auto-fill mode on if and only if arg is positive.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2607 In Auto-Fill mode, inserting a space at a column beyond `current-fill-column'
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2608 automatically breaks the line at a previous space.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2609
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2610 The value of `normal-auto-fill-function' specifies the function to use
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2611 for `auto-fill-function' when turning Auto Fill mode on."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2612 (interactive "P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2613 (prog1 (setq auto-fill-function
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2614 (if (if (null arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2615 (not auto-fill-function)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2616 (> (prefix-numeric-value arg) 0))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2617 normal-auto-fill-function
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2618 nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2619 (redraw-modeline)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2620
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2621 ;; This holds a document string used to document auto-fill-mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2622 (defun auto-fill-function ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2623 "Automatically break line at a previous space, in insertion of text."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2624 nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2625
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2626 (defun turn-on-auto-fill ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2627 "Unconditionally turn on Auto Fill mode."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2628 (auto-fill-mode 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2629
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2630 (defun set-fill-column (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2631 "Set `fill-column' to specified argument.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2632 Just \\[universal-argument] as argument means to use the current column
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2633 The variable `fill-column' has a separate value for each buffer."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2634 (interactive "_P") ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2635 (cond ((integerp arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2636 (setq fill-column arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2637 ((consp arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2638 (setq fill-column (current-column)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2639 ;; Disallow missing argument; it's probably a typo for C-x C-f.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2640 (t
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2641 (error "set-fill-column requires an explicit argument")))
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
2642 (lmessage 'command "fill-column set to %d" fill-column))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2643
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2644 (defcustom comment-multi-line t ; XEmacs - this works well with adaptive fill
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2645 "*Non-nil means \\[indent-new-comment-line] should continue same comment
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2646 on new line, with no new terminator or starter.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2647 This is obsolete because you might as well use \\[newline-and-indent]."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2648 :type 'boolean
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2649 :group 'fill-comments)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2650
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2651 (defun indent-new-comment-line (&optional soft)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2652 "Break line at point and indent, continuing comment if within one.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2653 This indents the body of the continued comment
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2654 under the previous comment line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2655
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2656 This command is intended for styles where you write a comment per line,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2657 starting a new comment (and terminating it if necessary) on each line.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2658 If you want to continue one comment across several lines, use \\[newline-and-indent].
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2659
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2660 If a fill column is specified, it overrides the use of the comment column
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2661 or comment indentation.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2662
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2663 The inserted newline is marked hard if `use-hard-newlines' is true,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2664 unless optional argument SOFT is non-nil."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2665 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2666 (let (comcol comstart)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2667 (skip-chars-backward " \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2668 ;; 97/3/14 jhod: Kinsoku processing
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2669 (if (featurep 'mule)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2670 (kinsoku-process))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2671 (delete-region (point)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2672 (progn (skip-chars-forward " \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2673 (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2674 (if soft (insert ?\n) (newline 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2675 (if fill-prefix
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2676 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2677 (indent-to-left-margin)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2678 (insert fill-prefix))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2679 ;; #### - Eric Eide reverts to v18 semantics for this function in
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2680 ;; fa-extras, which I'm not gonna do. His changes are to (1) execute
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2681 ;; the save-excursion below unconditionally, and (2) uncomment the check
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2682 ;; for (not comment-multi-line) further below. --Stig
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2683 ;;### jhod: probably need to fix this for kinsoku processing
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2684 (if (not comment-multi-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2685 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2686 (if (and comment-start-skip
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2687 (let ((opoint (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2688 (forward-line -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2689 (re-search-forward comment-start-skip opoint t)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2690 ;; The old line is a comment.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2691 ;; Set WIN to the pos of the comment-start.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2692 ;; But if the comment is empty, look at preceding lines
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2693 ;; to find one that has a nonempty comment.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2694
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2695 ;; If comment-start-skip contains a \(...\) pair,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2696 ;; the real comment delimiter starts at the end of that pair.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2697 (let ((win (or (match-end 1) (match-beginning 0))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2698 (while (and (eolp) (not (bobp))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2699 (let (opoint)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2700 (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2701 (setq opoint (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2702 (forward-line -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2703 (re-search-forward comment-start-skip opoint t)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2704 (setq win (or (match-end 1) (match-beginning 0))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2705 ;; Indent this line like what we found.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2706 (goto-char win)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2707 (setq comcol (current-column))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2708 (setq comstart
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2709 (buffer-substring (point) (match-end 0)))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2710 (if (and comcol (not fill-prefix)) ; XEmacs - (ENE) from fa-extras.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2711 (let ((comment-column comcol)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2712 (comment-start comstart)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2713 (comment-end comment-end))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2714 (and comment-end (not (equal comment-end ""))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2715 ; (if (not comment-multi-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2716 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2717 (forward-char -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2718 (insert comment-end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2719 (forward-char 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2720 ; (setq comment-column (+ comment-column (length comment-start))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2721 ; comment-start "")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2722 ; )
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2723 )
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2724 (if (not (eolp))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2725 (setq comment-end ""))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2726 (insert ?\n)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2727 (forward-char -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2728 (indent-for-comment)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2729 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2730 ;; Make sure we delete the newline inserted above.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2731 (end-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2732 (delete-char 1)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2733 (indent-according-to-mode)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2734
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2735
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2736 (defun set-selective-display (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2737 "Set `selective-display' to ARG; clear it if no arg.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2738 When the value of `selective-display' is a number > 0,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2739 lines whose indentation is >= that value are not displayed.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2740 The variable `selective-display' has a separate value for each buffer."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2741 (interactive "P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2742 (if (eq selective-display t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2743 (error "selective-display already in use for marked lines"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2744 (let ((current-vpos
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2745 (save-restriction
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2746 (narrow-to-region (point-min) (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2747 (goto-char (window-start))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2748 (vertical-motion (window-height)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2749 (setq selective-display
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2750 (and arg (prefix-numeric-value arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2751 (recenter current-vpos))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2752 (set-window-start (selected-window) (window-start (selected-window)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2753 ;; #### doesn't localize properly:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2754 (princ "selective-display set to " t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2755 (prin1 selective-display t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2756 (princ "." t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2757
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2758 ;; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2759 (defun nuke-selective-display ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2760 "Ensure that the buffer is not in selective-display mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2761 If `selective-display' is t, then restore the buffer text to it's original
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2762 state before disabling selective display."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2763 ;; by Stig@hackvan.com
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2764 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2765 (and (eq t selective-display)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2766 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2767 (save-restriction
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2768 (widen)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2769 (goto-char (point-min))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2770 (let ((mod-p (buffer-modified-p))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2771 (buffer-read-only nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2772 (while (search-forward "\r" nil t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2773 (delete-char -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2774 (insert "\n"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2775 (set-buffer-modified-p mod-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2776 ))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2777 (setq selective-display nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2778
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2779 (add-hook 'change-major-mode-hook 'nuke-selective-display)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2780
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2781 (defconst overwrite-mode-textual (purecopy " Ovwrt")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2782 "The string displayed in the mode line when in overwrite mode.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2783 (defconst overwrite-mode-binary (purecopy " Bin Ovwrt")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2784 "The string displayed in the mode line when in binary overwrite mode.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2785
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2786 (defun overwrite-mode (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2787 "Toggle overwrite mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2788 With arg, turn overwrite mode on iff arg is positive.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2789 In overwrite mode, printing characters typed in replace existing text
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2790 on a one-for-one basis, rather than pushing it to the right. At the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2791 end of a line, such characters extend the line. Before a tab,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2792 such characters insert until the tab is filled in.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2793 \\[quoted-insert] still inserts characters in overwrite mode; this
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2794 is supposed to make it easier to insert characters when necessary."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2795 (interactive "P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2796 (setq overwrite-mode
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2797 (if (if (null arg) (not overwrite-mode)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2798 (> (prefix-numeric-value arg) 0))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2799 'overwrite-mode-textual))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2800 (redraw-modeline))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2801
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2802 (defun binary-overwrite-mode (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2803 "Toggle binary overwrite mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2804 With arg, turn binary overwrite mode on iff arg is positive.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2805 In binary overwrite mode, printing characters typed in replace
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2806 existing text. Newlines are not treated specially, so typing at the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2807 end of a line joins the line to the next, with the typed character
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2808 between them. Typing before a tab character simply replaces the tab
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2809 with the character typed.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2810 \\[quoted-insert] replaces the text at the cursor, just as ordinary
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2811 typing characters do.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2812
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2813 Note that binary overwrite mode is not its own minor mode; it is a
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2814 specialization of overwrite-mode, entered by setting the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2815 `overwrite-mode' variable to `overwrite-mode-binary'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2816 (interactive "P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2817 (setq overwrite-mode
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2818 (if (if (null arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2819 (not (eq overwrite-mode 'overwrite-mode-binary))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2820 (> (prefix-numeric-value arg) 0))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2821 'overwrite-mode-binary))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2822 (redraw-modeline))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2823
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2824 (defcustom line-number-mode nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2825 "*Non-nil means display line number in modeline."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2826 :type 'boolean
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2827 :group 'editing-basics)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2828
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2829 (defun line-number-mode (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2830 "Toggle Line Number mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2831 With arg, turn Line Number mode on iff arg is positive.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2832 When Line Number mode is enabled, the line number appears
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2833 in the mode line."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2834 (interactive "P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2835 (setq line-number-mode
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2836 (if (null arg) (not line-number-mode)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2837 (> (prefix-numeric-value arg) 0)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2838 (redraw-modeline))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2839
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2840 (defcustom column-number-mode nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2841 "*Non-nil means display column number in mode line."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2842 :type 'boolean
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2843 :group 'editing-basics)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2844
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2845 (defun column-number-mode (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2846 "Toggle Column Number mode.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2847 With arg, turn Column Number mode on iff arg is positive.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2848 When Column Number mode is enabled, the column number appears
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2849 in the mode line."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2850 (interactive "P")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2851 (setq column-number-mode
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2852 (if (null arg) (not column-number-mode)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2853 (> (prefix-numeric-value arg) 0)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2854 (redraw-modeline))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2855
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2856
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2857 (defcustom blink-matching-paren t
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2858 "*Non-nil means show matching open-paren when close-paren is inserted."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2859 :type 'boolean
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2860 :group 'paren-blinking)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2861
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2862 (defcustom blink-matching-paren-on-screen t
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2863 "*Non-nil means show matching open-paren when it is on screen.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2864 nil means don't show it (but the open-paren can still be shown
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2865 when it is off screen."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2866 :type 'boolean
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2867 :group 'paren-blinking)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2868
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2869 (defcustom blink-matching-paren-distance 12000
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2870 "*If non-nil, is maximum distance to search for matching open-paren."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2871 :type '(choice integer (const nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2872 :group 'paren-blinking)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2873
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2874 (defcustom blink-matching-delay 1
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2875 "*The number of seconds that `blink-matching-open' will delay at a match."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2876 :type 'number
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2877 :group 'paren-blinking)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2878
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2879 (defcustom blink-matching-paren-dont-ignore-comments nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2880 "*Non-nil means `blink-matching-paren' should not ignore comments."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2881 :type 'boolean
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2882 :group 'paren-blinking)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2883
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2884 (defun blink-matching-open ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2885 "Move cursor momentarily to the beginning of the sexp before point."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2886 (interactive "_") ; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2887 (and (> (point) (1+ (point-min)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2888 blink-matching-paren
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2889 ;; Verify an even number of quoting characters precede the close.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2890 (= 1 (logand 1 (- (point)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2891 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2892 (forward-char -1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2893 (skip-syntax-backward "/\\")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2894 (point)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2895 (let* ((oldpos (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2896 (blinkpos)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2897 (mismatch))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2898 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2899 (save-restriction
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2900 (if blink-matching-paren-distance
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2901 (narrow-to-region (max (point-min)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2902 (- (point) blink-matching-paren-distance))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2903 oldpos))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2904 (condition-case ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2905 (let ((parse-sexp-ignore-comments
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2906 (and parse-sexp-ignore-comments
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2907 (not blink-matching-paren-dont-ignore-comments))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2908 (setq blinkpos (scan-sexps oldpos -1)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2909 (error nil)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2910 (and blinkpos
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2911 (/= (char-syntax (char-after blinkpos))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2912 ?\$)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2913 (setq mismatch
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2914 (or (null (matching-paren (char-after blinkpos)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2915 (/= (char-after (1- oldpos))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2916 (matching-paren (char-after blinkpos))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2917 (if mismatch (setq blinkpos nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2918 (if blinkpos
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2919 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2920 (goto-char blinkpos)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2921 (if (pos-visible-in-window-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2922 (and blink-matching-paren-on-screen
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2923 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2924 (auto-show-make-point-visible)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2925 (sit-for blink-matching-delay)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2926 (goto-char blinkpos)
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
2927 (lmessage 'command "Matches %s"
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2928 ;; Show what precedes the open in its line, if anything.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2929 (if (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2930 (skip-chars-backward " \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2931 (not (bolp)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2932 (buffer-substring (progn (beginning-of-line) (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2933 (1+ blinkpos))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2934 ;; Show what follows the open in its line, if anything.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2935 (if (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2936 (forward-char 1)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2937 (skip-chars-forward " \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2938 (not (eolp)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2939 (buffer-substring blinkpos
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2940 (progn (end-of-line) (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2941 ;; Otherwise show the previous nonblank line,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2942 ;; if there is one.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2943 (if (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2944 (skip-chars-backward "\n \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2945 (not (bobp)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2946 (concat
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2947 (buffer-substring (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2948 (skip-chars-backward "\n \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2949 (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2950 (point))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2951 (progn (end-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2952 (skip-chars-backward " \t")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2953 (point)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2954 ;; Replace the newline and other whitespace with `...'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2955 "..."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2956 (buffer-substring blinkpos (1+ blinkpos)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2957 ;; There is nothing to show except the char itself.
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
2958 (buffer-substring blinkpos (1+ blinkpos))))))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2959 (cond (mismatch
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2960 (display-message 'no-log "Mismatched parentheses"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2961 ((not blink-matching-paren-distance)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2962 (display-message 'no-log "Unmatched parenthesis"))))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2963
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2964 ;Turned off because it makes dbx bomb out.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2965 (setq blink-paren-function 'blink-matching-open)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2966
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2967 (eval-when-compile (defvar myhelp)) ; suppress compiler warning
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2968
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2969 ;; XEmacs: Some functions moved to cmdloop.el:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2970 ;; keyboard-quit
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2971 ;; buffer-quit-function
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2972 ;; keyboard-escape-quit
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2973
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2974 (defun assoc-ignore-case (key alist)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2975 "Like `assoc', but assumes KEY is a string and ignores case when comparing."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2976 (setq key (downcase key))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2977 (let (element)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2978 (while (and alist (not element))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2979 (if (equal key (downcase (car (car alist))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2980 (setq element (car alist)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2981 (setq alist (cdr alist)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2982 element))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2983
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2984
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2985 (defcustom mail-user-agent 'sendmail-user-agent
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2986 "*Your preference for a mail composition package.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2987 Various Emacs Lisp packages (e.g. reporter) require you to compose an
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2988 outgoing email message. This variable lets you specify which
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2989 mail-sending package you prefer.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2990
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2991 Valid values include:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2992
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2993 sendmail-user-agent -- use the default Emacs Mail package
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2994 mh-e-user-agent -- use the Emacs interface to the MH mail system
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2995 message-user-agent -- use the GNUS mail sending package
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2996
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2997 Additional valid symbols may be available; check with the author of
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2998 your package for details."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
2999 :type '(radio (function-item :tag "Default Emacs mail"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3000 :format "%t\n"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3001 sendmail-user-agent)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3002 (function-item :tag "Gnus mail sending package"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3003 :format "%t\n"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3004 message-user-agent)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3005 (function :tag "Other"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3006 :group 'mail)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3007
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3008 (defun define-mail-user-agent (symbol composefunc sendfunc
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3009 &optional abortfunc hookvar)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3010 "Define a symbol to identify a mail-sending package for `mail-user-agent'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3011
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3012 SYMBOL can be any Lisp symbol. Its function definition and/or
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3013 value as a variable do not matter for this usage; we use only certain
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3014 properties on its property list, to encode the rest of the arguments.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3015
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3016 COMPOSEFUNC is program callable function that composes an outgoing
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3017 mail message buffer. This function should set up the basics of the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3018 buffer without requiring user interaction. It should populate the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3019 standard mail headers, leaving the `to:' and `subject:' headers blank
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3020 by default.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3021
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3022 COMPOSEFUNC should accept several optional arguments--the same
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3023 arguments that `compose-mail' takes. See that function's documentation.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3024
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3025 SENDFUNC is the command a user would run to send the message.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3026
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3027 Optional ABORTFUNC is the command a user would run to abort the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3028 message. For mail packages that don't have a separate abort function,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3029 this can be `kill-buffer' (the equivalent of omitting this argument).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3030
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3031 Optional HOOKVAR is a hook variable that gets run before the message
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3032 is actually sent. Callers that use the `mail-user-agent' may
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3033 install a hook function temporarily on this hook variable.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3034 If HOOKVAR is nil, `mail-send-hook' is used.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3035
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3036 The properties used on SYMBOL are `composefunc', `sendfunc',
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3037 `abortfunc', and `hookvar'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3038 (put symbol 'composefunc composefunc)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3039 (put symbol 'sendfunc sendfunc)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3040 (put symbol 'abortfunc (or abortfunc 'kill-buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3041 (put symbol 'hookvar (or hookvar 'mail-send-hook)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3042
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3043 (define-mail-user-agent 'sendmail-user-agent
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3044 'sendmail-user-agent-compose 'mail-send-and-exit)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3045
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3046 (define-mail-user-agent 'message-user-agent
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3047 'message-mail 'message-send-and-exit
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3048 'message-kill-buffer 'message-send-hook)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3049
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3050 (defun sendmail-user-agent-compose (&optional to subject other-headers continue
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3051 switch-function yank-action
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3052 send-actions)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3053 (if switch-function
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3054 (let ((special-display-buffer-names nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3055 (special-display-regexps nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3056 (same-window-buffer-names nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3057 (same-window-regexps nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3058 (funcall switch-function "*mail*")))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3059 (let ((cc (cdr (assoc-ignore-case "cc" other-headers)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3060 (in-reply-to (cdr (assoc-ignore-case "in-reply-to" other-headers))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3061 (or (mail continue to subject in-reply-to cc yank-action send-actions)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3062 continue
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3063 (error "Message aborted"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3064 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3065 (goto-char (point-min))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3066 (search-forward mail-header-separator)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3067 (beginning-of-line)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3068 (while other-headers
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3069 (if (not (member (car (car other-headers)) '("in-reply-to" "cc")))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3070 (insert (car (car other-headers)) ": "
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3071 (cdr (car other-headers)) "\n"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3072 (setq other-headers (cdr other-headers)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3073 t)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3074
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3075 (define-mail-user-agent 'mh-e-user-agent
239
41f2f0e326e9 Import from CVS: tag r20-5b18
cvs
parents: 235
diff changeset
3076 'mh-user-agent-compose 'mh-send-letter 'mh-fully-kill-draft
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3077 'mh-before-send-letter-hook)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3078
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3079 (defun compose-mail (&optional to subject other-headers continue
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3080 switch-function yank-action send-actions)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3081 "Start composing a mail message to send.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3082 This uses the user's chosen mail composition package
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3083 as selected with the variable `mail-user-agent'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3084 The optional arguments TO and SUBJECT specify recipients
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3085 and the initial Subject field, respectively.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3086
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3087 OTHER-HEADERS is an alist specifying additional
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3088 header fields. Elements look like (HEADER . VALUE) where both
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3089 HEADER and VALUE are strings.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3090
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3091 CONTINUE, if non-nil, says to continue editing a message already
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3092 being composed.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3093
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3094 SWITCH-FUNCTION, if non-nil, is a function to use to
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3095 switch to and display the buffer used for mail composition.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3096
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3097 YANK-ACTION, if non-nil, is an action to perform, if and when necessary,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3098 to insert the raw text of the message being replied to.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3099 It has the form (FUNCTION . ARGS). The user agent will apply
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3100 FUNCTION to ARGS, to insert the raw text of the original message.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3101 \(The user agent will also run `mail-citation-hook', *after* the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3102 original text has been inserted in this way.)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3103
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3104 SEND-ACTIONS is a list of actions to call when the message is sent.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3105 Each action has the form (FUNCTION . ARGS)."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3106 (interactive
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3107 (list nil nil nil current-prefix-arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3108 (let ((function (get mail-user-agent 'composefunc)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3109 (funcall function to subject other-headers continue
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3110 switch-function yank-action send-actions)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3111
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3112 (defun compose-mail-other-window (&optional to subject other-headers continue
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3113 yank-action send-actions)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3114 "Like \\[compose-mail], but edit the outgoing message in another window."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3115 (interactive
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3116 (list nil nil nil current-prefix-arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3117 (compose-mail to subject other-headers continue
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3118 'switch-to-buffer-other-window yank-action send-actions))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3119
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3120
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3121 (defun compose-mail-other-frame (&optional to subject other-headers continue
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3122 yank-action send-actions)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3123 "Like \\[compose-mail], but edit the outgoing message in another frame."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3124 (interactive
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3125 (list nil nil nil current-prefix-arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3126 (compose-mail to subject other-headers continue
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3127 'switch-to-buffer-other-frame yank-action send-actions))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3128
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3129
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3130 (defun set-variable (var val)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3131 "Set VARIABLE to VALUE. VALUE is a Lisp object.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3132 When using this interactively, supply a Lisp expression for VALUE.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3133 If you want VALUE to be a string, you must surround it with doublequotes.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3134
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3135 If VARIABLE has a `variable-interactive' property, that is used as if
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3136 it were the arg to `interactive' (which see) to interactively read the value."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3137 (interactive
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3138 (let* ((var (read-variable "Set variable: "))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3139 ;; #### - yucky code replication here. This should use something
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3140 ;; from help.el or hyper-apropos.el
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3141 (minibuffer-help-form
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3142 '(funcall myhelp))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3143 (myhelp
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3144 #'(lambda ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3145 (with-output-to-temp-buffer "*Help*"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3146 (prin1 var)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3147 (princ "\nDocumentation:\n")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3148 (princ (substring (documentation-property var 'variable-documentation)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3149 1))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3150 (if (boundp var)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3151 (let ((print-length 20))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3152 (princ "\n\nCurrent value: ")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3153 (prin1 (symbol-value var))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3154 (save-excursion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3155 (set-buffer standard-output)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3156 (help-mode))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3157 nil))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3158 (list var
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3159 (let ((prop (get var 'variable-interactive)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3160 (if prop
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3161 ;; Use VAR's `variable-interactive' property
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3162 ;; as an interactive spec for prompting.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3163 (call-interactively (list 'lambda '(arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3164 (list 'interactive prop)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3165 'arg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3166 (eval-minibuffer (format "Set %s to value: " var)))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3167 (set var val))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3168
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3169 ;; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3170 (defun activate-region ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3171 "Activate the region, if `zmacs-regions' is true.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3172 Setting `zmacs-regions' to true causes LISPM-style active regions to be used.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3173 This function has no effect if `zmacs-regions' is false."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3174 (interactive)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3175 (and zmacs-regions (zmacs-activate-region)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3176
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3177 ;; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3178 (defsubst region-exists-p ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3179 "Non-nil iff the region exists.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3180 If active regions are in use (i.e. `zmacs-regions' is true), this means that
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3181 the region is active. Otherwise, this means that the user has pushed
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3182 a mark in this buffer at some point in the past.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3183 The functions `region-beginning' and `region-end' can be used to find the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3184 limits of the region."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3185 (not (null (mark))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3186
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3187 ;; XEmacs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3188 (defun region-active-p ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3189 "Non-nil iff the region is active.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3190 If `zmacs-regions' is true, this is equivalent to `region-exists-p'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3191 Otherwise, this function always returns false."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3192 (and zmacs-regions zmacs-region-extent))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3193
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3194 ;; A bunch of stuff was moved elsewhere:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3195 ;; completion-list-mode-map
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3196 ;; completion-reference-buffer
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3197 ;; completion-base-size
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3198 ;; delete-completion-window
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3199 ;; previous-completion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3200 ;; next-completion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3201 ;; choose-completion
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3202 ;; choose-completion-delete-max-match
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3203 ;; choose-completion-string
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3204 ;; completion-list-mode
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3205 ;; completion-fixup-function
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3206 ;; completion-setup-function
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3207 ;; switch-to-completions
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3208 ;; event stuffs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3209 ;; keypad stuffs
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3210
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3211 ;; The rest of this file is not in Lisp in FSF
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3212 (defun capitalize-region-or-word (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3213 "Capitalize the selected region or the following word (or ARG words)."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3214 (interactive "p")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3215 (if (region-active-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3216 (capitalize-region (region-beginning) (region-end))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3217 (capitalize-word arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3218
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3219 (defun upcase-region-or-word (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3220 "Upcase the selected region or the following word (or ARG words)."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3221 (interactive "p")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3222 (if (region-active-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3223 (upcase-region (region-beginning) (region-end))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3224 (upcase-word arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3225
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3226 (defun downcase-region-or-word (arg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3227 "Downcase the selected region or the following word (or ARG words)."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3228 (interactive "p")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3229 (if (region-active-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3230 (downcase-region (region-beginning) (region-end))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3231 (downcase-word arg)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3232
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
3233 ;; Most of the zmacs code is now in elisp. The only thing left in C
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
3234 ;; are the variables zmacs-regions, zmacs-region-active-p and
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
3235 ;; zmacs-region-stays plus the function zmacs_update_region which
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
3236 ;; simply calls the lisp level zmacs-update-region. It must remain
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
3237 ;; for convenience, since it is called by core C code.
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3238
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3239 (defvar zmacs-activate-region-hook nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3240 "Function or functions called when the region becomes active;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3241 see the variable `zmacs-regions'.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3242
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3243 (defvar zmacs-deactivate-region-hook nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3244 "Function or functions called when the region becomes inactive;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3245 see the variable `zmacs-regions'.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3246
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3247 (defvar zmacs-update-region-hook nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3248 "Function or functions called when the active region changes.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3249 This is called after each command that sets `zmacs-region-stays' to t.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3250 See the variable `zmacs-regions'.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3251
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3252 (defvar zmacs-region-extent nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3253 "The extent of the zmacs region; don't use this.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3254
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3255 (defvar zmacs-region-rectangular-p nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3256 "Whether the zmacs region is a rectangle; don't use this.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3257
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3258 (defun zmacs-make-extent-for-region (region)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3259 ;; Given a region, this makes an extent in the buffer which holds that
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3260 ;; region, for highlighting purposes. If the region isn't associated
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3261 ;; with a buffer, this does nothing.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3262 (let ((buffer nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3263 (valid (and (extentp zmacs-region-extent)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3264 (extent-object zmacs-region-extent)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3265 (buffer-live-p (extent-object zmacs-region-extent))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3266 start end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3267 (cond ((consp region)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3268 (setq start (min (car region) (cdr region))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3269 end (max (car region) (cdr region))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3270 valid (and valid
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3271 (eq (marker-buffer (car region))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3272 (extent-object zmacs-region-extent)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3273 buffer (marker-buffer (car region))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3274 (t
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3275 (signal 'error (list "Invalid region" region))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3276
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3277 (if valid
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3278 nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3279 ;; The condition case is in case any of the extents are dead or
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3280 ;; otherwise incapacitated.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3281 (condition-case ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3282 (if (listp zmacs-region-extent)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3283 (mapc 'delete-extent zmacs-region-extent)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3284 (delete-extent zmacs-region-extent))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3285 (error nil)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3286
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3287 (if valid
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3288 (set-extent-endpoints zmacs-region-extent start end)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3289 (setq zmacs-region-extent (make-extent start end buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3290
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3291 ;; Make the extent be closed on the right, which means that if
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3292 ;; characters are inserted exactly at the end of the extent, the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3293 ;; extent will grow to cover them. This is important for shell
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3294 ;; buffers - suppose one makes a region, and one end is at point-max.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3295 ;; If the shell produces output, that marker will remain at point-max
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3296 ;; (its position will increase). So it's important that the extent
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3297 ;; exhibit the same behavior, lest the region covered by the extent
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3298 ;; (the visual indication), and the region between point and mark
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3299 ;; (the actual region value) become different!
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3300 (set-extent-property zmacs-region-extent 'end-open nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3301
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3302 ;; use same priority as mouse-highlighting so that conflicts between
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3303 ;; the region extent and a mouse-highlighted extent are resolved by
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3304 ;; the usual size-and-endpoint-comparison method.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3305 (set-extent-priority zmacs-region-extent mouse-highlight-priority)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3306 (set-extent-face zmacs-region-extent 'zmacs-region)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3307
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3308 ;; #### It might be better to actually break
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3309 ;; default-mouse-track-next-move-rect out of mouse.el so that we
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3310 ;; can use its logic here.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3311 (cond
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3312 (zmacs-region-rectangular-p
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3313 (setq zmacs-region-extent (list zmacs-region-extent))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3314 (default-mouse-track-next-move-rect start end zmacs-region-extent)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3315 ))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3316
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3317 zmacs-region-extent)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3318
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3319 (defun zmacs-region-buffer ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3320 "Return the buffer containing the zmacs region, or nil."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3321 ;; #### this is horrible and kludgy! This stuff needs to be rethought.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3322 (and zmacs-regions zmacs-region-active-p
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3323 (or (marker-buffer (mark-marker t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3324 (and (extent-live-p zmacs-region-extent)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3325 (buffer-live-p (extent-object zmacs-region-extent))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3326 (extent-object zmacs-region-extent)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3327
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3328 (defun zmacs-activate-region ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3329 "Make the region between `point' and `mark' be active (highlighted),
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3330 if `zmacs-regions' is true. Only a very small number of commands
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3331 should ever do this. Calling this function will call the hook
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3332 `zmacs-activate-region-hook', if the region was previously inactive.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3333 Calling this function ensures that the region stays active after the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3334 current command terminates, even if `zmacs-region-stays' is not set.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3335 Returns t if the region was activated (i.e. if `zmacs-regions' if t)."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3336 (if (not zmacs-regions)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3337 nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3338 (setq zmacs-region-active-p t
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3339 zmacs-region-stays t
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3340 zmacs-region-rectangular-p (and (boundp 'mouse-track-rectangle-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3341 mouse-track-rectangle-p))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3342 (if (marker-buffer (mark-marker t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3343 (zmacs-make-extent-for-region (cons (point-marker t) (mark-marker t))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3344 (run-hooks 'zmacs-activate-region-hook)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3345 t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3346
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3347 (defun zmacs-deactivate-region ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3348 "Make the region between `point' and `mark' no longer be active,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3349 if `zmacs-regions' is true. You shouldn't need to call this; the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3350 command loop calls it when appropriate. Calling this function will
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3351 call the hook `zmacs-deactivate-region-hook', if the region was
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3352 previously active. Returns t if the region had been active, nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3353 otherwise."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3354 (if (not zmacs-region-active-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3355 nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3356 (setq zmacs-region-active-p nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3357 zmacs-region-stays nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3358 zmacs-region-rectangular-p nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3359 (if zmacs-region-extent
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3360 (let ((inhibit-quit t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3361 (if (listp zmacs-region-extent)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3362 (mapc 'delete-extent zmacs-region-extent)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3363 (delete-extent zmacs-region-extent))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3364 (setq zmacs-region-extent nil)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3365 (run-hooks 'zmacs-deactivate-region-hook)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3366 t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3367
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3368 (defun zmacs-update-region ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3369 "Update the highlighted region between `point' and `mark'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3370 You shouldn't need to call this; the command loop calls it
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3371 when appropriate. Calling this function will call the hook
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3372 `zmacs-update-region-hook', if the region is active."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3373 (when zmacs-region-active-p
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3374 (when (marker-buffer (mark-marker t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3375 (zmacs-make-extent-for-region (cons (point-marker t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3376 (mark-marker t))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3377 (run-hooks 'zmacs-update-region-hook)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3378
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3379 ;;;;;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3380 ;;;;;; echo area stuff
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3381 ;;;;;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3382
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3383 ;;; #### Should this be moved to a separate file, for clarity?
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3384 ;;; -hniksic
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3385
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3386 ;;; The `message-stack' is an alist of labels with messages; the first
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3387 ;;; message in this list is always in the echo area. A call to
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3388 ;;; `display-message' inserts a label/message pair at the head of the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3389 ;;; list, and removes any other pairs with that label. Calling
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3390 ;;; `clear-message' causes any pair with matching label to be removed,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3391 ;;; and this may cause the displayed message to change or vanish. If
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3392 ;;; the label arg is nil, the entire message stack is cleared.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3393 ;;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3394 ;;; Message/error filtering will be a little tricker to implement than
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3395 ;;; logging, since messages can be built up incrementally
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3396 ;;; using clear-message followed by repeated calls to append-message
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3397 ;;; (this happens with error messages). For messages which aren't
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3398 ;;; created this way, filtering could be implemented at display-message
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3399 ;;; very easily.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3400 ;;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3401 ;;; Bits of the logging code are borrowed from log-messages.el by
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3402 ;;; Robert Potter (rpotter@grip.cis.upenn.edu).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3403
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3404 ;; need this to terminate the currently-displayed message
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3405 ;; ("Loading simple ...")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3406 (when (and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3407 (not (fboundp 'display-message))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3408 (not (featurep 'debug)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3409 (send-string-to-terminal "\n"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3410
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3411 (defvar message-stack nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3412 "An alist of label/string pairs representing active echo-area messages.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3413 The first element in the list is currently displayed in the echo area.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3414 Do not modify this directly--use the `message' or
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3415 `display-message'/`clear-message' functions.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3416
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3417 (defvar remove-message-hook 'log-message
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3418 "A function or list of functions to be called when a message is removed
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3419 from the echo area at the bottom of the frame. The label of the removed
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3420 message is passed as the first argument, and the text of the message
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3421 as the second argument.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3422
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3423 (defcustom log-message-max-size 50000
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3424 "Maximum size of the \" *Message-Log*\" buffer. See `log-message'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3425 :type 'integer
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3426 :group 'log-message)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3427 (make-compatible-variable 'message-log-max 'log-message-max-size)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3428
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3429 ;; We used to reject quite a lot of stuff here, but it was a bad idea,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3430 ;; for two reasons:
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3431 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3432 ;; a) In most circumstances, you *want* to see the message in the log.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3433 ;; The explicitly non-loggable messages should be marked as such by
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3434 ;; the issuer. Gratuitous non-displaying of random regexps made
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3435 ;; debugging harder, too (because various reasonable debugging
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3436 ;; messages would get eaten).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3437 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3438 ;; b) It slowed things down. Yes, visibly.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3439 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3440 ;; So, I left only a few of the really useless ones on this kill-list.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3441 ;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3442 ;; --hniksic
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3443 (defcustom log-message-ignore-regexps
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3444 '(;; Note: adding entries to this list slows down messaging
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3445 ;; significantly. Wherever possible, use message lables.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3446
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3447 ;; Often-seen messages
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3448 "\\`\\'" ; empty message
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3449 "\\`\\(Beginning\\|End\\) of buffer\\'"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3450 ;;"^Quit$"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3451 ;; completions
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3452 ;; Many packages print this -- impossible to categorize
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3453 ;;"^Making completion list"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3454 ;; Gnus
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3455 ;; "^No news is no news$"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3456 ;; "^No more\\( unread\\)? newsgroups$"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3457 ;; "^Opening [^ ]+ server\\.\\.\\."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3458 ;; "^[^:]+: Reading incoming mail"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3459 ;; "^Getting mail from "
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3460 ;; "^\\(Generating Summary\\|Sorting threads\\|Making sparse threads\\|Scoring\\|Checking new news\\|Expiring articles\\|Sending\\)\\.\\.\\."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3461 ;; "^\\(Fetching headers for\\|Retrieving newsgroup\\|Reading active file\\)"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3462 ;; "^No more\\( unread\\)? articles"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3463 ;; "^Deleting article "
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3464 ;; W3
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3465 ;; "^Parsed [0-9]+ of [0-9]+ ([0-9]+%)"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3466 )
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3467 "List of regular expressions matching messages which shouldn't be logged.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3468 See `log-message'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3469
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3470 Ideally, packages which generate messages which might need to be ignored
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3471 should label them with 'progress, 'prompt, or 'no-log, so they can be
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3472 filtered by the log-message-ignore-labels."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3473 :type '(repeat regexp)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3474 :group 'log-message)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3475
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3476 (defcustom log-message-ignore-labels
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3477 '(help-echo command progress prompt no-log garbage-collecting auto-saving)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3478 "List of symbols indicating labels of messages which shouldn't be logged.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3479 See `display-message' for some common labels. See also `log-message'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3480 :type '(repeat (symbol :tag "Label"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3481 :group 'log-message)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3482
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3483 ;;Subsumed by view-lossage
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3484 ;; Not really, I'm adding it back by popular demand. -slb
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3485 (defun show-message-log ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3486 "Show the \" *Message-Log*\" buffer, which contains old messages and errors."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3487 (interactive)
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 209
diff changeset
3488 (pop-to-buffer (get-buffer-create " *Message-Log*")))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3489
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3490 (defvar log-message-filter-function 'log-message-filter
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3491 "Value must be a function of two arguments: a symbol (label) and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3492 a string (message). It should return non-nil to indicate a message
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3493 should be logged. Possible values include 'log-message-filter and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3494 'log-message-filter-errors-only.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3495
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3496 (defun log-message-filter (label message)
235
85a06df23a9a Import from CVS: tag r20-5b16
cvs
parents: 223
diff changeset
3497 "Default value of `log-message-filter-function'.
85a06df23a9a Import from CVS: tag r20-5b16
cvs
parents: 223
diff changeset
3498 Messages whose text matches one of the `log-message-ignore-regexps'
85a06df23a9a Import from CVS: tag r20-5b16
cvs
parents: 223
diff changeset
3499 or whose label appears in `log-message-ignore-labels' are not saved."
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3500 (let ((r log-message-ignore-regexps)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3501 (ok (not (memq label log-message-ignore-labels))))
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3502 (save-match-data
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3503 (while (and r ok)
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3504 (when (string-match (car r) message)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3505 (setq ok nil))
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3506 (setq r (cdr r))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3507 ok))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3508
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3509 (defun log-message-filter-errors-only (label message)
235
85a06df23a9a Import from CVS: tag r20-5b16
cvs
parents: 223
diff changeset
3510 "For use as the `log-message-filter-function'. Only logs error messages."
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3511 (eq label 'error))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3512
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3513 (defun log-message (label message)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3514 "Stuff a copy of the message into the \" *Message-Log*\" buffer,
235
85a06df23a9a Import from CVS: tag r20-5b16
cvs
parents: 223
diff changeset
3515 if it satisfies the `log-message-filter-function'.
85a06df23a9a Import from CVS: tag r20-5b16
cvs
parents: 223
diff changeset
3516
85a06df23a9a Import from CVS: tag r20-5b16
cvs
parents: 223
diff changeset
3517 For use on `remove-message-hook'."
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3518 (when (and (not noninteractive)
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3519 (funcall log-message-filter-function label message))
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3520 (with-current-buffer (get-buffer-create " *Message-Log*")
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3521 (goto-char (point-max))
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3522 ;; (insert (concat (upcase (symbol-name label)) ": " message "\n"))
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3523 (insert message "\n")
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3524 (when (> (point-max) (max log-message-max-size (point-min)))
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3525 ;; trim log to ~90% of max size
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3526 (goto-char (max (- (point-max)
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3527 (truncate (* 0.9 log-message-max-size)))
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3528 (point-min)))
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3529 (forward-line 1)
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3530 (delete-region (point-min) (point))))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3531
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3532 (defun message-displayed-p (&optional return-string frame)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3533 "Return a non-nil value if a message is presently displayed in the\n\
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3534 minibuffer's echo area. If optional argument RETURN-STRING is non-nil,\n\
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3535 return a string containing the message, otherwise just return t."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3536 ;; by definition, a message is displayed if the echo area buffer is
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3537 ;; non-empty (see also echo_area_active()). It had better also
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3538 ;; be the case that message-stack is nil exactly when the echo area
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3539 ;; is non-empty.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3540 (let ((buffer (get-buffer " *Echo Area*")))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3541 (and (< (point-min buffer) (point-max buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3542 (if return-string
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3543 (buffer-substring nil nil buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3544 t))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3545
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3546 ;;; Returns the string which remains in the echo area, or nil if none.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3547 ;;; If label is nil, the whole message stack is cleared.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3548 (defun clear-message (&optional label frame stdout-p no-restore)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3549 "Remove any message with the given LABEL from the message-stack,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3550 erasing it from the echo area if it's currently displayed there.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3551 If a message remains at the head of the message-stack and NO-RESTORE
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3552 is nil, it will be displayed. The string which remains in the echo
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3553 area will be returned, or nil if the message-stack is now empty.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3554 If LABEL is nil, the entire message-stack is cleared.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3555
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3556 Unless you need the return value or you need to specify a label,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3557 you should just use (message nil)."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3558 (or frame (setq frame (selected-frame)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3559 (let ((clear-stream (and message-stack (eq 'stream (frame-type frame)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3560 (remove-message label frame)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3561 (let ((buffer (get-buffer " *Echo Area*"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3562 (inhibit-read-only t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3563 (zmacs-region-stays zmacs-region-stays)) ; preserve from change
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3564 (erase-buffer buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3565 (if clear-stream
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3566 (send-string-to-terminal ?\n stdout-p))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3567 (if no-restore
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3568 nil ; just preparing to put another msg up
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3569 (if message-stack
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3570 (let ((oldmsg (cdr (car message-stack))))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3571 (raw-append-message oldmsg frame stdout-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3572 oldmsg)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3573 ;; ### should we (redisplay-echo-area) here? messes some things up.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3574 nil))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3575
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3576 (defun remove-message (&optional label frame)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3577 ;; If label is nil, we want to remove all matching messages.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3578 ;; Must reverse the stack first to log them in the right order.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3579 (let ((log nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3580 (while (and message-stack
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3581 (or (null label) ; null label means clear whole stack
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3582 (eq label (car (car message-stack)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3583 (setq log (cons (car message-stack) log))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3584 (setq message-stack (cdr message-stack)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3585 (let ((s message-stack))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3586 (while (cdr s)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3587 (let ((msg (car (cdr s))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3588 (if (eq label (car msg))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3589 (progn
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3590 (setq log (cons msg log))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3591 (setcdr s (cdr (cdr s))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3592 (setq s (cdr s))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3593 ;; (possibly) log each removed message
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3594 (while log
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3595 (condition-case e
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3596 (run-hook-with-args 'remove-message-hook
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3597 (car (car log)) (cdr (car log)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3598 (error (setq remove-message-hook nil)
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3599 (lwarn 'message-log 'warning
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3600 "Error caught in `remove-message-hook': %s"
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3601 (error-message-string e))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3602 (let ((inhibit-read-only t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3603 (erase-buffer (get-buffer " *Echo Area*")))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3604 (signal (car e) (cdr e))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3605 (setq log (cdr log)))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3606
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3607 (defun append-message (label message &optional frame stdout-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3608 (or frame (setq frame (selected-frame)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3609 ;; add a new entry to the message-stack, or modify an existing one
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3610 (let ((top (car message-stack)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3611 (if (eq label (car top))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3612 (setcdr top (concat (cdr top) message))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3613 (setq message-stack (cons (cons label message) message-stack))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3614 (raw-append-message message frame stdout-p))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3615
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3616 ;; really append the message to the echo area. no fiddling with message-stack.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3617 (defun raw-append-message (message &optional frame stdout-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3618 (if (eq message "") nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3619 (let ((buffer (get-buffer " *Echo Area*"))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3620 (zmacs-region-stays zmacs-region-stays)) ; preserve from change
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3621 (with-current-buffer buffer
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3622 (let ((inhibit-read-only t))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3623 (insert message)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3624 ;; Conditionalizing on the device type in this way is not that clean,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3625 ;; but neither is having a device method, as I originally implemented
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3626 ;; it: all non-stream devices behave in the same way. Perhaps
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3627 ;; the cleanest way is to make the concept of a "redisplayable"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3628 ;; device, which stream devices are not. Look into this more if
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3629 ;; we ever create another non-redisplayable device type (e.g.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3630 ;; processes? printers?).
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3631
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3632 ;; Don't redisplay the echo area if we are executing a macro.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3633 (if (not executing-kbd-macro)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3634 (if (eq 'stream (frame-type frame))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3635 (send-string-to-terminal message stdout-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3636 (redisplay-echo-area))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3637
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3638 (defun display-message (label message &optional frame stdout-p)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3639 "Print a one-line message at the bottom of the frame. First argument
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3640 LABEL is an identifier for this message. MESSAGE is the string to display.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3641 Use `clear-message' to remove a labelled message.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3642
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3643 Here are some standard labels (those marked with `*' are not logged
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3644 by default--see the `log-message-ignore-labels' variable):
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3645 message default label used by the `message' function
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3646 error default label used for reporting errors
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3647 * progress progress indicators like \"Converting... 45%\"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3648 * prompt prompt-like messages like \"I-search: foo\"
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 219
diff changeset
3649 * command helper command messages like \"Mark set\"
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3650 * no-log messages that should never be logged"
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3651 (clear-message label frame stdout-p t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3652 (append-message label message frame stdout-p))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3653
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3654 (defun current-message (&optional frame)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3655 "Returns the current message in the echo area, or nil.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3656 The FRAME argument is currently unused."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3657 (cdr (car message-stack)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3658
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3659 ;;; may eventually be frame-dependent
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3660 (defun current-message-label (&optional frame)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3661 (car (car message-stack)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3662
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3663 (defun message (fmt &rest args)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3664 "Print a one-line message at the bottom of the frame.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3665 The arguments are the same as to `format'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3666
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3667 If the only argument is nil, clear any existing message; let the
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3668 minibuffer contents show."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3669 ;; questionable junk in the C code
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3670 ;; (if (framep default-minibuffer-frame)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3671 ;; (make-frame-visible default-minibuffer-frame))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3672 (if (and (null fmt) (null args))
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3673 (prog1 nil
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3674 (clear-message nil))
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3675 (let ((str (apply 'format fmt args)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3676 (display-message 'message str)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3677 str)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3678
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3679 (defun lmessage (label fmt &rest args)
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3680 "Print a one-line message at the bottom of the frame.
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3681 First argument LABEL is an identifier for this message. The rest of the
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3682 arguments are the same as to `format'.
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3683
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3684 See `display-message' for a list of standard labels."
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3685 (if (and (null fmt) (null args))
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3686 (prog1 nil
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3687 (clear-message label nil))
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3688 (let ((str (apply 'format fmt args)))
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3689 (display-message label str)
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3690 str)))
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3691
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3692
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3693 ;;;;;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3694 ;;;;;; warning stuff
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3695 ;;;;;;
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3696
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3697 (defcustom log-warning-minimum-level 'info
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3698 "Minimum level of warnings that should be logged.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3699 The warnings in levels below this are completely ignored, as if they never
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3700 happened.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3701
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3702 The recognized warning levels, in decreasing order of priority, are
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3703 'emergency, 'alert, 'critical, 'error, 'warning, 'notice, 'info, and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3704 'debug.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3705
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3706 See also `display-warning-minimum-level'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3707
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3708 You can also control which warnings are displayed on a class-by-class
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3709 basis. See `display-warning-suppressed-classes' and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3710 `log-warning-suppressed-classes'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3711 :type '(choice (const emergency) (const alert) (const critical)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3712 (const error) (const warning) (const notice)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3713 (const info) (const debug))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3714 :group 'warnings)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3715
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3716 (defcustom display-warning-minimum-level 'info
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3717 "Minimum level of warnings that should be displayed.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3718 The warnings in levels below this are completely ignored, as if they never
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3719 happened.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3720
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3721 The recognized warning levels, in decreasing order of priority, are
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3722 'emergency, 'alert, 'critical, 'error, 'warning, 'notice, 'info, and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3723 'debug.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3724
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3725 See also `log-warning-minimum-level'.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3726
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3727 You can also control which warnings are displayed on a class-by-class
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3728 basis. See `display-warning-suppressed-classes' and
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3729 `log-warning-suppressed-classes'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3730 :type '(choice (const emergency) (const alert) (const critical)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3731 (const error) (const warning) (const notice)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3732 (const info) (const debug))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3733 :group 'warnings)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3734
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3735 (defvar log-warning-suppressed-classes nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3736 "List of classes of warnings that shouldn't be logged or displayed.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3737 If any of the CLASS symbols associated with a warning is the same as
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3738 any of the symbols listed here, the warning will be completely ignored,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3739 as it they never happened.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3740
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3741 NOTE: In most circumstances, you should *not* set this variable.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3742 Set `display-warning-suppressed-classes' instead. That way the suppressed
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3743 warnings are not displayed but are still unobtrusively logged.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3744
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3745 See also `log-warning-minimum-level' and `display-warning-minimum-level'.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3746
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3747 (defcustom display-warning-suppressed-classes nil
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3748 "List of classes of warnings that shouldn't be displayed.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3749 If any of the CLASS symbols associated with a warning is the same as
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3750 any of the symbols listed here, the warning will not be displayed.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3751 The warning will still logged in the *Warnings* buffer (unless also
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3752 contained in `log-warning-suppressed-classes'), but the buffer will
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3753 not be automatically popped up.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3754
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3755 See also `log-warning-minimum-level' and `display-warning-minimum-level'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3756 :type '(repeat symbol)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3757 :group 'warnings)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3758
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3759 (defvar warning-count 0
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3760 "Count of the number of warning messages displayed so far.")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3761
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3762 (defconst warning-level-alist '((emergency . 8)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3763 (alert . 7)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3764 (critical . 6)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3765 (error . 5)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3766 (warning . 4)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3767 (notice . 3)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3768 (info . 2)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3769 (debug . 1)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3770
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3771 (defun warning-level-p (level)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3772 "Non-nil if LEVEL specifies a warning level."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3773 (and (symbolp level) (assq level warning-level-alist)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3774
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3775 ;; If you're interested in rewriting this function, be aware that it
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3776 ;; could be called at arbitrary points in a Lisp program (when a
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3777 ;; built-in function wants to issue a warning, it will call out to
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3778 ;; this function the next time some Lisp code is evaluated). Therefore,
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3779 ;; this function *must* not permanently modify any global variables
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3780 ;; (e.g. the current buffer) except those that specifically apply
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3781 ;; to the warning system.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3782
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3783 (defvar before-init-deferred-warnings nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3784
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3785 (defun after-init-display-warnings ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3786 "Display warnings deferred till after the init file is run.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3787 Warnings that occur before then are deferred so that warning
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3788 suppression in the .emacs file will be honored."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3789 (while before-init-deferred-warnings
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3790 (apply 'display-warning (car before-init-deferred-warnings))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3791 (setq before-init-deferred-warnings
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3792 (cdr before-init-deferred-warnings))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3793
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3794 #-infodock (add-hook 'after-init-hook 'after-init-display-warnings)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3795
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3796 (defun display-warning (class message &optional level)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3797 "Display a warning message.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3798 CLASS should be a symbol describing what sort of warning this is, such
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3799 as `resource' or `key-mapping'. A list of such symbols is also
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3800 accepted. (Individual classes can be suppressed; see
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3801 `display-warning-suppressed-classes'.) Optional argument LEVEL can
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3802 be used to specify a priority for the warning, other than default priority
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3803 `warning'. (See `display-warning-minimum-level'). The message is
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3804 inserted into the *Warnings* buffer, which is made visible at appropriate
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3805 times."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3806 (or level (setq level 'warning))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3807 (or (listp class) (setq class (list class)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3808 (check-argument-type 'warning-level-p level)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3809 (if (and (not (featurep 'infodock))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3810 (not init-file-loaded))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3811 (setq before-init-deferred-warnings
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3812 (cons (list class message level) before-init-deferred-warnings))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3813 (catch 'ignored
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3814 (let ((display-p t)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3815 (level-num (cdr (assq level warning-level-alist))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3816 (if (< level-num (cdr (assq log-warning-minimum-level
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3817 warning-level-alist)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3818 (throw 'ignored nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3819 (if (intersection class log-warning-suppressed-classes)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3820 (throw 'ignored nil))
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3821
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3822 (if (< level-num (cdr (assq display-warning-minimum-level
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3823 warning-level-alist)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3824 (setq display-p nil))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3825 (if (and display-p
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3826 (intersection class display-warning-suppressed-classes))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3827 (setq display-p nil))
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3828 (let ((buffer (get-buffer-create "*Warnings*")))
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3829 (when display-p
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3830 ;; The C code looks at display-warning-tick to determine
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3831 ;; when it should call `display-warning-buffer'. Change it
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3832 ;; to get the C code's attention.
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3833 (incf display-warning-tick))
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3834 (with-current-buffer buffer
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3835 (goto-char (point-max))
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3836 (incf warning-count)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3837 (princ (format "(%d) (%s/%s) "
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3838 warning-count
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3839 (mapconcat 'symbol-name class ",")
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3840 level)
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3841 buffer)
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3842 (princ message buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3843 (terpri buffer)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3844 (terpri buffer)))))))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3845
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3846 (defun warn (&rest args)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3847 "Display a warning message.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3848 The message is constructed by passing all args to `format'. The message
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3849 is placed in the *Warnings* buffer, which will be popped up at the next
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3850 redisplay. The class of the warning is `warning'. See also
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3851 `display-warning'."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3852 (display-warning 'warning (apply 'format args)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3853
219
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3854 (defun lwarn (class level &rest args)
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3855 "Display a labeled warning message.
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3856 CLASS should be a symbol describing what sort of warning this is, such
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3857 as `resource' or `key-mapping'. A list of such symbols is also
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3858 accepted. (Individual classes can be suppressed; see
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3859 `display-warning-suppressed-classes'.) If non-nil, LEVEL can be used
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3860 to specify a priority for the warning, other than default priority
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3861 `warning'. (See `display-warning-minimum-level'). The message is
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3862 inserted into the *Warnings* buffer, which is made visible at appropriate
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3863 times.
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3864
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3865 The rest of the arguments are passed to `format'."
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3866 (display-warning class (apply 'format args)
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3867 (or level 'warning)))
262b8bb4a523 Import from CVS: tag r20-4b8
cvs
parents: 215
diff changeset
3868
209
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3869 (defvar warning-marker nil)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3870
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3871 ;; When this function is called by the C code, all non-local exits are
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3872 ;; trapped and C-g is inhibited; therefore, it would be a very, very
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3873 ;; bad idea for this function to get into an infinite loop.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3874
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3875 (defun display-warning-buffer ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3876 "Make the buffer that contains the warnings be visible.
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3877 The C code calls this periodically, right before redisplay."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3878 (let ((buffer (get-buffer-create "*Warnings*")))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3879 (when (or (not warning-marker)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3880 (not (eq (marker-buffer warning-marker) buffer)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3881 (setq warning-marker (make-marker))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3882 (set-marker warning-marker 1 buffer))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3883 (set-window-start (display-buffer buffer) warning-marker)
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3884 (set-marker warning-marker (point-max buffer) buffer)))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3885
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3886 (defun emacs-name ()
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3887 "Return the printable name of this instance of Emacs."
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3888 (cond ((featurep 'infodock) "InfoDock")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3889 ((featurep 'xemacs) "XEmacs")
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3890 (t "Emacs")))
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3891
41ff10fd062f Import from CVS: tag r20-4b3
cvs
parents:
diff changeset
3892 ;;; simple.el ends here