emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/crdt 2b0c9c0 10/10: Merge branch 'fix'


From: ELPA Syncer
Subject: [elpa] externals/crdt 2b0c9c0 10/10: Merge branch 'fix'
Date: Fri, 17 Sep 2021 14:57:12 -0400 (EDT)

branch: externals/crdt
commit 2b0c9c0dbe6da5e8829fc704171912ba4136e221
Merge: d5fd2bf c10a255
Author: Qiantan Hong <qhong@mit.edu>
Commit: Qiantan Hong <qhong@mit.edu>

    Merge branch 'fix'
---
 crdt.el | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/crdt.el b/crdt.el
index c2122d7..3ad436c 100644
--- a/crdt.el
+++ b/crdt.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Qiantan Hong <qhong@alum.mit.edu>
 ;; URL: https://code.librehq.com/qhong/crdt.el
 ;; Keywords: collaboration crdt
-;; Version: 0.2.3
+;; Version: 0.2.4
 
 ;; This file is part of GNU Emacs.
 
@@ -2535,12 +2535,14 @@ The result DIFF can be used in (CRDT--NAPPLY-DIFF OLD 
DIFF) to reproduce NEW."
     (funcall orig-func process start end)))
 
 (defun crdt--get-buffer-process-advice (orig-func buffer)
-  (and buffer
-       (setq buffer (get-buffer buffer))
-       (with-current-buffer buffer
-         (or (funcall orig-func buffer)
-             (and crdt--session (not (crdt--server-p))
-                  crdt--buffer-pseudo-process)))))
+  (or (funcall orig-func buffer)
+      (and buffer
+           (setq buffer (get-buffer buffer))
+           (buffer-live-p buffer)
+           (with-current-buffer buffer
+             (or (funcall orig-func buffer)
+                 (and crdt--session (not (crdt--server-p))
+                      crdt--buffer-pseudo-process))))))
 
 (defun crdt--get-process-advice (orig-func name)
   (if (crdt--pseudo-process-p name)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]