1. xemacs
  2. ilisp

Source

ilisp / ilisp-cmp.el

Diff from to

File ilisp-cmp.el

 ;;; -*- Mode: Emacs-Lisp -*-
 
 ;;; ilisp-cmp.el --
-
-;;; This file is part of ILISP.
-;;; Version: 5.10.1
-;;;
-;;; Copyright (C) 1990, 1991, 1992, 1993 Chris McConnell
-;;;               1993, 1994 Ivan Vasquez
-;;;               1994, 1995, 1996 Marco Antoniotti and Rick Busdiecker
-;;;               1996-2000 Marco Antoniotti and Rick Campbell
-;;;
-;;; Other authors' names for which this Copyright notice also holds
-;;; may appear later in this file.
-;;;
-;;; Send mail to 'majordomo@cons.org' to be included in the
-;;; ILISP mailing list. 'ilisp@cons.org' is the general ILISP
-;;; mailing list were bugs and improvements are discussed.
-;;;
-;;; ILISP is freely redistributable under the terms found in the file
-;;; COPYING.
-
-
-
-;;;
 ;;; ILISP completion
-;;;
-;;;
-;;;%Completion
 ;;; The basic idea behind the completion stuff is to use as much of
 ;;; the standard Emacs stuff as possible.  The extensions here go out
 ;;; to the inferior LISP to complete symbols if necessary.  
-;;; 
+;;;
+;;; This file is part of ILISP.
+;;; Please refer to the file COPYING for copyrights and licensing
+;;; information.
+;;; Please refer to the file ACKNOWLEGDEMENTS for an (incomplete) list
+;;; of present and past contributors.
+;;;
+;;; $Id$
+
 (defun ilisp-display-choices (symbol choices)
   "Display the possible choices for SYMBOL in alist CHOICES."
   (with-output-to-temp-buffer "*Completions*"
 		       (if function-p "function ")
 		       (lisp-buffer-symbol symbol)))
 	   'complete)))
-    (if (ilisp-value 'comint-errorp t)
+    (if (or (ilisp-value 'comint-errorp t)
+            (ignore-errors (string-match ilisp-error-regexp choices)))
 	(progn (lisp-display-output choices)
-	       (error "Error completing %s" (lisp-buffer-symbol symbol)))
+	       (error "Error completing %s" (lisp-buffer-symbol symbol))
+               nil)
 	(setq choices (read choices)
 	      choices (if (eq choices 'NIL) nil choices)))
     (setq ilisp-original symbol