(vc-svn-registered): Catch all errors.

[bpt/emacs.git] / lisp / bindings.el

diff --git a/lisp/bindings.el b/lisp/bindings.el
index 1e19592..dbab5f0 100644 (file)
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1,7 +1,7 @@
 ;;; bindings.el --- define standard key bindings and some variables
 
-;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996, 1999, 2000,
-;;   2001, 2005  Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996, 1999,
+;;   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -123,7 +123,7 @@ corresponding to the mode line clicked."
 
 (defvar mode-line-coding-system-map
   (let ((map (make-sparse-keymap)))
-    (define-key map [mode-line mouse-3]
+    (define-key map [mode-line mouse-1]
       (lambda (e)
        (interactive "e")
        (save-selected-window
@@ -156,7 +156,7 @@ corresponding to the mode line clicked."
       (setq desc
            (propertize
             mnemonic
-            'help-echo (format "%s end-of-line; mouse-3 to cycle"
+            'help-echo (format "%s end-of-line; mouse-1 to cycle"
                                (if (eq eol 0) "Unix-style LF"
                                  (if (eq eol 1) "Dos-style CRLF"
                                    (if (eq eol 2) "Mac-style CR"
@@ -164,7 +164,7 @@ corresponding to the mode line clicked."
             'keymap
             (eval-when-compile
               (let ((map (make-sparse-keymap)))
-                (define-key map [mode-line mouse-3] 'mode-line-change-eol)
+                (define-key map [mode-line mouse-1] 'mode-line-change-eol)
                 map))
             'mouse-face 'mode-line-highlight))
       (push (cons eol (cons mnemonic desc)) mode-line-eol-desc-cache)
@@ -190,7 +190,7 @@ corresponding to the mode line clicked."
            (when buffer-file-coding-system
              (if enable-multibyte-characters
                  (concat (symbol-name buffer-file-coding-system)
-                         " buffer; mouse-3: describe coding system")
+                         " buffer; mouse-1: describe coding system")
                (concat "Unibyte " (symbol-name buffer-file-coding-system)
                        " buffer")))))
       'mouse-face 'mode-line-highlight
@@ -230,27 +230,27 @@ Normally nil in most modes, since there is no process to display.")
   (list (propertize
         "%1*"
         'help-echo (purecopy (lambda (window object point)
-                               (format "%sead-only: mouse-3 toggles"
+                               (format "%sead-only: mouse-1 toggles"
                                        (save-selected-window
                                          (select-window window)
                                          (if buffer-read-only
                                              "R"
                                            "Not r")))))
         'local-map (purecopy (make-mode-line-mouse-map
-                              'mouse-3
+                              'mouse-1
                               #'mode-line-toggle-read-only))
         'mouse-face 'mode-line-highlight)
        (propertize
         "%1+"
         'help-echo  (purecopy (lambda (window object point)
-                                (format "%sodified: mouse-3 toggles"
+                                (format "%sodified: mouse-1 toggles"
                                         (save-selected-window
                                           (select-window window)
                                           (if (buffer-modified-p)
                                             "M"
                                           "Not m")))))
         'local-map (purecopy (make-mode-line-mouse-map
-                              'mouse-3 #'mode-line-toggle-modified))
+                              'mouse-1 #'mode-line-toggle-modified))
         'mouse-face 'mode-line-highlight))
   "Mode-line control for displaying whether current buffer is modified.")
 
@@ -291,6 +291,7 @@ Keymap to display on minor modes.")
        (dashes (propertize "--" 'help-echo help-echo)))
   (setq-default mode-line-format
     (list
+     "%e"
      (propertize "-" 'help-echo help-echo)
      'mode-line-mule-info
      'mode-line-modified
@@ -748,7 +749,7 @@ language you are using."
 
 ;; natural bindings for terminal keycaps --- defined in X keysym order
 (define-key global-map [C-S-backspace]  'kill-whole-line)
-(define-key global-map [home]          'beginning-of-line)
+(define-key global-map [home]          'move-beginning-of-line)
 (define-key global-map [C-home]                'beginning-of-buffer)
 (define-key global-map [M-home]                'beginning-of-buffer-other-window)
 (define-key esc-map    [home]          'beginning-of-buffer-other-window)
@@ -768,7 +769,7 @@ language you are using."
 (define-key global-map [M-prior]       'scroll-other-window-down)
 (define-key esc-map    [prior]         'scroll-other-window-down)
 (define-key esc-map [?\C-\S-v]         'scroll-other-window-down)
-(define-key global-map [end]           'end-of-line)
+(define-key global-map [end]           'move-end-of-line)
 (define-key global-map [C-end]         'end-of-buffer)
 (define-key global-map [M-end]         'end-of-buffer-other-window)
 (define-key esc-map    [end]           'end-of-buffer-other-window)