Snoooopy/dtos-dotfiles
1
0
Fork 0
mirror of https://gitlab.com/dwt1/dotfiles.git synced 2026-04-19 13:46:17 +10:00
Code Issues Packages Projects Releases Wiki Activity

Minor edits

Browse Source
This commit is contained in:
Derek Taylor
2023-11-18 12:53:56 -06:00
parent e824ebc157
commit d114e176fd
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.config/emacs/config.org
View File

@@ -14,11 +14,8 @@
- [[#dashboard][DASHBOARD]] - [[#dashboard][DASHBOARD]]
- [[#diminish][DIMINISH]] - [[#diminish][DIMINISH]]
- [[#dired][DIRED]] - [[#dired][DIRED]]
<<<<<<< HEAD
- [[#drag-stuff][DRAG-STUFF]] - [[#drag-stuff][DRAG-STUFF]]
=======
- [[#ediff][EDIFF]] - [[#ediff][EDIFF]]
>>>>>>> ada9eb05c6d0f92d0c6f610f2c1db552fe05340e
- [[#elfeed][ELFEED]] - [[#elfeed][ELFEED]]
- [[#eradio][ERADIO]] - [[#eradio][ERADIO]]
- [[#evil][EVIL]] - [[#evil][EVIL]]
@@ -171,7 +168,6 @@ This package implements hiding or abbreviation of the modeline displays (lighter
#+end_src #+end_src
<<<<<<< HEAD
* DRAG-STUFF * DRAG-STUFF
[[https://github.com/rejeep/drag-stuff.el][Drag Stuff]] is a minor mode for Emacs that makes it possible to drag stuff (words, region, lines) around in Emacs. When 'drag-stuff-define-keys' is enabled, then the following keybindings are set: M-up, M-down, M-left, and M-right. [[https://github.com/rejeep/drag-stuff.el][Drag Stuff]] is a minor mode for Emacs that makes it possible to drag stuff (words, region, lines) around in Emacs. When 'drag-stuff-define-keys' is enabled, then the following keybindings are set: M-up, M-down, M-left, and M-right.
@@ -182,7 +178,7 @@ This package implements hiding or abbreviation of the modeline displays (lighter
(drag-stuff-define-keys)) (drag-stuff-define-keys))
#+end_src #+end_src
=======
* EDIFF * EDIFF
'ediff' is a diff program that is built into Emacs. By default, 'ediff' splits files vertically and places the 'help' frame in its own window. I have changed this so the two files are split horizontally and the 'help' frame appears as a lower split within the existing window. Also, I create my own 'dt-ediff-hook' where I add 'j/k' for moving to next/prev diffs. By default, this is set to 'n/p'. 'ediff' is a diff program that is built into Emacs. By default, 'ediff' splits files vertically and places the 'help' frame in its own window. I have changed this so the two files are split horizontally and the 'help' frame appears as a lower split within the existing window. Also, I create my own 'dt-ediff-hook' where I add 'j/k' for moving to next/prev diffs. By default, this is set to 'n/p'.
@@ -198,7 +194,6 @@ This package implements hiding or abbreviation of the modeline displays (lighter
(add-hook 'ediff-mode-hook 'dt-ediff-hook) (add-hook 'ediff-mode-hook 'dt-ediff-hook)
#+end_src #+end_src
>>>>>>> ada9eb05c6d0f92d0c6f610f2c1db552fe05340e
* ELFEED * ELFEED
An RSS newsfeed reader for Emacs. Move through the articles with 'j/k'. Move through the stories with 'CTRL j/k' when in other frame. An RSS newsfeed reader for Emacs. Move through the articles with 'j/k'. Move through the stories with 'CTRL j/k' when in other frame.