(quoted-insert-character-offset): Initialize more cleanly.

[gnu-emacs] / lisp / bindings.el

diff --git a/lisp/bindings.el b/lisp/bindings.el
index 3978afa58e71caacef7a0f264a3280bace3b7462..dc65121239976409a87f73056e906bbd58fc0251 100644 (file)
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -47,6 +47,14 @@
 
 ;;; Code:
 
+(defconst mode-line-mule-info
+  (purecopy '(enable-multibyte-characters
+             ((current-input-method ("[" current-input-method-title "]"))
+              "%z:")))
+  "Mode-line control for displaying information of multilingual environment.")
+
+(make-variable-buffer-local 'mode-line-mule-info)
+
 (defvar mode-line-buffer-identification (purecopy '("%F: %12b"))
   "Mode-line control for identifying the buffer being displayed.
 Its default value is (\"%F: %12b\").  Under X, `%F' is replaced with `Emacs'.
@@ -68,6 +76,7 @@ Normally nil in most modes, since there is no process to display.")
 
 (setq-default mode-line-format
   (list (purecopy "")
+   'mode-line-mule-info
    'mode-line-modified
    'mode-line-buffer-identification
    (purecopy "   ")
@@ -145,9 +154,8 @@ is okay.  See `mode-line-format'.")
        "^Current buffer has no process$"
 
        ;; dabbrev
-       "^No dynamic expansion for \".*\" found\\.$"
-       "^No further dynamic expansions for \".*\" found\\.$"
-       "^No further dynamic expansions for `.*' found$"
+       "^No dynamic expansion for .* found$"
+       "^No further dynamic expansion for .* found$"
 
        ;; Completion
        "^To complete, the point must be after a symbol at least [0-9]* character long\\.$"
@@ -477,6 +485,10 @@ for \\[find-tag] (which see)."
 (define-key esc-map "\t" 'lisp-complete-symbol)
 
 (define-key ctl-x-map "\C-e" 'eval-last-sexp)
+
+(define-key ctl-x-map "m" 'compose-mail)
+(define-key ctl-x-4-map "m" 'compose-mail-other-window)
+(define-key ctl-x-5-map "m" 'compose-mail-other-frame)
 \f
 (define-key ctl-x-map "r\C-@" 'point-to-register)
 (define-key ctl-x-map [?r ?\C-\ ] 'point-to-register)