From 3dc628c63685a182accba2c77a8c2b80786a634d Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 19 Dec 2011 20:13:45 +0100
Subject: [PATCH] regedit: Merge accelerators into the main resource file.

---
 programs/regedit/En.rc       | 47 --------------------------------------------
 programs/regedit/Makefile.in |  5 +----
 programs/regedit/regedit.rc  | 15 ++++++++++++++
 3 files changed, 16 insertions(+), 51 deletions(-)
 delete mode 100644 programs/regedit/En.rc

diff --git a/programs/regedit/En.rc b/programs/regedit/En.rc
deleted file mode 100644
index 60120e20252..00000000000
--- a/programs/regedit/En.rc
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Regedit resources
- *
- * Copyright 2002 Robert Dickenson
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "resource.h"
-
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-IDC_REGEDIT ACCELERATORS
-{
-    "^F",	ID_EDIT_FIND
-    "^P",	ID_REGISTRY_PRINT
-    VK_DELETE,	ID_EDIT_DELETE, VIRTKEY
-    VK_F1,	ID_HELP_HELPTOPICS, VIRTKEY
-    VK_F2,	ID_EDIT_RENAME, VIRTKEY
-    VK_F3,	ID_EDIT_FINDNEXT, VIRTKEY
-    VK_F5,	ID_VIEW_REFRESH, VIRTKEY
-}
-
-/*****************************************************************/
-
-/*
- * TEXTINCLUDE
- */
-
-1 TEXTINCLUDE
-BEGIN
-    "resource.h\0"
-END
-
-/*****************************************************************/
diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in
index f5120170e1c..5d08ebf2e89 100644
--- a/programs/regedit/Makefile.in
+++ b/programs/regedit/Makefile.in
@@ -18,10 +18,7 @@ C_SRCS = \
 	regproc.c \
 	treeview.c
 
-RC_SRCS = \
-	En.rc \
-	regedit.rc
-
+RC_SRCS = regedit.rc
 PO_SRCS = regedit.rc
 
 MANPAGE = regedit.man
diff --git a/programs/regedit/regedit.rc b/programs/regedit/regedit.rc
index ed080ad8c25..4ddd3dc7d27 100644
--- a/programs/regedit/regedit.rc
+++ b/programs/regedit/regedit.rc
@@ -311,6 +311,21 @@ BEGIN
     PUSHBUTTON   "Cancel",IDCANCEL,160,156,45,15,WS_GROUP
 END
 
+/*
+ * Accelerators
+ */
+
+IDC_REGEDIT ACCELERATORS
+{
+    "^F",	ID_EDIT_FIND
+    "^P",	ID_REGISTRY_PRINT
+    VK_DELETE,	ID_EDIT_DELETE, VIRTKEY
+    VK_F1,	ID_HELP_HELPTOPICS, VIRTKEY
+    VK_F2,	ID_EDIT_RENAME, VIRTKEY
+    VK_F3,	ID_EDIT_FINDNEXT, VIRTKEY
+    VK_F5,	ID_VIEW_REFRESH, VIRTKEY
+}
+
 /* define language neutral resources */
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-- 
2.11.4.GIT