/*
* If a character was put back with vungetc, it was already processed.
* Return it directly.
-diff -cr vim70.orig/src/option.c vim70/src/option.c
-*** vim70.orig/src/option.c 2006-09-12 21:47:30.000000000 -0400
---- vim70/src/option.c 2006-09-12 21:54:07.000000000 -0400
-***************
-*** 529,534 ****
---- 529,537 ----
- {"autoindent", "ai", P_BOOL|P_VI_DEF,
- (char_u *)&p_ai, PV_AI,
- {(char_u *)FALSE, (char_u *)0L}},
-+ {"autopaste", "apa", P_BOOL|P_VI_DEF,
-+ (char_u *)&p_apa, PV_NONE,
-+ {(char_u *)FALSE, (char_u *)0L}},
- {"autoprint", "ap", P_BOOL|P_VI_DEF,
- (char_u *)NULL, PV_NONE,
- {(char_u *)FALSE, (char_u *)0L}},
-diff -cr vim70.orig/src/option.h vim70/src/option.h
-*** vim70.orig/src/option.h 2006-09-12 21:47:30.000000000 -0400
---- vim70/src/option.h 2006-09-12 21:54:23.000000000 -0400
-***************
-*** 312,317 ****
---- 312,318 ----
- #if defined(FEAT_GUI) && defined(MACOS_X)
- EXTERN int *p_antialias; /* 'antialias' */
- #endif
-+ EXTERN int p_apa; /* 'autopaste' */
- EXTERN int p_ar; /* 'autoread' */
- EXTERN int p_aw; /* 'autowrite' */
- EXTERN int p_awa; /* 'autowriteall' */
+--- vim72/src/optiondefs.h~ 2009-05-18 22:23:40.000000000 +0300
++++ vim72/src/optiondefs.h 2009-05-18 22:30:25.277259155 +0300
+@@ -377,6 +377,9 @@
+ {"autoindent", "ai", P_BOOL|P_VI_DEF,
+ (char_u *)&p_ai, PV_AI,
+ {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
++ {"autopaste", "apa", P_BOOL|P_VI_DEF,
++ (char_u *)&p_apa, PV_NONE,
++ {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
+ {"autoprint", "ap", P_BOOL|P_VI_DEF,
+ (char_u *)NULL, PV_NONE,
+ {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
+--- vim72/src/option.h~ 2009-05-18 22:23:40.000000000 +0300
++++ vim72/src/option.h 2009-05-18 22:30:25.277259155 +0300
+@@ -312,6 +312,7 @@
+ #if defined(FEAT_GUI) && defined(MACOS_X)
+ EXTERN int *p_antialias; // 'antialias'
+ #endif
++EXTERN int p_apa; /* 'autopaste' */
+ EXTERN int p_ar; // 'autoread'
+ EXTERN int p_aw; // 'autowrite'
+ EXTERN int p_awa; // 'autowriteall'