Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
crdt.el
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Will Foran
crdt.el
Compare revisions
master to 52506c637a9f28f80fb4332dda79535a825701c5
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
willforan/crdt.el
Select target project
No results found
52506c637a9f28f80fb4332dda79535a825701c5
Select Git revision
Branches
development
fix
master
Swap
Target
qhong/crdt.el
Select target project
qhong/crdt.el
jimmyhmiller/crdt.el
jming422/crdt.el
artenator/crdt.el
willforan/crdt.el
5 results
master
Select Git revision
Branches
development
fix
master
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (3)
more sensible version message
· 4b86674f
Qiantan Hong
authored
3 years ago
4b86674f
fix a bug when synchronizing mark
· 43bbb18b
Qiantan Hong
authored
3 years ago
43bbb18b
bump version
· 52506c63
Qiantan Hong
authored
3 years ago
52506c63
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
crdt.el
+4
-4
4 additions, 4 deletions
crdt.el
with
4 additions
and
4 deletions
crdt.el
View file @
52506c63
...
...
@@ -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.
5
;; Version: 0.2.
6
;; This file is part of GNU Emacs.
...
...
@@ -35,13 +35,13 @@
(
require
'url
)
(
require
'color
)
(
defconst
crdt-version
"0.2.
5
"
)
(
defconst
crdt-version
"0.2.
6
"
)
(
defconst
crdt-protocol-version
"0.2.5"
)
(
defun
crdt-version
()
"Show the crdt.el version."
(
interactive
)
(
message
crdt-version
))
(
message
"crdt.el version %s"
crdt-version
))
(
defgroup
crdt
nil
"Collaborative editing using Conflict-free Replicated Data Types."
...
...
@@ -1471,7 +1471,7 @@ CRDT--PROCESS should be bound to The network process for the client connection."
(
crdt--format-message
`
(
cursor
,
crdt--buffer-network-name
,
site-id
,
point
,
(
crdt--get-id
point
)
,
mark
,
(
crdt--get-id
mark
)))))))
,
mark
,
(
when
mark
(
crdt--get-id
mark
)))))))
)
crdt--pseudo-cursor-table
)
(
process-send-string
crdt--process
(
crdt--format-message
(
crdt--local-cursor
nil
)))
...
...
This diff is collapsed.
Click to expand it.