From 3730ddc5e3f9792f7dc81be52996a6002616d9d4 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 5 Mar 2012 00:13:09 -0500
Subject: [PATCH] Officially deprecateify :noremap and kin.

---
 common/content/commandline.js |  3 +--
 common/content/mappings.js    |  2 +-
 common/locale/en-US/map.xml   | 25 +++++++++++++------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/common/content/commandline.js b/common/content/commandline.js
index a58fb24a..c3187596 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -756,8 +756,7 @@ var CommandLine = Module("commandline", {
             data = message.message;
         }
 
-        if ((flags & this.ACTIVE_WINDOW) &&
-            window != overlay.activeWindow)
+        if ((flags & this.ACTIVE_WINDOW) && window != overlay.activeWindow)
             return;
 
         if ((flags & this.DISALLOW_MULTILINE) && !this.widgets.mowContainer.collapsed)
diff --git a/common/content/mappings.js b/common/content/mappings.js
index 67385d97..f14b3d2f 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -657,7 +657,7 @@ var Mappings = Module("mappings", {
             commands.add([ch + "no[remap]"],
                 "Map a key sequence without remapping keys" + modeDescription,
                 function (args) { map(args, true); },
-                update({}, opts));
+                update({ deprecated: ":" + ch + "map -builtin" }, opts));
 
             commands.add([ch + "unm[ap]"],
                 "Remove a mapping" + modeDescription,
diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml
index 4f21a5bd..6a585195 100644
--- a/common/locale/en-US/map.xml
+++ b/common/locale/en-US/map.xml
@@ -66,13 +66,12 @@
 </dl>
 
 <p>
-    The ordinary <ex>:map</ex> and <ex>:noremap</ex> commands
-    add mappings for Normal and Visual mode. In order to map key
-    bindings in a different mode, any of the mapping commands may be
-    prefixed with one of the above letters. For instance,
+    The ordinary <ex>:map</ex> command adds mappings for Normal and Visual
+    mode. In order to map key bindings in a different mode, any of the mapping
+    commands may be prefixed with one of the above letters. For instance,
     <ex>:imap</ex> creates a new key mapping in Insert mode, while
-    <ex>:cunmap</ex> removes a key mapping from Command Line mode.
-    Other modes can be specified using the <em>-modes</em> option described below.
+    <ex>:cunmap</ex> removes a key mapping from Command Line mode. Other modes
+    can be specified using the <em>-modes</em> option described below.
 </p>
 
 <warning>
@@ -127,12 +126,12 @@
 </p>
 
 <dl dt="width: 20em;">
-    <dt>:map   :noremap   :unmap</dt>  <dd>Normal and Visual modes</dd>
-    <dt>:nmap  :nnoremap  :nunmap</dt> <dd>Normal mode</dd>
-    <dt>:vmap  :vnoremap  :vunmap</dt> <dd>Visual mode</dd>
-    <dt>:imap  :inoremap  :iunmap</dt> <dd>Insert mode</dd>
-    <dt>:tmap  :tnoremap  :tunmap</dt> <dd>Text Edit mode</dd>
-    <dt>:cmap  :cnoremap  :cunmap</dt> <dd>Command Line mode</dd>
+    <dt>:map   :unmap</dt>  <dd>Normal and Visual modes</dd>
+    <dt>:nmap  :nunmap</dt> <dd>Normal mode</dd>
+    <dt>:vmap  :vunmap</dt> <dd>Visual mode</dd>
+    <dt>:imap  :iunmap</dt> <dd>Insert mode</dd>
+    <dt>:tmap  :tunmap</dt> <dd>Text Edit mode</dd>
+    <dt>:cmap  :cunmap</dt> <dd>Command Line mode</dd>
 </dl>
 
 <note>
@@ -175,6 +174,8 @@
     <tags>:cno :cnoremap</tags>
     <spec>:cno<oa>remap</oa> <a>lhs</a> <a>rhs</a></spec>
     <description>
+        <deprecated>These aliases are deprecated. The <em>-builtin</em> flag
+            should be used in their stead.</deprecated>
         <p>
             Map the <t>key-sequence</t> <a>lhs</a> to <a>rhs</a> for
             the applicable mode(s). The keys in <a>rhs</a> do not