diff --git a/share/functions/history.fish b/share/functions/history.fish
index cf115579c..487b86abe 100644
--- a/share/functions/history.fish
+++ b/share/functions/history.fish
@@ -8,140 +8,135 @@ function history --shadow-builtin --description "display or manipulate interacti
     set -l contains_args ""
     set -l search_mode none
     set -l time_args
-    if not set -q argv[1] or string match -r -- "^-t|^--with-time" $argv[1]
-        set -l show_all
-    end
-    if count $argv
 
     for i in (seq (count $argv))
         if set -q argv[$i]
-        	switch $argv[$i]
-        	    case -d --delete
-        		    set cmd delete
-        	    case -v --save
-        		    set cmd save
-        	    case -l --clear
-        		    set cmd clear
-        	    case -s --search
-        		    set cmd search
-        	    case -m --merge
-        		    set cmd merge
-        	    case -h --help
-        	       	set cmd help
-        	    case -t --with-time
-        	     	set time_args --with-time
-        	    case -p --prefix
-            		set search_mode prefix
-            		set prefix_args $argv[(math $i + 1)]
-        	    case -c --contains
-        		    set search_mode contains
-        		    set contains_args $argv[(math $i + 1)]
-        	    case --
-        		    set -e argv[1..$i]
-        		    break
-        	    case "-*" "--*"
+            switch $argv[$i]
+                case -d --delete
+                    set cmd delete
+                case -v --save
+                    set cmd save
+                case -l --clear
+                    set cmd clear
+                case -s --search
+                    set cmd search
+                case -m --merge
+                    set cmd merge
+                case -h --help
+                    set cmd help
+                case -t --with-time
+                    set time_args "-t"
+                case -p --prefix
+                    set search_mode prefix
+                    set prefix_args $argv[(math $i + 1)]
+                case -c --contains
+                    set search_mode contains
+                    set contains_args $argv[(math $i + 1)]
+                case --
+                    set -e argv[1..$i]
+                    break
+                case "-*" "--*"
                     printf ( _ "%s: invalid option -- %s\n" ) history $argv[$i] >&2
-        		    return 1
+                    return 1
             end
-        	end
         end
     end
 
     switch $cmd
         case search
-            if set -q show_all
-                begin 
-                    if status --is-interactive
-                        set -l pager less
-                        set -q PAGER
+            if set -q argv[1]
+                or begin
+                    test -n $time_args
+                    and contains $search_mode none
+                    set -l pager less
+                    set -q PAGER
                     and set pager $PAGER
-                        builtin history $argv | eval $pager
-                    end
-                    return
-                end
-            end
-            
-            builtin history $argv
-
-        case delete
-            # Interactively delete history
-            set -l found_items ""
-            switch $search_mode
-                case prefix:
-                    set found_items (builtin history --search --prefix $prefix_args)
-                case contains
-                    set found_items (builtin history --search --contains $contains_args)
-                case none
-                    builtin history $argv
-                    # Save changes after deleting item.
-                    builtin history --save
-                    return 0
-            end
-
-            set found_items_count (count $found_items)
-            if test $found_items_count -gt 0
-                echo "[0] cancel"
-                echo "[1] all"
-                echo
-
-                for i in (seq $found_items_count)
-                    printf "[%s] %s \n" (math $i + 1) $found_items[$i]
-                end
-
-                read --local --prompt "echo 'Delete which entries? > '" choice
-                set choice (string split " " -- $choice)
-
-                for i in $choice
-
-                    # Skip empty input, for example, if the user just hits return
-                    if test -z $i
-                        continue
-                    end
-
-                    # Following two validations could be embedded with "and" but I find the syntax
-                    # kind of weird.
-                    if not string match -qr '^[0-9]+$' $i
-                        printf "Invalid input: %s\n" $i
-                        continue
-                    end
-
-                    if test $i -gt (math $found_items_count + 1)
-                        printf "Invalid input : %s\n" $i
-                        continue
-                    end
-
-                    if test $i = "0"
-                        printf "Cancel\n"
-                        return
-                    else
-                        if test $i = "1"
-                            for item in $found_items
-                                builtin history --delete $item
-                            end
-                            printf "Deleted all!\n"
-                        else
-                            builtin history --delete $found_items[(math $i - 1)]
-                        end
-
-                    end
-                end
-                # Save changes after deleting item(s).
-                builtin history --save
-            end
-        case save
-            # Save changes to history file.
-            builtin history $argv
-        case merge
-            builtin history --merge
-        case help
-            builtin history --help
-        case clear
-            # Erase the entire history.
-            echo "Are you sure you want to clear history ? (y/n)"
-            read ch
-            if test $ch = "y"
-                builtin history $argv
-                echo "History cleared!"
-            end
-    end
+                    builtin history $time_args | eval $pager
+else
+builtin history $time_args $argv
+end
+return
+
+
+case delete
+# Interactively delete history
+set -l found_items ""
+switch $search_mode
+    case prefix:
+        set found_items (builtin history --search --prefix $prefix_args)
+    case contains
+        set found_items (builtin history --search --contains $contains_args)
+    case none
+        builtin history $argv
+        # Save changes after deleting item.
+        builtin history --save
+        return 0
+end
+
+set found_items_count (count $found_items)
+if test $found_items_count -gt 0
+    echo "[0] cancel"
+    echo "[1] all"
+    echo
+
+    for i in (seq $found_items_count)
+        printf "[%s] %s \n" (math $i + 1) $found_items[$i]
+    end
+
+    read --local --prompt "echo 'Delete which entries? > '" choice
+    set choice (string split " " -- $choice)
+
+    for i in $choice
+
+        # Skip empty input, for example, if the user just hits return
+        if test -z $i
+            continue
+        end
+
+        # Following two validations could be embedded with "and" but I find the syntax
+        # kind of weird.
+        if not string match -qr '^[0-9]+$' $i
+            printf "Invalid input: %s\n" $i
+            continue
+        end
+
+        if test $i -gt (math $found_items_count + 1)
+            printf "Invalid input : %s\n" $i
+            continue
+        end
+
+        if test $i = "0"
+            printf "Cancel\n"
+            return
+        else
+            if test $i = "1"
+                for item in $found_items
+                    builtin history --delete $item
+                end
+                printf "Deleted all!\n"
+            else
+                builtin history --delete $found_items[(math $i - 1)]
+            end
+
+        end
+    end
+    # Save changes after deleting item(s).
+    builtin history --save
+end
+case save
+# Save changes to history file.
+builtin history $argv
+case merge
+builtin history --merge
+case help
+builtin history --help
+case clear
+# Erase the entire history.
+echo "Are you sure you want to clear history ? (y/n)"
+read ch
+if test $ch = "y"
+    builtin history $argv
+    echo "History cleared!"
+end
+end
 end