From 1158798094f99b03a1edf86c5eee6710fb07962e Mon Sep 17 00:00:00 2001
From: Garen Torikian <gjtorikian@gmail.com>
Date: Tue, 13 Nov 2012 14:22:36 -0800
Subject: [PATCH] Support new getKeywords function

---
 lib/ace/mode/c_cpp_highlight_rules.js      | 2 +-
 lib/ace/mode/objectivec_highlight_rules.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/ace/mode/c_cpp_highlight_rules.js b/lib/ace/mode/c_cpp_highlight_rules.js
index 9d57e46c..7ab22467 100644
--- a/lib/ace/mode/c_cpp_highlight_rules.js
+++ b/lib/ace/mode/c_cpp_highlight_rules.js
@@ -65,7 +65,7 @@ var c_cppHighlightRules = function() {
         "NULL|true|false|TRUE|FALSE"
     );
 
-    var keywordMapper = exports.keywordMapper = this.createKeywordMapper({
+    var keywordMapper = this.$keywords = this.createKeywordMapper({
         "keyword.control" : keywordControls,
         "storage.type" : storageType,
         "storage.modifier" : storageModifiers,
diff --git a/lib/ace/mode/objectivec_highlight_rules.js b/lib/ace/mode/objectivec_highlight_rules.js
index a1f35080..2d557688 100644
--- a/lib/ace/mode/objectivec_highlight_rules.js
+++ b/lib/ace/mode/objectivec_highlight_rules.js
@@ -28,7 +28,8 @@ var ObjectiveCHighlightRules = function() {
         }
     ];
 
-    var cRules = new CHighlightRules().getRules();
+    var cObj = new CHighlightRules();
+    var cRules = cObj.getRules();
 
     this.$rules = 
         {
@@ -168,7 +169,7 @@ var ObjectiveCHighlightRules = function() {
         "regex": C_Highlight_File.cFunctions
         },
         {
-            "token" : C_Highlight_File.keywordMapper,
+            "token" : cObj.getKeywords(),
             "regex" : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
         },
         {