Index: /trunk/ccl/examples/hemlock-textstorage.lisp
===================================================================
--- /trunk/ccl/examples/hemlock-textstorage.lisp	(revision 565)
+++ /trunk/ccl/examples/hemlock-textstorage.lisp	(revision 566)
@@ -3,5 +3,6 @@
 (in-package "CCL")
 
-(require "COCOA")
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (require "HEMLOCK"))
 
 (eval-when (:compile-toplevel :execute)
@@ -9,5 +10,5 @@
 
 
-(defstruct hemlock-display
+(defstruct hemlock-display 
   buffer				; the hemlock buffer
   buflen				; length of buffer, if known
@@ -131,4 +132,5 @@
 			  :effective-range ((* :<NSR>ange) rangeptr))
 		     lisp-text-storage)
+  (declare (ignorable index))
   #+debug
   (#_NSLog #@"Attributes at index %d, rangeptr = %x"
@@ -212,4 +214,5 @@
 (define-objc-method ((:void :key-down event)
 		     lisp-text-view)
+  #+debug
   (#_NSLog #@"Key down event = %@" :address event)
   (let* ((buffer (text-view-buffer self)))
@@ -258,5 +261,5 @@
                             :font (default-font
                                       :name "Courier New Bold Italic"
-                                      :size 12.0)))
+                                      :size 9.0)))
 
 (defun buffer-for-modeline-view (mv)
@@ -652,5 +655,5 @@
             (update-line-cache-for-index display pos))
 
-          (send textstorage
+	  (send textstorage
                 :edited #$NSTextStorageEditedAttributes
                 :range (ns-make-range pos n)
Index: /trunk/ccl/hemlock/src/bindings.lisp
===================================================================
--- /trunk/ccl/hemlock/src/bindings.lisp	(revision 565)
+++ /trunk/ccl/hemlock/src/bindings.lisp	(revision 566)
@@ -381,4 +381,6 @@
 (bind-key "Delete Previous Character Expanding Tabs" #k"delete" :mode "Lisp")
 
+#+listener-bindings
+(progn
 (bind-key "Evaluate Expression" #k"meta-escape")
 (bind-key "Evaluate Defun" #k"control-x control-e")
@@ -389,7 +391,10 @@
 (bind-key "Describe Function Call" #k"control-meta-A")
 (bind-key "Describe Symbol" #k"control-meta-S")
+)
 
 (bind-key "Goto Definition" #k"control-meta-F")
 
+#+debugger-bindings
+(progn
 (bind-key "Debug Up" #k"control-meta-hyper-u")
 (bind-key "Debug Down" #k"control-meta-hyper-d")
@@ -410,5 +415,5 @@
 (bind-key "Debug Edit Source" #k"control-meta-hyper-S")
 (bind-key "Debug Flush Errors" #k"control-meta-hyper-F")
-
+)
 
 
Index: /trunk/ccl/hemlock/src/cocoa-hemlock.lisp
===================================================================
--- /trunk/ccl/hemlock/src/cocoa-hemlock.lisp	(revision 566)
+++ /trunk/ccl/hemlock/src/cocoa-hemlock.lisp	(revision 566)
@@ -0,0 +1,7 @@
+;;; -*- Mode: Lisp; Package: Hemlock-Internals -*-
+;;;
+;;; **********************************************************************
+;;; Hemlock was written as part of the CMU Common Lisp project at
+;;; Carnegie Mellon University, and has been placed in the public domain.
+
+(in-package :hemlock-internals)
Index: /trunk/ccl/hemlock/src/interp.lisp
===================================================================
--- /trunk/ccl/hemlock/src/interp.lisp	(revision 565)
+++ /trunk/ccl/hemlock/src/interp.lisp	(revision 566)
@@ -445,4 +445,5 @@
       (multiple-value-bind (trans-result prefix-p)
           (translate-key cmd trans)
+	#+debug
         (format t "~& trans-result = ~s, prefix-p = ~s" trans-result prefix-p)
         (multiple-value-bind (res t-bindings)
@@ -451,4 +452,5 @@
             (command 
              (let ((punt t))
+	       #+debug
                (format t "~& key-event = ~s, res = ~s, t-bindings = ~s, prefix = ~s"
                        key-event
Index: /trunk/ccl/hemlock/src/modeline.lisp
===================================================================
--- /trunk/ccl/hemlock/src/modeline.lisp	(revision 565)
+++ /trunk/ccl/hemlock/src/modeline.lisp	(revision 566)
@@ -100,4 +100,12 @@
 				   "Hemlock "))
 
+(make-modeline-field :name :external-format :width 4
+		     :function #'(lambda (buffer window)
+				   "Returns indication of buffer's external-format"
+				   (declare (ignore window))
+				   (format nil "[~c] "
+					   (schar
+					    (string (buffer-external-format buffer)) 0))))
+
 (make-modeline-field
  :name :package
@@ -124,10 +132,10 @@
  :name :modifiedp
  :function #'(lambda (buffer window)
-	       "Returns \"* \" if buffer is modified, or the empty string."
+	       "Returns \"* \" if buffer is modified, or \"  \"."
 	       (declare (ignore window))
 	       (let ((modifiedp (buffer-modified buffer)))
 		 (if modifiedp
 		     "* "
-		     ""))))
+		     "  "))))
 
 (make-modeline-field
@@ -198,8 +206,8 @@
 
 (defvar *default-modeline-fields*
-  (list (modeline-field :hemlock-literal)
+  (list (modeline-field :modifiedp) ;(modeline-field :hemlock-literal)
+	(modeline-field :external-format)
 	(modeline-field :package)
 	(modeline-field :modes)
-	(modeline-field :modifiedp)
 	(modeline-field :buffer-name)
 	(modeline-field :buffer-pathname))
Index: /trunk/ccl/hemlock/src/struct.lisp
===================================================================
--- /trunk/ccl/hemlock/src/struct.lisp	(revision 565)
+++ /trunk/ccl/hemlock/src/struct.lisp	(revision 566)
@@ -103,4 +103,5 @@
   %modeline-fields	      ; List of modeline-field-info's.
   (delete-hook nil)	      ; List of functions to call upon deletion.
+  (external-format :unix)     ; Line-termination, for the time being
   )