Applied Juri Linkov's change from upstream Emacs CVS.

* org.el (narrow-map): Bind `org-narrow-to-subtree' to "s" on the
new keymap `narrow-map' instead of binding "\C-xns".

See the message <E1KKMJ4-0007CK-V2@cvs.savannah.gnu.org>
from the [Emacs-commit] mailing list.

lisp/ChangeLog

@@ -1,3 +1,8 @@
+2008-07-20  Juri Linkov <juri@jurta.org>
+
+	* org.el (narrow-map): Bind `org-narrow-to-subtree' to "s" on the
+	new keymap `narrow-map' instead of binding "\C-xns".
+
 2008-07-18  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.el (org-open-file): Use

lisp/org.el

@@ -12517,7 +12517,7 @@ The images can be removed again with \\[org-ctrl-c-ctrl-c]."
 
 (org-defkey org-mode-map "\C-c\C-a" 'show-all)  ; in case allout messed up.
 (org-defkey org-mode-map "\C-c\C-r" 'org-reveal)
-(org-defkey org-mode-map "\C-xns" 'org-narrow-to-subtree)
+(org-defkey narrow-map "s" 'org-narrow-to-subtree)
 (org-defkey org-mode-map "\C-c$"    'org-archive-subtree)
 (org-defkey org-mode-map "\C-c\C-x\C-s" 'org-advertized-archive-subtree)
 (org-defkey org-mode-map "\C-c\C-x\C-a" 'org-toggle-archive-tag)