From 97c0d0a563d2303adc64e94c78544bb4d2dbf83c Mon Sep 17 00:00:00 2001
From: SomeDer <48731521+SomeDer@users.noreply.github.com>
Date: Mon, 19 Aug 2019 11:14:22 +0100
Subject: Allow plugins sudo and thefuck to be loaded before vi-mode (#8087)

---
 plugins/sudo/sudo.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'plugins/sudo')

diff --git a/plugins/sudo/sudo.plugin.zsh b/plugins/sudo/sudo.plugin.zsh
index 0b843822e..f405b025f 100644
--- a/plugins/sudo/sudo.plugin.zsh
+++ b/plugins/sudo/sudo.plugin.zsh
@@ -28,4 +28,6 @@ sudo-command-line() {
 }
 zle -N sudo-command-line
 # Defined shortcut keys: [Esc] [Esc]
-bindkey "\e\e" sudo-command-line
+bindkey -M emacs '\e\e' sudo-command-line
+bindkey -M vicmd '\e\e' sudo-command-line
+bindkey -M viins '\e\e' sudo-command-line
-- 
cgit v1.2.3-70-g09d2


From c130aadb6a66aa680a322c08d87ad773316f713d Mon Sep 17 00:00:00 2001
From: Jacob Tomaw <jtomaw@shoprunner.com>
Date: Tue, 19 Nov 2019 13:44:00 -0500
Subject: Replace "restart shell" documentation "exec zsh" (#8411)

Running `source ~/.zshrc` can have side effects, it's better to reload the whole
zsh session with `exec zsh`.
---
 plugins/catimg/README.md   | 4 ++--
 plugins/dircycle/README.md | 4 ++--
 plugins/encode64/README.md | 4 ++--
 plugins/lol/README.md      | 4 ++--
 plugins/sudo/README.md     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'plugins/sudo')

diff --git a/plugins/catimg/README.md b/plugins/catimg/README.md
index 2fc28a1c6..42b59a62c 100644
--- a/plugins/catimg/README.md
+++ b/plugins/catimg/README.md
@@ -17,10 +17,10 @@ Plugin for displaying images on the terminal using the the `catimg.sh` script pr
    )
    ```
 
-2. Reload the source file or restart your Terminal session:
+2. Restart the shell or restart your Terminal session:
 
    ```console
-   $ source ~/.zshrc
+   $ exec zsh
    $
    ```
 
diff --git a/plugins/dircycle/README.md b/plugins/dircycle/README.md
index 3ac162f05..3c9b3a96f 100644
--- a/plugins/dircycle/README.md
+++ b/plugins/dircycle/README.md
@@ -15,10 +15,10 @@ This plugin enables directory navigation similar to using back and forward on br
    )
    ```
 
-2. Reload the source file or restart your Terminal session:
+2. Restart the shell or restart your Terminal session:
 
    ```console
-   $ source ~/.zshrc
+   $ exec zsh
    $
    ```
 
diff --git a/plugins/encode64/README.md b/plugins/encode64/README.md
index 9850da85f..66fc7cba4 100644
--- a/plugins/encode64/README.md
+++ b/plugins/encode64/README.md
@@ -20,10 +20,10 @@ Alias plugin for encoding or decoding using `base64` command
    )
    ```
 
-2. Restart your terminal session or reload configuration by running:
+2. Restart your terminal session or restart the shell:
 
    ```sh
-   source ~/.zshrc
+   exec zsh
    ```
 
 ## Usage and examples
diff --git a/plugins/lol/README.md b/plugins/lol/README.md
index b0e54f575..8fba7b713 100644
--- a/plugins/lol/README.md
+++ b/plugins/lol/README.md
@@ -13,10 +13,10 @@ Plugin for adding catspeak aliases, because why not
    )
    ```
 
-2. Reload the source file or restart your Terminal session:
+2. Restart your terminal session or restart the shell:
 
    ```console
-   $ source ~/.zshrc
+   $ exec zsh
    $
    ```
 
diff --git a/plugins/sudo/README.md b/plugins/sudo/README.md
index ebfdfd10d..25eb85829 100644
--- a/plugins/sudo/README.md
+++ b/plugins/sudo/README.md
@@ -13,10 +13,10 @@ Easily prefix your current or previous commands with `sudo` by pressing <kbd>esc
     )
     ```
 
-2.  Reload the source file or restart your Terminal session:
+2.  Restart your shell or restart your Terminal session:
 
     ```console
-    $ source ~/.zshrc
+    $ exec zsh
     $
     ```
 
-- 
cgit v1.2.3-70-g09d2