--- a/lisp/prim/keydefs.el	Mon Aug 13 09:15:51 2007 +0200
+++ b/lisp/prim/keydefs.el	Mon Aug 13 09:16:51 2007 +0200
@@ -72,9 +72,11 @@
 ;; FSFmacs casefiddle.c
 
 (define-key global-map "\C-x\C-u" 'upcase-region)
-(put 'upcase-region 'disabled t)
+;; This is silly with zmacs regions
+;(put 'upcase-region 'disabled t)
 (define-key global-map "\C-x\C-l" 'downcase-region)
-(put 'downcase-region 'disabled t)
+;; This is silly with zmacs regions
+;(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)
@@ -198,7 +200,9 @@
 ;; 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)
-(put 'eval-expression 'disabled t)
+;; Do we really need to disable this now that it is harder to type
+;; by accident?
+;; (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)
@@ -240,11 +244,12 @@
 
 (define-key global-map "\C-n" 'next-line)
 (define-key global-map "\C-p" 'previous-line)
-(define-key global-map "\C-x\C-n" 'set-goal-column)
+;(define-key global-map "\C-x\C-n" 'set-goal-column)
 ;; XEmacs:
 ;;; Many people have said they rarely use this feature, and often type
 ;;; it by accident.  Maybe it shouldn't even be on a key.
-(put 'set-goal-column 'disabled t)
+;;; Done.  -hniksic
+;(put 'set-goal-column 'disabled t)
 
 (define-key global-map [menu] 'execute-extended-command)
 (define-key global-map [find] 'search-forward)