(mode-line-mule-info): In computing help-echo prop,

avoid using save-window-excursion.  And compile the function.

diff --git a/lisp/bindings.el b/lisp/bindings.el
index 4135cf1c187abd103edbb24d07ba853717a4bc1d..2d22d2b2f9d65fd378d4c565c94eb3299ca499c2 100644 (file)
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -149,18 +149,16 @@ corresponding to the mode line clicked."
     ,(propertize
       "%Z"
       'help-echo
-      (purecopy (lambda (window object point)
-                 (save-window-excursion
-                   (select-window window)
-                   ;; Don't show this tip if the coding system is nil,
-                   ;; it reads like a bug, and is not useful anyway.
-                   (when buffer-file-coding-system
-                     (if enable-multibyte-characters
-                         (concat (symbol-name buffer-file-coding-system)
-                                 " buffer; mouse-3: describe coding system")
-                       (concat "Unibyte "
-                               (symbol-name buffer-file-coding-system)
-                               " buffer"))))))
+      #'(lambda (window object point)
+         (with-current-buffer (window-buffer window)
+           ;; Don't show this tip if the coding system is nil,
+           ;; it reads like a bug, and is not useful anyway.
+           (when buffer-file-coding-system
+             (if enable-multibyte-characters
+                 (concat (symbol-name buffer-file-coding-system)
+                         " buffer; mouse-3: describe coding system")
+               (concat "Unibyte " (symbol-name buffer-file-coding-system)
+                       " buffer")))))
       'local-map mode-line-coding-system-map))
   "Mode-line control for displaying information of multilingual environment.
 Normally it displays current input method (if any activated) and