Skip to content

Commit 90b0a0f

Browse files
committed
Clarify ediff flow in README
1 parent 03510b3 commit 90b0a0f

File tree

1 file changed

+20
-1
lines changed

1 file changed

+20
-1
lines changed

README.org

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Claude Code IDE for Emacs provides native integration with Claude Code CLI throu
2121
- Tool support for file operations, editor state, and workspace info
2222
- Extensible MCP tools server for accessing Emacs commands (xrefs, tree-sitter, project info, e.g.)
2323
- Diagnostic integration with Flycheck and Flymake
24-
- Advanced diff view with ediff integration
24+
- Advanced diff view with ediff integration (modify suggestions before applying)
2525
- Tab-bar support for proper context switching
2626
- Selection and buffer tracking for better context awareness
2727

@@ -160,6 +160,25 @@ You can run multiple Claude Code instances simultaneously for different projects
160160
- The window can be closed with standard Emacs window commands (=C-x 0=) without stopping Claude
161161
- Use =claude-code-ide-toggle-recent= to toggle the most recent Claude window from anywhere, regardless of your current project context. This is useful when you're outside a project directory but want to quickly hide/show Claude
162162

163+
** Diff Viewing with Ediff
164+
165+
When =claude-code-ide-use-ide-diff= is enabled (default), Claude's code suggestions are displayed using Emacs' powerful =ediff= interface. This provides two key advantages:
166+
167+
1. *Visual diff comparison* - See exactly what Claude wants to change with side-by-side or unified diff views
168+
2. *Interactive editing* - You can modify Claude's suggestions before applying them
169+
170+
*** How to use ediff:
171+
172+
1. When Claude suggests code changes, =ediff= opens automatically
173+
2. The ediff control buffer becomes active (a small window with ediff commands)
174+
3. Buffer A shows the current code, Buffer B shows Claude's suggestion
175+
4. You can modify Buffer B to refine Claude's proposed changes
176+
5. Press =q= in the ediff control buffer to quit
177+
6. When prompted, choose whether to accept the changes (=y= or =n=)
178+
7. If you accept (=y=), any changes from Buffer B will be sent back to Claude to be applied on the original file
179+
180+
This allows you to refine Claude's suggestions before they're applied, ensuring the final code meets your exact requirements.
181+
163182
** Configuration
164183

165184
*** Configuration Variables

0 commit comments

Comments
 (0)