1
0
Fork 0
Commit graph

10 commits

Author SHA1 Message Date
2176f9319b [oni-ediff] Enable floating control frame 2023-08-09 13:14:01 -07:00
cfa0179053 Remove all self-loading autoload cookies
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.
2021-11-23 00:38:09 -08:00
af077d1e03 Remove debugging statement 2020-12-01 09:27:12 -08:00
690ec65a30 Make the diff server function clean up after itself 2020-11-13 09:40:43 -08:00
344bf537d4 Call ‘winner-undo’ when ediff finishes
This way the window layout that was used before ediff was started gets restored.
2020-11-06 16:49:34 -08:00
6caa901626 Automatically refine hunks in ediff 2020-11-06 16:49:16 -08:00
48d513550d Add support to call ediff through emacsclient
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
2020-11-06 16:42:58 -08:00
3ba4243277 Add function to start ediff from the command-line 2019-10-10 17:08:23 -07:00
bb29ee8a12 Change version format
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.
2019-09-04 21:09:38 -07:00
7a2be12e94 Add oni-ediff 2019-02-26 01:32:19 -08:00