From: Glenn Morris <rgm@gnu.org>
Date: Sat, 20 Aug 2011 22:41:41 +0000 (-0700)
Subject: Update some tutorial key bindings; ref bug#8739.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~70^2~15^2~30
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=59ee05427dbe2d7aaad260ea7c85515dd3c63bc0;p=emacs.git

Update some tutorial key bindings; ref bug#8739.

* lisp/tutorial.el (tutorial--default-keys): Update some default bindings.

* etc/NEWS: delete-forward-char is not bound to C-d.

* lisp/bindings.el, lisp/windows.el: Comments.
---

diff --git a/etc/NEWS b/etc/NEWS
index ec863dacef8..cec19d0c0a2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -407,7 +407,7 @@ If non-nil, C-d, [delete], and DEL delete the region if it is active
 and no prefix argument is given.  If set to `kill', these commands
 kill instead.
 
-*** New command `delete-forward-char', bound to C-d and [delete].
+*** New command `delete-forward-char', bound to [delete].
 This is meant for interactive use, and obeys `delete-active-region'.
 The command `delete-char' does not obey `delete-active-region'.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2e06de9fd98..4763c83c5a3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-08-20  Glenn Morris  <rgm@gnu.org>
 
+	* tutorial.el (tutorial--default-keys): Update some default bindings.
+
 	* files.el (hack-local-variables): Fully ignore case for "mode:".
 
 2011-08-20  Alan Mackenzie  <acm@muc.de>
diff --git a/lisp/bindings.el b/lisp/bindings.el
index c4f9369219a..57bfeb60f82 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -834,6 +834,7 @@ if `inhibit-field-text-motion' is non-nil."
     (setq i (1+ i))))
 (define-key global-map [?\C-\M--] 'negative-argument)
 
+;; Update tutorial--default-keys if you change these.
 (define-key global-map "\177" 'delete-backward-char)
 (define-key global-map "\C-d" 'delete-char)
 
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 77ef50843d3..d47079af5af 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -253,7 +253,7 @@ LEFT and RIGHT are the elements to compare."
              ;; * INSERTING AND DELETING
              ;; C-u 8 * to insert ********.
              (delete-backward-char "\d")
-             (delete-forward-char [?\C-d])
+             (delete-char [?\C-d])
              (backward-kill-word [?\M-\d])
              (kill-word [?\M-d])
              (kill-line [?\C-k])
@@ -298,7 +298,7 @@ LEFT and RIGHT are the elements to compare."
              (isearch-backward [?\C-r])
 
              ;; * MULTIPLE WINDOWS
-             (split-window-vertically [?\C-x ?2])
+             (split-window-above-each-other [?\C-x ?2])
              (scroll-other-window [?\C-\M-v])
              (other-window [?\C-x ?o])
              (find-file-other-window [?\C-x ?4 ?\C-f])
diff --git a/lisp/window.el b/lisp/window.el
index 8ddb6165197..75fa0b46a1c 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -7474,6 +7474,8 @@ Otherwise, consult the value of `truncate-partial-width-windows'
 	  (< (window-width window) t-p-w-w)
 	t-p-w-w))))
 
+;; Some of these are in tutorial--default-keys, so update that if you
+;; change these.
 (define-key ctl-x-map "0" 'delete-window)
 (define-key ctl-x-map "1" 'delete-other-windows)
 (define-key ctl-x-map "2" 'split-window-above-each-other)