https://github.com/zk-phi/commentize-conflict
Minor mode to treat git conflict markers and their changes as comment
https://github.com/zk-phi/commentize-conflict
emacs
Last synced: 10 months ago
JSON representation
Minor mode to treat git conflict markers and their changes as comment
- Host: GitHub
- URL: https://github.com/zk-phi/commentize-conflict
- Owner: zk-phi
- Created: 2017-01-08T13:45:29.000Z (over 9 years ago)
- Default Branch: master
- Last Pushed: 2021-02-28T17:40:44.000Z (about 5 years ago)
- Last Synced: 2024-12-30T21:16:11.734Z (over 1 year ago)
- Topics: emacs
- Language: Emacs Lisp
- Homepage:
- Size: 20.5 KB
- Stars: 1
- Watchers: 3
- Forks: 0
- Open Issues: 1
-
Metadata Files:
- Readme: Readme.org
Awesome Lists containing this project
README
* commentize-conflict.el
Prevent conflict markers from breaking syntactic analysis
コンフリクトでシンタックスハイライトなどが壊れないようにするマイナーモー
ド
** Description
This package provides a minor-mode which advices major modes to treat
git conflict markers and "their" changes as comments, so that they
will not break major-mode's syntax-highlighting.
** Screenshots
- without =commentize-conflict=
[[./img/without.png]]
=show-paren-mode= is broken by the conflict marker.
- with =commentize-conflict=
[[./img/with.png]]
lines between ~=~ and ~<<<<<<< feature-branch~ are treated as
comments and =show-paren-mode= is NOT broken.
** Installation
Put this scrpit into a 'load-path'ed directory, and load it in your
init file.
: (require 'commentize-conflict)
and add hook to the modes you want to enable the feature.
: (add-hook 'prog-mode-hook 'commentize-conflict-mode)