Merge branch 'master' of git://github.com/b4winckler/macvim

Conflicts:
	src/MacVim/Info.plist

Author: splhack

src/MacVim/Info.plist

@@ -1232,7 +1232,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20130815</string>
+	<string>20130911</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

src/MacVim/MMAppController.m

@@ -1677,12 +1677,9 @@ - (void)handleXcodeModEvent:(NSAppleEventDescriptor *)event
 - (void)handleGetURLEvent:(NSAppleEventDescriptor *)event
                replyEvent:(NSAppleEventDescriptor *)reply
 {
-    NSString *urlString = [[event paramDescriptorForKeyword:keyDirectObject]
-        stringValue];
-    // NOTE: URLWithString requires string to be percent escaped.
-    urlString = [urlString stringByAddingPercentEscapesUsingEncoding:
-                                                        NSUTF8StringEncoding];
-    NSURL *url = [NSURL URLWithString:urlString];
+    NSURL *url = [NSURL URLWithString:[[event
+                                        paramDescriptorForKeyword:keyDirectObject]
+                                        stringValue]];
 
     // We try to be compatible with TextMate's URL scheme here, as documented
     // at http://blog.macromates.com/2007/the-textmate-url-scheme/ . Currently,

src/MacVim/MacVim.xcodeproj/project.pbxproj

@@ -736,7 +736,7 @@
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 70;
+				CURRENT_PROJECT_VERSION = 71;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -769,7 +769,7 @@
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 70;
+				CURRENT_PROJECT_VERSION = 71;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",

src/MacVim/gvimrc

@@ -56,16 +56,16 @@ if !exists("macvim_skip_cmd_opt_movement")
 
   no   <D-Up>         <C-Home>
   ino  <D-Up>         <C-Home>
-  map  <M-Up>         {
-  imap <M-Up>         <C-o>{
+  no   <M-Up>         {
+  ino  <M-Up>         <C-o>{
 
   no   <D-Down>       <C-End>
   ino  <D-Down>       <C-End>
-  map  <M-Down>       }
-  imap <M-Down>       <C-o>}
+  no   <M-Down>       }
+  ino  <M-Down>       <C-o>}
 
-  imap <M-BS>         <C-w>
-  imap <D-BS>         <C-u>
+  ino  <M-BS>         <C-w>
+  ino  <D-BS>         <C-u>
 endif " !exists("macvim_skip_cmd_opt_movement")