aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/tutorial.el
diff options
context:
space:
mode:
authorPaul Eggert2011-10-29 19:23:07 -0700
committerPaul Eggert2011-10-29 19:23:07 -0700
commit1fa2385302f5b2e5bb17c8aad3cb4e320512ca46 (patch)
tree83c74219421f969e7b9c1061e781a6f9018bb47c /lisp/tutorial.el
parent8d0eb4c275581847990b85dbb350caa3df9e653f (diff)
parent2d197ffbe2029b479802528eeaec714df4c8a8f6 (diff)
downloademacs-1fa2385302f5b2e5bb17c8aad3cb4e320512ca46.tar.gz
emacs-1fa2385302f5b2e5bb17c8aad3cb4e320512ca46.zip
Merge from trunk.
Diffstat (limited to 'lisp/tutorial.el')
-rw-r--r--lisp/tutorial.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index c57ec33d2e2..be1a12b499b 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -298,7 +298,7 @@ LEFT and RIGHT are the elements to compare."
298 (isearch-backward [?\C-r]) 298 (isearch-backward [?\C-r])
299 299
300 ;; * MULTIPLE WINDOWS 300 ;; * MULTIPLE WINDOWS
301 (split-window-above-each-other [?\C-x ?2]) 301 (split-window-below [?\C-x ?2])
302 (scroll-other-window [?\C-\M-v]) 302 (scroll-other-window [?\C-\M-v])
303 (other-window [?\C-x ?o]) 303 (other-window [?\C-x ?o])
304 (find-file-other-window [?\C-x ?4 ?\C-f]) 304 (find-file-other-window [?\C-x ?4 ?\C-f])