diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-11 16:14:00 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-11 16:14:00 +0000 |
| commit | ecb21060d5c1752d41d7a742be565c59b5fcb855 (patch) | |
| tree | fadebcd18a69457a1d564f738c3f9bdcf512ab4b /lisp/bindings.el | |
| parent | 42af7493ae7e7a14ee508800c7fa75b65a94c143 (diff) | |
| parent | 58ade22bf16a9ec2ff0aee6c59d8db4d1703e94f (diff) | |
| download | emacs-ecb21060d5c1752d41d7a742be565c59b5fcb855.tar.gz emacs-ecb21060d5c1752d41d7a742be565c59b5fcb855.tar.bz2 emacs-ecb21060d5c1752d41d7a742be565c59b5fcb855.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
Diffstat (limited to 'lisp/bindings.el')
| -rw-r--r-- | lisp/bindings.el | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lisp/bindings.el b/lisp/bindings.el index 9fd4b3b9569..0e7bd15a494 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -170,6 +170,12 @@ corresponding to the mode line clicked." (push (cons eol (cons mnemonic desc)) mode-line-eol-desc-cache) desc))) +(defvar mode-line-client + `("" + (:propertize ("" (:eval (if (frame-parameter nil 'client) "@" ""))) + help-echo "Emacsclient frame")) + "Mode-line control for identifying Emacsclient frames.") + (defvar mode-line-mule-info `("" (current-input-method @@ -209,7 +215,7 @@ mnemonics of the following coding systems: (make-variable-buffer-local 'mode-line-mule-info) -(defvar mode-line-frame-identification '("-%F ") +(defvar mode-line-frame-identification '(window-system " " "-%F ") "Mode-line control to describe the current frame.") (defvar mode-line-process nil "\ @@ -302,6 +308,7 @@ Keymap to display on minor modes.") "%e" (propertize "-" 'help-echo help-echo) 'mode-line-mule-info + 'mode-line-client 'mode-line-modified 'mode-line-remote 'mode-line-frame-identification @@ -331,6 +338,7 @@ Keymap to display on minor modes.") 'local-map (make-mode-line-mouse-map 'mouse-2 #'mode-line-widen)) (propertize ")%]--" 'help-echo help-echo))) + (standard-mode-line-position `((-3 ,(propertize "%p" 'help-echo help-echo)) (size-indication-mode @@ -643,6 +651,10 @@ language you are using." (define-key global-map "\e\e\e" 'keyboard-escape-quit) (define-key global-map "\C-g" 'keyboard-quit) +;; Used to be in termdev.el: when using several terminals, make C-z +;; suspend only the relevant terminal. +(substitute-key-definition 'suspend-emacs 'suspend-frame global-map) + (define-key global-map "\C-j" 'newline-and-indent) (define-key global-map "\C-m" 'newline) (define-key global-map "\C-o" 'open-line) @@ -1023,8 +1035,7 @@ language you are using." (define-key ctl-x-map "rw" 'window-configuration-to-register) (define-key ctl-x-map "rf" 'frame-configuration-to-register) -(define-key esc-map "q" 'fill-paragraph) -;; (define-key esc-map "g" 'fill-region) +(define-key esc-map "q" 'fill-paragraph-or-region) (define-key ctl-x-map "." 'set-fill-prefix) (define-key esc-map "{" 'backward-paragraph) |