aboutsummaryrefslogtreecommitdiffstats
path: root/oni-ediff.el
Commit message (Collapse)AuthorAgeFilesLines
* [oni-ediff] Enable floating control frameGravatar Tom Willemse2023-08-091-1/+4
|
* Remove all self-loading autoload cookiesGravatar Tom Willemse2021-11-231-3/+1
| | | | | | | | The big downside of usuing these cookies to inject my configuration into the loading of a package is that it means that I can't load that package without my configuration anymore. This means that when I start ‘emacs -Q’ and then call ‘package-initialize’ it'll load my configuration as well. This makes debugging things very difficult.
* Remove debugging statementGravatar Tom Willemse2020-12-011-4/+2
|
* Make the diff server function clean up after itselfGravatar Tom Willemse2020-11-131-4/+18
|
* Call ‘winner-undo’ when ediff finishesGravatar Tom Willemse2020-11-061-1/+2
| | | | This way the window layout that was used before ediff was started gets restored.
* Automatically refine hunks in ediffGravatar Tom Willemse2020-11-061-0/+2
|
* Add support to call ediff through emacsclientGravatar Tom Willemse2020-11-061-0/+16
| | | | | | | This way Emacs can be used in Perforce, for example, as the diff program: Location: C:/msys64/mingw64/bin/emacsclientw.exe Arguments: diff %1 %2
* Add function to start ediff from the command-lineGravatar Tom Willemse2019-10-101-1/+9
|
* Change version formatGravatar Tom Willemse2019-09-041-1/+1
| | | | | | | | | | | In order to support my tablet which seems to have a lower maximum integer value (I guess it’s 32-bit? I’m surprised) and can’t handle the version numbers I was using before. It would turn them into floating point numbers, which adds a ~.0~, this made it impossible to install any package. Any installations I have will need to reinstall all their oni packages so that the new version number is picked up, since the new version number will be lower than the old one.
* Add oni-ediffGravatar Tom Willemse2019-02-261-0/+53