2 files changed, 10 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 394cfdd61d7..aae1e0e81c0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-18  Julien Danjou  <julien@danjou.info>
+
+        * bindings.el: Remove end dashes in default mode-line-format.
+
 2010-10-19  Chong Yidong  <cyd@stupidchicken.com>
 
         * bindings.el (global-map): Bind C-d to delete-char and deletechar
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 9c802e53a56..e9a4c559169 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -318,7 +318,7 @@ Keymap to display on column and line numbers.")
 mouse-2: Make current window occupy the whole frame\n\
 mouse-3: Remove current window from display")
        (recursive-edit-help-echo "Recursive edit, type C-M-c to get out")
-       (dashes (propertize "--" 'help-echo help-echo))
+       (spaces (propertize " " 'help-echo help-echo))
        (standard-mode-line-format
         (list
          "%e"
@@ -334,9 +334,10 @@ mouse-3: Remove current window from display")
          '(vc-mode vc-mode)
          (propertize "  " 'help-echo help-echo)
          'mode-line-modes
-         `(which-func-mode ("" which-func-format ,dashes))
-         `(global-mode-string ("" global-mode-string ,dashes))
-         (propertize "-%-" 'help-echo help-echo)))
+         `(which-func-mode ("" which-func-format ,spaces))
+         `(global-mode-string ("" global-mode-string ,spaces))
+         `(:eval (unless (display-graphic-p)
+                   ,(propertize "-%-" 'help-echo help-echo)))))
        (standard-mode-line-modes
         (list
          (propertize "%[" 'help-echo recursive-edit-help-echo)
@@ -362,7 +363,7 @@ mouse-3: Toggle minor modes"
                                  'mouse-2 #'mode-line-widen))
          (propertize ")" 'help-echo help-echo)
          (propertize "%]" 'help-echo recursive-edit-help-echo)
-         (propertize "--" 'help-echo help-echo)))
+         spaces))
 
        (standard-mode-line-position
         `((-3 ,(propertize