From abakic at common-lisp.net  Fri Sep  3 23:06:48 2004
From: abakic at common-lisp.net (Aleksandar Bakic)
Date: Fri, 03 Sep 2004 23:06:48 -0000
Subject: [Phemlock-cvs] CVS update: phemlock/INSTALL phemlock/hemlock.asd
	phemlock/hemlock.system 
Message-ID: <E1C3N8n-0002Ws-00@common-lisp.net>

Update of /project/phemlock/cvsroot/phemlock
In directory common-lisp.net:/tmp/cvs-serv4954

Modified Files:
	INSTALL hemlock.asd hemlock.system 
Log Message:
Changes to get rid of warnings and notes. As a side-effect, more code
has been commented out. There should be no more warnings nor notes
with CMUCL, and only two style warnings with SBCL. Not tested with
other implementations yet. TODO: spread key bindings to different
files.

Date: Sat Sep  4 01:06:43 2004
Author: abakic

Index: phemlock/INSTALL
diff -u phemlock/INSTALL:1.2 phemlock/INSTALL:1.3
--- phemlock/INSTALL:1.2	Fri Jul  9 17:07:09 2004
+++ phemlock/INSTALL	Sat Sep  4 01:06:43 2004
@@ -19,3 +19,4 @@
  - CLISP using MIT CLX
 
 
+ASDF system file hemlock.asd has been added, supporting SBCL for now.
\ No newline at end of file


Index: phemlock/hemlock.asd
diff -u phemlock/hemlock.asd:1.1 phemlock/hemlock.asd:1.2
--- phemlock/hemlock.asd:1.1	Tue Jul 20 01:50:26 2004
+++ phemlock/hemlock.asd	Sat Sep  4 01:06:43 2004
@@ -1,23 +1,233 @@
-(defpackage "MK"  (:export "DEFSYSTEM"))
-(defpackage :hemlock-system (:use "CL" "ASDF"))
-(in-package :hemlock-system)
-
-(with-open-file (in (merge-pathnames "hemlock.system" *load-truename*))
-  (loop for form = (read in nil nil)
-	while form
-	if (eql (car form) 'mk::defsystem)
-	do (destructuring-bind (name &key components &allow-other-keys)
-	       (cdr form)
-	     (eval `(asdf:defsystem ,name :serial t :depends-on (clx)
-		     :components
-		     ,(mapcar (lambda (x) `(:file ,x
-					    :pathname 
-					    ,(merge-pathnames
-					      (make-pathname
-					       :name x
-					       :directory '(:relative "src")
-					       :type "lisp")
-					      *load-truename*)))
+;; -*- Mode: Lisp; -*-
 
-			      components))))
-	else do (eval form)))
+(proclaim '(optimize (safety 3) (speed 0) (debug 3)))
+
+(defpackage #:hemlock-system
+  (:use #:cl)
+  (:export #:*hemlock-base-directory*))
+
+(in-package #:hemlock-system)
+
+(pushnew :command-bits *features*)
+(pushnew :buffered-lines *features*)
+
+(defparameter *hemlock-base-directory*
+  (make-pathname :name nil :type nil :version nil
+                 :defaults (parse-namestring *load-truename*)))
+
+(defparameter *binary-pathname*
+  (make-pathname :directory
+                 (append (pathname-directory *hemlock-base-directory*)
+                         (list "bin"
+                               #+CLISP "clisp"
+                               #+CMU   "cmu"
+                               #+EXCL  "acl"
+                               #+SBCL  "sbcl"
+                               #-(or CLISP CMU EXCL SBCL)
+                               (string-downcase (lisp-implementation-type))))
+                 :defaults *hemlock-base-directory*))
+
+#-CMU
+(asdf:defsystem :hemlock
+     :pathname #.(make-pathname
+ 			:directory
+ 			(append (pathname-directory *hemlock-base-directory*)
+ 				(list "src"))
+ 			:defaults *hemlock-base-directory*)
+;;     :source-extension "lisp"
+;;     :binary-pathname #.*binary-pathname*
+;;     :depends-on (:clim-clx #+NIL :mcclim-freetype)
+;;     ;; ehem ..
+;;     :initially-do
+;;     (progn
+;;       ;; try to load clx
+;;       (unless (ignore-errors (fboundp (find-symbol "OPEN-DISPLAY" "XLIB")))
+;;         (ignore-errors (require :clx))
+;;         (ignore-errors (require :cmucl-clx)))
+;;       (unless (ignore-errors (fboundp (find-symbol "OPEN-DISPLAY" "XLIB")))
+;;         (error "Please provide me with CLX."))
+;;       ;; Create binary pathnames
+;;       (ensure-directories-exist *binary-pathname*)
+;;       (dolist (subdir '("tty" "wire" "user" "core" "clim"))
+;;         (ensure-directories-exist
+;; 	 (merge-pathnames (make-pathname :directory (list :relative subdir))
+;; 			  *binary-pathname*)
+;; 	 :verbose t))
+;;       ;; Gray Streams
+;;       #+CMU
+;;       (require :gray-streams)
+;;       #+CMU
+;;       (setf ext:*efficiency-note-cost-threshold* most-positive-fixnum)
+;;       #+CMU
+;;       (setf ext:*efficiency-note-limit* 0)
+;;       #+CMU
+;;       (proclaim '(optimize (c::brevity 3)))
+;;       #+CMU
+;;       (setf c:*record-xref-info* t)
+;;       )
+    :components
+    ((:module core-1
+	      :pathname #.(merge-pathnames
+			   (make-pathname
+			    :directory '(:relative "src" "core")))
+	      :components
+	      ((:file "package")
+	       ;; Lisp implementation specific stuff goes into one of the next
+	       ;; two files.
+	       (:file "lispdep")
+	       (:file "hemlock-ext")
+
+	       (:file "decls") ; early declarations of functions and stuff
+	       (:file "struct")
+	       ;; "struct-ed"
+	       (:file "charmacs")
+	       (:file "key-event")))
+     (:module bitmap-1
+	      :pathname #.(merge-pathnames
+			   (make-pathname
+			    :directory '(:relative "src" "bitmap")))
+	      :depends-on (core-1)
+	      :components
+	      ((:file "keysym-defs") ; hmm.
+	       (:file "bit-stuff") ; input depends on it --amb
+	       (:file "hunk-draw"))) ; window depends on it --amb
+     (:module core-2
+	      :pathname #.(merge-pathnames
+			   (make-pathname
+			    :directory '(:relative "src" "core")))
+	      :depends-on (bitmap-1)
+	      :components
+	      ((:file "rompsite")
+	       (:file "input")
+	       (:file "macros")
+	       (:file "line")
+	       (:file "ring")
+	       (:file "htext1") ; buffer depends on it --amb
+	       (:file "buffer")
+	       (:file "vars")
+	       (:file "interp")
+	       (:file "syntax")
+	       (:file "htext2")
+	       (:file "htext3")
+	       (:file "htext4")
+	       (:file "files")
+	       (:file "search1")
+	       (:file "search2")
+	       (:file "table")
+     
+	       (:file "winimage")
+	       (:file "window")
+	       (:file "screen")
+	       (:file "linimage")
+	       (:file "cursor")
+	       (:file "display")))
+;;;      (:module tty-1
+;;; 	      :source-pathname "tty"
+;;; 	      :components
+;;; 	      ("termcap"
+;;; 	       ;; "tty-disp-rt"
+;;; 	       ;; "tty-display"
+;;; 	       ))
+     (:module root-1
+	      :pathname #.(merge-pathnames
+			   (make-pathname
+			    :directory '(:relative "src")))
+	      :depends-on (core-2)
+	      :components
+	      ((:file "pop-up-stream")))
+;;;     (:module tty-2
+;;;	      :source-pathname "tty"
+;;;	      :components
+;;;	      ("tty-screen"))
+     (:module root-2
+	      :pathname #.(merge-pathnames
+			   (make-pathname
+			    :directory '(:relative "src")))
+	      :depends-on (root-1)
+	      :components
+	      ((:file "font")
+	       (:file "streams")
+	       ;; "hacks"
+	       (:file "main")
+	       (:file "echo")))
+     (:module user-1
+	      :pathname #.(merge-pathnames
+			   (make-pathname
+			    :directory '(:relative "src" "user")))
+	      :depends-on (root-2)
+	      :components
+	      ((:file "echocoms")
+
+	       (:file "command")
+	       (:file "kbdmac")
+	       (:file "undo")
+	       (:file "killcoms")
+	       (:file "indent")
+	       (:file "searchcoms")
+	       (:file "filecoms")
+	       (:file "morecoms")
+	       (:file "doccoms")
+	       (:file "srccom")
+	       (:file "group")
+	       (:file "fill")
+	       (:file "text")
+
+	       (:file "lispmode")
+	       ;; "ts-buf"
+	       ;; "ts-stream"
+	       ;; "eval-server"
+	       (:file "lispbuf")
+	       ;; "lispeval"
+	       ;; "spell-rt"
+	       ;; "spell-corr"
+	       ;; "spell-aug"
+	       ;; "spellcoms"
+
+	       (:file "comments")
+	       (:file "overwrite")
+	       (:file "abbrev")
+	       (:file "icom")
+	       (:file "defsyn")
+	       (:file "scribe")
+	       (:file "pascal")
+	       (:file "dylan")
+
+	       (:file "edit-defs")
+	       (:file "auto-save")
+	       (:file "register")
+	       (:file "xcoms")
+	       ;; "unixcoms"
+	       ;; "mh"
+	       (:file "highlight")
+	       ;; "dired"
+	       ;; "diredcoms"
+	       (:file "bufed")
+	       ;;"lisp-lib"
+	       (:file "completion")
+	       ;; "shell"
+	       ;; "debug"
+	       ;; "netnews"
+	       ;; "rcs"
+	       (:file "dabbrev")
+	       (:file "bindings")
+	       (:file "bindings-gb")))
+     (:module bitmap-2
+	      :pathname #.(merge-pathnames
+			   (make-pathname
+			    :directory '(:relative "src" "bitmap")))
+	      :depends-on (user-1)
+	      :components
+	      ((:file "rompsite")
+	       (:file "input")
+	       (:file "bit-screen")
+	       (:file "bit-display")
+	       (:file "pop-up-stream")))
+     (:module clim-1
+	      :pathname #.(merge-pathnames
+			   (make-pathname
+			    :directory '(:relative "src" "clim")))
+	      :depends-on (bitmap-2)
+	      :components
+	      ((:file "patch")
+	       (:file "foo")
+	       #+nilamb(:file "exp-syntax")))))
\ No newline at end of file


Index: phemlock/hemlock.system
diff -u phemlock/hemlock.system:1.2 phemlock/hemlock.system:1.3
--- phemlock/hemlock.system:1.2	Fri Jul  9 17:16:55 2004
+++ phemlock/hemlock.system	Sat Sep  4 01:06:43 2004
@@ -28,10 +28,11 @@
                  :defaults *hemlock-base-directory*))
        
 (mk:defsystem :hemlock
-    :source-pathname #.(make-pathname :directory
-                                      (append (pathname-directory *hemlock-base-directory*)
-                                              (list "src"))
-                                      :defaults *hemlock-base-directory*)
+    :source-pathname #.(make-pathname
+			:directory
+			(append (pathname-directory *hemlock-base-directory*)
+				(list "src"))
+			:defaults *hemlock-base-directory*)
     :source-extension "lisp"
     :binary-pathname #.*binary-pathname*
     :depends-on (:clim-clx #+NIL :mcclim-freetype)
@@ -47,138 +48,169 @@
       ;; Create binary pathnames
       (ensure-directories-exist *binary-pathname*)
       (dolist (subdir '("tty" "wire" "user" "core" "clim"))
-        (ensure-directories-exist (merge-pathnames (make-pathname :directory (list :relative subdir))
-                                                   *binary-pathname*)
-                                  :verbose t))
+        (ensure-directories-exist
+	 (merge-pathnames (make-pathname :directory (list :relative subdir))
+			  *binary-pathname*)
+	 :verbose t))
       ;; Gray Streams
       #+CMU
       (require :gray-streams)
       #+CMU
-      (setf *EFFICIENCY-NOTE-COST-THRESHOLD* 1000000)
+      (setf ext:*efficiency-note-cost-threshold* most-positive-fixnum)
       #+CMU
-      (setf *EFFICIENCY-NOTE-LIMIT* 0)
+      (setf ext:*efficiency-note-limit* 0)
       #+CMU
-      (setf C:*RECORD-XREF-INFO* t)
+      (proclaim '(optimize (c::brevity 3)))
+      #+CMU
+      (setf c:*record-xref-info* t)
       )
     :components
-    ("core/package"
-
-     ;; Lisp implementation specific stuff goes into one of the next
-     ;; two files.
-     "core/lispdep"
-     "core/hemlock-ext"                     
-
-     "core/decls"                            ;early declarations of functions and stuff
-     
-     "core/struct"
-     ;; "struct-ed"
-     "core/charmacs"
-     "core/key-event" 
-     "bitmap/keysym-defs"               ;hmm.
-     "core/rompsite"
-     "core/input"
-     "core/macros"
-     "core/line"
-     "core/ring"
-     "core/vars"
-     "core/interp"
-     "core/syntax"
-     "core/htext1"
-     "core/buffer"  
-     "core/htext2"
-     "core/htext3"
-     "core/htext4"
-     "core/files"
-     "core/search1"
-     "core/search2"
-     "core/table"
+    ((:module core-1
+	      :source-pathname "core"
+	      :components
+	      ((:file "package")
+	       ;; Lisp implementation specific stuff goes into one of the next
+	       ;; two files.
+	       (:file "lispdep")
+	       (:file "hemlock-ext")
+
+	       (:file "decls") ; early declarations of functions and stuff
+	       (:file "struct")
+	       ;; "struct-ed"
+	       (:file "charmacs")
+	       (:file "key-event")))
+     (:module bitmap-1
+	      :source-pathname "bitmap"
+	      :depends-on (core-1)
+	      :components
+	      ((:file "keysym-defs") ; hmm.
+	       (:file "bit-stuff") ; input depends on it --amb
+	       (:file "hunk-draw"))) ; window depends on it --amb
+     (:module core-2
+	      :source-pathname "core"
+	      :depends-on (bitmap-1)
+	      :components
+	      ((:file "rompsite")
+	       (:file "input")
+	       (:file "macros")
+	       (:file "line")
+	       (:file "ring")
+	       (:file "htext1") ; buffer depends on it --amb
+	       (:file "buffer")
+	       (:file "vars")
+	       (:file "interp")
+	       (:file "syntax")
+	       (:file "htext2")
+	       (:file "htext3")
+	       (:file "htext4")
+	       (:file "files")
+	       (:file "search1")
+	       (:file "search2")
+	       (:file "table")
      
-     
-     "core/window"
-     "core/screen"
-     "core/winimage"
-     "core/linimage"
-     "core/cursor"
-     "core/display"
-
-
-     "tty/termcap"
-     ;"tty-disp-rt"
-     ;"tty-display"
-     "pop-up-stream"
-     "tty/tty-screen"
-
-     "font"
-     "streams"
-;     "hacks"
-     "main"
-     "echo"
-     "user/echocoms"
-
-     "user/command"
-     "user/kbdmac"
-     "user/undo"
-     "user/killcoms"
-     "user/indent"
-     "user/searchcoms"
-     "user/filecoms"
-     "user/morecoms"
-     "user/doccoms"
-     "user/srccom"
-     "user/group"
-     "user/fill"
-     "user/text"
-
-     "user/lispmode"
-;;     "user/ts-buf"
-;;     "user/ts-stream"
-;;     "user/eval-server"
-     "user/lispbuf"
-;;     "user/lispeval"
-;;     "user/spell-rt"
-;;     "user/spell-corr"
-;;     "user/spell-aug"
-;;     "user/spellcoms"
-
-     "user/comments"
-     "user/overwrite"
-     "user/abbrev"
-     "user/icom"
-     "user/defsyn"
-     "user/scribe"
-     "user/pascal"
-     "user/dylan"
-
-     "user/edit-defs"
-     "user/auto-save"
-     "user/register"
-     "user/xcoms"
-;;     "user/unixcoms"
-;;     "user/mh"
-     "user/highlight"
-;;     "user/dired"
-;;     "user/diredcoms"
-     "user/bufed"
-;;   "user/lisp-lib"
-     "user/completion"
-;;     "user/shell"
-;;     "user/debug"
-;;     "user/netnews"
-;;     "user/rcs"
-     "user/dabbrev"
-     "user/bindings"
-     "user/bindings-gb"
-
-
-     "bitmap/rompsite"
-     "bitmap/input"
-     "bitmap/bit-stuff"
-     "bitmap/hunk-draw"
-     "bitmap/bit-display"
-     "bitmap/bit-screen"
-     "bitmap/pop-up-stream"
-
-     "clim/patch"
-     "clim/foo"
-     "clim/exp-syntax"
-     ))
+	       (:file "winimage")
+	       (:file "window")
+	       (:file "screen")
+	       (:file "linimage")
+	       (:file "cursor")
+	       (:file "display")))
+;;;      (:module tty-1
+;;; 	      :source-pathname "tty"
+;;; 	      :components
+;;; 	      ("termcap"
+;;; 	       ;; "tty-disp-rt"
+;;; 	       ;; "tty-display"
+;;; 	       ))
+     (:module root-1
+	      :source-pathname ""
+	      :depends-on (core-2)
+	      :components
+	      ((:file "pop-up-stream")))
+;;;     (:module tty-2
+;;;	      :source-pathname "tty"
+;;;	      :components
+;;;	      ("tty-screen"))
+     (:module root-2
+	      :source-pathname ""
+	      :depends-on (root-1)
+	      :components
+	      ((:file "font")
+	       (:file "streams")
+	       ;; "hacks"
+	       (:file "main")
+	       (:file "echo")))
+     (:module user-1
+	      :source-pathname "user"
+	      :depends-on (root-2)
+	      :components
+	      ((:file "echocoms")
+
+	       (:file "command")
+	       (:file "kbdmac")
+	       (:file "undo")
+	       (:file "killcoms")
+	       (:file "indent")
+	       (:file "searchcoms")
+	       (:file "filecoms")
+	       (:file "morecoms")
+	       (:file "doccoms")
+	       (:file "srccom")
+	       (:file "group")
+	       (:file "fill")
+	       (:file "text")
+
+	       (:file "lispmode")
+	       ;; "ts-buf"
+	       ;; "ts-stream"
+	       ;; "eval-server"
+	       (:file "lispbuf")
+	       ;; "lispeval"
+	       ;; "spell-rt"
+	       ;; "spell-corr"
+	       ;; "spell-aug"
+	       ;; "spellcoms"
+
+	       (:file "comments")
+	       (:file "overwrite")
+	       (:file "abbrev")
+	       (:file "icom")
+	       (:file "defsyn")
+	       (:file "scribe")
+	       (:file "pascal")
+	       (:file "dylan")
+
+	       (:file "edit-defs")
+	       (:file "auto-save")
+	       (:file "register")
+	       (:file "xcoms")
+	       ;; "unixcoms"
+	       ;; "mh"
+	       (:file "highlight")
+	       ;; "dired"
+	       ;; "diredcoms"
+	       (:file "bufed")
+	       ;;"lisp-lib"
+	       (:file "completion")
+	       ;; "shell"
+	       ;; "debug"
+	       ;; "netnews"
+	       ;; "rcs"
+	       (:file "dabbrev")
+	       (:file "bindings")
+	       (:file "bindings-gb")))
+     (:module bitmap-2
+	      :source-pathname "bitmap"
+	      :depends-on (user-1)
+	      :components
+	      ((:file "rompsite")
+	       (:file "input")
+	       (:file "bit-screen")
+	       (:file "bit-display")
+	       (:file "pop-up-stream")))
+     (:module clim-1
+	      :source-pathname "clim"
+	      :depends-on (bitmap-2)
+	      :components
+	      ((:file "patch")
+	       (:file "foo")
+	       (:file "exp-syntax")))))
\ No newline at end of file




From abakic at common-lisp.net  Fri Sep  3 23:06:49 2004
From: abakic at common-lisp.net (Aleksandar Bakic)
Date: Fri, 03 Sep 2004 23:06:49 -0000
Subject: [Phemlock-cvs] CVS update: phemlock/src/main.lisp 
Message-ID: <E1C3N8p-0002X4-00@common-lisp.net>

Update of /project/phemlock/cvsroot/phemlock/src
In directory common-lisp.net:/tmp/cvs-serv4954/src

Modified Files:
	main.lisp 
Log Message:
Changes to get rid of warnings and notes. As a side-effect, more code
has been commented out. There should be no more warnings nor notes
with CMUCL, and only two style warnings with SBCL. Not tested with
other implementations yet. TODO: spread key bindings to different
files.

Date: Sat Sep  4 01:06:45 2004
Author: abakic

Index: phemlock/src/main.lisp
diff -u phemlock/src/main.lisp:1.1.1.1 phemlock/src/main.lisp:1.2
--- phemlock/src/main.lisp:1.1.1.1	Fri Jul  9 15:37:42 2004
+++ phemlock/src/main.lisp	Sat Sep  4 01:06:45 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/main.lisp,v 1.1.1.1 2004/07/09 13:37:42 gbaumann Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/main.lisp,v 1.2 2004/09/03 23:06:45 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -321,7 +321,7 @@
 	    (if (not (eq init t))
 		init
 		(and switch
-		     (or (cmd-switch-value switch)
+		     #+nilamb (or (cmd-switch-value switch)
 			 (car (cmd-switch-words switch))))))
            (home (user-homedir-pathname)))
       (when home




From abakic at common-lisp.net  Fri Sep  3 23:06:52 2004
From: abakic at common-lisp.net (Aleksandar Bakic)
Date: Fri, 03 Sep 2004 23:06:52 -0000
Subject: [Phemlock-cvs] CVS update: phemlock/src/bitmap/bit-screen.lisp
	phemlock/src/bitmap/hunk-draw.lisp
	phemlock/src/bitmap/rompsite.lisp 
Message-ID: <E1C3N8s-0002XK-00@common-lisp.net>

Update of /project/phemlock/cvsroot/phemlock/src/bitmap
In directory common-lisp.net:/tmp/cvs-serv4954/src/bitmap

Modified Files:
	bit-screen.lisp hunk-draw.lisp rompsite.lisp 
Log Message:
Changes to get rid of warnings and notes. As a side-effect, more code
has been commented out. There should be no more warnings nor notes
with CMUCL, and only two style warnings with SBCL. Not tested with
other implementations yet. TODO: spread key bindings to different
files.

Date: Sat Sep  4 01:06:48 2004
Author: abakic

Index: phemlock/src/bitmap/bit-screen.lisp
diff -u phemlock/src/bitmap/bit-screen.lisp:1.2 phemlock/src/bitmap/bit-screen.lisp:1.3
--- phemlock/src/bitmap/bit-screen.lisp:1.2	Tue Aug 10 14:47:06 2004
+++ phemlock/src/bitmap/bit-screen.lisp	Sat Sep  4 01:06:46 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/bitmap/bit-screen.lisp,v 1.2 2004/08/10 12:47:06 rstrandh Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/bitmap/bit-screen.lisp,v 1.3 2004/09/03 23:06:46 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -18,7 +18,11 @@
 
 (in-package :hemlock.x11)
 
-(declaim (special *echo-area-window*))
+(declaim (special *echo-area-window* ; defined in echo --amb
+		  *cursor-background-color* ; defined too late --amb
+		  *cursor-foreground-color* ; defined too late --amb
+		  *hemlock-cursor* ; defined too late --amb
+		  ))
 
 ;;; We have an internal notion of window groups on bitmap devices.  Every
 ;;; Hemlock window has a hunk slot which holds a structure with information
@@ -1122,22 +1126,24 @@
 
 
 ;;;; Setting window width and height.
+;;; Commented out by amb because of a side effect of undefining the
+;;; window struct.
 
 ;;; (SETF WINDOW-WIDTH)  --  Internal
 ;;;
 ;;;    Since we don't support non-full-width windows, this does nothing.
 ;;;
-(defun (setf window-width) (new-value window)
-  (declare (ignore window))
-  new-value)
+;;;(defun (setf window-width) (new-value window)
+;;;  (declare (ignore window))
+;;;  new-value)
 
 ;;; (SETF WINDOW-HEIGHT)  --  Internal
 ;;;
 ;;;    Can't change window height either.
 ;;;
-(defun (setf window-height) (new-value window)
-  (declare (ignore window))
-  new-value)
+;;;(defun (setf window-height) (new-value window)
+;;;  (declare (ignore window))
+;;;  new-value)
 
 
 


Index: phemlock/src/bitmap/hunk-draw.lisp
diff -u phemlock/src/bitmap/hunk-draw.lisp:1.1.1.1 phemlock/src/bitmap/hunk-draw.lisp:1.2
--- phemlock/src/bitmap/hunk-draw.lisp:1.1.1.1	Fri Jul  9 15:38:02 2004
+++ phemlock/src/bitmap/hunk-draw.lisp	Sat Sep  4 01:06:48 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/bitmap/hunk-draw.lisp,v 1.1.1.1 2004/07/09 13:38:02 gbaumann Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/bitmap/hunk-draw.lisp,v 1.2 2004/09/03 23:06:48 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -15,7 +15,11 @@
 ;;;
 (in-package :hemlock.x11)
 
-
+(declaim (special *default-background-pixel* ; defined in bit-screen --amb
+		  *foreground-background-xor* ; defined in bit-screen --amb
+		  *default-font-family* ; defined in font --amb
+		  *current-window* ; defined in window --amb
+		  ))
 ;;;; TODO
 
 ;; . concentrate these in a single point where we draw a string, so that we
@@ -471,6 +475,13 @@
 	  (incf x font-width))))))
 
 ;; $Log: hunk-draw.lisp,v $
+;; Revision 1.2  2004/09/03 23:06:48  abakic
+;; Changes to get rid of warnings and notes. As a side-effect, more code
+;; has been commented out. There should be no more warnings nor notes
+;; with CMUCL, and only two style warnings with SBCL. Not tested with
+;; other implementations yet. TODO: spread key bindings to different
+;; files.
+;;
 ;; Revision 1.1.1.1  2004/07/09 13:38:02  gbaumann
 ;; import
 ;;


Index: phemlock/src/bitmap/rompsite.lisp
diff -u phemlock/src/bitmap/rompsite.lisp:1.1.1.1 phemlock/src/bitmap/rompsite.lisp:1.2
--- phemlock/src/bitmap/rompsite.lisp:1.1.1.1	Fri Jul  9 15:38:05 2004
+++ phemlock/src/bitmap/rompsite.lisp	Sat Sep  4 01:06:48 2004
@@ -96,7 +96,7 @@
 ;;;    This function should be called whenever the editor is entered in a new
 ;;; lisp.  It sets up process specific data structures.
 ;;;
-(defun init-raw-io (display)
+#+nilamb-duplicate(defun init-raw-io (display)
   #-clx (declare (ignore display))
   (setf *editor-windowed-input* nil)
   (cond #+clx
@@ -107,6 +107,7 @@
                #-(or sbcl CMU scl openmcl) (xlib:open-display "localhost"))
 	 (setf *editor-input* (make-windowed-editor-input))
 	 (setup-font-family *editor-windowed-input*))
+	#+nilamb
 	(t ;; The editor's file descriptor is Unix standard input (0).
 	   ;; We don't need to affect system:*file-input-handlers* here
 	   ;; because the init and exit methods for tty redisplay devices




From abakic at common-lisp.net  Fri Sep  3 23:06:58 2004
From: abakic at common-lisp.net (Aleksandar Bakic)
Date: Fri, 03 Sep 2004 23:06:58 -0000
Subject: [Phemlock-cvs] CVS update: phemlock/src/clim/foo.lisp 
Message-ID: <E1C3N8s-0002XW-00@common-lisp.net>

Update of /project/phemlock/cvsroot/phemlock/src/clim
In directory common-lisp.net:/tmp/cvs-serv4954/src/clim

Modified Files:
	foo.lisp 
Log Message:
Changes to get rid of warnings and notes. As a side-effect, more code
has been commented out. There should be no more warnings nor notes
with CMUCL, and only two style warnings with SBCL. Not tested with
other implementations yet. TODO: spread key bindings to different
files.

Date: Sat Sep  4 01:06:50 2004
Author: abakic

Index: phemlock/src/clim/foo.lisp
diff -u phemlock/src/clim/foo.lisp:1.2 phemlock/src/clim/foo.lisp:1.3
--- phemlock/src/clim/foo.lisp:1.2	Fri Jul  9 17:16:14 2004
+++ phemlock/src/clim/foo.lisp	Sat Sep  4 01:06:50 2004
@@ -108,6 +108,7 @@
            :documentation "Extended input stream we read from.")) )
 
 (defmethod get-key-event ((stream clim-editor-input) &optional ignore-abort-attempts-p)
+  (declare (ignorable ignore-abort-attempts-p))
   (or (hi::dq-event stream)
       ;;
       (progn                            ;###
@@ -173,6 +174,10 @@
                                          (command-unparser 'command-line-command-unparser)
                                          (partial-command-parser 'command-line-read-remaining-arguments-for-partial-command)
                                          (prompt "Command: "))
+  (declare (ignorable command-parser
+		      command-unparser
+		      partial-command-parser
+		      prompt))
   (let ((clim:*application-frame* frame))
     (setf *sheet* (clim:frame-standard-output frame))
     (let ((*window-list* *window-list*)
@@ -420,7 +425,7 @@
          (buffer *current-buffer*)
          (start (buffer-start-mark buffer))
          (first (cons dummy-line the-sentinel)) )
-
+    (declare (ignorable start first))
     (setf (slot-value hunk 'ts) (clim:make-text-style :fixed :roman :normal))
     #+NIL
     (setf (slot-value hunk 'ts) (clim:make-device-font-text-style
@@ -536,6 +541,7 @@
          (w (slot-value hunk 'cw))
          (xo 5)
          (yo 5))
+    (declare (ignorable stream))
     ;; (print dl *trace-output*)(finish-output *trace-output*)
     (unless (zerop (dis-line-flags dl))
       (setf (hi::dis-line-tick dl) (incf *tick*)))




From abakic at common-lisp.net  Fri Sep  3 23:07:08 2004
From: abakic at common-lisp.net (Aleksandar Bakic)
Date: Fri, 03 Sep 2004 23:07:08 -0000
Subject: [Phemlock-cvs] CVS update: phemlock/src/core/buffer.lisp
	phemlock/src/core/decls.lisp phemlock/src/core/display.lisp
	phemlock/src/core/input.lisp phemlock/src/core/interp.lisp
	phemlock/src/core/macros.lisp phemlock/src/core/package.lisp
	phemlock/src/core/ring.lisp phemlock/src/core/rompsite.lisp
	phemlock/src/core/screen.lisp phemlock/src/core/struct.lisp
	phemlock/src/core/window.lisp 
Message-ID: <E1C3N98-0002YV-00@common-lisp.net>

Update of /project/phemlock/cvsroot/phemlock/src/core
In directory common-lisp.net:/tmp/cvs-serv4954/src/core

Modified Files:
	buffer.lisp decls.lisp display.lisp input.lisp interp.lisp 
	macros.lisp package.lisp ring.lisp rompsite.lisp screen.lisp 
	struct.lisp window.lisp 
Log Message:
Changes to get rid of warnings and notes. As a side-effect, more code
has been commented out. There should be no more warnings nor notes
with CMUCL, and only two style warnings with SBCL. Not tested with
other implementations yet. TODO: spread key bindings to different
files.

Date: Sat Sep  4 01:06:52 2004
Author: abakic

Index: phemlock/src/core/buffer.lisp
diff -u phemlock/src/core/buffer.lisp:1.2 phemlock/src/core/buffer.lisp:1.3
--- phemlock/src/core/buffer.lisp:1.2	Tue Aug 10 14:47:06 2004
+++ phemlock/src/core/buffer.lisp	Sat Sep  4 01:06:51 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/core/buffer.lisp,v 1.2 2004/08/10 12:47:06 rstrandh Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/core/buffer.lisp,v 1.3 2004/09/03 23:06:51 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -15,6 +15,10 @@
 ;;;
 
 (in-package :hemlock-internals)
+
+(declaim (special *current-buffer* ; because it is defined too late --amb
+		  *global-variable-names* ; defined in main.lisp --amb
+		  ))
 
 
 ;;;; Some buffer structure support.


Index: phemlock/src/core/decls.lisp
diff -u phemlock/src/core/decls.lisp:1.1 phemlock/src/core/decls.lisp:1.2
--- phemlock/src/core/decls.lisp:1.1	Fri Jul  9 17:00:36 2004
+++ phemlock/src/core/decls.lisp	Sat Sep  4 01:06:51 2004
@@ -2,7 +2,7 @@
 
 ;;; Use #.*fast* for optimizations.
 
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (defparameter *fast*
     '(declare (optimize speed)))
 


Index: phemlock/src/core/display.lisp
diff -u phemlock/src/core/display.lisp:1.1 phemlock/src/core/display.lisp:1.2
--- phemlock/src/core/display.lisp:1.1	Fri Jul  9 17:00:36 2004
+++ phemlock/src/core/display.lisp	Sat Sep  4 01:06:51 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/core/display.lisp,v 1.1 2004/07/09 15:00:36 gbaumann Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/core/display.lisp,v 1.2 2004/09/03 23:06:51 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -16,6 +16,7 @@
 
 (in-package :hemlock-internals)
 
+(declaim (special *in-the-editor*)) ; defined in main.lisp --amb
 
 ;;;; Main redisplay entry points.
 
@@ -105,14 +106,15 @@
 		 (setf ,n-res t)))
            (device-force-output ,device)
 	   ,@(if afterp
-		 `(progn 
-		     (device-after-redisplay ,device)
+		 (list
+		  `(progn 
+		    (device-after-redisplay ,device)
 		     ;; The after method may have queued input that the input
 		     ;; loop won't see until the next input arrives, so check
 		     ;; here to return the correct value as per the redisplay
 		     ;; contract.
 		     (when (listen-editor-input *real-editor-input*)
-		       (setf ,n-res :editor-input))))
+		       (setf ,n-res :editor-input)))))
 	   ,n-res)))))
 
 ) ;eval-when


Index: phemlock/src/core/input.lisp
diff -u phemlock/src/core/input.lisp:1.1 phemlock/src/core/input.lisp:1.2
--- phemlock/src/core/input.lisp:1.1	Fri Jul  9 17:00:36 2004
+++ phemlock/src/core/input.lisp	Sat Sep  4 01:06:51 2004
@@ -7,7 +7,7 @@
 (in-package :hemlock-internals)
 
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/core/input.lisp,v 1.1 2004/07/09 15:00:36 gbaumann Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/core/input.lisp,v 1.2 2004/09/03 23:06:51 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -337,7 +337,7 @@
 	 (buffer (window-buffer window))
 	 (start (buffer-start-mark buffer)))
     (when (typep (hi::device-hunk-device (hi::window-hunk window))
-		 'hi::bitmap-device)
+		 (the class (class-of 'hi::bitmap-device)))
       (let ((*more-prompt-action* :normal))
 	(update-modeline-field buffer window :more-prompt)
 	(random-typeout-redisplay window))


Index: phemlock/src/core/interp.lisp
diff -u phemlock/src/core/interp.lisp:1.2 phemlock/src/core/interp.lisp:1.3
--- phemlock/src/core/interp.lisp:1.2	Tue Aug 10 14:47:07 2004
+++ phemlock/src/core/interp.lisp	Sat Sep  4 01:06:51 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/core/interp.lisp,v 1.2 2004/08/10 12:47:07 rstrandh Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/core/interp.lisp,v 1.3 2004/09/03 23:06:51 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -16,6 +16,8 @@
 ;;;
 
 (in-package :hemlock-internals)
+
+(declaim (special *echo-area-buffer*)) ; defined in echo.lisp --amb
 
 (defun %print-hcommand (obj stream depth)
   (declare (ignore depth))


Index: phemlock/src/core/macros.lisp
diff -u phemlock/src/core/macros.lisp:1.1 phemlock/src/core/macros.lisp:1.2
--- phemlock/src/core/macros.lisp:1.1	Fri Jul  9 17:00:36 2004
+++ phemlock/src/core/macros.lisp	Sat Sep  4 01:06:51 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/core/macros.lisp,v 1.1 2004/07/09 15:00:36 gbaumann Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/core/macros.lisp,v 1.2 2004/09/03 23:06:51 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -17,6 +17,7 @@
 
 (in-package :hemlock-internals)
 
+(declaim (special *editor-input*)) ; defined in input --amb
 
 ;;;; Macros used for manipulating Hemlock variables.
 


Index: phemlock/src/core/package.lisp
diff -u phemlock/src/core/package.lisp:1.3 phemlock/src/core/package.lisp:1.4
--- phemlock/src/core/package.lisp:1.3	Tue Aug 10 07:58:04 2004
+++ phemlock/src/core/package.lisp	Sat Sep  4 01:06:51 2004
@@ -101,6 +101,8 @@
    #:delete-characters
    #:delete-region
    #:delete-and-save-region
+   #:fetch-cut-string
+   #:store-cut-string
    #:filter-region
    #:start-line-p
    #:end-line-p
@@ -537,6 +539,7 @@
    #:complete-file
    #:default-directory
    #:set-file-permissions
+   #:ambiguous-files
    ))
 
 (defpackage :hemlock-internals
@@ -858,6 +861,13 @@
   )
 
 ;; $Log: package.lisp,v $
+;; Revision 1.4  2004/09/03 23:06:51  abakic
+;; Changes to get rid of warnings and notes. As a side-effect, more code
+;; has been commented out. There should be no more warnings nor notes
+;; with CMUCL, and only two style warnings with SBCL. Not tested with
+;; other implementations yet. TODO: spread key bindings to different
+;; files.
+;;
 ;; Revision 1.3  2004/08/10 05:58:04  rstrandh
 ;; Removed logical-key-event-name and logical-key-event-documentation
 ;; as they were never used.


Index: phemlock/src/core/ring.lisp
diff -u phemlock/src/core/ring.lisp:1.2 phemlock/src/core/ring.lisp:1.3
--- phemlock/src/core/ring.lisp:1.2	Tue Aug 10 14:47:07 2004
+++ phemlock/src/core/ring.lisp	Sat Sep  4 01:06:51 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/core/ring.lisp,v 1.2 2004/08/10 12:47:07 rstrandh Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/core/ring.lisp,v 1.3 2004/09/03 23:06:51 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -18,6 +18,10 @@
 (defun %print-hring (obj stream depth)
   (declare (ignore depth obj))
   (write-string "#<Hemlock Ring>" stream))
+
+(defun required-argument ()
+  "Portable surrogate of cmucl ext:required-argument. --amb"
+  (error "A required keyword argument was not supplied."))
 
 ;;;; The ring data structure:
 ;;;


Index: phemlock/src/core/rompsite.lisp
diff -u phemlock/src/core/rompsite.lisp:1.1 phemlock/src/core/rompsite.lisp:1.2
--- phemlock/src/core/rompsite.lisp:1.1	Fri Jul  9 17:00:36 2004
+++ phemlock/src/core/rompsite.lisp	Sat Sep  4 01:06:51 2004
@@ -8,7 +8,7 @@
 
 #+CMU
 (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/core/rompsite.lisp,v 1.1 2004/07/09 15:00:36 gbaumann Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/core/rompsite.lisp,v 1.2 2004/09/03 23:06:51 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -205,6 +205,7 @@
                #-(or sbcl CMU scl openmcl) (xlib:open-display "localhost"))
 	 (setf *editor-input* (make-windowed-editor-input))
 	 (setup-font-family *editor-windowed-input*))
+	#+nilamb
 	(t ;; The editor's file descriptor is Unix standard input (0).
 	   ;; We don't need to affect system:*file-input-handlers* here
 	   ;; because the init and exit methods for tty redisplay devices
@@ -258,6 +259,7 @@
 ;;; *BEEP-FUNCTION* and BEEP are in SYSTEM package in CMUCL.
 ;;;
 (defvar *beep-function* #'(lambda (&optional stream)
+			    (declare (ignorable stream))
                             (print "BEEP!" *trace-output*)
                             (finish-output *trace-output*)))
 
@@ -311,6 +313,9 @@
   #+CMU (lisp::make-lisp-stream :in #'in-hemlock-standard-input-read)
   #-CMU (make-broadcast-stream))
 
+(declaim (special *gc-notify-before*
+		  *gc-notify-after*))
+
 (defmacro site-wrapper-macro (&body body)
   `(unwind-protect
      (progn
@@ -333,10 +338,10 @@
        (device-exit device))))
 
 (defun standard-device-init ()
-  (setup-input))
+  #+nilamb(setup-input))
 
 (defun standard-device-exit ()
-  (reset-input))
+  #+nilamb(reset-input))
 
 (declaim (special *echo-area-window*))
 
@@ -521,6 +526,7 @@
   "Takes a symbol or function and returns the pathname for the file the
    function was defined in.  If it was not defined in some file, nil is
    returned."
+  #-CMU(declare (ignorable function))
   #+CMU
   (flet ((frob (code)
 	   (let ((info (kernel:%code-debug-info code)))


Index: phemlock/src/core/screen.lisp
diff -u phemlock/src/core/screen.lisp:1.1 phemlock/src/core/screen.lisp:1.2
--- phemlock/src/core/screen.lisp:1.1	Fri Jul  9 17:00:36 2004
+++ phemlock/src/core/screen.lisp	Sat Sep  4 01:06:51 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/core/screen.lisp,v 1.1 2004/07/09 15:00:36 gbaumann Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/core/screen.lisp,v 1.2 2004/09/03 23:06:51 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -34,7 +34,7 @@
 	(value hemlock::default-status-line-fields))
   (if (windowed-monitor-p)
       (init-bitmap-screen-manager display)
-      (init-tty-screen-manager (get-terminal-name))))
+      nil));(init-tty-screen-manager (get-terminal-name)))) ; disabled --amb
 
 
 


Index: phemlock/src/core/struct.lisp
diff -u phemlock/src/core/struct.lisp:1.2 phemlock/src/core/struct.lisp:1.3
--- phemlock/src/core/struct.lisp:1.2	Tue Aug 10 14:47:07 2004
+++ phemlock/src/core/struct.lisp	Sat Sep  4 01:06:51 2004
@@ -7,7 +7,7 @@
 (in-package :hemlock-internals)
 
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/core/struct.lisp,v 1.2 2004/08/10 12:47:07 rstrandh Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/core/struct.lisp,v 1.3 2004/09/03 23:06:51 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -592,7 +592,7 @@
           :accessor tty-device-speed)))
 
 (defun %make-tty-device (&rest initargs)
-  (make-instance 'tty-device initargs))
+  (apply #'make-instance 'tty-device initargs))
 
 
 ;;;; Device screen hunks and window-group.


Index: phemlock/src/core/window.lisp
diff -u phemlock/src/core/window.lisp:1.2 phemlock/src/core/window.lisp:1.3
--- phemlock/src/core/window.lisp:1.2	Tue Aug 10 14:47:07 2004
+++ phemlock/src/core/window.lisp	Sat Sep  4 01:06:51 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/core/window.lisp,v 1.2 2004/08/10 12:47:07 rstrandh Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/core/window.lisp,v 1.3 2004/09/03 23:06:51 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -18,6 +18,8 @@
 
 (in-package :hemlock-internals)
 
+(declaim (special *echo-area-buffer* ; defined in echo.lisp --amb
+		  *things-to-do-once*)) ; defined in display.lisp --amb
 
 ;;;; CURRENT-WINDOW.
 




From abakic at common-lisp.net  Fri Sep  3 23:07:09 2004
From: abakic at common-lisp.net (Aleksandar Bakic)
Date: Fri, 03 Sep 2004 23:07:09 -0000
Subject: [Phemlock-cvs] CVS update: phemlock/src/user/bufed.lisp
	phemlock/src/user/command.lisp phemlock/src/user/echocoms.lisp
	phemlock/src/user/edit-defs.lisp phemlock/src/user/filecoms.lisp 
Message-ID: <E1C3N9A-0002Yq-00@common-lisp.net>

Update of /project/phemlock/cvsroot/phemlock/src/user
In directory common-lisp.net:/tmp/cvs-serv4954/src/user

Modified Files:
	bufed.lisp command.lisp echocoms.lisp edit-defs.lisp 
	filecoms.lisp 
Log Message:
Changes to get rid of warnings and notes. As a side-effect, more code
has been commented out. There should be no more warnings nor notes
with CMUCL, and only two style warnings with SBCL. Not tested with
other implementations yet. TODO: spread key bindings to different
files.

Date: Sat Sep  4 01:07:07 2004
Author: abakic

Index: phemlock/src/user/bufed.lisp
diff -u phemlock/src/user/bufed.lisp:1.1.1.1 phemlock/src/user/bufed.lisp:1.2
--- phemlock/src/user/bufed.lisp:1.1.1.1	Fri Jul  9 15:38:37 2004
+++ phemlock/src/user/bufed.lisp	Sat Sep  4 01:07:06 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/user/bufed.lisp,v 1.1.1.1 2004/07/09 13:38:37 gbaumann Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/user/bufed.lisp,v 1.2 2004/09/03 23:07:06 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -41,7 +41,21 @@
     (setf *bufed-buffer* nil)
     (setf *bufed-buffers* nil)))
 
-
+;;; copied from diredcoms.lisp (hemlock-internal package) --amb
+;;; ARRAY-ELEMENT-FROM-MARK -- Internal Interface.
+;;;
+;;; This counts the lines between it and the beginning of the buffer.  The
+;;; number is used to index vector as if each line mapped to an element
+;;; starting with the zero'th element (lines are numbered starting at 1).
+;;; This must use AREF since some modes use this with extendable vectors.
+;;;
+(defun array-element-from-mark (mark vector
+				&optional (error-msg "Invalid line."))
+  (when (blank-line-p (mark-line mark)) (editor-error error-msg))
+  (aref vector
+	 (1- (count-lines (region
+			   (buffer-start-mark (line-buffer (mark-line mark)))
+			   mark)))))
 
 ;;;; Commands.
 


Index: phemlock/src/user/command.lisp
diff -u phemlock/src/user/command.lisp:1.1.1.1 phemlock/src/user/command.lisp:1.2
--- phemlock/src/user/command.lisp:1.1.1.1	Fri Jul  9 15:39:09 2004
+++ phemlock/src/user/command.lisp	Sat Sep  4 01:07:06 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/user/command.lisp,v 1.1.1.1 2004/07/09 13:39:09 gbaumann Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/user/command.lisp,v 1.2 2004/09/03 23:07:06 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -40,7 +40,7 @@
   "Pause the Hemlock/Lisp process returning to the process that invoked the
    Lisp."
   (declare (ignore p))
-  (pause-hemlock))
+  #+nilamb(pause-hemlock))
 
 
 


Index: phemlock/src/user/echocoms.lisp
diff -u phemlock/src/user/echocoms.lisp:1.1.1.1 phemlock/src/user/echocoms.lisp:1.2
--- phemlock/src/user/echocoms.lisp:1.1.1.1	Fri Jul  9 15:39:10 2004
+++ phemlock/src/user/echocoms.lisp	Sat Sep  4 01:07:06 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/user/echocoms.lisp,v 1.1.1.1 2004/07/09 13:39:10 gbaumann Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/user/echocoms.lisp,v 1.2 2004/09/03 23:07:06 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -80,8 +80,9 @@
 		 (write-line 
  "There are no possible completions of what you have typed." s))))))
      ((and (eq *parse-type* :file) (not (zerop (length input))))
-      (let ((pns (ambiguous-files (region-to-string *parse-input-region*)
-				  *parse-default*)))
+      (let ((pns #-CMU(ambiguous-files (region-to-string *parse-input-region*)
+				  *parse-default*)
+		 #+CMU(list (region-to-string *parse-input-region*))))
 	(declare (list pns))
 	(with-pop-up-display(s :height (+ (length pns) 2))
 	  (write-line help s)


Index: phemlock/src/user/edit-defs.lisp
diff -u phemlock/src/user/edit-defs.lisp:1.1.1.1 phemlock/src/user/edit-defs.lisp:1.2
--- phemlock/src/user/edit-defs.lisp:1.1.1.1	Fri Jul  9 15:38:48 2004
+++ phemlock/src/user/edit-defs.lisp	Sat Sep  4 01:07:06 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/user/edit-defs.lisp,v 1.1.1.1 2004/07/09 13:38:48 gbaumann Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/user/edit-defs.lisp,v 1.2 2004/09/03 23:07:06 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -164,10 +164,13 @@
 	  (unless in-editor-p
 	    (message "Editing definition from editor Lisp ..."))
 	  (go-to-definition pathname type name))
-	(let ((results (eval-form-in-server
-			info
+	(let ((results (eval;-form-in-server ; disabled, trying something close --amb
+			;info
+			(mapcar
+			 #'prin1-to-string
+			(read-from-string
 			(format nil "(hemlock::definition-editing-info ~S)"
-				fun-name))))
+				fun-name))))))
 	  (go-to-definition (read-from-string (first results)) ;file
 			    (read-from-string (second results)) ;type
 			    (read-from-string (third results))))))) ;name


Index: phemlock/src/user/filecoms.lisp
diff -u phemlock/src/user/filecoms.lisp:1.1.1.1 phemlock/src/user/filecoms.lisp:1.2
--- phemlock/src/user/filecoms.lisp:1.1.1.1	Fri Jul  9 15:39:05 2004
+++ phemlock/src/user/filecoms.lisp	Sat Sep  4 01:07:06 2004
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 #+CMU (ext:file-comment
-  "$Header: /project/phemlock/cvsroot/phemlock/src/user/filecoms.lisp,v 1.1.1.1 2004/07/09 13:39:05 gbaumann Exp $")
+  "$Header: /project/phemlock/cvsroot/phemlock/src/user/filecoms.lisp,v 1.2 2004/09/03 23:07:06 abakic Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -372,9 +372,10 @@
     (cond ((not found)
            (if (and (null (pathname-name trial-pathname))
                     (null (pathname-type trial-pathname))
-                    (pathname-directory trial-pathname))
+                    (pathname-directory trial-pathname)
+		    nil) ; dired-guts is commented out for now --amb
                ;; This looks like a directory -- make dired buffer
-               (dired-guts nil nil trial-pathname)
+               nil ; (dired-guts nil nil trial-pathname)
 
                (let* ((name (pathname-to-buffer-name trial-pathname))
                       (found (getstring name *buffer-names*))
@@ -882,6 +883,15 @@
 
 
 ;;;; File utility commands:
+
+(defun print-directory (pathname &optional stream &key all verbose return-list)
+  "Portable surrogate of cmucl ext:print-directory. --amb"
+  (declare (ignorable all verbose return-list))
+  (let ((s (cond
+	     ((null stream) *standard-output*)
+	     ((eq t stream) *terminal-io*)
+	     (t stream))))
+    (format s "~{~&~A~}" (directory pathname))))
 
 (defcommand "Directory" (p)
   "Do a directory into a pop-up window.  If an argument is supplied, then