X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/14beddf4711854b01d400f36166dc71eb39435bb..6420d28b9ab9c09b69992e05e0e63c3bbaf2646d:/lisp/bindings.el diff --git a/lisp/bindings.el b/lisp/bindings.el index 4d9f4f09e5..a7b729a1ba 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -153,17 +153,17 @@ mouse-3: Describe current input method")) ,(propertize "%z" 'help-echo - #'(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 - (format "Buffer coding system %s\nmouse-1: describe coding system" - (if enable-multibyte-characters - (concat "(multi-byte): " - (symbol-name buffer-file-coding-system)) - (concat "(unibyte): " - (symbol-name buffer-file-coding-system))))))) + (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 + (format "Buffer coding system %s\nmouse-1: describe coding system" + (if enable-multibyte-characters + (concat "(multi-byte): " + (symbol-name buffer-file-coding-system)) + (concat "(unibyte): " + (symbol-name buffer-file-coding-system))))))) 'mouse-face 'mode-line-highlight 'local-map mode-line-coding-system-map) (:eval (mode-line-eol-desc))) @@ -209,7 +209,7 @@ Normally nil in most modes, since there is no process to display.") (defvar mode-line-modified (list (propertize "%1*" - 'help-echo (purecopy (lambda (window object point) + 'help-echo (purecopy (lambda (window _object _point) (format "Buffer is %s\nmouse-1 toggles" (save-selected-window (select-window window) @@ -222,7 +222,7 @@ Normally nil in most modes, since there is no process to display.") 'mouse-face 'mode-line-highlight) (propertize "%1+" - 'help-echo (purecopy (lambda (window object point) + 'help-echo (purecopy (lambda (window _object _point) (format "Buffer is %sodified\nmouse-1 toggles modified state" (save-selected-window (select-window window) @@ -242,7 +242,7 @@ Normally nil in most modes, since there is no process to display.") (list (propertize "%1@" 'mouse-face 'mode-line-highlight - 'help-echo (purecopy (lambda (window object point) + 'help-echo (purecopy (lambda (window _object _point) (format "%s" (save-selected-window (select-window window) @@ -321,7 +321,9 @@ mouse-3: Remove current window from display") (standard-mode-line-format (list "%e" - (propertize "-" 'help-echo help-echo) + `(:eval (if (display-graphic-p) + ,(propertize " " 'help-echo help-echo) + ,(propertize "-" 'help-echo help-echo))) 'mode-line-mule-info 'mode-line-client 'mode-line-modified @@ -452,11 +454,6 @@ Major modes that edit things other than ordinary files may change this (put 'mode-line-buffer-identification 'risky-local-variable t) (make-variable-buffer-local 'mode-line-buffer-identification) -(defun unbury-buffer () "\ -Switch to the last buffer in the buffer list." - (interactive) - (switch-to-buffer (last-buffer))) - (defun mode-line-unbury-buffer (event) "\ Call `unbury-buffer' in this window." (interactive "e") @@ -646,9 +643,10 @@ is okay. See `mode-line-format'.") (make-variable-buffer-local 'indent-tabs-mode) -;; We have base64 and md5 functions built in now. +;; We have base64, md5 and sha1 functions built in now. (provide 'base64) (provide 'md5) +(provide 'sha1) (provide 'overlay '(display syntax-table field)) (provide 'text-properties '(display syntax-table field point-entered))