comparison lisp/repeat.el @ 87862:b151c81bfd6e

(repeat-undo-count): New variable. (repeat): For self-insertions make undo boundary only after 20 repetitions. Inhibit point recording when repeat-repeat-char is non-nil.

87861:da84f0918d39

;;;;; ******************* THE REPEAT COMMAND ITSELF ******************* ;;;;;

(defvar repeat-previous-repeated-command nil
  "The previous repeated command.")

;;;###autoload
(defun repeat (repeat-arg)
  "Repeat most recently executed command.
With prefix arg, apply new prefix arg to that command; otherwise,

  ;; last-command-char contains the final character now, but may not still
  ;; contain it after the previous command is repeated, so the character
  ;; needs to be saved.
  (let ((repeat-repeat-char
         (if (eq repeat-on-final-keystroke t)
	     ;; The following commented out since it's equivalent to
	     ;; last-comment-char (martin 2007-08-29).
;;;              ;; allow any final input event that was a character
;;;              (when (eq last-command-char
;;;                        last-command-event)
;;;                last-command-char)
	     last-command-char
           ;; allow only specified final keystrokes
           (car (memq last-command-char
                      (listify-key-sequence
                       repeat-on-final-keystroke))))))

	    (setq insertion (substring insertion -1))
	    (let ((count (prefix-numeric-value repeat-arg))
		  (i 0))
	      ;; Run pre- and post-command hooks for self-insertion too.
	      (run-hooks 'pre-command-hook)
	      (while (< i count)
		(repeat-self-insert insertion)
		(setq i (1+ i)))
	      (run-hooks 'post-command-hook)))
	(let ((indirect (indirect-function last-repeatable-command)))
	  (if (or (stringp indirect)
		  (vectorp indirect))
	      ;; Bind real-last-command so that executing the macro does
	      ;; not alter it.  Do the same for last-repeatable-command.
	      (let ((real-last-command real-last-command)

      ;; A simple recursion here gets into trouble with max-lisp-eval-depth
      ;; on long sequences of repetitions of a command like `forward-word'
      ;; (only 32 repetitions are possible given the default value of 200 for
      ;; max-lisp-eval-depth), but if I now locally disable the repeat char I
      ;; can iterate indefinitely here around a single level of recursion.
      (let (repeat-on-final-keystroke)
	(setq real-last-command 'repeat)
        (while (eq (read-event) repeat-repeat-char)
	  ;; Make each repetition undo separately.
	  (undo-boundary)
          (repeat repeat-arg))
        (setq unread-command-events (list last-input-event))))))

(defun repeat-self-insert (string)
  (let ((i 0))
    (while (< i (length string))

87862:b151c81bfd6e

;;;;; ******************* THE REPEAT COMMAND ITSELF ******************* ;;;;;

(defvar repeat-previous-repeated-command nil
  "The previous repeated command.")

;; The following variable counts repeated self-insertions.  The idea is
;; that repeating a self-insertion command and subsequently undoing it
;; should have almost the same effect as if the characters were inserted
;; manually.  The basic difference is that we leave in one undo-boundary
;; between the original insertion and its first repetition.
(defvar repeat-undo-count nil
  "Number of self-insertions since last `undo-boundary'.")

;;;###autoload
(defun repeat (repeat-arg)
  "Repeat most recently executed command.
With prefix arg, apply new prefix arg to that command; otherwise,

  ;; last-command-char contains the final character now, but may not still
  ;; contain it after the previous command is repeated, so the character
  ;; needs to be saved.
  (let ((repeat-repeat-char
         (if (eq repeat-on-final-keystroke t)
	     last-command-char
           ;; allow only specified final keystrokes
           (car (memq last-command-char
                      (listify-key-sequence
                       repeat-on-final-keystroke))))))

	    (setq insertion (substring insertion -1))
	    (let ((count (prefix-numeric-value repeat-arg))
		  (i 0))
	      ;; Run pre- and post-command hooks for self-insertion too.
	      (run-hooks 'pre-command-hook)
	      (cond
	       ((not repeat-undo-count))
	       ((< repeat-undo-count 20)
		;; Don't make an undo-boundary here.
		(setq repeat-undo-count (1+ repeat-undo-count)))
	       (t
		;; Make an undo-boundary after 20 repetitions only.
		(undo-boundary)
		(setq repeat-undo-count 1)))
	      (while (< i count)
		(repeat-self-insert insertion)
		(setq i (1+ i)))
	      (run-hooks 'post-command-hook)))
	(let ((indirect (indirect-function last-repeatable-command)))
	  ;; Make each repetition undo separately.
	  (undo-boundary)
	  (if (or (stringp indirect)
		  (vectorp indirect))
	      ;; Bind real-last-command so that executing the macro does
	      ;; not alter it.  Do the same for last-repeatable-command.
	      (let ((real-last-command real-last-command)

      ;; A simple recursion here gets into trouble with max-lisp-eval-depth
      ;; on long sequences of repetitions of a command like `forward-word'
      ;; (only 32 repetitions are possible given the default value of 200 for
      ;; max-lisp-eval-depth), but if I now locally disable the repeat char I
      ;; can iterate indefinitely here around a single level of recursion.
      (let (repeat-on-final-keystroke
	    ;; Bind `undo-inhibit-record-point' to t in order to avoid
	    ;; recording point in `buffer-undo-list' here.  We have to
	    ;; do this since the command loop does not set the last
	    ;; position of point thus confusing the point recording
	    ;; mechanism when inserting or deleting text.
	    (undo-inhibit-record-point t))
	(setq real-last-command 'repeat)
	(setq repeat-undo-count 1)
	(unwind-protect
	    (while (eq (read-event) repeat-repeat-char)
	      (repeat repeat-arg))
	  ;; Make sure `repeat-undo-count' is reset.
	  (setq repeat-undo-count nil))
        (setq unread-command-events (list last-input-event))))))

(defun repeat-self-insert (string)
  (let ((i 0))
    (while (< i (length string))