[Emacs-diffs] /srv/bzr/emacs/trunk r102002: Remove mode-line end dashes on graphical terminals.

[Chong Yidong]

------------------------------------------------------------
revno: 102002
author: Julien Danjou <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2010-10-19 15:20:33 -0400
message:
  Remove mode-line end dashes on graphical terminals.
  
  * tutorials/TUTORIAL: Don't mention mode-line end dashes.
  * bindings.el: Remove end dashes in default mode-line-format.
modified:
  etc/ChangeLog
  etc/tutorials/TUTORIAL
  lisp/ChangeLog
  lisp/bindings.el

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2010-10-16 18:27:08 +0000
+++ b/etc/ChangeLog     2010-10-19 19:20:33 +0000
@@ -1,3 +1,7 @@
+2010-10-19  Julien Danjou  <address@hidden>
+
+       * tutorials/TUTORIAL: Don't mention mode-line end dashes.
+
 2010-10-16  Chong Yidong  <address@hidden>
 
        * themes: New directory for custom theme files, moved from lisp/.

=== modified file 'etc/tutorials/TUTORIAL'
--- a/etc/tutorials/TUTORIAL    2010-01-13 08:35:10 +0000
+++ b/etc/tutorials/TUTORIAL    2010-10-19 19:20:33 +0000
@@ -498,12 +498,12 @@
 you later decide that your changes were a mistake.
 
 If you look near the bottom of the screen you will see a line that
-begins and ends with dashes, and starts with "--:--- TUTORIAL" or
-something like that.  This part of the screen normally shows the name
-of the file that you are visiting.  Right now, you are visiting a file
-called "TUTORIAL" which is your personal scratch copy of the Emacs
-tutorial.  When you find a file with Emacs, that file's name will
-appear in that precise spot.
+begins with dashes, and starts with "--:--- TUTORIAL" or something
+like that.  This part of the screen normally shows the name of the
+file that you are visiting.  Right now, you are visiting a file called
+"TUTORIAL" which is your personal scratch copy of the Emacs tutorial.
+When you find a file with Emacs, that file's name will appear in that
+precise spot.
 
 One special thing about the command for finding a file is that you
 have to say what file name you want.  We say the command "reads an

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-19 15:43:27 +0000
+++ b/lisp/ChangeLog    2010-10-19 19:20:33 +0000
@@ -1,3 +1,7 @@
+2010-10-18  Julien Danjou  <address@hidden>
+
+       * bindings.el: Remove end dashes in default mode-line-format.
+
 2010-10-19  Chong Yidong  <address@hidden>
 
        * bindings.el (global-map): Bind C-d to delete-char and deletechar

=== modified file 'lisp/bindings.el'
--- a/lisp/bindings.el  2010-10-19 15:43:27 +0000
+++ b/lisp/bindings.el  2010-10-19 19:20:33 +0000
@@ -318,7 +318,7 @@
 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 @@
         '(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-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