[Emacs-diffs] /srv/bzr/emacs/trunk r105511: Update some tutorial key bindings; ref bug#8739.

[Glenn Morris]

------------------------------------------------------------
revno: 105511
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-08-20 15:41:41 -0700
message:
  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.
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/bindings.el
  lisp/tutorial.el
  lisp/window.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2011-08-18 15:53:29 +0000
+++ b/etc/NEWS  2011-08-20 22:41:41 +0000
@@ -407,7 +407,7 @@
 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'.
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-20 22:26:52 +0000
+++ b/lisp/ChangeLog    2011-08-20 22:41:41 +0000
@@ -1,5 +1,7 @@
 2011-08-20  Glenn Morris  <address@hidden>
 
+       * tutorial.el (tutorial--default-keys): Update some default bindings.
+
        * files.el (hack-local-variables): Fully ignore case for "mode:".
 
 2011-08-20  Alan Mackenzie  <address@hidden>

=== modified file 'lisp/bindings.el'
--- a/lisp/bindings.el  2011-07-14 01:58:51 +0000
+++ b/lisp/bindings.el  2011-08-20 22:41:41 +0000
@@ -834,6 +834,7 @@
     (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)
 

=== modified file 'lisp/tutorial.el'
--- a/lisp/tutorial.el  2011-01-25 04:08:28 +0000
+++ b/lisp/tutorial.el  2011-08-20 22:41:41 +0000
@@ -253,7 +253,7 @@
              ;; * 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 @@
              (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])

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-08-20 10:10:05 +0000
+++ b/lisp/window.el    2011-08-20 22:41:41 +0000
@@ -7474,6 +7474,8 @@
          (< (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)