kylekrein/emacs-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ediff

Browse source
This commit is contained in:
Aleksandr Lebedev 2025-04-16 16:50:10 +02:00
parent a2ebd01819
commit 998c112bf7
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
config.org
View file

@ -23,6 +23,7 @@
- [[#emoji][Emoji]] - [[#emoji][Emoji]]
- [[#copy-to-clipboard-1][Copy to clipboard]] - [[#copy-to-clipboard-1][Copy to clipboard]]
- [[#standalone-emoji-picker][Standalone emoji picker]] - [[#standalone-emoji-picker][Standalone emoji picker]]
- [[#ediff][EDIFF]]
- [[#fonts][Fonts]] - [[#fonts][Fonts]]
- [[#sane-defaults][Sane defaults]] - [[#sane-defaults][Sane defaults]]
- [[#battery-info][Battery info]] - [[#battery-info][Battery info]]
@ -541,7 +542,11 @@ To use it, create a global keyboard shortcut with the following code
(make-frame-invisible launcher-frame) (make-frame-invisible launcher-frame)
(run-at-time "60 sec" nil (lambda (frame) (delete-frame frame)) launcher-frame)))) (run-at-time "60 sec" nil (lambda (frame) (delete-frame frame)) launcher-frame))))
#+end_src #+end_src
* EDIFF
#+begin_src emacs-lisp
(setq ediff-split-window-function 'split-window-horizontally)
;;(setq ediff-window-setup-function 'ediff-setup-windows-plain)
#+end_src
* Fonts * Fonts
Defining the various fonts that Emacs will use. Defining the various fonts that Emacs will use.
#+begin_src emacs-lisp #+begin_src emacs-lisp