From 9c6ce73028a1c340d08235f7411ef7b2db11d3f3 Mon Sep 17 00:00:00 2001
From: Jonas Widen <jonas.widen@widens.eu>
Date: Sun, 16 Mar 2025 17:43:13 +0100
Subject: [PATCH] Minor fixes

---
 README.md           | 42 +++++++++++++++++++-----------------------
 lua/gemini/init.lua |  5 +++++
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index d58064f..2214604 100644
--- a/README.md
+++ b/README.md
@@ -55,41 +55,37 @@ The plugin provides three ways to interact with Gemini:
 - This will send your current buffer's content as context along with your query
 - Useful for code-related questions about the file you're working on
 
-### Response Window
-
-The AI response appears in a floating window. You can close it using:
-- `q` key
-- `<Esc>` key
-- `<Enter>` key
-- `:q` command
-
-## Chat Features
-
-The plugin now maintains a continuous chat session with Gemini:
-
-- All conversations appear in a persistent chat window
-- Chat history is maintained throughout the session
-- Press `i` in the chat window to enter a new query
-- Press `q` to close the chat window (history is preserved)
-- Use `:GeminiClearChat` to clear the conversation history
-
 ### Chat Window Controls
 
-While in the chat window:
+The chat window appears on the right side of your editor and provides the following controls:
+
 - `i`: Enter a new query
-- `q`: Close the window
-- Normal mode scrolling commands work as expected
+- `q`: Close the chat window (history is preserved)
+- `<Esc>`: Return focus to previous buffer
+- Normal mode scrolling commands (`j`, `k`, `<C-d>`, `<C-u>`, etc.) work as expected
 - Window automatically scrolls to show new messages
 
-The chat window appears on the right side of your editor and preserves the entire conversation history until you explicitly clear it or restart Neovim.
+File operations in the chat window are intentionally disabled:
+- `:w`, `:e`, `:sp`, `:vs` and similar commands are blocked
+- The command-line mode (`:`) is disabled to prevent file operations
+- A warning message appears if you attempt these operations
+
+### Chat Commands
+
+- `:GeminiClearChat`: Clear the conversation history and chat window
+- `:Gemini <query>`: Send a query directly from command mode
 
 ## Features
 
-- Floating window interface
+- Floating window interface with persistent chat history
 - Non-blocking API calls
 - Error handling and notifications
 - Easy-to-use command and keymap interface
 - Support for the latest Gemini 2.0 Flash model
+- Markdown syntax highlighting for responses
+- Context-aware queries using current buffer content
+- Automatic scrolling to new messages
+- Protected chat window to prevent accidental modifications
 
 ## Troubleshooting
 
diff --git a/lua/gemini/init.lua b/lua/gemini/init.lua
index 64b046b..18bfd17 100644
--- a/lua/gemini/init.lua
+++ b/lua/gemini/init.lua
@@ -104,6 +104,11 @@ local function update_chat_window(new_content)
             chat_winnr = nil
         end, { buffer = chat_bufnr, nowait = true })
 
+        -- Make Esc return focus to previous window
+        vim.keymap.set('n', '<Esc>', function()
+            vim.cmd('wincmd p')
+        end, { buffer = chat_bufnr, nowait = true })
+
         -- Add input mapping
         vim.keymap.set('n', 'i', function()
             vim.ui.input({ prompt = "Gemini: " }, function(input)