[elpa] branch scratch/add-vdiff created (now 819ea4b)

[Justin Burkett]

justbur pushed a change to branch scratch/add-vdiff.

        at  819ea4b   Add 'packages/vdiff/' from commit 
'f11c7c2eeef33a0b75fe4e025818e7e672c57397'

This branch includes the following new commits:

       new  04f5436   Initial commit
       new  952440e   Initial commit
       new  ce10994   Introduce defcustoms and use lists instead of ..
       new  4b7f3d1   Make buffer names easier to read in functions
       new  1549115   Add option to lock scrolling by default
       new  b705857   Remove window-starts variable
       new  0f640d3   Add header info
       new  b77efe3   Add README and improve docstrings
       new  ad37c86   Factor out subtraction overlay and prefix internal vars
       new  72c20a5   Add gitignore
       new  aadf726   Add TODO item
       new  5a6623f   Update README
       new  23a8f14   One more TODO
       new  1155601   Fix problem with restarting mode and temp files
       new  ad6035d   Implement folding of unchanged lines
       new  016518f   Fix folds at end of buffer
       new  e178a90   One more fold fix
       new  10b7760   Add faces
       new  e6e87f3   Add screenshot
       new  3ef30aa   Update screenshot
       new  1b96390   Use fringes for open folds
       new  b6b37a5   Broaden search for overlays at point
       new  d8a4efb   Remove unused variable
       new  305e723   Add count to next/prev change and simplify
       new  8a51468   Don't close fold on point on refresh
       new  dec9dc5   Small README change
       new  988c476   Add new defcustoms to README
       new  245850f   Load cl-lib for using its function
       new  2c113c4   Merge pull request #1 from syohex/cl-lib
       new  23b3360   Fix compiler warnings
       new  4d5299e   Fix alignment of folds next to subtractions
       new  d77dd83   Take care to only remove vdiff overlays on refresh
       new  f826315   Increase default fold padding
       new  4312bb1   Make subtraction overlays zero width
       new  e8834fa   Fix fold size calcs
       new  af75c6d   Add vdiff-exit
       new  bac92b3   Improve line translation and command mirroring
       new  72d8dfc   Avoid making new folds
       new  f54616f   Don't close folds if all are open
       new  3d38f6c   Fix line endings
       new  9547850   Use diff faces from theme
       new  12f4a21   Add quit command
       new  3e1169c   Screenshot showing off theme integration
       new  6b6f6e7   Force fold refresh on window size change
       new  eeede0b   Reset open-fold-face
       new  96258b1   Don't set open fold face
       new  f915562   Use customizable function to format closed fold strings
       new  a094450   Tweak line translation rules for better scrolling
       new  dc7a5e2   Add a comment on line-map structure
       new  e9d0cc7   Define new bitmaps for open and close of folds
       new  528a5ce   Simplify logic for sending/receiving changes
       new  79b3434   Make some arg names more consistent
       new  bfdfc74   Modify gitignore
       new  d25fe21   More arg name changes
       new  1cf0730   Fix compiler warnings
       new  d07e9fb   Fix typo in package description, remove redundant "for 
Emacs"
       new  875e6ce   Merge pull request #2 from purcell/patch-1
       new  e005d43   Delete overlays right away on sending changes
       new  e94d187   Simplify adding overlays
       new  697bb79   Prefer last element of multiple in line map
       new  1640078   Merge remote-tracking branch 'origin/master'
       new  f77f184   Fix alignment of folds problem caused by recent change
       new  0fd1837   Update screenshot
       new  3207365   Satisfy compiler
       new  9a748df   Update README
       new  9be4fe3   Update install instructions in README
       new  f2aaa2e   Fix goto-corresponding-line
       new  c2f1ad9   Add vdiff-hydra.el
       new  9b4e829   Update requirements for vdiff-hydra
       new  b2ba7ab   Move hydra to main file and avoid dependency
       new  c6c959d   Fix nth-change at beginning and end of buffer
       new  b02b59e   Whitespace cleanup
       new  4bb84e4   Add update command to hydra
       new  8a88f84   Use simpler strategy for updating windows on line move
       new  6516112   Minor formatting
       new  d6a399f   Annouce exit
       new  4dc6c89   Add next/prev fold commands and update hydra
       new  14abb75   Allow jumping to subtraction overlays
       new  40351c6   Exit hydra on vdiff exit
       new  69c85cb   Better way to trigger other window update
       new  4596948   Reduce load in vdiff--scroll-function
       new  4ea6afb   Add docstrings and rearrange some calls
       new  d65fcd7   Simplify commentary
       new  a15b0e5   Move point before closing fold
       new  425d50b   Add vdiff-close-other-folds
       new  cce8eb1   Don't close fold on point after change
       new  85a4d4e   Fix point jumping after sending changes
       new  88ce867   Initial attempt at refine commands
       new  c5589a1   Delete temp files on deactivation
       new  c82f2b5   Add docs on refinements
       new  ad0e8c3   Make mirrored-commands private and rename
       new  20bd4b4   Change terminology
       new  968047f   Change wording in a docstring
       new  d46f686   Make README table narrower
       new  7811f01   Add two features
       new  52c675a   Add hydra screenshot
       new  43b9dc6   Add missing image
       new  803fd6d   Add subtraction style option
       new  0777eda   Add vdiff-refresh binding to prefix map
       new  7561f87   Split line maps
       new  3fcf4b9   Fix sign problem in adding hunk overlays
       new  f041c58   Sync lines after sending changes
       new  1276208   Recenter after next/prev hunk
       new  4ee7fca   Set intangible property for closed folds
       new  5f2c72c   Change alignment algorithm
       new  9346e46   Simplify method for setting vscroll
       new  16eb802   Update README
       new  309e912   Refresh automatically on idle after change
       new  fd8c973   Remove post-command-hook
       new  f3ca6cb   Tweak vscroll function
       new  c46b76b   Set window point on scroll
       new  f481a82   Add refresh timer delay
       new  84380fb   Delete unused lexical vars
       new  0dc9fde   Try not to move point on change transmission
       new  cc24574   Fix scroll update for other subtraction styles
       new  28d28b7   Add restore windows command
       new  81478be   Lock diff data for certain operations
       new  83f0788   Don't make temp files global
       new  5b1b342   Remove duplicated code in vdiff-files
       new  c912ebc   Don't use window-size-change-hook
       new  717d5b6   Allow failed line translation
       new  905be9c   Map remove refinements command
       new  fa6391e   Reorg README commands section
       new  750a1bc   Fix bug in remove-refinements
       new  c8cba47   Fix package
       new  bd80900   Merge pull request #7 from syohex/fix-package
       new  3d8e224   Simplify insertion arrow code
       new  25a7516   Only run scroll-function once per command
       new  1102da8   Avoid subtraction overlays larger than window-height
       new  72fe0fa   Don't update diff info while sending changes
       new  32756c3   A little better than a WIP now
       new  7135738   Version 0.1
       new  8daa391   Add case and whitespace toggles
       new  25ec344   Require diff-mode so that diff-mode faces are available
       new  371febc   Add option to automatically refine hunks
       new  c6e30a2   Merge pull request #9 from gvol/master
       new  b267885   Merge branch 'gvol-master'
       new  1c8dd1e   Default to nil for auto refinement
       new  a373c6b   Fix line endings in README
       new  e171b7c   Depend on hydra
       new  2e7f076   Simplify bitmap creation
       new  3d0678f   Make bitmaps nicer
       new  74ebab6   Don't move point when closing all folds
       new  667a7e4   Generalize data structures to prepare for diff3
       new  5031c90   Finish new line translation logic
       new  a2fbb7b   Rename diff-program-args
       new  78071df   Use a separate minor-mode for 3way
       new  baed24a   Work on moving refresh to 3way
       new  53ee239   Fix bug in receive changes for 3way
       new  9b3ffb0   Don't distiguish exit code 0 from 1
       new  e556705   Simplify scroll function
       new  001ae43   Fix modification of buffer list
       new  53c2a6b   Fix receiving changes
       new  95a1230   Fix vscroll bug
       new  938cc55   Fix use of delq (wanted remq)
       new  0cbaf6f   Fix point jumping after receive-changes
       new  8f7a212   Remove with-other-window and sync-line
       new  5dcdc97   Remove other-window
       new  7029054   Comment out vdiff-buffers3
       new  c2627f0   Fix recenter-all
       new  477eb88   Fix refinement bug
       new  f36b6b2   Fix line-translation error
       new  13f553f   Fix fold logic for diff3
       new  30b85fe   Fix sending changes with diff3
       new  f1eca80   Disable refine-all-hunks for diff3
       new  192dbfe   Release vdiff-buffers3
       new  d33845c   Minor change in cleanup
       new  5043ca3   Wrap global state into session object
       new  71d1d20   Add overlay markers to diff3 send/receive
       new  8c78e58   Fix compiler warning
       new  8b79246   Make sure we're in a vdiff buffer on refresh
       new  7bc7f40   Add recent changes
       new  466b852   Fix subtraction overlay addition
       new  97d7098   Add screenshot of three way diff
       new  90f81f0   Make sure hook functions execute in vdiff bufs
       new  edfae89   Cleanup vdiff-buffers
       new  42f56ae   Don't jump to beginning of buffer on start
       new  88e7f1c   Remove min-window-width
       new  f3b6cec   Center on start
       new  582d13d   Fix compiler warnings
       new  9890b81   Fix weird vscroll problem
       new  816fe2a   Fix subtraction string width
       new  2847cd6   Add callback support on quit
       new  8842469   Allow point to leave overlay on target selection
       new  1d8f6e7   Use correct mode for three way diff on quit
       new  03e1b64   Remove unnecessary unique name function
       new  9454053   Use window-text-width instead of window-width
       new  dcf811e   Add new on-quit options
       new  fef3208   Update screenshot
       new  4dd194b   Update screenshot with refinements
       new  cd9dad4   Fix refresh function call sequence
       new  87ade86   Always move to start of fold on close
       new  133e187   Allow folds to close on point but make optional
       new  28c939f   Document new option
       new  b4c3e09   Ensure sentinel runs in correct context
       new  e6e834f   Don't refresh on buffer switch
       new  d3faef0   Refresh manually after receive
       new  048d544   Pass session explicitly from refresh sentinel
       new  679617c   Force update of window-start on manual scroll-function
       new  a88d313   Sync scroll after fold toggle
       new  7d60015   Add some doctrings
       new  b840935   Use more specific faces for refinements
       new  af5ddce   Remove vdiff-sync-and-center
       new  eda4b1b   Force update of window-start in manual calls to scroll 
func
       new  7fbb20e   Nil temp-session after using it
       new  74feddf   Adjust width of subtraction string
       new  cfad650   Provide missing function for emacs-nox users
       new  059d288   Update gitignore
       new  c2c991d   Add initial vdiff-magit work
       new  7f100a3   Fix vdiff-refresh callback function
       new  9d89a66   Add melpa badge
       new  f4332f2   Fix typo in Commentary section
       new  30b0f9c   Add vdiff-magit.el with two functions
       new  52d49ba   Merge branch 'magit' into magit2
       new  64430c3   Cleanup merge
       new  98e1add   vdiff-magit: Port show-staged, show-unstaged and stage
       new  19f4616   vdiff-magit: Port compare and show-commit
       new  8b6cb54   vdiff-magit: Port resolve
       new  1478a02   vdiff-magit: Make group
       new  c31755a   vdiff-magit: Port show stash
       new  e567468   vdiff-magit: Port show-working-tree
       new  3037be6   vdiff-magit: Cleanup references in dwim
       new  90374e7   vdiff-magit: Port dwim-show-on-hunks
       new  ed25084   vdiff-magit: Fix some strings
       new  219d765   vdiff-magit: Simplify stage
       new  e5d3633   Revert "vdiff-magit: Simplify stage"
       new  05cbdee   vdiff: Allow buffers to be killed in quit
       new  615e7bd   vdiff-magit: Fix killing of buffers in stage
       new  2d48cb5   vdiff-magit: Simplify resolve
       new  432534d   vdiff-magit: Don't use vdiff-magit-resolve yet
       new  6f89757   vdiff-magit: Resurrect resolve
       new  de84cfd   vdiff-magit: Fix a function reference in dwim
       new  cfb90d7   vdiff-magit: Add note to README
       new  7a3e456   vdiff-magit: Cleanup after stage
       new  1d79425   vdiff-magit: Cleanup header
       new  e8d3d26   vdiff-magit: Try to switch resolve functions gracefully
       new  52ea351   vdiff-magit: Add option to prefer ediff for merges
       new  617265b   vdiff-magit: Remove unused magit-ediff code
       new  0f8dd15   vdiff: Improve a couple of docstrings
       new  a81d62a   README: Update recent changes
       new  f5fdcaa   vdiff-magit: Simplify exit from stage
       new  bc5a9a8   vdiff-magit: Remove unnecessary local bindings
       new  d8cfb8f   vdiff: Don't use scroll-lock-mode programmatically
       new  7c87360   vdiff: Add vdiff-current-file
       new  8b32329   vdiff: Filter out killed buffers better
       new  a040a4b   vdiff: Add vdiff-merge-conflict
       new  fb3097c   vdiff: Check if window exists before forcing vscroll
       new  ff1fbc4   vdiff: Generate ancestor buffer in merge-conflict
       new  bcacd3f   vdiff: Add option vdiff-use-ancestor-as-merge-buffer
       new  8aa5c45   vdiff-magit: Fix paren
       new  c32fe46   vdiff: Fix compiler warnings
       new  875b0d5   README: Improve vdiff-magit-popup
       new  d243767   README: Add entry points and vimdiff bindings
       new  8a3dff3   vdiff-magit: Add vdiff-magit-stage-is-2way
       new  3a32c4e   README: Update
       new  d4883de   vdiff-magit: Remove use of camel case names for 
consistency
       new  f11c7c2   vdiff: Fix vdiff-buffers window layout
       new  819ea4b   Add 'packages/vdiff/' from commit 
'f11c7c2eeef33a0b75fe4e025818e7e672c57397'