--- a/lisp/menubar-items.el	Mon Aug 13 11:17:10 2007 +0200
+++ b/lisp/menubar-items.el	Mon Aug 13 11:18:11 2007 +0200
@@ -1374,7 +1374,8 @@
        ;; #### there should be something that holds the name that the init
        ;; file should be created as, when it's not present.
        (progn (find-file (or user-init-file "~/.emacs"))
-	      (emacs-lisp-mode))]
+	      (or (eq major-mode 'emacs-lisp-mode)
+		  (emacs-lisp-mode)))]
       ["%_Save Options to .emacs File" customize-save-customized]
       )
 
@@ -1866,13 +1867,13 @@
 					  current-language-environment))
 			    `([,(car lang)
 			       (help-with-tutorial nil ,(cdr tut))]))))
-		 language-info-alist))
-     ;; Non mule tutorials.
-     (mapcar #'(lambda (lang)
-		 `[,(car lang)
-		   (help-with-tutorial ,(format "TUTORIAL.%s"
-						(cadr lang)))])
-	     tutorial-supported-languages))))
+		 language-info-alist)
+       ;; Non mule tutorials.
+       (mapcar #'(lambda (lang)
+		   `[,(car lang)
+		     (help-with-tutorial ,(format "TUTORIAL.%s"
+						  (cadr lang)))])
+	       tutorial-supported-languages)))))
 
 
 (set-menubar default-menubar)