From 55bef3cd2ee53b48704dace006932057db6352ab Mon Sep 17 00:00:00 2001
From: Kurtis Rader <krader@skepticism.us>
Date: Mon, 7 Aug 2017 18:29:33 -0700
Subject: [PATCH] remove deprecated `.` (dot) command

Fixes #4294
---
 CHANGELOG.md             |  9 ++++++---
 Makefile.in              |  2 +-
 share/completions/..fish |  1 -
 share/config.fish        | 14 --------------
 src/parser.cpp           |  2 +-
 5 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 share/completions/..fish

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22a7ea389..ba919bce7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,17 +4,20 @@ This section is for changes merged to the `major` branch that are not also merge
 ## Deprecations
 - The `IFS` variable is deprecated and will be removed in fish 4.0 (#4156).
 
+## Notable non-backward compatible changes
+- `.` command no longer exists -- use `source` (#4294).
+- `read` now requires at least one var name (#4220).
+- `set x[1] x[2] a b` is no longer valid syntax (#4236).
+
 ## Notable fixes and improvements
 - `read` has a new `--delimiter` option as a better alternative to the `IFS` variable (#4256).
 - `set` has a new `--append` and `--prepend` option (#1326).
 - `set` has a new `--show` option to show lots of information about variables (#4265).
-- `set x[1] x[2] a b` is no longer valid syntax (#4236).
 - `complete` now has a `-k` and `--keep-order` option to keep the order of the OPTION_ARGUMENTS (#361).
 - Local exported (`set -lx`) vars are now visible to functions (#1091).
+- `abbr` has been reimplemented to be faster. This means the old `fish_user_abbreviations` variable is ignored (#4048).
 
 ## Other significant changes
-- `read` now requires at least one var name (#4220).
-- `abbr` has been reimplemented to be faster. This means the old `fish_user_abbreviations` variable is ignored (#4048).
 - Command substitution output is now limited to 10 MB by default (#3822).
 
 
diff --git a/Makefile.in b/Makefile.in
index 08aaa35b3..0ecb86acc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -169,7 +169,7 @@ TEST_IN := $(wildcard tests/test*.in)
 #
 # Files in ./share/completions/
 #
-COMPLETIONS_DIR_FILES := $(wildcard share/completions/*.fish) share/completions/..fish
+COMPLETIONS_DIR_FILES := $(wildcard share/completions/*.fish)
 
 #
 # Files in ./share/functions/
diff --git a/share/completions/..fish b/share/completions/..fish
deleted file mode 100644
index dcb48a1ed..000000000
--- a/share/completions/..fish
+++ /dev/null
@@ -1 +0,0 @@
-complete -c . -x -a "(__fish_complete_suffix .fish)"
diff --git a/share/config.fish b/share/config.fish
index 44c4248a6..b280ea848 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -217,20 +217,6 @@ function __fish_on_interactive --on-event fish_prompt
     functions -e __fish_on_interactive
 end
 
-# "." command for compatibility with old fish versions.
-function . --description 'Evaluate contents of file (deprecated, see "source")' --no-scope-shadowing
-    if begin
-            test (count $argv) -eq 0
-            # Uses tty directly, as isatty depends on "."
-            and tty 0>&0 >/dev/null
-        end
-        echo "source: '.' command is deprecated, and doesn't work with STDIN anymore. Did you mean 'source' or './'?" >&2
-        return 1
-    else
-        source $argv
-    end
-end
-
 # Set the locale if it isn't explicitly set. Allowing the lack of locale env vars to imply the
 # C/POSIX locale causes too many problems. Do this before reading the snippets because they might be
 # in UTF-8 (with non-ASCII characters).
diff --git a/src/parser.cpp b/src/parser.cpp
index 422bff2f6..ad9e07398 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -89,7 +89,7 @@ static const struct block_lookup_entry block_lookup[] = {
     {TOP, 0, TOP_BLOCK},
     {SUBST, 0, SUBST_BLOCK},
     {BEGIN, L"begin", BEGIN_BLOCK},
-    {SOURCE, L".", SOURCE_BLOCK},
+    {SOURCE, L"source", SOURCE_BLOCK},
     {EVENT, 0, EVENT_BLOCK},
     {BREAKPOINT, L"breakpoint", BREAKPOINT_BLOCK},
     {(block_type_t)0, 0, 0}};