Index: wp-includes/registration.php
===================================================================
--- wp-includes/registration.php	(revision 9212)
+++ wp-includes/registration.php	(working copy)
@@ -154,6 +154,9 @@
 	if ( empty($rich_editing) )
 		$rich_editing = 'true';
 
+	if ( empty($comment_shortcuts) )
+		$comment_shortcuts = 'false';
+
 	if ( empty($admin_color) )
 		$admin_color = 'fresh';
 	$admin_color = preg_replace('|[^a-z0-9 _.\-@]|i', '', $admin_color);
@@ -183,6 +186,7 @@
 	update_usermeta( $user_id, 'aim', $aim );
 	update_usermeta( $user_id, 'yim', $yim );
 	update_usermeta( $user_id, 'rich_editing', $rich_editing);
+	update_usermeta( $user_id, 'comment_shortcuts', $comment_shortcuts);
 	update_usermeta( $user_id, 'admin_color', $admin_color);
 	update_usermeta( $user_id, 'use_ssl', $use_ssl);
 
Index: wp-admin/edit-comments.php
===================================================================
--- wp-admin/edit-comments.php	(revision 9212)
+++ wp-admin/edit-comments.php	(working copy)
@@ -12,7 +12,7 @@
 $title = __('Edit Comments');
 wp_enqueue_script( 'admin-comments' );
 wp_enqueue_script( 'admin-forms' );
-wp_enqueue_script( 'jquery-table-hotkeys' );
+enqueue_comment_hotkeys_js();
 
 if ( ( isset( $_POST['delete_all_spam'] ) || isset( $_POST['delete_all_spam2'] ) ) && !empty( $_POST['pagegen_timestamp'] ) ) {
 	check_admin_referer('bulk-spam-delete');
Index: wp-admin/includes/comment.php
===================================================================
--- wp-admin/includes/comment.php	(revision 9212)
+++ wp-admin/includes/comment.php	(working copy)
@@ -151,6 +151,11 @@
 	return "$avatar $name";
 }
 
+function enqueue_comment_hotkeys_js() {
+	if ( 'true' == get_user_option( 'comment_shortcuts' ) )
+		wp_enqueue_script( 'jquery-table-hotkeys' );
+}
+
 if ( is_admin() && ('edit-comments.php' == $pagenow || 'edit.php' == $pagenow) ) {
 	if ( get_option('show_avatars') )
 		add_filter( 'comment_author', 'floated_admin_avatar' );
Index: wp-admin/includes/user.php
===================================================================
--- wp-admin/includes/user.php	(revision 9212)
+++ wp-admin/includes/user.php	(working copy)
@@ -98,6 +98,8 @@
 	else
 		$user->rich_editing = 'true';
 
+	$user->comment_shortcuts = isset( $_POST['comment_shortcuts'] )? $_POST['comment_shortcuts'] : ''; 
+	
 	$user->use_ssl = 0;
 	if ( !empty($_POST['use_ssl']) )
 		$user->use_ssl = 1;
Index: wp-admin/post.php
===================================================================
--- wp-admin/post.php	(revision 9212)
+++ wp-admin/post.php	(working copy)
@@ -140,7 +140,7 @@
 	wp_enqueue_script('media-upload');
 	wp_enqueue_script('word-count');
 	wp_enqueue_script( 'admin-comments' );
-	wp_enqueue_script( 'jquery-table-hotkeys' );
+	enqueue_comment_hotkeys_js();
 
 	if ( current_user_can('edit_post', $post_ID) ) {
 		if ( $last = wp_check_post_lock( $post->ID ) ) {
Index: wp-admin/upload.php
===================================================================
--- wp-admin/upload.php	(revision 9212)
+++ wp-admin/upload.php	(working copy)
@@ -140,7 +140,7 @@
 
 if ( is_singular() ) {
 	wp_enqueue_script( 'admin-comments' );
-	wp_enqueue_script( 'jquery-table-hotkeys' );
+	enqueue_comment_hotkeys_js();
 }
 
 require_once('admin-header.php'); ?>
Index: wp-admin/edit.php
===================================================================
--- wp-admin/edit.php	(revision 9212)
+++ wp-admin/edit.php	(working copy)
@@ -77,7 +77,7 @@
 
 if ( 1 == count($posts) && is_singular() ) {
 	wp_enqueue_script( 'admin-comments' );
-	wp_enqueue_script( 'jquery-table-hotkeys' );
+	enqueue_comment_hotkeys_js();
 }
 
 require_once('admin-header.php');
Index: wp-admin/user-edit.php
===================================================================
--- wp-admin/user-edit.php	(revision 9212)
+++ wp-admin/user-edit.php	(working copy)
@@ -220,6 +220,10 @@
 	<?php endforeach; ?>
 </fieldset></td>
 </tr>
+<tr>
+<th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
+<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php checked('true', $profileuser->comment_shortcuts); ?> /> <?php _e( 'Enable keyboard shortcuts for comment moderation. <a href="http://codex.wordpress.org/Keyboard_Shortcuts">More information</a>' ); ?></label></td>
+</tr>
 <?php
 endif;
 do_action('personal_options', $profileuser);
Index: wp-admin/edit-pages.php
===================================================================
--- wp-admin/edit-pages.php	(revision 9212)
+++ wp-admin/edit-pages.php	(working copy)
@@ -95,7 +95,7 @@
 
 if ( is_singular() ) {
 	wp_enqueue_script( 'admin-comments' );
-	wp_enqueue_script( 'jquery-table-hotkeys' );
+	enqueue_comment_hotkeys_js();
 }
 
 require_once('admin-header.php'); ?>

