[PATCH (pkgs)] ilisp comint fixes

PATCH packages This is the third in the series of patches to fix comint use. I was going to submit this to the ilisp maintainers, but ilisp.cons.org appears to be gone. Does anybody know if ilisp is maintained anywhere? xemacs-packages/ilisp/ChangeLog addition: 2006-05-13 Jerry James <james(a)xemacs.org&gt; * 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. packages source patch: Diff command: cvs -q diff -uN Files affected: xemacs-packages/ilisp/ilisp-xfr.el xemacs-packages/ilisp/ilisp-rng.el xemacs-packages/ilisp/ilisp-dia.el Index: xemacs-packages/ilisp/ilisp-dia.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ilisp/ilisp-dia.el,v retrieving revision 1.5 diff -d -u -r1.5 ilisp-dia.el --- xemacs-packages/ilisp/ilisp-dia.el 2002/06/03 23:37:00 1.5 +++ xemacs-packages/ilisp/ilisp-dia.el 2006/05/13 18:35:04 ＠＠ -170,9 +170,9 ＠＠ ;; 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) Index: xemacs-packages/ilisp/ilisp-rng.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ilisp/ilisp-rng.el,v retrieving revision 1.3 diff -d -u -r1.3 ilisp-rng.el --- xemacs-packages/ilisp/ilisp-rng.el 2001/07/02 09:40:48 1.3 +++ xemacs-packages/ilisp/ilisp-rng.el 2006/05/13 18:35:04 ＠＠ -38,7 +38,7 ＠＠ (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) Index: xemacs-packages/ilisp/ilisp-xfr.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ilisp/ilisp-xfr.el,v retrieving revision 1.4 diff -d -u -r1.4 ilisp-xfr.el --- xemacs-packages/ilisp/ilisp-xfr.el 2002/06/03 23:37:04 1.4 +++ xemacs-packages/ilisp/ilisp-xfr.el 2006/05/13 18:35:04 ＠＠ -38,15 +38,8 ＠＠ (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) -- Jerry James, Assistant Professor james(a)xemacs.org Computer Science Department http://www.cs.usu.edu/~jerry/ Utah State University