Source

ilisp / ilisp-cl.el

Diff from to

File ilisp-cl.el

 ;;; -*- Mode: Emacs-Lisp -*-
 
 ;;; ilisp-cl.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 Common Lisp dialect definition
 ;;;
-
-
-;;;%%Common LISP
+;;; 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$
 
 (defvar ilisp-cl-ilisp-package-file "ilisp-pkg.lisp")
 
   ;; 19990912 Marco Antoniotti
   ;; Changed the argument below from 'clisp to 'common-lisp.
   (ilisp-load-init 'common-lisp ilisp-cl-ilisp-init-file)
-  (setq ilisp-package-regexp
-	"^[ \t]*(in-package[ \t\n]*"
+  (setq ilisp-package-separator-regexp
+	":+"
 
 	ilisp-package-command
-	"(let ((*package* *package*)) %s (package-name *package*))"
+	;;; "(nth-value 0 (ignore-errors (let ((*package* *package*)) %s (package-name *package*))))"
+          "(let ((*package* *package*)) (nth-value 0 (ignore-errors %s (package-name *package*))))"
+
+        ilisp-no-package-in-core-regexp
+        "^nil"
+
+        ilisp-fallback-package
+        "\"COMMON-LISP-USER\""
 
 	ilisp-in-package-command-string
 	"in-package"
          "^[ \t]*(defpackage[ \t\n]*"
  
          ilisp-hash-form-regexp
-         "\\(^[ \t]*#[+-].\\)\\|\\(^[ \t]*(defpackage[ \t\n]\\)\\|\\(^[ \t]*(in-package[ \t\n]*\\)"
+         "\\(^[ \t]*#[+-].\\)\\|\\(^[ \t]*(\\(.*::?\\)?defpackage[ \t\n]\\)\\|\\(^[ \t]*(\\(.*::?\\)?in-package[ \t\n]*\\)"
 
 	ilisp-last-command
 	"*"