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

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

;; 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
9
;; the Free Software Foundation; either version 2, or (at your option)
Jim Blandy's avatar
Jim Blandy committed
10 11 12 13 14 15 16 17
;; 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
18 19 20
;; 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
21

22 23 24 25 26
;;; 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
27
;;; Code:
Jim Blandy's avatar
Jim Blandy committed
28

29
(defun newline (&optional arg)
30
  "Insert a newline, and move to left margin of the new line if it's blank.
31 32 33 34
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")
35
  (barf-if-buffer-read-only)
36 37 38 39 40 41
  ;; 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)
42 43 44 45 46 47
		   ;; 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)
48 49
		   ;; Make sure there are no markers here.
		   (not (buffer-has-markers-at (1- (point))))
50 51 52 53 54 55
		   ;; 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)))
56 57 58 59 60 61 62 63
		   ;; 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).
64
		   (< (or (previous-property-change (point)) -2) 
65 66 67 68
		      (- (point) 2))))
	(was-page-start (and (bolp)
			     (looking-at page-delimiter)))
	(beforepos (point)))
69 70 71 72 73
    (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.
74 75 76
	  ;; 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)))
77 78 79 80 81 82
      (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))
83 84
    ;; Mark the newline(s) `hard'.
    (if use-hard-newlines
85 86
	(set-hard-newline-properties 
	 (- (point) (if arg (prefix-numeric-value arg) 1)) (point)))
87 88 89 90 91 92 93 94 95 96 97 98 99 100 101
    ;; 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)))
102 103
  nil)

104 105 106 107 108 109 110 111
(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
112
(defun open-line (arg)
113
  "Insert a newline and leave point before it.
114
If there is a fill prefix and/or a left-margin, insert them on the new line
115
if the line would have been blank.
116
With arg N, insert N newlines."
Jim Blandy's avatar
Jim Blandy committed
117
  (interactive "*p")
118
  (let* ((do-fill-prefix (and fill-prefix (bolp)))
119
	 (do-left-margin (and (bolp) (> (current-left-margin) 0)))
120
	 (loc (point)))
121 122
    (newline arg)
    (goto-char loc)
123
    (while (> arg 0)
124 125 126 127
      (cond ((bolp)
	     (if do-left-margin (indent-to (current-left-margin)))
	     (if do-fill-prefix (insert-and-inherit fill-prefix))))
      (forward-line 1)
128
      (setq arg (1- arg)))
129 130
    (goto-char loc)
    (end-of-line)))
Jim Blandy's avatar
Jim Blandy committed
131 132 133 134 135 136 137

(defun split-line ()
  "Split current line, moving portion beyond point vertically down."
  (interactive "*")
  (skip-chars-forward " \t")
  (let ((col (current-column))
	(pos (point)))
138
    (newline 1)
Jim Blandy's avatar
Jim Blandy committed
139 140 141 142 143
    (indent-to col 0)
    (goto-char pos)))

(defun quoted-insert (arg)
  "Read next input character and insert it.
144
This is useful for inserting control characters.
Jim Blandy's avatar
Jim Blandy committed
145
You may also type up to 3 octal digits, to insert a character with that code.
146 147 148 149 150 151 152 153 154

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
digits are interpreted as a character code.  This is supposed to make
this function useful in editing binary files."
Jim Blandy's avatar
Jim Blandy committed
155
  (interactive "*p")
156 157 158 159
  (let ((char (if (or (not overwrite-mode)
		      (eq overwrite-mode 'overwrite-mode-binary))
		  (read-quoted-char)
		(read-char))))
160 161 162 163 164 165
    (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
166 167 168

(defun delete-indentation (&optional arg)
  "Join this line to previous and fix up whitespace at join.
169
If there is a fill prefix, delete it from the beginning of this line.
Jim Blandy's avatar
Jim Blandy committed
170 171 172 173 174 175 176
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)))
177 178 179
	;; If the second line started with the fill prefix,
	;; delete the prefix.
	(if (and fill-prefix
180
		 (<= (+ (point) (length fill-prefix)) (point-max))
181 182 183 184
		 (string= fill-prefix
			  (buffer-substring (point)
					    (+ (point) (length fill-prefix)))))
	    (delete-region (point) (+ (point) (length fill-prefix))))
Jim Blandy's avatar
Jim Blandy committed
185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216
	(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.
217
On nonblank line, delete any immediately following blank lines."
Jim Blandy's avatar
Jim Blandy committed
218 219 220 221 222
  (interactive "*")
  (let (thisblank singleblank)
    (save-excursion
      (beginning-of-line)
      (setq thisblank (looking-at "[ \t]*$"))
Jim Blandy's avatar
Jim Blandy committed
223
      ;; Set singleblank if there is just one blank line here.
Jim Blandy's avatar
Jim Blandy committed
224 225 226 227 228 229
      (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
230
    ;; Delete preceding blank lines, and this one too if it's the only one.
Jim Blandy's avatar
Jim Blandy committed
231 232 233 234 235 236 237 238
    (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
239 240
    ;; Delete following blank lines, unless the current line is blank
    ;; and there are no following blank lines.
Jim Blandy's avatar
Jim Blandy committed
241 242 243 244 245 246 247
    (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
248 249 250 251 252
			   (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
253 254 255 256 257 258 259 260 261

(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.
262
Indentation is done using the value of `indent-line-function'.
Jim Blandy's avatar
Jim Blandy committed
263
In programming language modes, this is the same as TAB.
264
In some text modes, where TAB inserts a tab, this command indents to the
265
column specified by the function `current-left-margin'."
Jim Blandy's avatar
Jim Blandy committed
266 267
  (interactive "*")
  (delete-region (point) (progn (skip-chars-backward " \t") (point)))
Jim Blandy's avatar
Jim Blandy committed
268
  (newline)
Jim Blandy's avatar
Jim Blandy committed
269 270 271 272 273
  (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,
274
which means calling the current value of `indent-line-function'.
Jim Blandy's avatar
Jim Blandy committed
275 276
In programming language modes, this is the same as TAB.
In some text modes, where TAB inserts a tab, this indents to the
277
column specified by the function `current-left-margin'."
Jim Blandy's avatar
Jim Blandy committed
278 279 280 281
  (interactive "*")
  (save-excursion
    (delete-region (point) (progn (skip-chars-backward " \t") (point)))
    (indent-according-to-mode))
Jim Blandy's avatar
Jim Blandy committed
282
  (newline)
Jim Blandy's avatar
Jim Blandy committed
283 284
  (indent-according-to-mode))

285 286 287 288
;; Internal subroutine of delete-char
(defun kill-forward-chars (arg)
  (if (listp arg) (setq arg (car arg)))
  (if (eq arg '-) (setq arg -1))
289
  (kill-region (point) (forward-point arg)))
290 291 292 293 294

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

Jim Blandy's avatar
Jim Blandy committed
297 298 299 300
(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)
301
and KILLP is t if a prefix arg was specified."
Jim Blandy's avatar
Jim Blandy committed
302 303 304 305 306 307 308 309 310 311 312 313
  (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)))))
314
  (delete-backward-char arg killp))
Jim Blandy's avatar
Jim Blandy committed
315 316 317 318 319 320 321 322 323 324 325 326

(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.
327 328 329 330
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.
331 332

Don't use this command in Lisp programs!
Jim Blandy's avatar
Jim Blandy committed
333 334 335
\(goto-char (point-min)) is faster and avoids clobbering the mark."
  (interactive "P")
  (push-mark)
336 337 338 339 340 341 342 343 344
  (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
345 346 347 348
  (if arg (forward-line 1)))

(defun end-of-buffer (&optional arg)
  "Move point to the end of the buffer; leave mark at previous position.
349 350 351 352
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.
353 354

Don't use this command in Lisp programs!
Jim Blandy's avatar
Jim Blandy committed
355 356 357
\(goto-char (point-max)) is faster and avoids clobbering the mark."
  (interactive "P")
  (push-mark)
358 359 360 361 362 363 364 365 366
  (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
367 368
  ;; 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
369
  (if arg (forward-line 1)
Eric S. Raymond's avatar
Eric S. Raymond committed
370 371 372 373 374 375 376
    ;; 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)))
377 378 379
	(progn
	  (overlay-recenter (point))
	  (recenter -3)))))
Jim Blandy's avatar
Jim Blandy committed
380 381

(defun mark-whole-buffer ()
Jim Blandy's avatar
Jim Blandy committed
382 383 384 385
  "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
386 387
  (interactive)
  (push-mark (point))
388
  (push-mark (point-max) nil t)
Jim Blandy's avatar
Jim Blandy committed
389 390 391
  (goto-char (point-min)))

(defun count-lines-region (start end)
392
  "Print number of lines and characters in the region."
Jim Blandy's avatar
Jim Blandy committed
393 394 395 396 397
  (interactive "r")
  (message "Region has %d lines, %d characters"
	   (count-lines start end) (- end start)))

(defun what-line ()
398
  "Print the current buffer line number and narrowed line number of point."
Jim Blandy's avatar
Jim Blandy committed
399
  (interactive)
400
  (let ((opoint (point)) start)
Jim Blandy's avatar
Jim Blandy committed
401
    (save-excursion
402 403 404 405 406 407 408 409 410 411 412 413 414
      (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
415 416 417 418

(defun count-lines (start end)
  "Return number of lines between START and END.
This is usually the number of newlines between them,
419
but can be one more if START is not equal to END
Jim Blandy's avatar
Jim Blandy committed
420
and the greater of them is not at the start of a line."
421 422 423 424 425 426
  (save-excursion
    (save-restriction
      (narrow-to-region start end)
      (goto-char (point-min))
      (if (eq selective-display t)
	  (save-match-data
427 428 429 430 431
	    (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)))
432 433 434 435
	      (goto-char (point-max))
	      (if (and (/= start end)
		       (not (bolp)))
		  (1+ done)
436 437
		done)))
	(- (buffer-size) (forward-line (buffer-size)))))))
Jim Blandy's avatar
Jim Blandy committed
438

439 440 441 442
(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
443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461
  (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))
462 463 464 465 466 467 468 469 470 471 472 473
      (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
474 475 476 477 478 479 480

(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))

481
(defvar read-expression-map (cons 'keymap minibuffer-local-map)
482 483 484
  "Minibuffer keymap used for reading Lisp expressions.")
(define-key read-expression-map "\M-\t" 'lisp-complete-symbol)

485 486 487
(defvar read-expression-history nil)

;; We define this, rather than making `eval' interactive,
Jim Blandy's avatar
Jim Blandy committed
488
;; for the sake of completion of names like eval-region, eval-current-buffer.
489
(defun eval-expression (eval-expression-arg)
Jim Blandy's avatar
Jim Blandy committed
490
  "Evaluate EXPRESSION and print value in minibuffer.
491
Value is also consed on to front of the variable `values'."
492
  (interactive
493 494 495
   (list (read-from-minibuffer "Eval: "
			       nil read-expression-map t
			       'read-expression-history)))
496
  (setq values (cons (eval eval-expression-arg) values))
Jim Blandy's avatar
Jim Blandy committed
497 498 499 500 501 502
  (prin1 (car values) t))

(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."
503 504 505 506
  (let ((command (read-from-minibuffer prompt
				       (prin1-to-string command)
				       read-expression-map t
				       '(command-history . 1))))
507
    ;; If command was added to command-history as a string,
508
    ;; get rid of that.  We want only evaluable expressions there.
509 510 511 512 513 514 515
    (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
516 517
    (eval command)))

518
(defun repeat-complex-command (arg)
Jim Blandy's avatar
Jim Blandy committed
519 520 521 522 523 524
  "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.
525 526
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
527
  (interactive "p")
528
  (let ((elt (nth (1- arg) command-history))
Jim Blandy's avatar
Jim Blandy committed
529 530
	newcmd)
    (if elt
531
	(progn
532
	  (setq newcmd
533 534 535
		(let ((print-level nil)
		      (minibuffer-history-position arg)
		      (minibuffer-history-sexp-flag t))
536 537 538
		  (read-from-minibuffer
		   "Redo: " (prin1-to-string elt) read-expression-map t
		   (cons 'command-history arg))))
539

540
	  ;; If command was added to command-history as a string,
541
	  ;; get rid of that.  We want only evaluable expressions there.
542 543 544 545 546 547 548
	  (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
549 550
	  (eval newcmd))
      (ding))))
551

552 553 554 555 556
(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
557
  "Non-nil when doing history operations on `command-history'.
558 559
More generally, indicates that the history list being acted on
contains expressions rather than strings.")
560 561
(setq minibuffer-history-variable 'minibuffer-history)
(setq minibuffer-history-position nil)
562
(defvar minibuffer-history-search-history nil)
563

Jim Blandy's avatar
Jim Blandy committed
564
(mapcar
565 566 567 568 569 570 571 572 573 574
 (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)
575 576 577 578
	      ;; (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
579
		  (progn (error "EMACS BUG!") (cdr command))
580 581 582 583 584 585 586
		(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))))
587 588 589 590
 '(("\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
591 592
   ("\er" . previous-matching-history-element)
   ("\es" . next-matching-history-element)))
593 594

(defun previous-matching-history-element (regexp n)
595 596 597 598 599
  "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
600 601 602 603 604 605 606 607 608
   (let* ((enable-recursive-minibuffers t)
	  (minibuffer-history-sexp-flag nil)
	  (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 "")
609 610 611
	       (if minibuffer-history-search-history
		   (car minibuffer-history-search-history)
		 (error "No previous history search regexp"))
612
	     regexp)
613
	   (prefix-numeric-value current-prefix-arg))))
614
  (let ((history (symbol-value minibuffer-history-variable))
615
	prevpos
616 617 618 619 620 621
	(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)
622 623
		     "No later matching history item"
		   "No earlier matching history item")))
624 625
      (if (string-match regexp
			(if minibuffer-history-sexp-flag
626 627
			    (let ((print-level nil))
			      (prin1-to-string (nth (1- pos) history)))
628
			  (nth (1- pos) history)))
629
	  (setq n (+ n (if (< n 0) 1 -1)))))
630 631 632 633
    (setq minibuffer-history-position pos)
    (erase-buffer)
    (let ((elt (nth (1- pos) history)))
      (insert (if minibuffer-history-sexp-flag
634 635
		  (let ((print-level nil))
		    (prin1-to-string elt))
636
		elt)))
637 638 639 640
      (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))))
641 642

(defun next-matching-history-element (regexp n)
643 644 645 646 647
  "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
648 649 650 651 652 653 654 655 656 657 658 659
   (let* ((enable-recursive-minibuffers t)
	  (minibuffer-history-sexp-flag nil)
	  (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)
660
	   (prefix-numeric-value current-prefix-arg))))
661
  (previous-matching-history-element regexp (- n)))
Jim Blandy's avatar
Jim Blandy committed
662

663 664
(defun next-history-element (n)
  "Insert the next element of the minibuffer history into the minibuffer."
Jim Blandy's avatar
Jim Blandy committed
665
  (interactive "p")
666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685
  (or (zerop n)
      (let ((narg (min (max 1 (- minibuffer-history-position n))
		       (length (symbol-value minibuffer-history-variable)))))
	    (if (or (zerop narg)
		    (= minibuffer-history-position narg))
		(error (if (if (zerop narg)
			       (> n 0)
			     (= minibuffer-history-position 1))
		       "End of history; no next item"
		     "Beginning of history; no preceding item"))
	  (erase-buffer)
	  (setq minibuffer-history-position narg)
	  (let ((elt (nth (1- minibuffer-history-position)
			  (symbol-value minibuffer-history-variable))))
	    (insert
	     (if minibuffer-history-sexp-flag
		 (let ((print-level nil))
		   (prin1-to-string elt))
	       elt)))
	  (goto-char (point-min))))))
Jim Blandy's avatar
Jim Blandy committed
686

687
(defun previous-history-element (n)
Richard M. Stallman's avatar
Richard M. Stallman committed
688
  "Inserts the previous element of the minibuffer history into the minibuffer."
Jim Blandy's avatar
Jim Blandy committed
689
  (interactive "p")
690
  (next-history-element (- n)))
691 692

(defun next-complete-history-element (n)
693
  "Get next element of history which is a completion of minibuffer contents."
694
  (interactive "p")
695 696 697 698 699 700 701
  (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)))
702 703

(defun previous-complete-history-element (n)
704 705
  "\
Get previous element of history which is a completion of minibuffer contents."
706 707
  (interactive "p")
  (next-complete-history-element (- n)))
708

Jim Blandy's avatar
Jim Blandy committed
709 710 711
(defun goto-line (arg)
  "Goto line ARG, counting from line 1 at beginning of buffer."
  (interactive "NGoto line: ")
712
  (setq arg (prefix-numeric-value arg))
Jim Blandy's avatar
Jim Blandy committed
713 714 715 716 717 718 719 720
  (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
721
(defalias 'advertised-undo 'undo)
Jim Blandy's avatar
Jim Blandy committed
722 723 724 725 726 727

(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")
728 729 730
  ;; If we don't get all the way thru, make last-command indicate that
  ;; for the following command.
  (setq this-command t)
731 732
  (let ((modified (buffer-modified-p))
	(recent-save (recent-auto-save-p)))
Jim Blandy's avatar
Jim Blandy committed
733 734
    (or (eq (selected-window) (minibuffer-window))
	(message "Undo!"))
Jim Blandy's avatar
Jim Blandy committed
735 736 737 738
    (or (eq last-command 'undo)
	(progn (undo-start)
	       (undo-more 1)))
    (undo-more (or arg 1))
739 740 741 742 743 744 745 746 747 748
    ;; 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
749
    (and modified (not (buffer-modified-p))
750 751 752
	 (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
753

754 755 756
(defvar pending-undo-list nil
  "Within a run of consecutive undo commands, list remaining to be undone.")

Jim Blandy's avatar
Jim Blandy committed
757
(defun undo-start ()
758 759
  "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
760 761 762 763 764 765
  (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.
766 767
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
768 769 770 771
  (or pending-undo-list
      (error "No further undo information"))
  (setq pending-undo-list (primitive-undo count pending-undo-list)))

772 773 774
(defvar shell-command-history nil
  "History list for some commands that read shell commands.")

775 776 777
(defvar shell-command-switch "-c"
  "Switch used to have the shell execute its command line argument.")

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

Jim Blandy's avatar
Jim Blandy committed
781
If COMMAND ends in ampersand, execute it asynchronously.
782
The output appears in the buffer `*Async Shell Command*'.
783
That buffer is in shell mode.
784

785 786
Otherwise, COMMAND is executed synchronously.  The output appears in the
buffer `*Shell Command Output*'.
787 788 789 790 791
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.
792 793 794 795 796 797 798

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)."
799 800 801
  (interactive (list (read-from-minibuffer "Shell command: "
					   nil nil nil 'shell-command-history)
		     current-prefix-arg))
802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853
  ;; 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)
		  ))
854
	    (shell-command-on-region (point) (point) command output-buffer)
855
	    ))))))
Jim Blandy's avatar
Jim Blandy committed
856 857 858 859

;; We have a sentinel to prevent insertion of a termination message
;; in the buffer itself.
(defun shell-command-sentinel (process signal)
860 861 862 863
  (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
864

865
(defun shell-command-on-region (start end command
866
				      &optional output-buffer replace)
Jim Blandy's avatar
Jim Blandy committed
867 868 869
  "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.
870 871 872

The noninteractive arguments are START, END, COMMAND, OUTPUT-BUFFER, REPLACE.
If REPLACE is non-nil, that means insert the output
873
in place of text from START to END, putting point and mark around it.
Jim Blandy's avatar
Jim Blandy committed
874 875 876

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

881 882
If the optional fourth argument OUTPUT-BUFFER is non-nil,
that says to put the output in some other buffer.
883 884 885 886
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.
In either case, the output is inserted after point (leaving mark after it)."
887 888 889 890 891 892 893
  (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)))
894 895 896
		 ;; call-interactively recognizes region-beginning and
		 ;; region-end specially, leaving them in the history.
		 (list (region-beginning) (region-end)
897 898
		       string
		       current-prefix-arg
899 900 901
		       current-prefix-arg)))
  (if (or replace
	  (and output-buffer
902 903
	       (not (or (bufferp output-buffer) (stringp output-buffer))))
	  (equal (buffer-name (current-buffer)) "*Shell Command Output*"))
Jim Blandy's avatar
Jim Blandy committed
904
      ;; Replace specified region with output from command.
905
      (let ((swap (and replace (< start end))))
906 907
	;; Don't muck with mark unless REPLACE says we should.
	(goto-char start)
908
	(and replace (push-mark))
Jim Blandy's avatar
Jim Blandy committed
909
	(call-process-region start end shell-file-name t t nil
910
			     shell-command-switch command)
911 912 913
	(let ((shell-buffer (get-buffer "*Shell Command Output*")))
	  (and shell-buffer (not (eq shell-buffer (current-buffer)))
	       (kill-buffer shell-buffer)))
914
	;; Don't muck with mark unless REPLACE says we should.
915
	(and replace swap (exchange-point-and-mark)))
Jim Blandy's avatar
Jim Blandy committed
916 917
    ;; No prefix argument: put the output in a temp buffer,
    ;; replacing its entire contents.
918 919
    (let ((buffer (get-buffer-create
		   (or output-buffer "*Shell Command Output*")))
920 921 922 923 924 925
	  (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.
926
	      (progn (setq buffer-read-only nil)
927
		     (delete-region (max start end) (point-max))
928
		     (delete-region (point-min) (min start end))
929 930
		     (call-process-region (point-min) (point-max)
					  shell-file-name t t nil
931
					  shell-command-switch command)
932 933 934 935
		     (setq success t))
	    ;; Clear the output buffer, then run the command with output there.
	    (save-excursion
	      (set-buffer buffer)
936
	      (setq buffer-read-only nil)
937 938 939
	      (erase-buffer))
	    (call-process-region start end shell-file-name
				 nil buffer nil
940
				 shell-command-switch command)
941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957
	    (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)
958
					      (progn (end-of-line) (point))))))
959
		(t 
960 961 962 963
		 (save-excursion
		   (set-buffer buffer)
		   (goto-char (point-min)))
		 (display-buffer buffer))))))))
964 965 966 967
       
(defun shell-command-to-string (command)
  "Execute shell command COMMAND and return its output as a string."
  (with-output-to-string
968 969 970
    (with-current-buffer
      standard-output
      (call-process shell-file-name nil t nil shell-command-switch command))))
Jim Blandy's avatar
Jim Blandy committed
971

972
(defvar universal-argument-map
973 974
  (let ((map (make-sparse-keymap)))
    (define-key map [t] 'universal-argument-other-key)
975
    (define-key map (vector meta-prefix-char t) 'universal-argument-other-key)
976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991
    (define-key map [switch-frame] nil)
    (define-key map [?\C-u] 'universal-argument-more)
    (define-key map [?-] 'universal-argument-minus)
    (define-key map [?0] 'digit-argument)
    (define-key map [?1] 'digit-argument)
    (define-key map [?2] 'digit-argument)
    (define-key map [?3] 'digit-argument)
    (define-key map [?4] 'digit-argument)
    (define-key map [?5] 'digit-argument)
    (define-key map [?6] 'digit-argument)
    (define-key map [?7] 'digit-argument)
    (define-key map [?8] 'digit-argument)
    (define-key map [?9] 'digit-argument)
    map)
  "Keymap used while processing \\[universal-argument].")

992 993 994 995 996
(defvar universal-argument-num-events nil
  "Number of argument-specifying events read by `universal-argument'.
`universal-argument-other-key' uses this to discard those events
from (this-command-keys), and reread only the final command.")

997 998 999 1000 1001 1002
(defun universal-argument ()
  "Begin a numeric argument for the following command.
Digits or minus sign following \\[universal-argument] make up the numeric argument.
\\[universal-argument] following the digits or minus sign ends the argument.
\\[universal-argument] without digits or minus sign provides 4 as argument.
Repeating \\[universal-argument] without digits or minus sign
1003 1004
 multiplies the argument by 4 each time.
For some commands, just \\[universal-argument] by itself serves as a flag
1005 1006
which is different in effect from any particular numeric argument.
These commands include \\[set-mark-command] and \\[start-kbd-macro]."
1007 1008
  (interactive)
  (setq prefix-arg (list 4))
1009
  (setq universal-argument-num-events (length (this-command-keys)))
1010
  (setq overriding-terminal-local-map universal-argument-map))
1011

1012 1013 1014
;; A subsequent C-u means to multiply the factor by 4 if we've typed
;; nothing but C-u's; otherwise it means to terminate the prefix arg.
(defun universal-argument-more (arg)
1015
  (interactive "P")
1016 1017
  (if (consp arg)
      (setq prefix-arg (list (* 4 (car arg))))
1018 1019 1020 1021
    (if (eq arg '-)
	(setq prefix-arg (list -4))
      (setq prefix-arg arg)
      (setq overriding-terminal-local-map nil)))
1022
  (setq universal-argument-num-events (length (this-command-keys))))
1023 1024 1025 1026 1027

(defun negative-argument (arg)
  "Begin a negative numeric argument for the next command.
\\[universal-argument] following digits or minus sign ends the argument."
  (interactive "P")
1028 1029 1030 1031 1032
  (cond ((integerp arg)
	 (setq prefix-arg (- arg)))
	((eq arg '-)
	 (setq prefix-arg nil))
	(t
1033
	 (setq prefix-arg '-)))
1034
  (setq universal-argument-num-events (length (this-command-keys)))
1035
  (setq overriding-terminal-local-map universal-argument-map))
1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048

(defun digit-argument (arg)
  "Part of the numeric argument for the next command.
\\[universal-argument] following digits or minus sign ends the argument."
  (interactive "P")
  (let ((digit (- (logand last-command-char ?\177) ?0)))
    (cond ((integerp arg)
	   (setq prefix-arg (+ (* arg 10)
			       (if (< arg 0) (- digit) digit))))
	  ((eq arg '-)
	   ;; Treat -0 as just -, so that -01 will work.
	   (setq prefix-arg (if (zerop digit) '- (- digit))))
	  (t
1049
	   (setq prefix-arg digit))))
1050
  (setq universal-argument-num-events (length (this-command-keys)))
1051
  (setq overriding-terminal-local-map universal-argument-map))
1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065

;; For backward compatibility, minus with no modifiers is an ordinary
;; command if digits have already been entered.
(defun universal-argument-minus (arg)
  (interactive "P")
  (if (integerp arg)
      (universal-argument-other-key arg)
    (negative-argument arg)))

;; Anything else terminates the argument and is left in the queue to be
;; executed as a command.
(defun universal-argument-other-key (arg)
  (interactive "P")
  (setq prefix-arg arg)
1066 1067 1068
  (let* ((key (this-command-keys))
	 (keylist (listify-key-sequence key)))
    (setq unread-command-events
1069 1070
	  (append (nthcdr universal-argument-num-events keylist)
		  unread-command-events)))
1071
  (reset-this-command-lengths)
1072
  (setq overriding-terminal-local-map nil))
1073

Jim Blandy's avatar
Jim Blandy committed
1074 1075 1076