diff --git a/runtime/ftplugin/tutor.vim b/runtime/ftplugin/tutor.vim
index 45ee582cba..a0e4907692 100644
--- a/runtime/ftplugin/tutor.vim
+++ b/runtime/ftplugin/tutor.vim
@@ -1,4 +1,11 @@
-" vim: fdm=marker
+" Tutor filetype plugin
+" Language:	Tutor (the new tutor plugin)
+" Maintainer:	This runtime file is looking for a new maintainer.
+" Last Change:	2025 May 10
+" Contributors:	Phạm Bình An <phambinhanctb2004@gmail.com>
+" Original Author: Felipe Morales <hel.sheep@gmail.com>
+" Last Change:
+" 2025 May 10 set b:undo_ftplugin
 
 " Base: {{{1
 call tutor#SetupVim()
@@ -43,3 +50,10 @@ if !exists('g:tutor_debug') || g:tutor_debug == 0
     call tutor#ApplyMarks()
     autocmd! TextChanged,TextChangedI <buffer> call tutor#ApplyMarksOnChanged()
 endif
+
+let b:undo_ftplugin = 'unlet! g:tutor_debug |'
+let b:undo_ftplugin ..= 'setl concealcursor< conceallevel< |'
+let b:undo_ftplugin ..= 'setl foldmethod< foldexpr< foldlevel< |'
+let b:undo_ftplugin ..= 'setl buftype< undofile< keywordprg< iskeyword< |'
+
+" vim: fdm=marker
diff --git a/runtime/plugin/tutor.vim b/runtime/plugin/tutor.vim
index 1411b1ac63..b79ba93093 100644
--- a/runtime/plugin/tutor.vim
+++ b/runtime/plugin/tutor.vim
@@ -1,6 +1,17 @@
+" Tutor:	New Style Tutor Plugin :h vim-tutor-mode
+" Maintainer:	This runtime file is looking for a new maintainer.
+" Contributors:	Phạm Bình An <phambinhanctb2004@gmail.com>
+" Original Author: Felipe Morales <hel.sheep@gmail.com>
+" Date: 2025 May 10
+
 if exists('g:loaded_tutor_mode_plugin') || &compatible
     finish
 endif
 let g:loaded_tutor_mode_plugin = 1
 
+" Define this variable so that users get cmdline completion.
+if !exists('g:tutor_debug')
+  let g:tutor_debug = 0
+endif
+
 command! -nargs=? -complete=custom,tutor#TutorCmdComplete Tutor call tutor#TutorCmd(<q-args>)