From a7ecc0db1fd396ca00431c60c53b593660110514 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 31 Jul 2015 17:07:27 +0800
Subject: [PATCH] functions/history.fish: validate command line arguments in
 wrapper

Closes #2055.

Implements the standard `--` option for delimiting options from
arguments; to search for "--", use `history --search -- --`.
---
 share/functions/history.fish | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/share/functions/history.fish b/share/functions/history.fish
index fd2b91fab..441a3ebb3 100644
--- a/share/functions/history.fish
+++ b/share/functions/history.fish
@@ -33,7 +33,13 @@ function history --description "Deletes an item from history"
                 case --clear
                     set cmd clear
                 case --search
-                	set cmd print
+                    set cmd print
+                case --
+                    set -e argv[$i]
+                    break
+                case -* --*
+                    printf ( _ "%s: invalid option -- %s\n" ) history $argv[1] >&2
+                    return 1
             end
         end
     else