Changeset 4073 for trunk/lisp/comint.el

Timestamp:

05/03/06 18:37:43 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk (modified) (1 prop)
• trunk/lisp/comint.el (modified) (7 diffs)

trunk/lisp/comint.el

@@ -559 +559 @@
-The command \\[comint-accumulate] sets this.")
-
+(defvar comint-stored-incomplete-input nil
+  "Stored input for history cycling.")
+
-(put 'comint-replace-by-expanded-history 'menu-enable 'comint-input-autoexpand)
-(put 'comint-input-ring 'permanent-local t)
@@ -639 +642 @@
-  (make-local-variable 'comint-move-point-for-output)
-  (make-local-variable 'comint-scroll-show-maximum-output)
+  (make-local-variable 'comint-stored-incomplete-input)
-  ;; This makes it really work to keep point at the bottom.
-  (make-local-variable 'scroll-conservatively)
@@ -1016 +1020 @@
-         arg)))
-
+(defun comint-restore-input ()
+  "Restore unfinished input."
+  (interactive)
+  (when comint-input-ring-index
+    (comint-delete-input)
+    (when (> (length comint-stored-incomplete-input) 0)
+      (insert comint-stored-incomplete-input)
+      (message "Input restored"))
+    (setq comint-input-ring-index nil)))
+
-(defun comint-search-start (arg)
-  "Index to start a directional search, starting at `comint-input-ring-index'."
@@ -1036 +1050 @@
-
-(defun comint-previous-input (arg)
-
+, saving input
-  (interactive "*p")
-
+
+
+
+
+
+
+
+
+
+
-
-(defun comint-next-input (arg)
@@ -1078 +1101 @@
-        n)))
-
+(defun comint-delete-input ()
+  "Delete all input between accumulation or process mark and point."
+  (delete-region
+   ;; Can't use kill-region as it sets this-command
+   (or  (marker-position comint-accum-marker)
+        (process-mark (get-buffer-process (current-buffer))))
+   (point-max)))
+
-(defun comint-previous-matching-input (regexp n)
-  "Search backwards through input history for match for REGEXP.
@@ -1089 +1120 @@
-    (if (null pos)
-        (error "Not found")
+      ;; If leaving the edit line, save partial input
+      (if (null comint-input-ring-index)        ;not yet on ring
+          (setq comint-stored-incomplete-input
+                (funcall comint-get-old-input)))
-      (setq comint-input-ring-index pos)
-      (message "History item: %d" (1+ pos))
-
-
-
-
-
+
-      (insert (ring-ref comint-input-ring pos)))))
-
@@ -2673 +2704 @@
-
-(defun comint-match-partial-filename ()
-
+e
-Environment variables are substituted.  See `comint-word'."
-  (let ((filename (comint-word comint-file-name-chars)))