branch: externals/detached
commit bebf530cea1bd4f4e479e9b0dab45369f087d10c
Author: Niklas Eklund <niklas.ekl...@posteo.net>
Commit: Niklas Eklund <niklas.ekl...@posteo.net>
Fix error in diff sessions
Since detached-log-mode might be enabled in buffers when diffing,
inhibit-read-only is required in order to not fail the second time.
---
detached.el | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/detached.el b/detached.el
index 5f8ab0cb77..735a6cb62f 100644
--- a/detached.el
+++ b/detached.el
@@ -491,19 +491,21 @@ Optionally DELETE the session if prefix-argument is
provided."
(let ((buffer1 "*detached-session-output-1*")
(buffer2 "*detached-session-output-2*"))
(with-current-buffer (get-buffer-create buffer1)
- (erase-buffer)
- (insert (detached--session-header session1))
- (insert (detached--session-output session1))
- (when (eq 'terminal-data (detached--session-env session1))
- ;; Enable `detached-log-mode' to parse ansi-escape sequences
- (detached-log-mode)))
+ (let ((inhibit-read-only t))
+ (erase-buffer)
+ (insert (detached--session-header session1))
+ (insert (detached--session-output session1))
+ (when (eq 'terminal-data (detached--session-env session1))
+ ;; Enable `detached-log-mode' to parse ansi-escape sequences
+ (detached-log-mode))))
(with-current-buffer (get-buffer-create buffer2)
- (erase-buffer)
- (insert (detached--session-header session2))
- (insert (detached--session-output session2))
- (when (eq 'terminal-data (detached--session-env session2))
- ;; Enable `detached-log-mode' to parse ansi-escape sequences
- (detached-log-mode)))
+ (let ((inhibit-read-only t))
+ (erase-buffer)
+ (insert (detached--session-header session2))
+ (insert (detached--session-output session2))
+ (when (eq 'terminal-data (detached--session-env session2))
+ ;; Enable `detached-log-mode' to parse ansi-escape sequences
+ (detached-log-mode))))
(ediff-buffers buffer1 buffer2))))
;;;###autoload
