aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-02-16 01:45:47 +0000
committerDan Nicolaescu2008-02-16 01:45:47 +0000
commitf46b8f6d96a47cc6d26e794c492db80e7fd0d714 (patch)
treea7eb1573097a46c4d5dc20f6c8d550b5ebbcc830
parent2826687d5b21d423ee34b610b194ac3f7dd00788 (diff)
downloademacs-f46b8f6d96a47cc6d26e794c492db80e7fd0d714.tar.gz
emacs-f46b8f6d96a47cc6d26e794c492db80e7fd0d714.zip
(mode-line-mule-info): Make the tooltips more explicit.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/bindings.el19
2 files changed, 15 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25e42a9d2b7..1cdf82a55cd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-02-16 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * bindings.el (mode-line-mule-info): Make the tooltips more explicit.
4
12008-02-15 Jason Rumney <jasonr@gnu.org> 52008-02-15 Jason Rumney <jasonr@gnu.org>
2 6
3 * term/mac-win.el: Fix coding tag. 7 * term/mac-win.el: Fix coding tag.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 8c1a650b9c1..bee285a30b2 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -181,9 +181,11 @@ corresponding to the mode line clicked."
181 (current-input-method 181 (current-input-method
182 (:propertize ("" current-input-method-title) 182 (:propertize ("" current-input-method-title)
183 help-echo (concat 183 help-echo (concat
184 "Input method: " 184 "Current input method: "
185 current-input-method 185 current-input-method
186 ". mouse-2: disable, mouse-3: describe") 186 "\n\
187mouse-2: Disable input method\n\
188mouse-3: Describe current input method")
187 local-map ,mode-line-input-method-map 189 local-map ,mode-line-input-method-map
188 mouse-face mode-line-highlight)) 190 mouse-face mode-line-highlight))
189 ,(propertize 191 ,(propertize
@@ -194,11 +196,12 @@ corresponding to the mode line clicked."
194 ;; Don't show this tip if the coding system is nil, 196 ;; Don't show this tip if the coding system is nil,
195 ;; it reads like a bug, and is not useful anyway. 197 ;; it reads like a bug, and is not useful anyway.
196 (when buffer-file-coding-system 198 (when buffer-file-coding-system
197 (if enable-multibyte-characters 199 (format "Buffer coding system %s\nmouse-1: describe coding system"
198 (concat (symbol-name buffer-file-coding-system) 200 (if enable-multibyte-characters
199 " buffer; mouse-1: describe coding system") 201 (concat "(multi-byte): "
200 (concat "Unibyte " (symbol-name buffer-file-coding-system) 202 (symbol-name buffer-file-coding-system))
201 " buffer"))))) 203 (concat "(unibyte): "
204 (symbol-name buffer-file-coding-system)))))))
202 'mouse-face 'mode-line-highlight 205 'mouse-face 'mode-line-highlight
203 'local-map mode-line-coding-system-map) 206 'local-map mode-line-coding-system-map)
204 (:eval (mode-line-eol-desc))) 207 (:eval (mode-line-eol-desc)))
@@ -241,7 +244,7 @@ Normally nil in most modes, since there is no process to display.")
241 (propertize 244 (propertize
242 "%1+" 245 "%1+"
243 'help-echo (purecopy (lambda (window object point) 246 'help-echo (purecopy (lambda (window object point)
244 (format "%sodified: mouse-1 toggles" 247 (format "Buffer is %sodified\nmouse-1 toggles modified state"
245 (save-selected-window 248 (save-selected-window
246 (select-window window) 249 (select-window window)
247 (if (buffer-modified-p) 250 (if (buffer-modified-p)