diff options
Diffstat (limited to 'lisp/bindings.el')
| -rw-r--r-- | lisp/bindings.el | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/lisp/bindings.el b/lisp/bindings.el index d19db2c779e..bd4a1203364 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -318,7 +318,7 @@ 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" @@ -334,9 +334,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 +363,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 @@ -654,6 +655,16 @@ is okay. See `mode-line-format'.") (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) @@ -824,7 +835,7 @@ if `inhibit-field-text-motion' is non-nil." (define-key global-map [?\C-\M--] 'negative-argument) (define-key global-map "\177" 'delete-backward-char) -(define-key global-map "\C-d" 'delete-forward-char) +(define-key global-map "\C-d" 'delete-char) (define-key global-map "\C-k" 'kill-line) (define-key global-map "\C-w" 'kill-region) @@ -933,7 +944,7 @@ if `inhibit-field-text-motion' is non-nil." ;; (define-key global-map [clearline] 'function-key-error) (define-key global-map [insertline] 'open-line) (define-key global-map [deleteline] 'kill-line) -(define-key global-map [deletechar] 'delete-char) +(define-key global-map [deletechar] 'delete-forward-char) ;; (define-key global-map [backtab] 'function-key-error) ;; (define-key global-map [f1] 'function-key-error) ;; (define-key global-map [f2] 'function-key-error) |