simple.el 137 KB
Newer Older
Eric S. Raymond's avatar
Eric S. Raymond committed
1 2
;;; simple.el --- basic editing commands for Emacs

3 4
;; Copyright (C) 1985, 86, 87, 93, 94, 95, 96, 1997
;;        Free Software Foundation, Inc.
Jim Blandy's avatar
Jim Blandy committed
5 6 7 8 9

;; This file is part of GNU Emacs.

;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
Eric S. Raymond's avatar
Eric S. Raymond committed
10
;; the Free Software Foundation; either version 2, or (at your option)
Jim Blandy's avatar
Jim Blandy committed
11 12 13 14 15 16 17 18
;; any later version.

;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
Erik Naggum's avatar
Erik Naggum committed
19 20 21
;; along with GNU Emacs; see the file COPYING.  If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
Jim Blandy's avatar
Jim Blandy committed
22

23 24 25 26 27
;;; Commentary:

;; A grab-bag of basic Emacs commands not specifically related to some
;; major mode or to file-handling.

Eric S. Raymond's avatar
Eric S. Raymond committed
28
;;; Code:
Jim Blandy's avatar
Jim Blandy committed
29

30 31 32 33 34 35 36 37 38 39 40 41 42 43
(defgroup killing nil
  "Killing and yanking commands"
  :group 'editing)

(defgroup fill-comments nil
  "Indenting and filling of comments."
  :prefix "comment-"
  :group 'fill)

(defgroup paren-matching nil
  "Highlight (un)matching of parens and expressions."
  :group 'matching)


44
(defun newline (&optional arg)
45
  "Insert a newline, and move to left margin of the new line if it's blank.
46 47 48 49
The newline is marked with the text-property `hard'.
With arg, insert that many newlines.
In Auto Fill mode, if no numeric arg, break the preceding line if it's long."
  (interactive "*P")
50
  (barf-if-buffer-read-only)
51 52 53 54 55 56
  ;; Inserting a newline at the end of a line produces better redisplay in
  ;; try_window_id than inserting at the beginning of a line, and the textual
  ;; result is the same.  So, if we're at beginning of line, pretend to be at
  ;; the end of the previous line.
  (let ((flag (and (not (bobp)) 
		   (bolp)
57 58 59 60 61 62
		   ;; Make sure no functions want to be told about
		   ;; the range of the changes.
		   (not after-change-function)
		   (not before-change-function)
		   (not after-change-functions)
		   (not before-change-functions)
63 64
		   ;; Make sure there are no markers here.
		   (not (buffer-has-markers-at (1- (point))))
65 66 67 68 69 70
		   ;; Make sure no text properties want to know
		   ;; where the change was.
		   (not (get-char-property (1- (point)) 'modification-hooks))
		   (not (get-char-property (1- (point)) 'insert-behind-hooks))
		   (or (eobp)
		       (not (get-char-property (point) 'insert-in-front-hooks)))
71 72 73 74 75 76 77 78
		   ;; Make sure the newline before point isn't intangible.
		   (not (get-char-property (1- (point)) 'intangible))
		   ;; Make sure the newline before point isn't read-only.
		   (not (get-char-property (1- (point)) 'read-only))
		   ;; Make sure the newline before point isn't invisible.
		   (not (get-char-property (1- (point)) 'invisible))
		   ;; Make sure the newline before point has the same
		   ;; properties as the char before it (if any).
79
		   (< (or (previous-property-change (point)) -2) 
80 81 82 83
		      (- (point) 2))))
	(was-page-start (and (bolp)
			     (looking-at page-delimiter)))
	(beforepos (point)))
84 85 86 87 88
    (if flag (backward-char 1))
    ;; Call self-insert so that auto-fill, abbrev expansion etc. happens.
    ;; Set last-command-char to tell self-insert what to insert.
    (let ((last-command-char ?\n)
	  ;; Don't auto-fill if we have a numeric argument.
89 90 91
	  ;; Also not if flag is true (it would fill wrong line);
	  ;; there is no need to since we're at BOL.
	  (auto-fill-function (if (or arg flag) nil auto-fill-function)))
92 93 94 95 96 97
      (unwind-protect
	  (self-insert-command (prefix-numeric-value arg))
	;; If we get an error in self-insert-command, put point at right place.
	(if flag (forward-char 1))))
    ;; If we did *not* get an error, cancel that forward-char.
    (if flag (backward-char 1))
98 99
    ;; Mark the newline(s) `hard'.
    (if use-hard-newlines
100 101
	(set-hard-newline-properties 
	 (- (point) (if arg (prefix-numeric-value arg) 1)) (point)))
102 103 104 105 106 107 108 109 110 111 112 113 114 115 116
    ;; If the newline leaves the previous line blank,
    ;; and we have a left margin, delete that from the blank line.
    (or flag
	(save-excursion
	  (goto-char beforepos)
	  (beginning-of-line)
	  (and (looking-at "[ \t]$")
	       (> (current-left-margin) 0)
	       (delete-region (point) (progn (end-of-line) (point))))))
    (if flag (forward-char 1))
    ;; Indent the line after the newline, except in one case:
    ;; when we added the newline at the beginning of a line
    ;; which starts a page.
    (or was-page-start
	(move-to-left-margin nil t)))
117 118
  nil)

119 120 121 122 123 124 125 126
(defun set-hard-newline-properties (from to)
  (let ((sticky (get-text-property from 'rear-nonsticky)))
    (put-text-property from to 'hard 't)
    ;; If rear-nonsticky is not "t", add 'hard to rear-nonsticky list
    (if (and (listp sticky) (not (memq 'hard sticky)))
	(put-text-property from (point) 'rear-nonsticky
			   (cons 'hard sticky)))))

Jim Blandy's avatar
Jim Blandy committed
127
(defun open-line (arg)
128
  "Insert a newline and leave point before it.
129
If there is a fill prefix and/or a left-margin, insert them on the new line
130
if the line would have been blank.
131
With arg N, insert N newlines."
Jim Blandy's avatar
Jim Blandy committed
132
  (interactive "*p")
133
  (let* ((do-fill-prefix (and fill-prefix (bolp)))
134
	 (do-left-margin (and (bolp) (> (current-left-margin) 0)))
135
	 (loc (point)))
136 137
    (newline arg)
    (goto-char loc)
138
    (while (> arg 0)
139 140 141 142
      (cond ((bolp)
	     (if do-left-margin (indent-to (current-left-margin)))
	     (if do-fill-prefix (insert-and-inherit fill-prefix))))
      (forward-line 1)
143
      (setq arg (1- arg)))
144 145
    (goto-char loc)
    (end-of-line)))
Jim Blandy's avatar
Jim Blandy committed
146 147 148 149 150 151 152

(defun split-line ()
  "Split current line, moving portion beyond point vertically down."
  (interactive "*")
  (skip-chars-forward " \t")
  (let ((col (current-column))
	(pos (point)))
153
    (newline 1)
Jim Blandy's avatar
Jim Blandy committed
154 155 156 157 158
    (indent-to col 0)
    (goto-char pos)))

(defun quoted-insert (arg)
  "Read next input character and insert it.
159
This is useful for inserting control characters.
160 161 162

If the first character you type after this command is an octal digit,
you should type a sequence of octal digits which specify a character code.
163
Any nondigit terminates the sequence.  If the terminator is a RET,
164
it is discarded; any other terminator is used itself as input.
165 166
The variable `read-quoted-char-radix' specifies the radix for this feature;
set it to 10 or 16 to use decimal or hex instead of octal.
167 168 169 170 171 172 173

In overwrite mode, this function inserts the character anyway, and
does not handle octal digits specially.  This means that if you use
overwrite as your normal editing mode, you can use this function to
insert characters when necessary.

In binary overwrite mode, this function does overwrite, and octal
174 175
digits are interpreted as a character code.  This is intended to be
useful for editing binary files."
Jim Blandy's avatar
Jim Blandy committed
176
  (interactive "*p")
177 178 179 180
  (let ((char (if (or (not overwrite-mode)
		      (eq overwrite-mode 'overwrite-mode-binary))
		  (read-quoted-char)
		(read-char))))
181 182 183 184 185
    ;; Assume character codes 0200 - 0377 stand for 
    ;; European characters in Latin-1, and convert them
    ;; to Emacs characters.
    (and enable-multibyte-characters
	 (>= char ?\200)
186
	 (<= char ?\377)
187
	 (setq char (+ nonascii-insert-offset char)))
188 189 190 191 192 193
    (if (> arg 0)
	(if (eq overwrite-mode 'overwrite-mode-binary)
	    (delete-char arg)))
    (while (> arg 0)
      (insert-and-inherit char)
      (setq arg (1- arg)))))
Jim Blandy's avatar
Jim Blandy committed
194 195 196

(defun delete-indentation (&optional arg)
  "Join this line to previous and fix up whitespace at join.
197
If there is a fill prefix, delete it from the beginning of this line.
Jim Blandy's avatar
Jim Blandy committed
198 199 200 201 202 203 204
With argument, join this line to following line."
  (interactive "*P")
  (beginning-of-line)
  (if arg (forward-line 1))
  (if (eq (preceding-char) ?\n)
      (progn
	(delete-region (point) (1- (point)))
205 206 207
	;; If the second line started with the fill prefix,
	;; delete the prefix.
	(if (and fill-prefix
208
		 (<= (+ (point) (length fill-prefix)) (point-max))
209 210 211 212
		 (string= fill-prefix
			  (buffer-substring (point)
					    (+ (point) (length fill-prefix)))))
	    (delete-region (point) (+ (point) (length fill-prefix))))
Jim Blandy's avatar
Jim Blandy committed
213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244
	(fixup-whitespace))))

(defun fixup-whitespace ()
  "Fixup white space between objects around point.
Leave one space or none, according to the context."
  (interactive "*")
  (save-excursion
    (delete-horizontal-space)
    (if (or (looking-at "^\\|\\s)")
	    (save-excursion (forward-char -1)
			    (looking-at "$\\|\\s(\\|\\s'")))
	nil
      (insert ?\ ))))

(defun delete-horizontal-space ()
  "Delete all spaces and tabs around point."
  (interactive "*")
  (skip-chars-backward " \t")
  (delete-region (point) (progn (skip-chars-forward " \t") (point))))

(defun just-one-space ()
  "Delete all spaces and tabs around point, leaving one space."
  (interactive "*")
  (skip-chars-backward " \t")
  (if (= (following-char) ? )
      (forward-char 1)
    (insert ? ))
  (delete-region (point) (progn (skip-chars-forward " \t") (point))))

(defun delete-blank-lines ()
  "On blank line, delete all surrounding blank lines, leaving just one.
On isolated blank line, delete that one.
245
On nonblank line, delete any immediately following blank lines."
Jim Blandy's avatar
Jim Blandy committed
246 247 248 249 250
  (interactive "*")
  (let (thisblank singleblank)
    (save-excursion
      (beginning-of-line)
      (setq thisblank (looking-at "[ \t]*$"))
Jim Blandy's avatar
Jim Blandy committed
251
      ;; Set singleblank if there is just one blank line here.
Jim Blandy's avatar
Jim Blandy committed
252 253 254 255 256 257
      (setq singleblank
	    (and thisblank
		 (not (looking-at "[ \t]*\n[ \t]*$"))
		 (or (bobp)
		     (progn (forward-line -1)
			    (not (looking-at "[ \t]*$")))))))
Jim Blandy's avatar
Jim Blandy committed
258
    ;; Delete preceding blank lines, and this one too if it's the only one.
Jim Blandy's avatar
Jim Blandy committed
259 260 261 262 263 264 265 266
    (if thisblank
	(progn
	  (beginning-of-line)
	  (if singleblank (forward-line 1))
	  (delete-region (point)
			 (if (re-search-backward "[^ \t\n]" nil t)
			     (progn (forward-line 1) (point))
			   (point-min)))))
Jim Blandy's avatar
Jim Blandy committed
267 268
    ;; Delete following blank lines, unless the current line is blank
    ;; and there are no following blank lines.
Jim Blandy's avatar
Jim Blandy committed
269 270 271 272 273 274 275
    (if (not (and thisblank singleblank))
	(save-excursion
	  (end-of-line)
	  (forward-line 1)
	  (delete-region (point)
			 (if (re-search-forward "[^ \t\n]" nil t)
			     (progn (beginning-of-line) (point))
Jim Blandy's avatar
Jim Blandy committed
276 277 278 279 280
			   (point-max)))))
    ;; Handle the special case where point is followed by newline and eob.
    ;; Delete the line, leaving point at eob.
    (if (looking-at "^[ \t]*\n\\'")
	(delete-region (point) (point-max)))))
Jim Blandy's avatar
Jim Blandy committed
281 282 283 284 285 286 287 288 289

(defun back-to-indentation ()
  "Move point to the first non-whitespace character on this line."
  (interactive)
  (beginning-of-line 1)
  (skip-chars-forward " \t"))

(defun newline-and-indent ()
  "Insert a newline, then indent according to major mode.
290
Indentation is done using the value of `indent-line-function'.
Jim Blandy's avatar
Jim Blandy committed
291
In programming language modes, this is the same as TAB.
292
In some text modes, where TAB inserts a tab, this command indents to the
293
column specified by the function `current-left-margin'."
Jim Blandy's avatar
Jim Blandy committed
294 295
  (interactive "*")
  (delete-region (point) (progn (skip-chars-backward " \t") (point)))
Jim Blandy's avatar
Jim Blandy committed
296
  (newline)
Jim Blandy's avatar
Jim Blandy committed
297 298 299 300 301
  (indent-according-to-mode))

(defun reindent-then-newline-and-indent ()
  "Reindent current line, insert newline, then indent the new line.
Indentation of both lines is done according to the current major mode,
302
which means calling the current value of `indent-line-function'.
Jim Blandy's avatar
Jim Blandy committed
303 304
In programming language modes, this is the same as TAB.
In some text modes, where TAB inserts a tab, this indents to the
305
column specified by the function `current-left-margin'."
Jim Blandy's avatar
Jim Blandy committed
306 307 308 309
  (interactive "*")
  (save-excursion
    (delete-region (point) (progn (skip-chars-backward " \t") (point)))
    (indent-according-to-mode))
Jim Blandy's avatar
Jim Blandy committed
310
  (newline)
Jim Blandy's avatar
Jim Blandy committed
311 312
  (indent-according-to-mode))

313 314 315 316
;; Internal subroutine of delete-char
(defun kill-forward-chars (arg)
  (if (listp arg) (setq arg (car arg)))
  (if (eq arg '-) (setq arg -1))
317
  (kill-region (point) (forward-point arg)))
318 319 320 321 322

;; Internal subroutine of backward-delete-char
(defun kill-backward-chars (arg)
  (if (listp arg) (setq arg (car arg)))
  (if (eq arg '-) (setq arg -1))
323
  (kill-region (point) (forward-point (- arg))))
324

Jim Blandy's avatar
Jim Blandy committed
325 326 327 328
(defun backward-delete-char-untabify (arg &optional killp)
  "Delete characters backward, changing tabs into spaces.
Delete ARG chars, and kill (save in kill ring) if KILLP is non-nil.
Interactively, ARG is the prefix arg (default 1)
329
and KILLP is t if a prefix arg was specified."
Jim Blandy's avatar
Jim Blandy committed
330 331 332 333 334 335 336 337 338 339 340 341
  (interactive "*p\nP")
  (let ((count arg))
    (save-excursion
      (while (and (> count 0) (not (bobp)))
	(if (= (preceding-char) ?\t)
	    (let ((col (current-column)))
	      (forward-char -1)
	      (setq col (- col (current-column)))
	      (insert-char ?\ col)
	      (delete-char 1)))
	(forward-char -1)
	(setq count (1- count)))))
342
  (delete-backward-char arg killp))
Jim Blandy's avatar
Jim Blandy committed
343 344 345 346 347 348 349 350 351 352 353 354

(defun zap-to-char (arg char)
  "Kill up to and including ARG'th occurrence of CHAR.
Goes backward if ARG is negative; error if CHAR not found."
  (interactive "p\ncZap to char: ")
  (kill-region (point) (progn
			 (search-forward (char-to-string char) nil nil arg)
;			 (goto-char (if (> arg 0) (1- (point)) (1+ (point))))
			 (point))))

(defun beginning-of-buffer (&optional arg)
  "Move point to the beginning of the buffer; leave mark at previous position.
355 356 357 358
With arg N, put point N/10 of the way from the beginning.

If the buffer is narrowed, this command uses the beginning and size
of the accessible part of the buffer.
359 360

Don't use this command in Lisp programs!
Jim Blandy's avatar
Jim Blandy committed
361 362 363
\(goto-char (point-min)) is faster and avoids clobbering the mark."
  (interactive "P")
  (push-mark)
364 365 366 367 368 369 370 371 372
  (let ((size (- (point-max) (point-min))))
    (goto-char (if arg
		   (+ (point-min)
		      (if (> size 10000)
			  ;; Avoid overflow for large buffer sizes!
			  (* (prefix-numeric-value arg)
			     (/ size 10))
			(/ (+ 10 (* size (prefix-numeric-value arg))) 10)))
		 (point-min))))
Jim Blandy's avatar
Jim Blandy committed
373 374 375 376
  (if arg (forward-line 1)))

(defun end-of-buffer (&optional arg)
  "Move point to the end of the buffer; leave mark at previous position.
377 378 379 380
With arg N, put point N/10 of the way from the end.

If the buffer is narrowed, this command uses the beginning and size
of the accessible part of the buffer.
381 382

Don't use this command in Lisp programs!
Jim Blandy's avatar
Jim Blandy committed
383 384 385
\(goto-char (point-max)) is faster and avoids clobbering the mark."
  (interactive "P")
  (push-mark)
386 387 388 389 390 391 392 393 394
  (let ((size (- (point-max) (point-min))))
    (goto-char (if arg
		   (- (point-max)
		      (if (> size 10000)
			  ;; Avoid overflow for large buffer sizes!
			  (* (prefix-numeric-value arg)
			     (/ size 10))
			(/ (* size (prefix-numeric-value arg)) 10)))
		 (point-max))))
Eric S. Raymond's avatar
Eric S. Raymond committed
395 396
  ;; If we went to a place in the middle of the buffer,
  ;; adjust it to the beginning of a line.
Jim Blandy's avatar
Jim Blandy committed
397
  (if arg (forward-line 1)
Eric S. Raymond's avatar
Eric S. Raymond committed
398 399 400 401 402 403 404
    ;; If the end of the buffer is not already on the screen,
    ;; then scroll specially to put it near, but not at, the bottom.
    (if (let ((old-point (point)))
	  (save-excursion
		    (goto-char (window-start))
		    (vertical-motion (window-height))
		    (< (point) old-point)))
405 406 407
	(progn
	  (overlay-recenter (point))
	  (recenter -3)))))
Jim Blandy's avatar
Jim Blandy committed
408 409

(defun mark-whole-buffer ()
Jim Blandy's avatar
Jim Blandy committed
410 411 412 413
  "Put point at beginning and mark at end of buffer.
You probably should not use this function in Lisp programs;
it is usually a mistake for a Lisp function to use any subroutine
that uses or sets the mark."
Jim Blandy's avatar
Jim Blandy committed
414 415
  (interactive)
  (push-mark (point))
416
  (push-mark (point-max) nil t)
Jim Blandy's avatar
Jim Blandy committed
417 418 419
  (goto-char (point-min)))

(defun count-lines-region (start end)
420
  "Print number of lines and characters in the region."
Jim Blandy's avatar
Jim Blandy committed
421 422 423 424 425
  (interactive "r")
  (message "Region has %d lines, %d characters"
	   (count-lines start end) (- end start)))

(defun what-line ()
426
  "Print the current buffer line number and narrowed line number of point."
Jim Blandy's avatar
Jim Blandy committed
427
  (interactive)
428
  (let ((opoint (point)) start)
Jim Blandy's avatar
Jim Blandy committed
429
    (save-excursion
430 431 432 433 434 435 436 437 438 439 440 441 442
      (save-restriction
	(goto-char (point-min))
	(widen)
	(beginning-of-line)
	(setq start (point))
	(goto-char opoint)
	(beginning-of-line)
	(if (/= start 1)
	    (message "line %d (narrowed line %d)"
		     (1+ (count-lines 1 (point)))
		     (1+ (count-lines start (point))))
	  (message "Line %d" (1+ (count-lines 1 (point)))))))))

Jim Blandy's avatar
Jim Blandy committed
443 444 445 446

(defun count-lines (start end)
  "Return number of lines between START and END.
This is usually the number of newlines between them,
447
but can be one more if START is not equal to END
Jim Blandy's avatar
Jim Blandy committed
448
and the greater of them is not at the start of a line."
449 450 451 452 453 454
  (save-excursion
    (save-restriction
      (narrow-to-region start end)
      (goto-char (point-min))
      (if (eq selective-display t)
	  (save-match-data
455 456 457 458 459
	    (let ((done 0))
	      (while (re-search-forward "[\n\C-m]" nil t 40)
		(setq done (+ 40 done)))
	      (while (re-search-forward "[\n\C-m]" nil t 1)
		(setq done (+ 1 done)))
460 461 462 463
	      (goto-char (point-max))
	      (if (and (/= start end)
		       (not (bolp)))
		  (1+ done)
464 465
		done)))
	(- (buffer-size) (forward-line (buffer-size)))))))
Jim Blandy's avatar
Jim Blandy committed
466

467 468 469 470
(defun what-cursor-position (&optional detail)
  "Print info on cursor position (on screen and within buffer).
With prefix argument, print detailed info of a character on cursor position."
  (interactive "P")
Jim Blandy's avatar
Jim Blandy committed
471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489
  (let* ((char (following-char))
	 (beg (point-min))
	 (end (point-max))
         (pos (point))
	 (total (buffer-size))
	 (percent (if (> total 50000)
		      ;; Avoid overflow from multiplying by 100!
		      (/ (+ (/ total 200) (1- pos)) (max (/ total 100) 1))
		    (/ (+ (/ total 2) (* 100 (1- pos))) (max total 1))))
	 (hscroll (if (= (window-hscroll) 0)
		      ""
		    (format " Hscroll=%d" (window-hscroll))))
	 (col (current-column)))
    (if (= pos end)
	(if (or (/= beg 1) (/= end (1+ total)))
	    (message "point=%d of %d(%d%%) <%d - %d>  column %d %s"
		     pos total percent beg end col hscroll)
	  (message "point=%d of %d(%d%%)  column %d %s"
		   pos total percent col hscroll))
490 491 492 493 494 495 496 497 498 499 500 501
      (let ((str (if detail (format " %s" (split-char char)) "")))
	(if (or (/= beg 1) (/= end (1+ total)))
	    (message "Char: %s (0%o, %d, 0x%x) %s point=%d of %d(%d%%) <%d - %d>  column %d %s"
		     (if (< char 256)
			 (single-key-description char)
		       (char-to-string char))
		     char char char str pos total percent beg end col hscroll)
	  (message "Char: %s (0%o, %d, 0x%x)%s point=%d of %d(%d%%)  column %d %s"
		   (if (< char 256)
		       (single-key-description char)
		     (char-to-string char))
		   char char char str pos total percent col hscroll))))))
Jim Blandy's avatar
Jim Blandy committed
502 503 504 505 506 507 508

(defun fundamental-mode ()
  "Major mode not specialized for anything in particular.
Other major modes are defined by comparison with this one."
  (interactive)
  (kill-all-local-variables))

509
(defvar read-expression-map (cons 'keymap minibuffer-local-map)
510 511 512
  "Minibuffer keymap used for reading Lisp expressions.")
(define-key read-expression-map "\M-\t" 'lisp-complete-symbol)

513 514 515
(defvar read-expression-history nil)

;; We define this, rather than making `eval' interactive,
Jim Blandy's avatar
Jim Blandy committed
516
;; for the sake of completion of names like eval-region, eval-current-buffer.
517 518
(defun eval-expression (eval-expression-arg
			&optional eval-expression-insert-value)
Jim Blandy's avatar
Jim Blandy committed
519
  "Evaluate EXPRESSION and print value in minibuffer.
520
Value is also consed on to front of the variable `values'."
521
  (interactive
522 523
   (list (read-from-minibuffer "Eval: "
			       nil read-expression-map t
524 525
			       'read-expression-history)
	 current-prefix-arg))
526
  (setq values (cons (eval eval-expression-arg) values))
527 528
  (prin1 (car values)
	 (if eval-expression-insert-value (current-buffer) t)))
Jim Blandy's avatar
Jim Blandy committed
529 530 531 532 533

(defun edit-and-eval-command (prompt command)
  "Prompting with PROMPT, let user edit COMMAND and eval result.
COMMAND is a Lisp expression.  Let user edit that expression in
the minibuffer, then read and evaluate the result."
534 535 536 537
  (let ((command (read-from-minibuffer prompt
				       (prin1-to-string command)
				       read-expression-map t
				       '(command-history . 1))))
538
    ;; If command was added to command-history as a string,
539
    ;; get rid of that.  We want only evaluable expressions there.
540 541 542 543 544 545 546
    (if (stringp (car command-history))
	(setq command-history (cdr command-history)))

    ;; If command to be redone does not match front of history,
    ;; add it to the history.
    (or (equal command (car command-history))
	(setq command-history (cons command command-history)))
Jim Blandy's avatar
Jim Blandy committed
547 548
    (eval command)))

549
(defun repeat-complex-command (arg)
Jim Blandy's avatar
Jim Blandy committed
550 551 552 553 554 555
  "Edit and re-evaluate last complex command, or ARGth from last.
A complex command is one which used the minibuffer.
The command is placed in the minibuffer as a Lisp form for editing.
The result is executed, repeating the command as changed.
If the command has been changed or is not the most recent previous command
it is added to the front of the command history.
556 557
You can use the minibuffer history commands \\<minibuffer-local-map>\\[next-history-element] and \\[previous-history-element]
to get different commands to edit and resubmit."
Jim Blandy's avatar
Jim Blandy committed
558
  (interactive "p")
559
  (let ((elt (nth (1- arg) command-history))
Jim Blandy's avatar
Jim Blandy committed
560 561
	newcmd)
    (if elt
562
	(progn
563
	  (setq newcmd
564 565
		(let ((print-level nil)
		      (minibuffer-history-position arg)
566
		      (minibuffer-history-sexp-flag (1+ (minibuffer-depth))))
567 568 569
		  (read-from-minibuffer
		   "Redo: " (prin1-to-string elt) read-expression-map t
		   (cons 'command-history arg))))
570

571
	  ;; If command was added to command-history as a string,
572
	  ;; get rid of that.  We want only evaluable expressions there.
573 574 575 576 577 578 579
	  (if (stringp (car command-history))
	      (setq command-history (cdr command-history)))

	  ;; If command to be redone does not match front of history,
	  ;; add it to the history.
	  (or (equal newcmd (car command-history))
	      (setq command-history (cons newcmd command-history)))
Jim Blandy's avatar
Jim Blandy committed
580 581
	  (eval newcmd))
      (ding))))
582

583 584 585 586 587
(defvar minibuffer-history nil
  "Default minibuffer history list.
This is used for all minibuffer input
except when an alternate history list is specified.")
(defvar minibuffer-history-sexp-flag nil
588
  "Non-nil when doing history operations on `command-history'.
589
More generally, indicates that the history list being acted on
590 591 592
contains expressions rather than strings.
It is only valid if its value equals the current minibuffer depth,
to handle recursive uses of the minibuffer.")
593 594
(setq minibuffer-history-variable 'minibuffer-history)
(setq minibuffer-history-position nil)
595
(defvar minibuffer-history-search-history nil)
596

Jim Blandy's avatar
Jim Blandy committed
597
(mapcar
598 599 600 601 602 603 604 605 606 607
 (lambda (key-and-command)
   (mapcar
    (lambda (keymap-and-completionp)
      ;; Arg is (KEYMAP-SYMBOL . COMPLETION-MAP-P).
      ;; If the cdr of KEY-AND-COMMAND (the command) is a cons,
      ;; its car is used if COMPLETION-MAP-P is nil, its cdr if it is t.
      (define-key (symbol-value (car keymap-and-completionp))
	(car key-and-command)
	(let ((command (cdr key-and-command)))
	  (if (consp command)
608 609 610 611
	      ;; (and ... nil) => ... turns back on the completion-oriented
	      ;; history commands which rms turned off since they seem to
	      ;; do things he doesn't like.
	      (if (and (cdr keymap-and-completionp) nil) ;XXX turned off
612
		  (progn (error "EMACS BUG!") (cdr command))
613 614 615 616 617 618 619
		(car command))
	    command))))
    '((minibuffer-local-map . nil)
      (minibuffer-local-ns-map . nil)
      (minibuffer-local-completion-map . t)
      (minibuffer-local-must-match-map . t)
      (read-expression-map . nil))))
620 621 622 623
 '(("\en" . (next-history-element . next-complete-history-element))
   ([next] . (next-history-element . next-complete-history-element))
   ("\ep" . (previous-history-element . previous-complete-history-element))
   ([prior] . (previous-history-element . previous-complete-history-element))
Jim Blandy's avatar
Jim Blandy committed
624 625
   ("\er" . previous-matching-history-element)
   ("\es" . next-matching-history-element)))
626

627 628 629 630 631 632 633 634 635 636
(defvar minibuffer-text-before-history nil
  "Text that was in this minibuffer before any history commands.
This is nil if there have not yet been any history commands
in this use of the minibuffer.")

(add-hook 'minibuffer-setup-hook 'minibuffer-history-initialize)

(defun minibuffer-history-initialize ()
  (setq minibuffer-text-before-history nil))

637
(defun previous-matching-history-element (regexp n)
638 639 640 641 642
  "Find the previous history element that matches REGEXP.
\(Previous history elements refer to earlier actions.)
With prefix argument N, search for Nth previous match.
If N is negative, find the next or Nth next match."
  (interactive
643 644 645 646 647 648 649 650
   (let* ((enable-recursive-minibuffers t)
	  (regexp (read-from-minibuffer "Previous element matching (regexp): "
					nil
					minibuffer-local-map
					nil
					'minibuffer-history-search-history)))
     ;; Use the last regexp specified, by default, if input is empty.
     (list (if (string= regexp "")
651 652 653
	       (if minibuffer-history-search-history
		   (car minibuffer-history-search-history)
		 (error "No previous history search regexp"))
654
	     regexp)
655
	   (prefix-numeric-value current-prefix-arg))))
656 657 658
  (if (and (zerop minibuffer-history-position)
	   (null minibuffer-text-before-history))
      (setq minibuffer-text-before-history (buffer-string)))
659
  (let ((history (symbol-value minibuffer-history-variable))
660
	prevpos
661 662 663 664 665 666
	(pos minibuffer-history-position))
    (while (/= n 0)
      (setq prevpos pos)
      (setq pos (min (max 1 (+ pos (if (< n 0) -1 1))) (length history)))
      (if (= pos prevpos)
	  (error (if (= pos 1)
667 668
		     "No later matching history item"
		   "No earlier matching history item")))
669
      (if (string-match regexp
670 671
			(if (eq minibuffer-history-sexp-flag
				(minibuffer-depth))
672 673
			    (let ((print-level nil))
			      (prin1-to-string (nth (1- pos) history)))
674
			  (nth (1- pos) history)))
675
	  (setq n (+ n (if (< n 0) 1 -1)))))
676 677 678
    (setq minibuffer-history-position pos)
    (erase-buffer)
    (let ((elt (nth (1- pos) history)))
679
      (insert (if (eq minibuffer-history-sexp-flag (minibuffer-depth))
680 681
		  (let ((print-level nil))
		    (prin1-to-string elt))
682
		elt)))
683 684 685 686
      (goto-char (point-min)))
  (if (or (eq (car (car command-history)) 'previous-matching-history-element)
	  (eq (car (car command-history)) 'next-matching-history-element))
      (setq command-history (cdr command-history))))
687 688

(defun next-matching-history-element (regexp n)
689 690 691 692 693
  "Find the next history element that matches REGEXP.
\(The next history element refers to a more recent action.)
With prefix argument N, search for Nth next match.
If N is negative, find the previous or Nth previous match."
  (interactive
694 695 696 697 698 699 700 701 702 703 704
   (let* ((enable-recursive-minibuffers t)
	  (regexp (read-from-minibuffer "Next element matching (regexp): "
					nil
					minibuffer-local-map
					nil
					'minibuffer-history-search-history)))
     ;; Use the last regexp specified, by default, if input is empty.
     (list (if (string= regexp "")
	       (setcar minibuffer-history-search-history
		       (nth 1 minibuffer-history-search-history))
	     regexp)
705
	   (prefix-numeric-value current-prefix-arg))))
706
  (previous-matching-history-element regexp (- n)))
Jim Blandy's avatar
Jim Blandy committed
707

708 709
(defun next-history-element (n)
  "Insert the next element of the minibuffer history into the minibuffer."
Jim Blandy's avatar
Jim Blandy committed
710
  (interactive "p")
711
  (or (zerop n)
712 713 714 715 716 717 718 719 720 721 722 723 724 725 726
      (let ((narg (- minibuffer-history-position n))
	    (minimum (if minibuffer-default -1 0))
	    elt)
	(if (and (zerop minibuffer-history-position)
		 (null minibuffer-text-before-history))
	    (setq minibuffer-text-before-history (buffer-string)))
	(if (< narg minimum)
	    (error "End of history; no next item"))
	(if (> narg (length (symbol-value minibuffer-history-variable)))
	    (error "Beginning of history; no preceding item"))
	(erase-buffer)
	(setq minibuffer-history-position narg)
	(cond ((= narg -1)
	       (setq elt minibuffer-default))
	      ((= narg 0)
Richard M. Stallman's avatar
Richard M. Stallman committed
727
	       (setq elt (or minibuffer-text-before-history ""))
728 729 730 731
	       (setq minibuffer-text-before-history nil))
	      (t (setq elt (nth (1- minibuffer-history-position)
				(symbol-value minibuffer-history-variable)))))
	(insert
732
	 (if (eq minibuffer-history-sexp-flag (minibuffer-depth))
733 734 735 736
	     (let ((print-level nil))
	       (prin1-to-string elt))
	   elt))
	(goto-char (point-min)))))
Jim Blandy's avatar
Jim Blandy committed
737

738
(defun previous-history-element (n)
Richard M. Stallman's avatar
Richard M. Stallman committed
739
  "Inserts the previous element of the minibuffer history into the minibuffer."
Jim Blandy's avatar
Jim Blandy committed
740
  (interactive "p")
741
  (next-history-element (- n)))
742 743

(defun next-complete-history-element (n)
744
  "Get next element of history which is a completion of minibuffer contents."
745
  (interactive "p")
746 747 748 749 750 751 752
  (let ((point-at-start (point)))
    (next-matching-history-element
     (concat "^" (regexp-quote (buffer-substring (point-min) (point)))) n)
    ;; next-matching-history-element always puts us at (point-min).
    ;; Move to the position we were at before changing the buffer contents.
    ;; This is still sensical, because the text before point has not changed.
    (goto-char point-at-start)))
753 754

(defun previous-complete-history-element (n)
755 756
  "\
Get previous element of history which is a completion of minibuffer contents."
757 758
  (interactive "p")
  (next-complete-history-element (- n)))
759

Jim Blandy's avatar
Jim Blandy committed
760 761 762
(defun goto-line (arg)
  "Goto line ARG, counting from line 1 at beginning of buffer."
  (interactive "NGoto line: ")
763
  (setq arg (prefix-numeric-value arg))
Jim Blandy's avatar
Jim Blandy committed
764 765 766 767 768 769 770 771
  (save-restriction
    (widen)
    (goto-char 1)
    (if (eq selective-display t)
	(re-search-forward "[\n\C-m]" nil 'end (1- arg))
      (forward-line (1- arg)))))

;Put this on C-x u, so we can force that rather than C-_ into startup msg
772
(defalias 'advertised-undo 'undo)
Jim Blandy's avatar
Jim Blandy committed
773 774 775 776 777 778

(defun undo (&optional arg)
  "Undo some previous changes.
Repeat this command to undo more changes.
A numeric argument serves as a repeat count."
  (interactive "*p")
779 780 781
  ;; If we don't get all the way thru, make last-command indicate that
  ;; for the following command.
  (setq this-command t)
782 783
  (let ((modified (buffer-modified-p))
	(recent-save (recent-auto-save-p)))
Jim Blandy's avatar
Jim Blandy committed
784 785
    (or (eq (selected-window) (minibuffer-window))
	(message "Undo!"))
Jim Blandy's avatar
Jim Blandy committed
786 787 788 789
    (or (eq last-command 'undo)
	(progn (undo-start)
	       (undo-more 1)))
    (undo-more (or arg 1))
790 791 792 793 794 795 796 797 798 799
    ;; Don't specify a position in the undo record for the undo command.
    ;; Instead, undoing this should move point to where the change is.
    (let ((tail buffer-undo-list)
	  done)
      (while (and tail (not done) (not (null (car tail))))
	(if (integerp (car tail))
	    (progn
	      (setq done t)
	      (setq buffer-undo-list (delq (car tail) buffer-undo-list))))
	(setq tail (cdr tail))))
Jim Blandy's avatar
Jim Blandy committed
800
    (and modified (not (buffer-modified-p))
801 802 803
	 (delete-auto-save-file-if-necessary recent-save)))
  ;; If we do get all the way thru, make this-command indicate that.
  (setq this-command 'undo))
Jim Blandy's avatar
Jim Blandy committed
804

805 806 807
(defvar pending-undo-list nil
  "Within a run of consecutive undo commands, list remaining to be undone.")

Jim Blandy's avatar
Jim Blandy committed
808
(defun undo-start ()
809 810
  "Set `pending-undo-list' to the front of the undo list.
The next call to `undo-more' will undo the most recently made change."
Jim Blandy's avatar
Jim Blandy committed
811 812 813 814 815 816
  (if (eq buffer-undo-list t)
      (error "No undo information in this buffer"))
  (setq pending-undo-list buffer-undo-list))

(defun undo-more (count)
  "Undo back N undo-boundaries beyond what was already undone recently.
817 818
Call `undo-start' to get ready to undo recent changes,
then call `undo-more' one or more times to undo them."
Jim Blandy's avatar
Jim Blandy committed
819 820 821 822
  (or pending-undo-list
      (error "No further undo information"))
  (setq pending-undo-list (primitive-undo count pending-undo-list)))

823 824 825
(defvar shell-command-history nil
  "History list for some commands that read shell commands.")

826 827 828
(defvar shell-command-switch "-c"
  "Switch used to have the shell execute its command line argument.")

829
(defun shell-command (command &optional output-buffer)
Jim Blandy's avatar
Jim Blandy committed
830
  "Execute string COMMAND in inferior shell; display output, if any.
831

Jim Blandy's avatar
Jim Blandy committed
832
If COMMAND ends in ampersand, execute it asynchronously.
833
The output appears in the buffer `*Async Shell Command*'.
834
That buffer is in shell mode.
835

836 837
Otherwise, COMMAND is executed synchronously.  The output appears in the
buffer `*Shell Command Output*'.
838 839 840 841 842
If the output is one line, it is displayed in the echo area *as well*,
but it is nonetheless available in buffer `*Shell Command Output*',
even though that buffer is not automatically displayed.
If there is no output, or if output is inserted in the current buffer,
then `*Shell Command Output*' is deleted.
843

844 845 846 847 848 849 850
To specify a coding system for converting non-ASCII characters
in the shell command output, use \\[universal-coding-system-argument]
before this command.

Noninteractive callers can specify coding systems by binding
`coding-system-for-read' and `coding-system-for-write'.

851 852 853 854 855 856
The optional second argument OUTPUT-BUFFER, if non-nil,
says to put the output in some other buffer.
If OUTPUT-BUFFER is a buffer or buffer name, put the output there.
If OUTPUT-BUFFER is not a buffer and not nil,
insert output in current buffer.  (This cannot be done asynchronously.)
In either case, the output is inserted after point (leaving mark after it)."
857 858 859
  (interactive (list (read-from-minibuffer "Shell command: "
					   nil nil nil 'shell-command-history)
		     current-prefix-arg))
860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911
  ;; Look for a handler in case default-directory is a remote file name.
  (let ((handler
	 (find-file-name-handler (directory-file-name default-directory)
				 'shell-command)))
    (if handler
	(funcall handler 'shell-command command output-buffer)
      (if (and output-buffer
	       (not (or (bufferp output-buffer)  (stringp output-buffer))))
	  (progn (barf-if-buffer-read-only)
		 (push-mark)
		 ;; We do not use -f for csh; we will not support broken use of
		 ;; .cshrcs.  Even the BSD csh manual says to use
		 ;; "if ($?prompt) exit" before things which are not useful
		 ;; non-interactively.  Besides, if someone wants their other
		 ;; aliases for shell commands then they can still have them.
		 (call-process shell-file-name nil t nil
			       shell-command-switch command)
		 ;; This is like exchange-point-and-mark, but doesn't
		 ;; activate the mark.  It is cleaner to avoid activation,
		 ;; even though the command loop would deactivate the mark
		 ;; because we inserted text.
		 (goto-char (prog1 (mark t)
			      (set-marker (mark-marker) (point)
					  (current-buffer)))))
	;; Preserve the match data in case called from a program.
	(save-match-data
	  (if (string-match "[ \t]*&[ \t]*$" command)
	      ;; Command ending with ampersand means asynchronous.
	      (let ((buffer (get-buffer-create
			     (or output-buffer "*Async Shell Command*")))
		    (directory default-directory)
		    proc)
		;; Remove the ampersand.
		(setq command (substring command 0 (match-beginning 0)))
		;; If will kill a process, query first.
		(setq proc (get-buffer-process buffer))
		(if proc
		    (if (yes-or-no-p "A command is running.  Kill it? ")
			(kill-process proc)
		      (error "Shell command in progress")))
		(save-excursion
		  (set-buffer buffer)
		  (setq buffer-read-only nil)
		  (erase-buffer)
		  (display-buffer buffer)
		  (setq default-directory directory)
		  (setq proc (start-process "Shell" buffer shell-file-name 
					    shell-command-switch command))
		  (setq mode-line-process '(":%s"))
		  (require 'shell) (shell-mode)
		  (set-process-sentinel proc 'shell-command-sentinel)
		  ))
912
	    (shell-command-on-region (point) (point) command output-buffer)
913
	    ))))))
Jim Blandy's avatar
Jim Blandy committed
914 915 916 917

;; We have a sentinel to prevent insertion of a termination message
;; in the buffer itself.
(defun shell-command-sentinel (process signal)
918 919 920 921
  (if (memq (process-status process) '(exit signal))
      (message "%s: %s." 
	       (car (cdr (cdr (process-command process))))
	       (substring signal 0 -1))))
Jim Blandy's avatar
Jim Blandy committed
922

923
(defun shell-command-on-region (start end command
924 925
				      &optional output-buffer replace
				      error-buffer)
Jim Blandy's avatar
Jim Blandy committed
926 927 928
  "Execute string COMMAND in inferior shell with region as input.
Normally display output (if any) in temp buffer `*Shell Command Output*';
Prefix arg means replace the region with it.
929

930 931 932 933 934 935 936
To specify a coding system for converting non-ASCII characters
in the input and output to the shell command, use \\[universal-coding-system-argument]
before this command.  By default, the input (from the current buffer)
is encoded in the same coding system that will be used to save the file,
`buffer-file-coding-system'.  If the output is going to replace the region,
then it is decoded from that same coding system.

937 938
The noninteractive arguments are START, END, COMMAND, OUTPUT-BUFFER, REPLACE,
ERROR-BUFFER.  If REPLACE is non-nil, that means insert the output
939
in place of text from START to END, putting point and mark around it.
940 941
Noninteractive callers can specify coding systems by binding
`coding-system-for-read' and `coding-system-for-write'.
Jim Blandy's avatar
Jim Blandy committed
942 943 944

If the output is one line, it is displayed in the echo area,
but it is nonetheless available in buffer `*Shell Command Output*'
945
even though that buffer is not automatically displayed.
946
If there is no output, or if output is inserted in the current buffer,
947
then `*Shell Command Output*' is deleted.
948

949 950
If the optional fourth argument OUTPUT-BUFFER is non-nil,
that says to put the output in some other buffer.
951 952 953
If OUTPUT-BUFFER is a buffer or buffer name, put the output there.
If OUTPUT-BUFFER is not a buffer and not nil,
insert output in the current buffer.
954 955 956 957 958
In either case, the output is inserted after point (leaving mark after it).

If optional fifth argument ERROR-BUFFER is non-nil, it is a buffer
or buffer name to which to direct the command's standard error output.
If it is nil, error output is mingled with regular output."
959 960 961 962 963 964 965
  (interactive (let ((string
		      ;; Do this before calling region-beginning
		      ;; and region-end, in case subprocess output
		      ;; relocates them while we are in the minibuffer.
		      (read-from-minibuffer "Shell command on region: "
					    nil nil nil
					    'shell-command-history)))
966 967 968
		 ;; call-interactively recognizes region-beginning and
		 ;; region-end specially, leaving them in the history.
		 (list (region-beginning) (region-end)
969 970
		       string
		       current-prefix-arg
971
		       current-prefix-arg)))
972 973 974 975 976
  (let ((error-file
	 (if error-buffer 
	     (concat (file-name-directory temp-file-name-pattern)
		     (make-temp-name "scor"))
	   nil)))
977 978
  (if (or replace
	  (and output-buffer
979 980
	       (not (or (bufferp output-buffer) (stringp output-buffer))))
	  (equal (buffer-name (current-buffer)) "*Shell Command Output*"))
Jim Blandy's avatar
Jim Blandy committed
981
      ;; Replace specified region with output from command.
982
      (let ((swap (and replace (< start end))))
983 984
	;; Don't muck with mark unless REPLACE says we should.
	(goto-char start)
985
	(and replace (push-mark))
986 987 988 989 990
	(call-process-region start end shell-file-name t
			     (if error-file
				 (list t error-file)
			       t)
			     nil shell-command-switch command)
991 992 993
	(let ((shell-buffer (get-buffer "*Shell Command Output*")))
	  (and shell-buffer (not (eq shell-buffer (current-buffer)))
	       (kill-buffer shell-buffer)))
994
	;; Don't muck with mark unless REPLACE says we should.
995
	(and replace swap (exchange-point-and-mark)))
Jim Blandy's avatar
Jim Blandy committed
996 997
    ;; No prefix argument: put the output in a temp buffer,
    ;; replacing its entire contents.
998 999
    (let ((buffer (get-buffer-create
		   (or output-buffer "*Shell Command Output*")))
1000 1001 1002 1003 1004 1005
	  (success nil))
      (unwind-protect
	  (if (eq buffer (current-buffer))
	      ;; If the input is the same buffer as the output,
	      ;; delete everything but the specified region,
	      ;; then replace that region with the output.
1006
	      (progn (setq buffer-read-only nil)
1007
		     (delete-region (max start end) (point-max))
1008
		     (delete-region (point-min) (min start end))
1009
		     (call-process-region (point-min) (point-max)
1010 1011 1012 1013 1014
					  shell-file-name t 
					  (if error-file
					      (list t error-file)
					    t)
					  nil shell-command-switch command)
1015 1016 1017 1018
		     (setq success t))
	    ;; Clear the output buffer, then run the command with output there.
	    (save-excursion
	      (set-buffer buffer)
1019
	      (setq buffer-read-only nil)
1020
	      (erase-buffer))
1021 1022 1023 1024 1025
	    (call-process-region start end shell-file-name nil
				 (if error-file
				     (list buffer error-file)
				   buffer)
				 nil shell-command-switch command)
1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042
	    (setq success t))
	;; Report the amount of output.
	(let ((lines (save-excursion
		       (set-buffer buffer)
		       (if (= (buffer-size) 0)
			   0
			 (count-lines (point-min) (point-max))))))
	  (cond ((= lines 0)
		 (if success
		     (message "(Shell command completed with no output)"))
		 (kill-buffer buffer))
		((and success (= lines 1))
		 (message "%s"
			  (save-excursion
			    (set-buffer buffer)
			    (goto-char (point-min))
			    (buffer-substring (point)
1043
					      (progn (end-of-line) (point))))))
1044
		(t 
1045 1046 1047
		 (save-excursion
		   (set-buffer buffer)
		   (goto-char (point-min)))
1048 1049 1050 1051 1052 1053 1054
		 (display-buffer buffer)))))))
  (if (and error-file (file-exists-p error-file))
      (save-excursion
	(set-buffer (get-buffer-create error-buffer))
    ;; Do no formatting while reading error file, for fear of looping.
	(format-insert-file error-file nil)
	(delete-file error-file)))))
1055 1056 1057 1058
       
(defun shell-command-to-string (command)
  "Execute shell command COMMAND and return its output as a string."
  (with-output-to-string
1059 1060 1061
    (with-current-buffer
      standard-output
      (call-process shell-file-name nil t nil shell-command-switch command))))
Jim Blandy's avatar
Jim Blandy committed
1062

1063
(defvar universal-argument-map
1064 1065
  (let ((map (make-sparse-keymap)))
    (define-key map [t] 'universal-argument-other-key)
1066
    (define-key map (vector meta-prefix-char t) 'universal-argument-other-key)