$NetBSD: patch-ak,v 1.4 2013/01/23 17:26:07 wiz Exp $

--- common/options_def.h.orig	2007-11-19 03:43:54.000000000 +1100
+++ common/options_def.h
@@ -1,4 +1,3 @@
-/* Do not edit: automatically built by build/distrib. */
 #define O_ALTWERASE 0
 #define O_AUTOINDENT 1
 #define O_AUTOPRINT 2
@@ -12,72 +11,75 @@
 #define O_COMMENT 10
 #define O_TMP_DIRECTORY 11
 #define O_EDCOMPATIBLE 12
-#define O_ESCAPETIME 13
-#define O_ERRORBELLS 14
-#define O_EXRC 15
-#define O_EXTENDED 16
-#define O_FILEC 17
-#define O_FILEENCODING 18
-#define O_FLASH 19
-#define O_HARDTABS 20
-#define O_ICLOWER 21
-#define O_IGNORECASE 22
-#define O_INPUTENCODING 23
-#define O_KEYTIME 24
-#define O_LEFTRIGHT 25
-#define O_LINES 26
-#define O_LISP 27
-#define O_LIST 28
-#define O_LOCKFILES 29
-#define O_MAGIC 30
-#define O_MATCHTIME 31
-#define O_MESG 32
-#define O_MODELINE 33
-#define O_MSGCAT 34
-#define O_NOPRINT 35
-#define O_NUMBER 36
-#define O_OCTAL 37
-#define O_OPEN 38
-#define O_OPTIMIZE 39
-#define O_PARAGRAPHS 40
-#define O_PATH 41
-#define O_PRINT 42
-#define O_PROMPT 43
-#define O_READONLY 44
-#define O_RECDIR 45
-#define O_REDRAW 46
-#define O_REMAP 47
-#define O_REPORT 48
-#define O_RULER 49
-#define O_SCROLL 50
-#define O_SEARCHINCR 51
-#define O_SECTIONS 52
-#define O_SECURE 53
-#define O_SHELL 54
-#define O_SHELLMETA 55
-#define O_SHIFTWIDTH 56
-#define O_SHOWMATCH 57
-#define O_SHOWMODE 58
-#define O_SIDESCROLL 59
-#define O_SLOWOPEN 60
-#define O_SOURCEANY 61
-#define O_TABSTOP 62
-#define O_TAGLENGTH 63
-#define O_TAGS 64
-#define O_TERM 65
-#define O_TERSE 66
-#define O_TILDEOP 67
-#define O_TIMEOUT 68
-#define O_TTYWERASE 69
-#define O_VERBOSE 70
-#define O_W1200 71
-#define O_W300 72
-#define O_W9600 73
-#define O_WARN 74
-#define O_WINDOW 75
-#define O_WINDOWNAME 76
-#define O_WRAPLEN 77
-#define O_WRAPMARGIN 78
-#define O_WRAPSCAN 79
-#define O_WRITEANY 80
-#define O_OPTIONCOUNT 81
+#define O_ERRORBELLS 13
+#define O_ESCAPETIME 14
+#define O_EXPANDTAB 15
+#define O_EXRC 16
+#define O_EXTENDED 17
+#define O_FILEC 18
+#define O_FILEENCODING 19
+#define O_FLASH 20
+#define O_GTAGSMODE 21
+#define O_HARDTABS 22
+#define O_ICLOWER 23
+#define O_IGNORECASE 24
+#define O_INPUTENCODING 25
+#define O_KEYTIME 26
+#define O_LEFTRIGHT 27
+#define O_LINES 28
+#define O_LISP 29
+#define O_LIST 30
+#define O_LOCKFILES 31
+#define O_MAGIC 32
+#define O_MATCHCHARS 33
+#define O_MATCHTIME 34
+#define O_MESG 35
+#define O_MODELINE 36
+#define O_MSGCAT 37
+#define O_NOPRINT 38
+#define O_NUMBER 39
+#define O_OCTAL 40
+#define O_OPEN 41
+#define O_OPTIMIZE 42
+#define O_PARAGRAPHS 43
+#define O_PATH 44
+#define O_PRINT 45
+#define O_PROMPT 46
+#define O_READONLY 47
+#define O_RECDIR 48
+#define O_REDRAW 49
+#define O_REMAP 50
+#define O_REPORT 51
+#define O_RULER 52
+#define O_SCROLL 53
+#define O_SEARCHINCR 54
+#define O_SECTIONS 55
+#define O_SECURE 56
+#define O_SHELL 57
+#define O_SHELLMETA 58
+#define O_SHIFTWIDTH 59
+#define O_SHOWMATCH 60
+#define O_SHOWMODE 61
+#define O_SIDESCROLL 62
+#define O_SLOWOPEN 63
+#define O_SOURCEANY 64
+#define O_TABSTOP 65
+#define O_TAGLENGTH 66
+#define O_TAGS 67
+#define O_TERM 68
+#define O_TERSE 69
+#define O_TILDEOP 70
+#define O_TIMEOUT 71
+#define O_TTYWERASE 72
+#define O_VERBOSE 73
+#define O_W1200 74
+#define O_W300 75
+#define O_W9600 76
+#define O_WARN 77
+#define O_WINDOW 78
+#define O_WINDOWNAME 79
+#define O_WRAPLEN 80
+#define O_WRAPMARGIN 81
+#define O_WRAPSCAN 82
+#define O_WRITEANY 83
+#define O_OPTIONCOUNT 84