From 3f12b18cb57c5cb2a11706ba87fdbb20aa0d6301 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Tue, 19 Oct 2010 15:20:33 -0400 Subject: [PATCH] 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. --- etc/ChangeLog | 4 ++++ etc/tutorials/TUTORIAL | 12 ++++++------ lisp/ChangeLog | 4 ++++ lisp/bindings.el | 11 ++++++----- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/etc/ChangeLog b/etc/ChangeLog index 3e5a6e79894..f1b17fe320d 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2010-10-19 Julien Danjou + + * tutorials/TUTORIAL: Don't mention mode-line end dashes. + 2010-10-16 Chong Yidong * themes: New directory for custom theme files, moved from lisp/. diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL index 1d80f4e1191..f566df9735d 100644 --- a/etc/tutorials/TUTORIAL +++ b/etc/tutorials/TUTORIAL @@ -498,12 +498,12 @@ you save, Emacs leaves the original file under a changed name in case 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 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 + + * bindings.el: Remove end dashes in default mode-line-format. + 2010-10-19 Chong Yidong * 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