aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/bindings.el9
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ecd949d4c1..0efca43be1e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -12,6 +12,9 @@
12 (mode-line-mule-info, mode-line-modified): Use them. 12 (mode-line-mule-info, mode-line-modified): Use them.
13 (mode-line-eol-desc, propertized-buffer-identification): 13 (mode-line-eol-desc, propertized-buffer-identification):
14 Consistency fixes for help text. 14 Consistency fixes for help text.
15 (mode-line-coding-system-map): Allow using mouse-3 to invoke
16 set-buffer-file-coding-system (Bug#289).
17 (mode-line-mule-info-help-echo): Update help text.
15 18
162012-06-02 Stefan Monnier <monnier@iro.umontreal.ca> 192012-06-02 Stefan Monnier <monnier@iro.umontreal.ca>
17 20
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 8e6c94466cf..2a37bfd19a7 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -88,6 +88,12 @@ corresponding to the mode line clicked."
88 (when (and enable-multibyte-characters 88 (when (and enable-multibyte-characters
89 buffer-file-coding-system) 89 buffer-file-coding-system)
90 (describe-coding-system buffer-file-coding-system))))) 90 (describe-coding-system buffer-file-coding-system)))))
91 (define-key map [mode-line mouse-3]
92 (lambda (e)
93 (interactive "e")
94 (save-selected-window
95 (select-window (posn-window (event-start e)))
96 (call-interactively 'set-buffer-file-coding-system))))
91 (purecopy map)) 97 (purecopy map))
92 "Local keymap for the coding-system part of the mode line.") 98 "Local keymap for the coding-system part of the mode line.")
93 99
@@ -153,7 +159,8 @@ is displayed first.")
153 (with-current-buffer (window-buffer window) 159 (with-current-buffer (window-buffer window)
154 (if buffer-file-coding-system 160 (if buffer-file-coding-system
155 (format "Buffer coding system (%s): %s 161 (format "Buffer coding system (%s): %s
156mouse-1: Describe coding system" 162mouse-1: Describe coding system
163mouse-3: Set coding system"
157 (if enable-multibyte-characters "multi-byte" "unibyte") 164 (if enable-multibyte-characters "multi-byte" "unibyte")
158 (symbol-name buffer-file-coding-system)) 165 (symbol-name buffer-file-coding-system))
159 "Buffer coding system: none specified"))) 166 "Buffer coding system: none specified")))