Commits

Anonymous committed 432cc21

Update uses of defunct comint interfaces. See xemacs-patches message with ID
<m3d5ehahs4.fsf@jerrypc.cs.usu.edu>.

  • Participants
  • Parent commits a80b98c

Comments (0)

Files changed (4)

+2006-05-13  Jerry James  <james@xemacs.org>
+
+	* ilisp-dia.el (setup-ilisp): Change from defunct
+	comint-use-prompt-regexp-instead-of-fields to current
+	comint-use-prompt-regexp.  Also set comint-input-filter-functions
+	instead of defunct comint-input-sentinel.
+	* ilisp-rng.el (lisp-match-ring): Change from defunct
+	comint-last-similar-string to current
+	comint-matching-input-from-input-string.
+	* ilisp-xfr.el (return-ilisp): Run the comint-input-filter-functions
+	hook instead of calling the defunct comint-input-sentinel.  Also
+	remove the dated version check for setting comint-input-index.
+
 2004-10-05  Ilya N. Golubev <gin@mo.msk.ru>
 
 	 * extra/.cvsignore (hyperspec.el): Remove, to sync with revision

File ilisp-dia.el

   ;; Comint defaults
   (set-ilisp-input-ring-size 200)
   (setq comint-prompt-regexp "^[^<> ]*>+:? *"
-	comint-use-prompt-regexp-instead-of-fields t ; Emacs 21 fields don't seem to work with comint-ipc (?)
+	comint-use-prompt-regexp t ; Emacs 21 fields don't seem to work with comint-ipc (?)
 	comint-get-old-input 'ilisp-get-old-input
-	comint-input-sentinel (function ignore)
+	comint-input-filter-functions nil
 	comint-input-filter 'ilisp-input-filter
 	comint-input-sender 'comint-default-send
 	comint-eol-on-send t)

File ilisp-rng.el

 	  (push-mark point)
 	  (set-ilisp-input-ring-index n)
 	  (setq this-command 'comint-previous-similar-input
-		comint-last-similar-string string)
+		comint-matching-input-from-input-string string)
 	  t)
 	(if (and string (not no-insert))
 	    (progn (comint-kill-input) (insert string) t)

File ilisp-xfr.el

 			     (not (string= (ring-ref (ilisp-get-input-ring) 0)
 					   input))))
 		    (ilisp-ring-insert (ilisp-get-input-ring) input))
-		(funcall comint-input-sentinel input)
-		;; Ugh, comint changing under my feet....
-		;; Note: This used to be
-		;;        (eq ilisp-emacs-version-id 'gnu-19)
-		;;       25/11/94 Marco Antoniotti
-		(when (or (eq +ilisp-emacs-version-id+ 'fsf-19)
-			  (eq +ilisp-emacs-version-id+ 'fsf-20)
-			  (eq +ilisp-emacs-version-id+ 'fsf-21))
-		  (setq comint-input-ring-index nil))
+		(run-hook-with-args 'comint-input-filter-functions input)
+		(setq comint-input-ring-index nil)
 		;; Nuke symbol table
 		(setq ilisp-original nil)
 		(funcall comint-input-sender proc input)