[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff c82f2b5 090/258: Add docs on refinements
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff c82f2b5 090/258: Add docs on refinements |
Date: |
Wed, 17 May 2017 08:13:28 -0400 (EDT) |
branch: scratch/add-vdiff
commit c82f2b5a30bbeecc99ada92aaafabf5e733f55e4
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Add docs on refinements
---
README.org | 12 ++++++++++++
vdiff.el | 1 -
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/README.org b/README.org
index 7a41069..286c175 100644
--- a/README.org
+++ b/README.org
@@ -49,6 +49,8 @@ the commands would be
| =C-c P= | =vdiff-previous-fold= | Move to previous fold in buffer
|
| =C-c r= | =vdiff-receive-changes= | Receive the corresponding hunk
from other buffer |
| =C-c s= | =vdiff-send-changes= | Send this hunk (or all in
region) to other buffer |
+| =C-c f= | =vdiff-refine-this-change= | Highlight changed words in
change |
+| =C-c F= | =vdiff-refine-all-changes= | Highlight changed words in
change |
| =C-c c= | =vdiff-close-fold= | Close fold at point or in region
|
| =C-c C= | =vdiff-close-all-folds= | Close all folds in buffer
|
| =C-c t= | =vdiff-close-other-folds= | Close all other folds in buffer
|
@@ -112,5 +114,15 @@ The current customization options and there defaults are
;; passed are the number of lines folded, the text on the first line, and the
;; width of the buffer.
(setq vdiff-fold-string-function 'vdiff-fold-string-default)
+
+ ;; Default syntax table class code to use for identifying \"words\" in
+ ;; \`vdiff-refine-this-change'. Some useful options are
+ ;;
+ ;; \"w\" (default) words
+ ;; \"w_\" symbols \(really words plus symbol constituents\)
+ ;;
+ ;; For more information see
+ ;;
https://www.gnu.org/software/emacs/manual/html_node/elisp/Syntax-Class-Table.html
+ (setq vdiff-default-refinement-syntax-code "w")
#+END_SRC
diff --git a/vdiff.el b/vdiff.el
index f83db94..4cc9c17 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -106,7 +106,6 @@ text on the first line, and the width of the buffer."
\"w\" (default) words
\"w_\" symbols \(really words plus symbol constituents\)
-\"-\" whitespace
For more information see
https://www.gnu.org/software/emacs/manual/html_node/elisp/Syntax-Class-Table.html"
- [elpa] scratch/add-vdiff 717d5b6 121/258: Allow failed line translation, (continued)
- [elpa] scratch/add-vdiff 717d5b6 121/258: Allow failed line translation, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff b267885 137/258: Merge branch 'gvol-master', Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 8daa391 133/258: Add case and whitespace toggles, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 95a1230 154/258: Fix vscroll bug, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e556705 151/258: Simplify scroll function, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f36b6b2 162/258: Fix line-translation error, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 13f553f 163/258: Fix fold logic for diff3, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 88e7f1c 178/258: Remove min-window-width, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 679617c 199/258: Force update of window-start on manual scroll-function, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff dcf811e 188/258: Add new on-quit options, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c82f2b5 090/258: Add docs on refinements,
Justin Burkett <=
- [elpa] scratch/add-vdiff 3fcf4b9 101/258: Fix sign problem in adding hunk overlays, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 9346e46 106/258: Simplify method for setting vscroll, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c46b76b 111/258: Set window point on scroll, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff fd8c973 109/258: Remove post-command-hook, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 25a7516 128/258: Only run scroll-function once per command, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 25ec344 134/258: Require diff-mode so that diff-mode faces are available, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 371febc 135/258: Add option to automatically refine hunks, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 9b3ffb0 150/258: Don't distiguish exit code 0 from 1, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d33845c 167/258: Minor change in cleanup, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff edfae89 176/258: Cleanup vdiff-buffers, Justin Burkett, 2017/05/17