X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b8a47412d30e73a12c1919d0109f9272096e9ce6..6420d28b9ab9c09b69992e05e0e63c3bbaf2646d:/lisp/bindings.el diff --git a/lisp/bindings.el b/lisp/bindings.el index 9c802e53a5..a7b729a1ba 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -1,7 +1,6 @@ ;;; bindings.el --- define standard key bindings and some variables -;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996, 1999, -;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Copyright (C) 1985-1987, 1992-1996, 1999-2011 ;; Free Software Foundation, Inc. ;; Maintainer: FSF @@ -154,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))) @@ -210,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) @@ -223,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) @@ -243,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) @@ -318,11 +317,13 @@ 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" - (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 @@ -334,9 +335,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 +364,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 @@ -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,14 +643,25 @@ 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)) (define-key esc-map "\t" 'complete-symbol) +(defun complete-symbol (arg) + "Perform completion on the text around point. +The completion method is determined by `completion-at-point-functions'. + +With a prefix argument, this command does completion within +the collection of symbols listed in the index of the manual for the +language you are using." + (interactive "P") + (if arg (info-complete-symbol) (completion-at-point))) + ;; Reduce total amount of space we must allocate during this function ;; that we will not need to keep permanently. (garbage-collect) @@ -1203,5 +1211,4 @@ if `inhibit-field-text-motion' is non-nil." ;; no-update-autoloads: t ;; End: -;; arch-tag: 23b5c7e6-e47b-49ed-8c6c-ed213c5fffe0 ;;; bindings.el ends here