Merge pull request #188 from artros/feature/keep-edit-history-on-reload
commitf403e7e8c26a100534017f8ca2c5c1f1f9bac81f
authorColomban Wendling <ban@herbesfolles.org>
Wed, 28 Jan 2015 14:05:30 +0000 (28 15:05 +0100)
committerColomban Wendling <ban@herbesfolles.org>
Wed, 28 Jan 2015 14:16:40 +0000 (28 15:16 +0100)
tree7c3a1722f179fb83674ac4efdf3028db77bd5e3e
parent44eecc25c3352d0197b94f1458d8496bc48668ae
parent660c441b4af272fe4e40eb6a6cda2badb8f17eac
Merge pull request #188 from artros/feature/keep-edit-history-on-reload

Maintain edit history on document reload

Conflicts:
 * src/callbacks.c: document_reload_prompt().

Amendments:
 * src/document.c: document_redo(), document_undo(): for loop style.
doc/geany.txt
src/document.c
src/document.h
src/documentprivate.h
src/keyfile.c