From ea4b37d5c57a5f7377a605ea87411ca1e033f61a Mon Sep 17 00:00:00 2001
From: maxfl <gmaxfl@gmail.com>
Date: Mon, 2 Jul 2012 11:19:30 +0800
Subject: [PATCH] Fixed case behaviour

* case no properly handles -h and --help flags, i.e. treats it as
  pattern
* fixed case escaping:
The following expressions now work correctly:
switch '*'
  echo '*'
  echo Match any string
end
switch '*'
  echo '\*'
  echo Match asterix
end
switch '\\'
  echo '\\\\'
  echo Match slash
end

The same for '?' sign
---
 builtin.cpp                 | 2 +-
 parse_util.cpp              | 2 +-
 share/functions/funced.fish | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/builtin.cpp b/builtin.cpp
index 1d570ae92..3204a6055 100644
--- a/builtin.cpp
+++ b/builtin.cpp
@@ -3838,7 +3838,7 @@ static int internal_help( const wchar_t *cmd )
 {
 	CHECK( cmd, 0 );
 	return contains( cmd, L"for", L"while", L"function",
-			 L"if", L"end", L"switch", L"count" );
+			 L"if", L"end", L"switch", L"case", L"count" );
 }
 
 
diff --git a/parse_util.cpp b/parse_util.cpp
index eed4b2605..c9c7f548c 100644
--- a/parse_util.cpp
+++ b/parse_util.cpp
@@ -665,7 +665,6 @@ wchar_t *parse_util_unescape_wildcards( const wchar_t *str )
 					in++;
 					*(out++)=*in;
 				}
-				*(out++)=*in;
 				break;
 			}
 			
@@ -688,6 +687,7 @@ wchar_t *parse_util_unescape_wildcards( const wchar_t *str )
 			}
 		}		
 	}
+    *out = *in;
 	return unescaped;
 }
 
diff --git a/share/functions/funced.fish b/share/functions/funced.fish
index cc9db224a..075b03019 100644
--- a/share/functions/funced.fish
+++ b/share/functions/funced.fish
@@ -4,7 +4,7 @@ function funced --description 'Edit function definition'
     set -l funcname
     while set -q argv[1]
         switch $argv[1]
-			case '---long impossible to match line, because case respects -h option' -h --help
+			case -h --help
 				__fish_print_help funced
 				return 0