From c24c25f4db27722a6fc43c97e897433f674179d0 Mon Sep 17 00:00:00 2001
From: Bjorn Winckler <bjorn.winckler@gmail.com>
Date: Sun, 12 Oct 2008 14:05:42 +0200
Subject: [PATCH] Use option as meta key

Added a buffer local option called 'macmeta' which when set causes
MacVim not to interpret option+key presses thus enabling the user to
bind to <M-..>.  Also updated the documentation and added 'macmeta' to
the .vim syntax file.
---
 runtime/doc/options.txt       | 12 +++++++++
 runtime/doc/quickref.txt      |  1 +
 runtime/doc/tags              |  4 +++
 runtime/optwin.vim            |  3 +++
 runtime/syntax/vim.vim        | 12 ++++-----
 src/MacVim/MMBackend.m        | 57 ++++++++++++++++++++++++++++++++++++-------
 src/MacVim/MMTextViewHelper.m | 11 +++++++++
 src/option.c                  | 19 +++++++++++++++
 src/option.h                  |  3 +++
 src/structs.h                 |  3 +++
 10 files changed, 110 insertions(+), 15 deletions(-)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index bd001d7a..3cdcdf99 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4493,6 +4493,18 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'termencoding'.
 	Note: MacVim does not use this option.
 
+				*'macmeta'* *'mmta'* *'nomacmeta'* *'nommta'*
+'macmeta'		boolean	(default off)
+			local to buffer
+			{only available in MacVim GUI}
+	Use option (alt) as meta key.  When on, option-key presses are not
+	interpreted, thus enabling bindings to <M-..>.  When off, option-key
+	presses are interpreted by the selected input method and inserted as
+	text.
+	Note: Some keys (e.g. <M-F1>, <M-Tab>, <M-Return>, <M-Left>) can be
+	bound with the Meta flag even when this option is disabled, but this
+	is not the case for the majority of keys (e.g. <M-a>, <M-`>).
+
 						*'magic'* *'nomagic'*
 'magic'			boolean	(default on)
 			global
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index ae528258..cc1af875 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -767,6 +767,7 @@ Short explanation of each option:		*option-list*
 'listchars'	  'lcs'     characters for displaying in list mode
 'loadplugins'	  'lpl'     load plugin scripts when starting up
 'macatsui'		    Mac GUI: use ATSUI text drawing
+'macmeta'	  'mmta'    use option as meta key (MacVim GUI only)
 'magic'			    changes special characters in search patterns
 'makeef'	  'mef'     name of the errorfile for ":make"
 'makeprg'	  'mp'	    program to use for the ":make" command
diff --git a/runtime/doc/tags b/runtime/doc/tags
index d8962860..75717359 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -381,6 +381,7 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 'lz'	options.txt	/*'lz'*
 'ma'	options.txt	/*'ma'*
 'macatsui'	options.txt	/*'macatsui'*
+'macmeta'	options.txt	/*'macmeta'*
 'magic'	options.txt	/*'magic'*
 'makeef'	options.txt	/*'makeef'*
 'makeprg'	options.txt	/*'makeprg'*
@@ -407,6 +408,7 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 'mmd'	options.txt	/*'mmd'*
 'mmp'	options.txt	/*'mmp'*
 'mmt'	options.txt	/*'mmt'*
+'mmta'	options.txt	/*'mmta'*
 'mod'	options.txt	/*'mod'*
 'modeline'	options.txt	/*'modeline'*
 'modelines'	options.txt	/*'modelines'*
@@ -543,9 +545,11 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 'nolz'	options.txt	/*'nolz'*
 'noma'	options.txt	/*'noma'*
 'nomacatsui'	options.txt	/*'nomacatsui'*
+'nomacmeta'	options.txt	/*'nomacmeta'*
 'nomagic'	options.txt	/*'nomagic'*
 'nomh'	options.txt	/*'nomh'*
 'noml'	options.txt	/*'noml'*
+'nommta'	options.txt	/*'nommta'*
 'nomod'	options.txt	/*'nomod'*
 'nomodeline'	options.txt	/*'nomodeline'*
 'nomodifiable'	options.txt	/*'nomodifiable'*
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 3738b762..f81cd9fe 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -623,6 +623,9 @@ if has("gui")
     call <SID>BinOptionG("fullscreen", &fullscreen)
     call append("$", "fuoptions\tcontrol how fullscreen mode should behave")
     call <SID>OptionG("fuoptions", &fuoptions)
+    call append("$", "macmeta\tuse option as meta key")
+    call append("$", "\t(local to buffer)")
+    call <SID>BinOptionL("mmta")
   endif
 endif
 
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index b7bc7da4..1731c973 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -25,21 +25,21 @@ syn match   vimCommand contained	"\<z[-+^.=]"
 
 " vimOptions are caught only when contained in a vimSet {{{2
 syn keyword vimOption contained	acd ambiwidth arabicshape autowriteall backupdir bdlay binary breakat bufhidden cdpath cin cinwords columns completeopt cpo cscopetagorder csverb deco dictionary directory ed encoding errorfile exrc fdls fencs fileformats fmr foldlevel foldtext fsync gfs gtl guioptions hf hk hlsearch imak ims indentexpr is isp keywordprg lazyredraw lispwords ls makeef maxmapdepth mfd mmd modified mousemodel msm numberwidth operatorfunc pastetoggle pexpr pmbfn printexpr pt readonly rightleft rtp sb scroll sect sessionoptions shellpipe shellxquote showbreak shq slm smd spc spf sr sta sts swapfile sxq tabpagemax tags tbis terse thesaurus titleold toolbariconsize tsr ttyfast tx ut verbosefile virtualedit wb wfw wildcharm winaltkeys winminwidth wmnu write
-syn keyword vimOption contained	ai ambw ari aw backupext beval biosk brk buflisted cedit cindent clipboard com confirm cpoptions cscopeverbose cuc def diff display edcompatible endofline errorformat fcl fdm fex filetype fo foldlevelstart formatexpr ft gfw gtt guipty hh hkmap ic imc imsearch indentkeys isf isprint km lbr list lsp makeprg maxmem mh mmp more mouses mzq nuw opfunc patchexpr pfn popt printfont pumheight redrawtime rightleftcmd ru sbo scrollbind sections sft shellquote shiftround showcmd si sm sn spell spl srr stal su swapsync syn tabstop tagstack tbs textauto tildeop titlestring top ttimeout ttym uc vb vfile visualbell wc wh wildignore window winwidth wmw writeany
+syn keyword vimOption contained	ai ambw ari aw backupext beval biosk brk buflisted cedit cindent clipboard com confirm cpoptions cscopeverbose cuc def diff display edcompatible endofline errorformat fcl fdm fex filetype fo foldlevelstart formatexpr ft gfw gtt guipty hh hkmap ic imc imsearch indentkeys isf isprint km lbr list lsp makeprg maxmem mh mmp mmta more mouses mzq nuw opfunc patchexpr pfn popt printfont pumheight redrawtime rightleftcmd ru sbo scrollbind sections sft shellquote shiftround showcmd si sm sn spell spl srr stal su swapsync syn tabstop tagstack tbs textauto tildeop titlestring top ttimeout ttym uc vb vfile visualbell wc wh wildignore window winwidth wmw writeany
 syn keyword vimOption contained	akm anti arshape awa backupskip bex bioskey browsedir buftype cf cink cmdheight comments consk cpt cspc cul define diffexpr dy ef eol esckeys fcs fdn ff fillchars foldclose foldmarker formatlistpat gcr ghr guicursor guitablabel hi hkmapp icon imcmdline inc indk isfname joinspaces kmp lcs listchars lw mat maxmempattern mis mmt mouse mouseshape mzquantum odev osfiletype patchmode ph preserveindent printheader pvh remap rl ruf sbr scrolljump secure sh shellredir shiftwidth showfulltag sidescroll smartcase so spellcapcheck splitbelow ss startofline sua swb synmaxcol tag tal tenc textmode timeout tl tpm ttimeoutlen ttymouse ul vbs vi vop wcm whichwrap wildmenu winfixheight wiv wop writebackup
-syn keyword vimOption contained	al antialias autochdir background balloondelay bexpr bk bs casemap cfu cinkeys cmdwinheight commentstring conskey cscopepathcomp csprg cursorcolumn delcombine diffopt ea efm ep et fdc fdo ffs fk foldcolumn foldmethod formatoptions gd go guifont guitabtooltip hid hkp iconstring imd include inex isi js kp linebreak lm lz matchpairs maxmemtot mkspellmem mod mousef mouset nf oft pa path pheader previewheight printmbcharset pvw report rlc ruler sc scrolloff sel shcf shellslash shm showmatch sidescrolloff smartindent softtabstop spellfile splitright ssl statusline suffixes swf syntax tagbsearch tb term textwidth timeoutlen tm tr ttm ttyscroll undolevels vdir viewdir wa wd wi wildmode winfixwidth wiw wrap writedelay
+syn keyword vimOption contained	al antialias autochdir background balloondelay bexpr bk bs casemap cfu cinkeys cmdwinheight commentstring conskey cscopepathcomp csprg cursorcolumn delcombine diffopt ea efm ep et fdc fdo ffs fk foldcolumn foldmethod formatoptions gd go guifont guitabtooltip hid hkp iconstring imd include inex isi js kp linebreak lm lz macmeta matchpairs maxmemtot mkspellmem mod mousef mouset nf oft pa path pheader previewheight printmbcharset pvw report rlc ruler sc scrolloff sel shcf shellslash shm showmatch sidescrolloff smartindent softtabstop spellfile splitright ssl statusline suffixes swf syntax tagbsearch tb term textwidth timeoutlen tm tr ttm ttyscroll undolevels vdir viewdir wa wd wi wildmode winfixwidth wiw wrap writedelay
 syn keyword vimOption contained	aleph ar autoindent backspace ballooneval bg bkc bsdir cb ch cino cmp compatible copyindent cscopeprg csqf cursorline dex digraph ead ei equalalways eventignore fde fdt fileencoding fkmap foldenable foldminlines formatprg gdefault gp guifontset helpfile hidden hl ignorecase imdisable includeexpr inf isident key langmap lines lmap ma matchtime mco ml modeline mousefocus mousetime nrformats ofu para pdev pi previewwindow printmbfont qe restorescreen ro rulerformat scb scrollopt selection shell shelltemp shortmess showmode siso smarttab sol spelllang spr ssop stl suffixesadd switchbuf ta taglength tbi termbidi tf title to ts tty ttytype updatecount ve viewoptions wak weirdinvert wig wildoptions winheight wm wrapmargin ws
 syn keyword vimOption contained	allowrevins arab autoread backup balloonexpr bh bl bsk ccv charconvert cinoptions cms complete cot cscopequickfix cst cwh dg dip eadirection ek equalprg ex fdi fen fileencodings flp foldexpr foldnestmax fp gfm grepformat guifontwide helpheight highlight hlg im imi incsearch infercase isk keymap langmenu linespace loadplugins macatsui maxcombine mef mls modelines mousehide mp nu omnifunc paragraphs penc pm printdevice printoptions quoteescape revins rs runtimepath scr scs selectmode shellcmdflag shelltype shortname showtabline sj smc sp spellsuggest sps st stmp sw sws tabline tagrelative tbidi termencoding tgst titlelen toolbar tsl ttybuiltin tw updatetime verbose viminfo warn wfh wildchar wim winminheight wmh wrapscan ww
 syn keyword vimOption contained	altkeymap arabic autowrite backupcopy bdir bin bomb bt cd ci cinw co completefunc cp cscopetag csto debug dict dir eb enc errorbells expandtab fdl fenc fileformat fml foldignore foldopen fs gfn grepprg guiheadroom helplang history hls imactivatekey iminsert inde insertmode iskeyword keymodel laststatus lisp lpl magic maxfuncdepth menuitems mm modifiable mousem mps number opendevice paste pex pmbcs printencoding prompt rdt ri 
 
 " vimOptions: These are the turn-off setting variants {{{2
-syn keyword vimOption contained	noacd noallowrevins noantialias noarabic noarshape noautoread noaw noballooneval nobinary nobk nobuflisted nocin noconfirm nocopyindent nocscopeverbose nocuc nocursorline nodg nodisable noeb noedcompatible noendofline noequalalways noesckeys noex noexrc nofk nofoldenable nogdefault nohid nohk nohkmapp nohls noic noignorecase noimc noimd noinf noinsertmode nojoinspaces nolazyredraw nolinebreak nolist nolpl noma nomagic noml nomodeline nomodified nomousef nomousehide nonumber noopendevice nopi nopreviewwindow nopvw noremap norevins norightleft norl noro noru nosb noscb noscs nosft noshelltemp noshortname noshowfulltag noshowmode nosm nosmartindent nosmd nosol nosplitbelow nospr nossl nostartofline noswapfile nota notagrelative notbi notbs noterse notextmode notgst notimeout noto notr nottybuiltin notx novisualbell nowarn noweirdinvert nowfw nowinfixheight nowiv nowrap nowrite nowritebackup
-syn keyword vimOption contained	noai noaltkeymap noar noarabicshape noautochdir noautowrite noawa nobeval nobiosk nobl nocf nocindent noconsk nocp nocst nocul nodeco nodiff noea noed noek noeol noerrorbells noet noexpandtab nofen nofkmap nogd noguipty nohidden nohkmap nohkp nohlsearch noicon noim noimcmdline noincsearch noinfercase nois nojs nolbr nolisp noloadplugins nolz nomacatsui nomh nomod nomodifiable nomore nomousefocus nonu noodev nopaste nopreserveindent noprompt noreadonly norestorescreen nori norightleftcmd norlc nors noruler nosc noscrollbind nosecure noshellslash noshiftround noshowcmd noshowmatch nosi nosmartcase nosmarttab nosn nospell nosplitright nosr nosta nostmp noswf notagbsearch notagstack notbidi notermbidi notextauto notf notildeop notitle notop nottimeout nottyfast novb nowa nowb nowfh nowildmenu nowinfixwidth nowmnu nowrapscan nowriteany nows
+syn keyword vimOption contained	noacd noallowrevins noantialias noarabic noarshape noautoread noaw noballooneval nobinary nobk nobuflisted nocin noconfirm nocopyindent nocscopeverbose nocuc nocursorline nodg nodisable noeb noedcompatible noendofline noequalalways noesckeys noex noexrc nofk nofoldenable nogdefault nohid nohk nohkmapp nohls noic noignorecase noimc noimd noinf noinsertmode nojoinspaces nolazyredraw nolinebreak nolist nolpl noma nomacmeta nomagic noml nomodeline nomodified nomousef nomousehide nonumber noopendevice nopi nopreviewwindow nopvw noremap norevins norightleft norl noro noru nosb noscb noscs nosft noshelltemp noshortname noshowfulltag noshowmode nosm nosmartindent nosmd nosol nosplitbelow nospr nossl nostartofline noswapfile nota notagrelative notbi notbs noterse notextmode notgst notimeout noto notr nottybuiltin notx novisualbell nowarn noweirdinvert nowfw nowinfixheight nowiv nowrap nowrite nowritebackup
+syn keyword vimOption contained	noai noaltkeymap noar noarabicshape noautochdir noautowrite noawa nobeval nobiosk nobl nocf nocindent noconsk nocp nocst nocul nodeco nodiff noea noed noek noeol noerrorbells noet noexpandtab nofen nofkmap nogd noguipty nohidden nohkmap nohkp nohlsearch noicon noim noimcmdline noincsearch noinfercase nois nojs nolbr nolisp noloadplugins nolz nomacatsui nomh nommta nomod nomodifiable nomore nomousefocus nonu noodev nopaste nopreserveindent noprompt noreadonly norestorescreen nori norightleftcmd norlc nors noruler nosc noscrollbind nosecure noshellslash noshiftround noshowcmd noshowmatch nosi nosmartcase nosmarttab nosn nospell nosplitright nosr nosta nostmp noswf notagbsearch notagstack notbidi notermbidi notextauto notf notildeop notitle notop nottimeout nottyfast novb nowa nowb nowfh nowildmenu nowinfixwidth nowmnu nowrapscan nowriteany nows
 syn keyword vimOption contained	noakm noanti noarab noari noautoindent noautowriteall nobackup nobin nobioskey nobomb noci nocompatible noconskey nocscopetag nocsverb nocursorcolumn nodelcombine nodigraph 
 
 " vimOptions: These are the invertible variants {{{2
-syn keyword vimOption contained	invacd invallowrevins invantialias invarabic invarshape invautoread invaw invballooneval invbinary invbk invbuflisted invcin invconfirm invcopyindent invcscopeverbose invcuc invcursorline invdg invdisable inveb invedcompatible invendofline invequalalways invesckeys invex invexrc invfk invfoldenable invgdefault invhid invhk invhkmapp invhls invic invignorecase invimc invimd invinf invinsertmode invjoinspaces invlazyredraw invlinebreak invlist invlpl invma invmagic invml invmodeline invmodified invmousef invmousehide invnumber invopendevice invpi invpreviewwindow invpvw invremap invrevins invrightleft invrl invro invru invsb invscb invscs invsft invshelltemp invshortname invshowfulltag invshowmode invsm invsmartindent invsmd invsol invsplitbelow invspr invssl invstartofline invswapfile invta invtagrelative invtbi invtbs invterse invtextmode invtgst invtimeout invto invtr invttybuiltin invtx invvisualbell invwarn invweirdinvert invwfw invwinfixheight invwiv invwrap invwrite invwritebackup
-syn keyword vimOption contained	invai invaltkeymap invar invarabicshape invautochdir invautowrite invawa invbeval invbiosk invbl invcf invcindent invconsk invcp invcst invcul invdeco invdiff invea inved invek inveol inverrorbells invet invexpandtab invfen invfkmap invgd invguipty invhidden invhkmap invhkp invhlsearch invicon invim invimcmdline invincsearch invinfercase invis invjs invlbr invlisp invloadplugins invlz invmacatsui invmh invmod invmodifiable invmore invmousefocus invnu invodev invpaste invpreserveindent invprompt invreadonly invrestorescreen invri invrightleftcmd invrlc invrs invruler invsc invscrollbind invsecure invshellslash invshiftround invshowcmd invshowmatch invsi invsmartcase invsmarttab invsn invspell invsplitright invsr invsta invstmp invswf invtagbsearch invtagstack invtbidi invtermbidi invtextauto invtf invtildeop invtitle invtop invttimeout invttyfast invvb invwa invwb invwfh invwildmenu invwinfixwidth invwmnu invwrapscan invwriteany invws
+syn keyword vimOption contained	invacd invallowrevins invantialias invarabic invarshape invautoread invaw invballooneval invbinary invbk invbuflisted invcin invconfirm invcopyindent invcscopeverbose invcuc invcursorline invdg invdisable inveb invedcompatible invendofline invequalalways invesckeys invex invexrc invfk invfoldenable invgdefault invhid invhk invhkmapp invhls invic invignorecase invimc invimd invinf invinsertmode invjoinspaces invlazyredraw invlinebreak invlist invlpl invma invmacmeta invmagic invml invmodeline invmodified invmousef invmousehide invnumber invopendevice invpi invpreviewwindow invpvw invremap invrevins invrightleft invrl invro invru invsb invscb invscs invsft invshelltemp invshortname invshowfulltag invshowmode invsm invsmartindent invsmd invsol invsplitbelow invspr invssl invstartofline invswapfile invta invtagrelative invtbi invtbs invterse invtextmode invtgst invtimeout invto invtr invttybuiltin invtx invvisualbell invwarn invweirdinvert invwfw invwinfixheight invwiv invwrap invwrite invwritebackup
+syn keyword vimOption contained	invai invaltkeymap invar invarabicshape invautochdir invautowrite invawa invbeval invbiosk invbl invcf invcindent invconsk invcp invcst invcul invdeco invdiff invea inved invek inveol inverrorbells invet invexpandtab invfen invfkmap invgd invguipty invhidden invhkmap invhkp invhlsearch invicon invim invimcmdline invincsearch invinfercase invis invjs invlbr invlisp invloadplugins invlz invmacatsui invmh invmmta invmod invmodifiable invmore invmousefocus invnu invodev invpaste invpreserveindent invprompt invreadonly invrestorescreen invri invrightleftcmd invrlc invrs invruler invsc invscrollbind invsecure invshellslash invshiftround invshowcmd invshowmatch invsi invsmartcase invsmarttab invsn invspell invsplitright invsr invsta invstmp invswf invtagbsearch invtagstack invtbidi invtermbidi invtextauto invtf invtildeop invtitle invtop invttimeout invttyfast invvb invwa invwb invwfh invwildmenu invwinfixwidth invwmnu invwrapscan invwriteany invws
 syn keyword vimOption contained	invakm invanti invarab invari invautoindent invautowriteall invbackup invbin invbioskey invbomb invci invcompatible invconskey invcscopetag invcsverb invcursorcolumn invdelcombine invdigraph 
 
 " termcap codes (which can also be set) {{{2
diff --git a/src/MacVim/MMBackend.m b/src/MacVim/MMBackend.m
index b2ab343e..63e79f47 100644
--- a/src/MacVim/MMBackend.m
+++ b/src/MacVim/MMBackend.m
@@ -1521,10 +1521,13 @@ static NSString *MMSymlinkWarningString =
     // We take this approach of "pushing" the state to MacVim to avoid having
     // to make synchronous calls from MacVim to Vim in order to get state.
 
+    BOOL mmta = curbuf ? curbuf->b_p_mmta : NO;
+
     NSDictionary *vimState = [NSDictionary dictionaryWithObjectsAndKeys:
         [[NSFileManager defaultManager] currentDirectoryPath], @"pwd",
         [NSNumber numberWithInt:p_mh], @"p_mh",
         [NSNumber numberWithBool:[self unusedEditor]], @"unusedEditor",
+        [NSNumber numberWithBool:mmta], @"p_mmta",
         nil];
 
     // Put the state before all other messages.
@@ -1796,6 +1799,7 @@ static NSString *MMSymlinkWarningString =
 
 - (void)handleKeyDown:(NSString *)key modifiers:(int)mods
 {
+    // TODO: This code is a horrible mess -- clean up!
     char_u special[3];
     char_u modChars[3];
     char_u *chars = (char_u*)[key UTF8String];
@@ -1858,9 +1862,52 @@ static NSString *MMSymlinkWarningString =
             }
             mods &= ~MOD_MASK_ALT;
         }
+    } else if (1 == length && chars[0] < 0x80 && (mods & MOD_MASK_ALT)) {
+        // META key is treated separately.  This code was taken from gui_w48.c
+        // and gui_gtk_x11.c.
+        char_u string[7];
+        int ch = simplify_key(chars[0], &mods);
+
+        // Remove the SHIFT modifier for keys where it's already included,
+        // e.g., '(' and '*'
+        if (ch < 0x100 && !isalpha(ch) && isprint(ch))
+            mods &= ~MOD_MASK_SHIFT;
+
+        // Interpret the ALT key as making the key META, include SHIFT, etc.
+        ch = extract_modifiers(ch, &mods);
+        if (ch == CSI)
+            ch = K_CSI;
+
+        int len = 0;
+        if (mods) {
+            string[len++] = CSI;
+            string[len++] = KS_MODIFIER;
+            string[len++] = mods;
+        }
+
+        if (IS_SPECIAL(ch)) {
+            string[len++] = CSI;
+            string[len++] = K_SECOND(ch);
+            string[len++] = K_THIRD(ch);
+        } else {
+            string[len++] = ch;
+#ifdef FEAT_MBYTE
+            // TODO: What if 'enc' is not "utf-8"?
+            if (enc_utf8 && (ch & 0x80)) { // convert to utf-8
+                string[len++] = ch & 0xbf;
+                string[len-2] = ((unsigned)ch >> 6) + 0xc0;
+                if (string[len-1] == CSI) {
+                    string[len++] = KS_EXTRA;
+                    string[len++] = (int)KE_CSI;
+                }
+            }
+#endif
+        }
+
+        add_to_input_buf(string, len);
+        return;
     } else if (length > 0) {
         unichar c = [key characterAtIndex:0];
-
         //NSLog(@"non-special: %@ (hex=%x, mods=%d)", key,
         //        [key characterAtIndex:0], mods);
 
@@ -1875,14 +1922,6 @@ static NSString *MMSymlinkWarningString =
             //NSLog(@"clear shift ctrl");
         }
 
-        // HACK!  All Option+key presses go via 'insert text' messages, except
-        // for <M-Space>.  If the Alt flag is not cleared for <M-Space> it does
-        // not work to map to it.
-        if (0xa0 == c && !(mods & MOD_MASK_CMD)) {
-            //NSLog(@"clear alt");
-            mods &= ~MOD_MASK_ALT;
-        }
-
 #ifdef FEAT_MBYTE
         if (input_conv.vc_type != CONV_NONE) {
             conv_str = string_convert(&input_conv, chars, &length);
diff --git a/src/MacVim/MMTextViewHelper.m b/src/MacVim/MMTextViewHelper.m
index 6142b110..6b75e225 100644
--- a/src/MacVim/MMTextViewHelper.m
+++ b/src/MacVim/MMTextViewHelper.m
@@ -111,6 +111,17 @@ static float MMDragAreaSize = 73.0f;
         } else {
             [self dispatchKeyEvent:event];
         }
+    } else if ((flags & NSAlternateKeyMask) &&
+            [[[[self vimController] vimState] objectForKey:@"p_mmta"]
+                                                                boolValue]) {
+        // If the 'macmeta' option is set, then send Alt+key presses directly
+        // to Vim without interpreting the key press.
+        NSString *unmod = [event charactersIgnoringModifiers];
+        int len = [unmod lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
+        const char *bytes = [unmod UTF8String];
+
+        [self sendKeyDown:bytes length:len modifiers:flags
+                isARepeat:[event isARepeat]];
     } else {
         [textView interpretKeyEvents:[NSArray arrayWithObject:event]];
     }
diff --git a/src/option.c b/src/option.c
index 5d3b86e5..7ddd8022 100644
--- a/src/option.c
+++ b/src/option.c
@@ -138,6 +138,9 @@
 #define PV_ML		OPT_BUF(BV_ML)
 #define PV_MOD		OPT_BUF(BV_MOD)
 #define PV_MPS		OPT_BUF(BV_MPS)
+#ifdef FEAT_GUI_MACVIM
+#define PV_MMTA		OPT_BUF(BV_MMTA)
+#endif
 #define PV_NF		OPT_BUF(BV_NF)
 #ifdef FEAT_OSFILETYPE
 # define PV_OFT		OPT_BUF(BV_OFT)
@@ -322,6 +325,9 @@ static int	p_lisp;
 #endif
 static int	p_ml;
 static int	p_ma;
+#ifdef FEAT_GUI_MACVIM
+static int	p_mmta;
+#endif
 static int	p_mod;
 static char_u	*p_mps;
 static char_u	*p_nf;
@@ -1658,6 +1664,13 @@ static struct vimoption
 			    (char_u *)&p_macatsui, PV_NONE,
 			    {(char_u *)TRUE, (char_u *)0L}},
 #endif
+    {"macmeta",	    "mmta", P_BOOL|P_VI_DEF,
+#ifdef FEAT_GUI_MACVIM
+			    (char_u *)&p_mmta, PV_MMTA,
+#else
+			    (char_u *)NULL, PV_NONE,
+#endif
+			    {(char_u *)FALSE, (char_u *)0L}},
     {"magic",	    NULL,   P_BOOL|P_VI_DEF,
 			    (char_u *)&p_magic, PV_NONE,
 			    {(char_u *)TRUE, (char_u *)0L}},
@@ -9235,6 +9248,9 @@ get_varp(p)
 #endif
 	case PV_ML:	return (char_u *)&(curbuf->b_p_ml);
 	case PV_MPS:	return (char_u *)&(curbuf->b_p_mps);
+#ifdef FEAT_GUI_MACVIM
+	case PV_MMTA:	return (char_u *)&(curbuf->b_p_mmta);
+#endif
 	case PV_MA:	return (char_u *)&(curbuf->b_p_ma);
 	case PV_MOD:	return (char_u *)&(curbuf->b_changed);
 	case PV_NF:	return (char_u *)&(curbuf->b_p_nf);
@@ -9607,6 +9623,9 @@ buf_copy_options(buf, flags)
 	    buf->b_p_keymap = vim_strsave(p_keymap);
 	    buf->b_kmap_state |= KEYMAP_INIT;
 #endif
+#ifdef FEAT_GUI_MACVIM
+	    buf->b_p_mmta = p_mmta;
+#endif
 	    /* This isn't really an option, but copying the langmap and IME
 	     * state from the current buffer is better than resetting it. */
 	    buf->b_p_iminsert = p_iminsert;
diff --git a/src/option.h b/src/option.h
index 2077fa5a..c1cbf5f4 100644
--- a/src/option.h
+++ b/src/option.h
@@ -981,6 +981,9 @@ enum
     , BV_ML
     , BV_MOD
     , BV_MPS
+#ifdef FEAT_GUI_MACVIM
+    , BV_MMTA
+#endif
     , BV_NF
 #ifdef FEAT_OSFILETYPE
     , BV_OFT
diff --git a/src/structs.h b/src/structs.h
index eb75dcd8..673540e5 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1456,6 +1456,9 @@ struct file_buffer
     char_u	*b_p_dict;	/* 'dictionary' local value */
     char_u	*b_p_tsr;	/* 'thesaurus' local value */
 #endif
+#ifdef FEAT_GUI_MACVIM
+    int		b_p_mmta;	/* 'macmeta' local value */
+#endif
 
     /* end of buffer options */
 
-- 
2.11.4.GIT