;;; -*- Mode: Emacs-Lisp -*-
-;;; This file is part of ILISP.
-;;; 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 'firstname.lastname@example.org' to be included in the
-;;; ILISP mailing list. 'email@example.com' is the general ILISP
-;;; mailing list were bugs and improvements are discussed.
-;;; ILISP is freely redistributable under the terms found in the file
;;; 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
+;;; Please refer to the file ACKNOWLEGDEMENTS for an (incomplete) list
+;;; of present and past contributors.
(defun ilisp-display-choices (symbol choices)
"Display the possible choices for SYMBOL in alist CHOICES."
(if function-p "function ")
- (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))
(setq choices (read choices)
choices (if (eq choices 'NIL) nil choices)))
(setq ilisp-original symbol