Index: /branches/ide-1.0/ccl/hemlock/src/modeline.lisp
===================================================================
--- /branches/ide-1.0/ccl/hemlock/src/modeline.lisp	(revision 6693)
+++ /branches/ide-1.0/ccl/hemlock/src/modeline.lisp	(revision 6694)
@@ -106,9 +106,15 @@
 other than :DEFAULT"
 	       (declare (ignore window))
-	       (let* ((external-format (buffer-external-format buffer)))
-		 (case external-format
-		   ((:unix nil))
-		   (:macos "[CR] ")
-		   (:cp/m "[CRLF] ")))))
+	       (let* ((line-termination-string
+                       (case (buffer-line-termination buffer)
+                         ((:unix nil))
+                         (:macos "CR")
+                         (:cp/m "CRLF")))
+                      (doc (buffer-document buffer))
+                      (encoding-name (if doc
+                                       (document-encoding-name doc)
+                                       "Default")))
+                 (format nil "[~a~@[ ~a~]] "
+                         encoding-name line-termination-string))))
 
 
@@ -211,7 +217,11 @@
 	"")))
 
+
+
 (make-modeline-field
  :name :buffer-pathname
  :function 'buffer-pathname-ml-field-fun)
+
+
 
 (make-modeline-field
@@ -230,7 +240,5 @@
 	(modeline-field :external-format)
 	(modeline-field :package)
-	(modeline-field :modes)
-	(modeline-field :buffer-name)
-	(modeline-field :buffer-pathname))
+	(modeline-field :modes))
   "This is the default value for \"Default Modeline Fields\".")