fix live process/dead buffer bub on w32

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

diff --git a/lisp/bindings.el b/lisp/bindings.el
index d156360..10a098b 100644 (file)
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1,6 +1,6 @@
 ;;; bindings.el --- define standard key bindings and some variables.
 
-;; Copyright (C) 1985,86,87,92,93,94,95,96,99,2000
+;; Copyright (C) 1985,86,87,92,93,94,95,96,99,2000, 2001
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -187,7 +187,7 @@ Normally nil in most modes, since there is no process to display.")
        (propertize
         "%1+"
         'help-echo  (purecopy (lambda (window object point)
-                                (format "%sodified: mouse-2 toggles flag"
+                                (format "%sodified: mouse-2 toggles"
                                         (save-selected-window
                                           (select-window window)
                                           (if (buffer-modified-p)
@@ -322,6 +322,9 @@ Return a string to display in the mode line for the current mode name."
 (define-key mode-line-mode-menu [highlight-changes-mode]
   `(menu-item ,(purecopy "Highlight changes") highlight-changes-mode
              :button (:toggle . highlight-changes-mode)))
+(define-key mode-line-mode-menu [glasses-mode]
+  `(menu-item ,(purecopy "Glasses") glasses-mode
+             :button (:toggle . (bound-and-true-p glasses-mode))))
 (define-key mode-line-mode-menu [hide-ifdef-mode]
   `(menu-item ,(purecopy "Hide ifdef") hide-ifdef-mode
              :button (:toggle . (bound-and-true-p hide-ifdef-mode))))
@@ -411,8 +414,6 @@ buffer, mouse-2: prev, M-mouse-2: next, mouse-3: buffer menu")
         ".x86f" ".sparcf"
         ;; Libtool
         ".lo" ".la"
-        ;; Java
-        ".class"
         ;; Texinfo-related
         ".toc" ".log" ".aux"
         ".cp" ".fn" ".ky" ".pg" ".tp" ".vr"
@@ -487,8 +488,10 @@ buffer, mouse-2: prev, M-mouse-2: next, mouse-3: buffer menu")
 
 (make-variable-buffer-local 'indent-tabs-mode)
 
-;; We have base64 functions built in now.
+;; We have base64 and md5 functions built in now.
 (add-to-list 'features 'base64)
+(add-to-list 'features 'md5)
+(add-to-list 'features 'overlay)
 
 (define-key esc-map "\t" 'complete-symbol)
 
@@ -616,10 +619,12 @@ language you are using."
 (define-key global-map [menu] 'execute-extended-command)
 (define-key global-map [find] 'search-forward)
 
-(define-key global-map [delete] 'delete-char)
+;; Don't do this.  We define <delete> in function-key-map instead.
+;(define-key global-map [delete] 'backward-delete-char)
 
 ;; natural bindings for terminal keycaps --- defined in X keysym order
-(define-key global-map [home]          'beginning-of-buffer)
+(define-key global-map [home]          '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 global-map [left]          'backward-char)
 (define-key global-map [up]            'previous-line)
@@ -633,7 +638,8 @@ language you are using."
 (define-key global-map [C-next]                'scroll-left)
 (define-key global-map [M-next]                'scroll-other-window)
 (define-key global-map [M-prior]       'scroll-other-window-down)
-(define-key global-map [end]           'end-of-buffer)
+(define-key global-map [end]           '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 global-map [begin]         'beginning-of-buffer)
 (define-key global-map [M-begin]       'beginning-of-buffer-other-window)
@@ -725,7 +731,9 @@ language you are using."
 (define-key function-key-map [kp-end] [end])
 (define-key function-key-map [kp-begin] [begin])
 (define-key function-key-map [kp-insert] [insert])
-(define-key function-key-map [kp-delete] [delete])
+(define-key function-key-map [backspace] [?\C-?])
+(define-key function-key-map [delete] [?\C-?])
+(define-key function-key-map [kp-delete] [?\C-?])
 
 (define-key global-map [mouse-movement] 'ignore)
 
@@ -763,7 +771,8 @@ language you are using."
 (global-set-key [C-right]  'forward-word)
 (global-set-key [C-left]   'backward-word)
 ;; This is not quite compatible, but at least is analogous
-(global-set-key [C-delete]   'backward-kill-word)
+(global-set-key [C-delete] 'backward-kill-word)
+(global-set-key [C-backspace] 'kill-word)
 ;; This is "move to the clipboard", or as close as we come.
 (global-set-key [S-delete] 'kill-region)