diff --git a/hemlock/bit-stream.lisp b/hemlock/bit-stream.lisp
index 051b06fd12c8770526d0eea2f5173ea39632acdc..171ba26174c280b7c8fd8c0eaca5fd18c5334274 100644
--- a/hemlock/bit-stream.lisp
+++ b/hemlock/bit-stream.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/bit-stream.lisp,v 1.1.1.3 1991/11/09 03:05:30 wlott Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/bit-stream.lisp,v 1.1.1.4 1993/08/25 02:07:52 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -16,7 +16,7 @@
 ;;; Written by Rob MacLachlan.
 ;;; Modified by Bill Chiles to run under X on the IBM RT.
 ;;;
-(in-package 'hemlock-internals)
+(in-package "HEMLOCK"-internals)
 
 
 ;;; These streams have an associated bitmap-hunk that is used for its
diff --git a/hemlock/charmacs.lisp b/hemlock/charmacs.lisp
index 22c360fc538a61ccf6bd430a880a7ae3e89b9b9b..39f0c8522b9aa4d01bffe76217c28228292d7f12 100644
--- a/hemlock/charmacs.lisp
+++ b/hemlock/charmacs.lisp
@@ -7,13 +7,13 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/charmacs.lisp,v 1.1.1.7 1991/11/09 03:05:31 wlott Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/charmacs.lisp,v 1.1.1.8 1993/08/25 02:07:59 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
 ;;; Implementation specific character-hacking macros and constants.
 ;;;
-(in-package 'hemlock-internals)
+(in-package "HEMLOCK"-internals)
 (export ' (syntax-char-code-limit search-char-code-limit do-alpha-chars))
 
 ;;; This file contains various constants and macros which are implementation or
diff --git a/hemlock/cursor.lisp b/hemlock/cursor.lisp
index 4b9d6b0ee26b1baff7b5d3969797db4f74f6457c..48d6f3eb63615449167c77d37360308bcc10242a 100644
--- a/hemlock/cursor.lisp
+++ b/hemlock/cursor.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/cursor.lisp,v 1.1.1.4 1991/03/16 02:18:57 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/cursor.lisp,v 1.1.1.5 1993/08/25 02:08:05 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -15,7 +15,7 @@
 ;;;
 ;;; Cursor: Routines for cursor positioning and recentering
 ;;;
-(in-package 'hemlock-internals)
+(in-package "HEMLOCK"-internals)
 (export '(mark-to-cursorpos center-window displayed-p scroll-window
 			    mark-column cursorpos-to-mark move-to-column))
 
diff --git a/hemlock/echocoms.lisp b/hemlock/echocoms.lisp
index 6fae6bc4c0ac427428e12214ab0c23c3c8a31bed..345263b756ac531aff687ee1176ff9e879dd2dbb 100644
--- a/hemlock/echocoms.lisp
+++ b/hemlock/echocoms.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/echocoms.lisp,v 1.1.1.7 1993/08/24 19:30:31 hallgren Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/echocoms.lisp,v 1.1.1.8 1993/08/25 02:08:28 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -15,7 +15,7 @@
 ;;;
 ;;; Written by Rob MacLachlan and Skef Wholey.
 ;;;
-(in-package 'hemlock)
+(in-package "HEMLOCK")
 
 (defhvar "Beep on Ambiguity"
   "If non-NIL, beep when completion of a parse is ambiguous."
diff --git a/hemlock/eval-server.lisp b/hemlock/eval-server.lisp
index 7231ebbdec8bc903d48a7e3820480d5140fa7db2..36812f9d6a5035959cecaea395d52a3ddcbf2b9c 100644
--- a/hemlock/eval-server.lisp
+++ b/hemlock/eval-server.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/eval-server.lisp,v 1.1.1.13 1992/02/15 01:05:57 wlott Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/eval-server.lisp,v 1.1.1.14 1993/08/25 02:08:34 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -916,7 +916,6 @@
 ;;; compilation form.
 ;;;
 (defun compiler-error-handler (condition)
-  (declare (ignore condition))
   (when *compiler-wire*
     (wire:remote *compiler-wire*
       (lisp-error *compiler-note* nil nil
diff --git a/hemlock/group.lisp b/hemlock/group.lisp
index d03c6714a1e4b6726575e17434b11d6db2c33023..a7ba96fbe4a097344de5f64b4bdc80f86c8d8b8a 100644
--- a/hemlock/group.lisp
+++ b/hemlock/group.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/group.lisp,v 1.1.1.2 1991/02/08 16:34:45 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/group.lisp,v 1.1.1.3 1993/08/25 02:08:50 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -27,7 +27,7 @@
 ;;; one wishes to change the name of the definition file after a group has
 ;;; been selected, one should call Select Group with a prefix argument.
 
-(in-package 'hemlock)
+(in-package "HEMLOCK")
 
 (defvar *file-groups* (make-string-table)
   "A string table of file groups.")
diff --git a/hemlock/line.lisp b/hemlock/line.lisp
index 520faf88884aa3daa8269ddae2f1ff8c2e55555d..0d99e32d0ec24131c0278cebaf070b999c5d8088 100644
--- a/hemlock/line.lisp
+++ b/hemlock/line.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/line.lisp,v 1.1.1.2 1991/02/08 16:35:54 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/line.lisp,v 1.1.1.3 1993/08/25 02:09:26 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -22,7 +22,7 @@
 ;;; is mapped in memory.  Such lines are called "buffered".  This stuff
 ;;; links up with the file-reading stuff and the line-image building stuff.
 ;;;
-(in-package 'hemlock-internals)
+(in-package "HEMLOCK"-internals)
 (export '(line linep line-previous line-next line-plist line-signature))
 
 (setf (documentation 'linep 'function)
diff --git a/hemlock/linimage.lisp b/hemlock/linimage.lisp
index cb083ed43770c7d148764ef6fe3bd001ae86d31d..05e99c05f583b862f80256335e35f268a22d237b 100644
--- a/hemlock/linimage.lisp
+++ b/hemlock/linimage.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/linimage.lisp,v 1.1.1.5 1993/08/02 17:31:04 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/linimage.lisp,v 1.1.1.6 1993/08/25 02:09:27 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -15,7 +15,7 @@
 ;;;
 ;;; This file contains functions related to building line images.
 ;;;
-(in-package 'hemlock-internals)
+(in-package "HEMLOCK"-internals)
 
 ;;;    The code in here is factored out in this way because it is more
 ;;; or less implementation dependant.  The reason this code is 
diff --git a/hemlock/register.lisp b/hemlock/register.lisp
index 879ca8fc9ca3b25e448c771b8846a8a90fe58168..6eaf0aaba9c850eab1bef20837ef2edf48ebf99a 100644
--- a/hemlock/register.lisp
+++ b/hemlock/register.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/register.lisp,v 1.1.1.3 1991/02/08 16:37:02 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/register.lisp,v 1.1.1.4 1993/08/25 02:10:14 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -16,7 +16,7 @@
 ;;; Written by Dave Touretzky.
 ;;; Modified by Bill Chiles for Hemlock consistency.
 ;;;
-(in-package 'hemlock)
+(in-package "HEMLOCK")
 
 
 
diff --git a/hemlock/ring.lisp b/hemlock/ring.lisp
index 82925b9f0eab8c4e56d07c802b5e3843569e4609..306532944ec5cfbabc9a4fc746cb4125c8ce7965 100644
--- a/hemlock/ring.lisp
+++ b/hemlock/ring.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/ring.lisp,v 1.1.1.2 1991/02/08 16:37:05 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/ring.lisp,v 1.1.1.3 1993/08/25 02:10:15 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -15,7 +15,7 @@
 ;;;
 ;;;  This file defines a ring-buffer type and access functions.
 ;;;
-(in-package 'hemlock-internals)
+(in-package "HEMLOCK"-internals)
 (export '(ring ringp make-ring ring-push ring-pop ring-length ring-ref
 	       rotate-ring))
 
@@ -35,9 +35,9 @@
 		 (:print-function %print-hring))
   "Used with Ring-Push and friends to implement ring buffers."
   (first -1 :type fixnum)	   ;The index of the first position used.
-  (bound () :type fixnum)	   ;The index after the last element.
-  delete-function		   ;The function  to be called on deletion. 
-  (vector () :type simple-vector)) ;The vector.
+  (bound (required-argument) :type fixnum)   ;The index after the last element.
+  delete-function ;The function  to be called on deletion. 
+  (vector (required-argument) :type simple-vector)) ;The vector.
 
 ;;; make-ring  --  Public
 ;;;
diff --git a/hemlock/shell.lisp b/hemlock/shell.lisp
index 075e35f5ee9c4ef55f077dbb3fd286e9c2219d75..e8c84eb8274c6df9bc5c74052db08edaac6c5e6c 100644
--- a/hemlock/shell.lisp
+++ b/hemlock/shell.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/shell.lisp,v 1.1.1.10 1992/02/15 01:06:10 wlott Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/shell.lisp,v 1.1.1.11 1993/08/25 02:10:35 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -234,7 +234,7 @@
 (defun set-current-shell ()
   (let ((old-buffer (value current-shell))
 	(first-old-shell (do-strings (var val *shell-names* nil)
-			   (declare (ignore var val))
+			   (declare (ignore var))
 			   (return var))))
     (when (and (not old-buffer) (not first-old-shell))
       (editor-error "Nothing to set current shell to."))
diff --git a/hemlock/spell-aug.lisp b/hemlock/spell-aug.lisp
index ed6c47d2046a879c0a1200bb8eab111b81ad81d6..3c13a290f0c7a73b365a1947fb219b72254cbb17 100644
--- a/hemlock/spell-aug.lisp
+++ b/hemlock/spell-aug.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/spell-aug.lisp,v 1.1.1.2 1991/02/08 16:37:44 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/spell-aug.lisp,v 1.1.1.3 1993/08/25 02:10:37 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -59,12 +59,14 @@
 (defmacro string-table-replace (src-string dst-start length)
   `(sap-replace *string-table* ,src-string 0 ,dst-start (+ ,dst-start ,length)))
 
+(defconstant spell-deleted-entry #xFFFF)
+
 ;;; HASH-ENTRY is used in SPELL-ADD-ENTRY to find a dictionary location for
-;;; adding a new entry.  If a location contains a zero, then it has never
-;;; been used, and no entries have ever been "hashed past" it.  If a location
-;;; contains a -1, then it once contained an entry that has since been
-;;; deleted.
-;;; 
+;;; adding a new entry.  If a location contains a zero, then it has never been
+;;; used, and no entries have ever been "hashed past" it.  If a location
+;;; contains SPELL-DELETED-ENTRY, then it once contained an entry that has
+;;; since been deleted.
+;;;
 (defmacro hash-entry (entry entry-len)
   (let ((loop-loc (gensym)) (loc-contents (gensym))
 	(hash (gensym)) (loc (gensym)))
@@ -72,7 +74,7 @@
 	    (,loc (rem ,hash (the fixnum *dictionary-size*)))
 	    (,loc-contents (dictionary-ref ,loc)))
        (declare (fixnum ,loc ,loc-contents))
-       (if (or (zerop ,loc-contents) (= ,loc-contents -1))
+       (if (or (zerop ,loc-contents) (= ,loc-contents spell-deleted-entry))
 	   ,loc
 	   (hash2-loop (,loop-loc ,loc-contents) ,loc ,hash
 	     ,loop-loc nil t)))))
@@ -157,7 +159,7 @@
 ;;; flag, the flag is cleared in the descriptor table.  If entry is a root
 ;;; word in the dictionary (that is, looked up without the use of a flag),
 ;;; then the root and all its derivitives are deleted by setting its
-;;; dictionary location to -1.
+;;; dictionary location to spell-deleted-entry.
 ;;; 
 (defun spell-remove-entry (entry)
   "Removes entry from the dictionary, so it will be an unknown word.  Entry
@@ -183,14 +185,15 @@
 		(declare (fixnum hash hash-and-len loc))
 		(cond ((zerop loc-contents) nil)
 		      ((found-entry-p loc-contents entry entry-len hash-and-len)
-		       (setf (dictionary-ref loc) -1))
+		       (setf (dictionary-ref loc) spell-deleted-entry))
 		      (t
 		       (hash2-loop (loop-loc loc-contents) loc hash
 				   nil
 				   (when (found-entry-p loc-contents entry
 							entry-len hash-and-len)
-				     (setf (dictionary-ref loop-loc) -1)
-				     (return -1))))))))))))
+				     (setf (dictionary-ref loop-loc)
+					   spell-deleted-entry)
+				     (return spell-deleted-entry))))))))))))
 
 (defun spell-root-flags (index)
   "Return the flags associated with the root word corresponding to a
diff --git a/hemlock/table.lisp b/hemlock/table.lisp
index f21d6fdbcd4d80c75af3b75ca2b9d76e0988d7ef..a9643e796ffec5f0dae0617bc0cfd0c337d9b83c 100644
--- a/hemlock/table.lisp
+++ b/hemlock/table.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/table.lisp,v 1.1.1.5 1991/12/20 18:25:28 ram Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/table.lisp,v 1.1.1.6 1993/08/25 02:10:57 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -220,7 +220,7 @@
 	    ;; move the buggers down a slot
 	    (replace ,vector ,vector :start1 (1+ ,pos) :start2 ,pos)
 	    (setf (svref ,vector ,pos) ,element)
-	    ,vector)))))
+	    ,vector))))
 
 (define-modify-macro nconcf (&rest args) nconc)
 
diff --git a/hemlock/tty-display.lisp b/hemlock/tty-display.lisp
index f31e970f4347604a8c40ddde05630fc7c8386ba7..e0ecf3f23d93d23bb7e3e0e1014b1bbc82fa5d87 100644
--- a/hemlock/tty-display.lisp
+++ b/hemlock/tty-display.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/tty-display.lisp,v 1.1.1.10 1991/10/30 08:22:37 wlott Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/tty-display.lisp,v 1.1.1.11 1993/08/25 02:11:11 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -1216,19 +1216,19 @@
   (let* ((device (device-hunk-device hunk))
 	 (init-string (tty-device-insert-init-string device))
 	 (char-init-string (tty-device-insert-char-init-string device))
-	 (cis-len (if char-init-string (length char-init-string)))
 	 (char-end-string (tty-device-insert-char-end-string device))
-	 (ces-len (if char-end-string (length char-end-string)))
 	 (end-string (tty-device-insert-end-string device)))
     (declare (type (or simple-string null) char-init-string char-end-string))
     (when init-string (device-write-string init-string))
     (if char-init-string
-	(do ((i start (1+ i)))
-	    ((= i end))
-	  (device-write-string char-init-string 0 cis-len)
-	  (tty-write-char (schar string i))
-	  (when char-end-string
-	    (device-write-string char-end-string 0 ces-len)))
+	(let ((cis-len (length char-init-string))
+	      (ces-len (length char-end-string)))
+	  (do ((i start (1+ i)))
+	      ((= i end))
+	    (device-write-string char-init-string 0 cis-len)
+	    (tty-write-char (schar string i))
+	    (when char-end-string
+	      (device-write-string char-end-string 0 ces-len))))
 	(device-write-string string start end))
     (when end-string (device-write-string end-string))
     (setf (tty-device-cursor-x device)
diff --git a/hemlock/tty-stream.lisp b/hemlock/tty-stream.lisp
index 013a7df605212a3da073a4e28ca29f6a8264df17..a1a8c3d506e758eeae3a34cba8b2ea6bf71f737a 100644
--- a/hemlock/tty-stream.lisp
+++ b/hemlock/tty-stream.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/tty-stream.lisp,v 1.1.1.3 1991/11/09 03:06:04 wlott Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/tty-stream.lisp,v 1.1.1.4 1993/08/25 02:11:17 ram Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -19,7 +19,7 @@
 ;;; (if only) difference is in TTY-HUNK-STREAM-NEWLINE.
 ;;;
 
-(in-package 'hemlock-internals)
+(in-package "HEMLOCK"-internals)