--- a/lisp/prim/keydefs.el	Mon Aug 13 09:00:04 2007 +0200
+++ b/lisp/prim/keydefs.el	Mon Aug 13 09:02:59 2007 +0200
@@ -15,7 +15,7 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the 
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;; All the global bindings should be here so that one can reload things
@@ -68,11 +68,9 @@
 ;; FSFmacs casefiddle.c
 
 (define-key global-map "\C-x\C-u" 'upcase-region)
-;; This is silly with zmacs regions
-;(put 'upcase-region 'disabled t)
+(put 'upcase-region 'disabled t)
 (define-key global-map "\C-x\C-l" 'downcase-region)
-;; This is silly with zmacs regions
-;(put 'downcase-region 'disabled t)
+(put 'downcase-region 'disabled t)
 (define-key global-map "\M-u" 'upcase-region-or-word)
 (define-key global-map "\M-l" 'downcase-region-or-word)
 (define-key global-map "\M-c" 'capitalize-region-or-word)
@@ -136,7 +134,7 @@
 (define-key global-map "\C-x50" 'delete-frame)
 (define-key global-map "\C-x5o" 'other-frame)
 ;; XEmacs addition:
-;;(define-key global-map "\C-x5m" 'mail-other-frame)
+(define-key global-map "\C-x5m" 'mail-other-frame)
 
 ;; FSFmacs help.el
 
@@ -199,9 +197,7 @@
 ;; Define ESC ESC : like ESC : for people who type ESC ESC out of habit.
 (define-key global-map "\M-\e:" 'eval-expression)
 ;(define-key global-map "\M-\e" 'eval-expression)
-;; Do we really need to disable this now that it is harder to type
-;; by accident?
-;; (put 'eval-expression 'disabled t)
+(put 'eval-expression 'disabled t)
 ;; Changed from C-x ESC so that function keys work following C-x.
 (define-key global-map "\C-x\e\e" 'repeat-complex-command)
 ;(define-key global-map "\C-x\e" 'repeat-complex-command)
@@ -520,10 +516,10 @@
 ;; files, but these appear to be the standard Motif and PC bindings.
 
 ;; potential R6isms
-(define-key global-map 'kp-left		'backward-char)
-(define-key global-map 'kp-up		'previous-line)
-(define-key global-map 'kp-right	'forward-char)
-(define-key global-map 'kp-down		'next-line)
+(define-key global-map 'kp_left		'backward-char)
+(define-key global-map 'kp_up		'previous-line)
+(define-key global-map 'kp_right	'forward-char)
+(define-key global-map 'kp_down		'next-line)
 
 
 ;; movement by larger blocks
@@ -546,10 +542,10 @@
 (define-key global-map '(control prior)	'scroll-right)
 (define-key global-map '(control next)	'scroll-left)
 ;; potential R6isms
-(define-key global-map 'kp-prior	'scroll-down)
-(define-key global-map 'kp-next		'scroll-up)
-(define-key global-map '(control kp-prior) 'scroll-right)
-(define-key global-map '(control kp-next) 'scroll-left)
+(define-key global-map 'kp_prior	'scroll-down)
+(define-key global-map 'kp_next		'scroll-up)
+(define-key global-map '(control kp_prior) 'scroll-right)
+(define-key global-map '(control kp_next) 'scroll-left)
 
 
 ;; movement to the limits
@@ -558,10 +554,10 @@
 (define-key global-map 'begin		'beginning-of-line)
 (define-key global-map '(control begin)	'beginning-of-buffer)
 ;; potential R6isms
-(define-key global-map 'kp-home		'beginning-of-line)
-(define-key global-map '(control kp-home) 'beginning-of-buffer)
-(define-key global-map 'kp-end		'end-of-line)
-(define-key global-map '(control kp-end) 'end-of-buffer)
+(define-key global-map 'kp_home		'beginning-of-line)
+(define-key global-map '(control kp_home) 'beginning-of-buffer)
+(define-key global-map 'kp_end		'end-of-line)
+(define-key global-map '(control kp_end) 'end-of-buffer)
 
 ;; movement between windows
 (define-key global-map '(control tab)	'other-window)
@@ -573,41 +569,41 @@
 (define-key global-map '(meta home)	'beginning-of-buffer-other-window)
 (define-key global-map '(meta end)	'end-of-buffer-other-window)
 ;; potential R6isms
-(define-key global-map '(meta kp-next)	'scroll-other-window)
-(define-key global-map '(meta kp-prior)	'scroll-other-window-down)
-(define-key global-map '(meta kp-home)	'beginning-of-buffer-other-window)
-(define-key global-map '(meta kp-end)	'end-of-buffer-other-window)
+(define-key global-map '(meta kp_next)	'scroll-other-window)
+(define-key global-map '(meta kp_prior)	'scroll-other-window-down)
+(define-key global-map '(meta kp_home)	'beginning-of-buffer-other-window)
+(define-key global-map '(meta kp_end)	'end-of-buffer-other-window)
 
 ;; potential R6isms
 (define-key global-map 'redo		'repeat-complex-command)
-(define-key global-map 'kp-insert	'overwrite-mode)
-(define-key global-map 'kp-delete	'backward-delete-char-untabify)
+(define-key global-map 'kp_insert	'overwrite-mode)
+(define-key global-map 'kp_delete	'backward-delete-char-untabify)
 
-(define-key global-map 'kp-enter	[return]) ; do whatever RET does now
-(define-key global-map 'kp-tab		[tab])
+(define-key global-map 'kp_enter	[return]) ; do whatever RET does now
+(define-key global-map 'kp_tab		[tab])
 
 (define-key global-map 'undo		'undo)
 (define-key global-map 'help		'help-for-help)
 
-(define-key global-map 'kp-space	'self-insert-command)
-(define-key global-map 'kp-equal	'self-insert-command)
-(define-key global-map 'kp-multiply	'self-insert-command)
-(define-key global-map 'kp-add		'self-insert-command)
-(define-key global-map 'kp-separator	'self-insert-command)
-(define-key global-map 'kp-subtract	'self-insert-command)
-(define-key global-map 'kp-decimal	'self-insert-command)
-(define-key global-map 'kp-divide	'self-insert-command)
+(define-key global-map 'kp_space	'self-insert-command)
+(define-key global-map 'kp_equal	'self-insert-command)
+(define-key global-map 'kp_multiply	'self-insert-command)
+(define-key global-map 'kp_add		'self-insert-command)
+(define-key global-map 'kp_separator	'self-insert-command)
+(define-key global-map 'kp_subtract	'self-insert-command)
+(define-key global-map 'kp_decimal	'self-insert-command)
+(define-key global-map 'kp_divide	'self-insert-command)
 
-(define-key global-map 'kp-0		'self-insert-command)
-(define-key global-map 'kp-1		'self-insert-command)
-(define-key global-map 'kp-2		'self-insert-command)
-(define-key global-map 'kp-3		'self-insert-command)
-(define-key global-map 'kp-4		'self-insert-command)
-(define-key global-map 'kp-5		'self-insert-command)
-(define-key global-map 'kp-6		'self-insert-command)
-(define-key global-map 'kp-7		'self-insert-command)
-(define-key global-map 'kp-8		'self-insert-command)
-(define-key global-map 'kp-9		'self-insert-command)
+(define-key global-map 'kp_0		'self-insert-command)
+(define-key global-map 'kp_1		'self-insert-command)
+(define-key global-map 'kp_2		'self-insert-command)
+(define-key global-map 'kp_3		'self-insert-command)
+(define-key global-map 'kp_4		'self-insert-command)
+(define-key global-map 'kp_5		'self-insert-command)
+(define-key global-map 'kp_6		'self-insert-command)
+(define-key global-map 'kp_7		'self-insert-command)
+(define-key global-map 'kp_8		'self-insert-command)
+(define-key global-map 'kp_9		'self-insert-command)
 
 (define-key global-map 'select		'function-key-error)
 (define-key global-map 'print		'function-key-error)