comparison lisp/comint.el @ 33053:eb3d446c4a6e

(comint-replace-by-expanded-history): Don't use comint-get-old-input (we're not looking at *old* input). (comint-get-old-input-default): If using fields, signal an error when the point is not in an input field.

33052:9ec478daa468

See `comint-magic-space' and `comint-replace-by-expanded-history-before-point'.

Returns t if successful."
  (interactive)
  (if (and comint-input-autoexpand
	   (string-match "!\\|^\\^" (funcall comint-get-old-input))
	   (if comint-use-prompt-regexp-instead-of-fields
	       ;; Use comint-prompt-regexp
	       (save-excursion (beginning-of-line)
			       (looking-at comint-prompt-regexp))
	     ;; Use input fields.  User input that hasn't been entered
	     ;; yet, at the end of the buffer, has a nil `field' property.
	     (null (get-char-property (point) 'field))))
      ;; Looks like there might be history references in the command.
      (let ((previous-modified-tick (buffer-modified-tick)))
	(comint-replace-by-expanded-history-before-point silent start)
	(/= previous-modified-tick (buffer-modified-tick)))))

	(comint-skip-prompt)
	(let ((beg (point)))
	  (end-of-line)
	  (buffer-substring beg (point))))
    ;; Return the contents of the field at the current point.
    (field-string)))


(defun comint-copy-old-input ()
  "Insert after prompt old input at point as new input to be edited.
Calls `comint-get-old-input' to get old input."
  (interactive)

33053:eb3d446c4a6e

See `comint-magic-space' and `comint-replace-by-expanded-history-before-point'.

Returns t if successful."
  (interactive)
  (if (and comint-input-autoexpand
	   (if comint-use-prompt-regexp-instead-of-fields
	       ;; Use comint-prompt-regexp
	       (save-excursion
		 (beginning-of-line)
		 (looking-at (concat comint-prompt-regexp "!\\|\\^")))
	     ;; Use input fields.  User input that hasn't been entered
	     ;; yet, at the end of the buffer, has a nil `field' property.
	     (and (null (get-char-property (point) 'field))
		  (string-match "!\\|^\\^" (field-string)))))
      ;; Looks like there might be history references in the command.
      (let ((previous-modified-tick (buffer-modified-tick)))
	(comint-replace-by-expanded-history-before-point silent start)
	(/= previous-modified-tick (buffer-modified-tick)))))

	(comint-skip-prompt)
	(let ((beg (point)))
	  (end-of-line)
	  (buffer-substring beg (point))))
    ;; Return the contents of the field at the current point.
    (let ((pos (field-beginning (point))))
      (unless (eq (get-char-property pos 'field) 'input)
	(error "Point not in input field"))
      (field-string pos))))

(defun comint-copy-old-input ()
  "Insert after prompt old input at point as new input to be edited.
Calls `comint-get-old-input' to get old input."
  (interactive)