11:50 p.m.
User: james
Date: 06/05/17 00:50:25
Modified: packages/xemacs-packages/ilisp ChangeLog ilisp-dia.el
ilisp-rng.el ilisp-xfr.el
Log:
Update uses of defunct comint interfaces. See xemacs-patches message with ID
<m3d5ehahs4.fsf(a)jerrypc.cs.usu.edu>.
Revision Changes Path
1.50 +13 -0 XEmacs/packages/xemacs-packages/ilisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ilisp/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- ChangeLog 2004/10/05 14:24:39 1.49
+++ ChangeLog 2006/05/16 22:50:22 1.50
＠＠ -1,3 +1,16 ＠＠
+2006-05-13 Jerry James <james(a)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(a)mo.msk.ru>
* extra/.cvsignore (hyperspec.el): Remove, to sync with revision
1.6 +3 -3 XEmacs/packages/xemacs-packages/ilisp/ilisp-dia.el
Index: ilisp-dia.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ilisp/ilisp-dia.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ilisp-dia.el 2002/06/03 23:37:00 1.5
+++ ilisp-dia.el 2006/05/16 22:50:22 1.6
＠＠ -9,7 +9,7 ＠＠
;;; Please refer to the file ACKNOWLEGDEMENTS for an (incomplete) list
;;; of present and past contributors.
;;;
-;;; $Id: ilisp-dia.el,v 1.5 2002/06/03 23:37:00 wbd Exp $
+;;; $Id: ilisp-dia.el,v 1.6 2006/05/16 22:50:22 james Exp $
;;;%%CUSTOMIZING DIALECTS
＠＠ -170,9 +170,9 ＠＠ inferior LISP. PARENT is the name of th
;; 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)
1.4 +2 -2 XEmacs/packages/xemacs-packages/ilisp/ilisp-rng.el
Index: ilisp-rng.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ilisp/ilisp-rng.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ilisp-rng.el 2001/07/02 09:40:48 1.3
+++ ilisp-rng.el 2006/05/16 22:50:22 1.4
＠＠ -9,7 +9,7 ＠＠
;;; Please refer to the file ACKNOWLEGDEMENTS for an (incomplete) list
;;; of present and past contributors.
;;;
-;;; $Id: ilisp-rng.el,v 1.3 2001/07/02 09:40:48 youngs Exp $
+;;; $Id: ilisp-rng.el,v 1.4 2006/05/16 22:50:22 james Exp $
(defun match-ring (ring regexp start)
"Return the index in RING of REGEXP starting at START."
＠＠ -38,7 +38,7 ＠＠ If not found insert STRING, unless NO-IN
(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)
1.5 +3 -10 XEmacs/packages/xemacs-packages/ilisp/ilisp-xfr.el
Index: ilisp-xfr.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ilisp/ilisp-xfr.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ilisp-xfr.el 2002/06/03 23:37:04 1.4
+++ ilisp-xfr.el 2006/05/16 22:50:22 1.5
＠＠ -9,7 +9,7 ＠＠
;;; Please refer to the file ACKNOWLEGDEMENTS for an (incomplete) list
;;; of present and past contributors.
;;;
-;;; $Id: ilisp-xfr.el,v 1.4 2002/06/03 23:37:04 wbd Exp $
+;;; $Id: ilisp-xfr.el,v 1.5 2006/05/16 22:50:22 james Exp $
(require 'cl)
＠＠ -38,15 +38,8 ＠＠ If we have a complete sexp, send it. Ot
(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)