* lisp/progmodes/cfengine.el (cfengine-mode): Derive from prog-mode.

[bpt/emacs.git] / lisp / tutorial.el

diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 3290d67..77ef508 100644 (file)
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -1,9 +1,10 @@
 ;;; tutorial.el --- tutorial for Emacs
 
-;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2011 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help, internal
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
@@ -74,7 +75,7 @@ Where
               for the function it is remapped to)"
   (with-output-to-temp-buffer (help-buffer)
     (help-setup-xref (list #'tutorial--describe-nonstandard-key value)
-                     (interactive-p))
+                     (called-interactively-p 'interactive))
     (with-current-buffer (help-buffer)
       (insert
        "Your Emacs customizations override the default binding for this key:"
@@ -218,8 +219,8 @@ LEFT and RIGHT are the elements to compare."
              (save-buffers-kill-terminal [?\C-x ?\C-c])
 
              ;; * SUMMARY
-             (scroll-up [?\C-v])
-             (scroll-down [?\M-v])
+             (scroll-up-command [?\C-v])
+             (scroll-down-command [?\M-v])
              (recenter-top-bottom [?\C-l])
 
              ;; * BASIC CURSOR CONTROL
@@ -252,7 +253,7 @@ LEFT and RIGHT are the elements to compare."
              ;; * INSERTING AND DELETING
              ;; C-u 8 * to insert ********.
              (delete-backward-char "\d")
-             (delete-char [?\C-d])
+             (delete-forward-char [?\C-d])
              (backward-kill-word [?\M-\d])
              (kill-word [?\M-d])
              (kill-line [?\C-k])
@@ -323,7 +324,7 @@ LEFT and RIGHT are the elements to compare."
   "Give detailed help about changed keys."
   (with-output-to-temp-buffer (help-buffer)
     (help-setup-xref (list #'tutorial--detailed-help button)
-                     (interactive-p))
+                     (called-interactively-p 'interactive))
     (with-current-buffer (help-buffer)
       (let* ((tutorial-buffer  (button-get button 'tutorial-buffer))
              (explain-key-desc (button-get button 'explain-key-desc))
@@ -829,6 +830,8 @@ Run the Viper tutorial? "))
         (if old-tut-file
             (progn
               (insert-file-contents (tutorial--saved-file))
+             (let ((enable-local-variables :safe))
+               (hack-local-variables))
               (goto-char (point-min))
               (setq old-tut-point
                     (string-to-number
@@ -844,6 +847,8 @@ Run the Viper tutorial? "))
               (goto-char tutorial--point-before-chkeys)
               (setq tutorial--point-before-chkeys (point-marker)))
           (insert-file-contents (expand-file-name filename tutorial-directory))
+         (let ((enable-local-variables :safe))
+           (hack-local-variables))
           (forward-line)
           (setq tutorial--point-before-chkeys (point-marker)))
 
@@ -958,5 +963,4 @@ Currently this feature is only used in `help-with-tutorial'."
 
 (provide 'tutorial)
 
-;; arch-tag: c8e80aef-c3bb-4ffb-8af6-22171bf0c100
 ;;; tutorial.el ends here