Changeset 6694

Timestamp:

Jun 12, 2007, 12:08:43 AM (17 years ago)

Author:

Gary Byers

Message:

Don't show (redundant) buffer-name, pathname in modeline.
Do show line termination/character encoding info.

File:

• branches/ide-1.0/ccl/hemlock/src/modeline.lisp (modified) (3 diffs)

branches/ide-1.0/ccl/hemlock/src/modeline.lisp

@@ -106 +106 @@
 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 +217 @@
         "")))
 
+
+
 (make-modeline-field
  :name :buffer-pathname
  :function 'buffer-pathname-ml-field-fun)
+
+
 
 (make-modeline-field
@@ -230 +240 @@
         (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\".")