diff --git a/.emacs b/.emacs index 90edda7..5150d23 100644 --- a/.emacs +++ b/.emacs @@ -4780,17 +4780,33 @@ files marked, always operate on current line in dired-mode" (eval-after-load "ediff" '(progn - (message "doing ediff customisation") - (setq diff-switches "-u" - ediff-custom-diff-options "-U3" + (setq ediff-diff-options "-w" ediff-split-window-function 'split-window-horizontally ediff-window-setup-function 'ediff-setup-windows-plain) (add-hook 'ediff-startup-hook 'ediff-toggle-wide-display) (add-hook 'ediff-cleanup-hook 'ediff-toggle-wide-display) (add-hook 'ediff-suspend-hook 'ediff-toggle-wide-display) + + (add-hook 'ediff-mode-hook + (lambda () + (ediff-setup-keymap) + ;; merge left to right + (define-key ediff-mode-map ">" 'ediff-copy-A-to-B) + ;; merge right to left + (define-key ediff-mode-map "<" 'ediff-copy-B-to-A))) + + ;; restore window config on quit + (add-hook 'ediff-after-quit-hook-internal 'winner-undo) )) +;; from emacswiki: +;; Usage: emacs -diff file1 file2 +(defun command-line-diff (switch) + (let ((file1 (pop command-line-args-left)) + (file2 (pop command-line-args-left))) + (ediff file1 file2))) +(add-to-list 'command-switch-alist '("diff" . command-line-diff)) ;; -------------------------------------------------------------------------------- ;; ** Emacs Interface diff --git a/emacs.html b/emacs.html index d88fd46..8b284ea 100644 --- a/emacs.html +++ b/emacs.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + @@ -232,196 +232,196 @@ for the JavaScript code in this tag.

Table of Contents

@@ -430,8 +430,8 @@ for the JavaScript code in this tag.

Toms Emacs Config - portable - version (20180210.01) -*-emacs-lisp-*-

-
-

1 Introduction

+
+

1 Introduction

This is my emacs config, it is more than twenty years old. It @@ -485,11 +485,11 @@ outshine-to-html, written by myself, see below.

-
-

2 Config Log, Trivia, Notes, Changes

+
+

2 Config Log, Trivia, Notes, Changes

-
-

2.1 Changelog

+
+

2.1 Changelog

20160420.03: @@ -1598,8 +1598,8 @@ didn't know about it before

-
-

2.2 TODO

+
+

2.2 TODO

-
-

2.3 Parking Lot / Snippets

+
+

2.3 Parking Lot / Snippets

Snippets which maybe of use in the future

-
-

2.3.1 buffer-local hook

+
+

2.3.1 buffer-local hook

(with-current-buffer (get-buffer "scratch") @@ -1636,8 +1636,8 @@ Snippets which maybe of use in the future

-
-

2.4 .emacs config version

+
+

2.4 .emacs config version

My emacs config has a version (consisting of a timestamp with a @@ -1654,11 +1654,11 @@ I'm using an outdated config somewhere.

-
-

3 System Specifics

+
+

3 System Specifics

-
-

3.1 Global init file+dir vars, portable

+
+

3.1 Global init file+dir vars, portable

  • added dev function which opens a new development frame
  • @@ -1696,8 +1696,8 @@ all modes and extensions are located here
-
-

3.2 Shortcut Mode - mode specific help about my own customizations

+
+

3.2 Shortcut Mode - mode specific help about my own customizations

FIXME: complete @@ -1716,8 +1716,8 @@ all modes and extensions are located here


-
-

3.3 Fontlock-mode - use syntax highlighting on graphical displays

+
+

3.3 Fontlock-mode - use syntax highlighting on graphical displays

look: emacswiki @@ -1734,8 +1734,8 @@ look: emacswiki


-
-

3.4 line-cursor in console

+
+

3.4 line-cursor in console

better visibility of cursor in console sessions @@ -1751,8 +1751,8 @@ better visibility of cursor in console sessions


-
-

3.5 Backup Config

+
+

3.5 Backup Config

I save backup files in a central location below the init dir, that @@ -1823,8 +1823,8 @@ This is system specific and only matches special host names.


-
-

3.6 console backspace fix

+
+

3.6 console backspace fix

make backspace work in console sessions @@ -1837,8 +1837,8 @@ make backspace work in console sessions


-
-

3.7 hide menu- and tool-bar

+
+

3.7 hide menu- and tool-bar

I prefer a bare bones emacs window without any distractions, so turn them off. @@ -1854,8 +1854,8 @@ I prefer a bare bones emacs window without any distractions, so turn them off.


-
-

3.8 stay silent on startup

+
+

3.8 stay silent on startup

(setq initial-scratch-message "")
@@ -1868,8 +1868,8 @@ I prefer a bare bones emacs window without any distractions, so turn them off.
 
-
-

3.9 y means yes

+
+

3.9 y means yes

y is shorter than yes and less error prone. @@ -1882,8 +1882,8 @@ y is shorter than yes and less error prone.


-
-

3.10 show col in modeline

+
+

3.10 show col in modeline

very useful to know current column @@ -1896,8 +1896,8 @@ very useful to know current column


-
-

3.11 file or buffer in title

+
+

3.11 file or buffer in title

this can be seen in xmobar @@ -1911,8 +1911,8 @@ this can be seen in xmobar


-
-

3.12 avoid invalid files

+
+

3.12 avoid invalid files

(setq require-final-newline t)
@@ -1922,8 +1922,8 @@ this can be seen in xmobar
 
-
-

3.13 prepare load-path

+
+

3.13 prepare load-path

where to look for extensions: @@ -1951,8 +1951,8 @@ modules


-
-

3.14 byte-compile all of them, if needed

+
+

3.14 byte-compile all of them, if needed

handy function to recompile all lisp files @@ -1967,8 +1967,8 @@ handy function to recompile all lisp files


-
-

3.15 increase fontsize with ctrl-+ and ctrl--

+
+

3.15 increase fontsize with ctrl-+ and ctrl--

I use those bindings everywhere (firefox, terminal, etc), and in @@ -1994,11 +1994,11 @@ emacs as well.


-
-

3.16 WINDOW management stuff

+
+

3.16 WINDOW management stuff

-
-

3.16.1 resize windows by keyboard

+
+

3.16.1 resize windows by keyboard

Very practical: resize windows easily. @@ -2015,8 +2015,8 @@ hit C-c C-r then use cursor keys to resize, <ret> to finish

-
-

3.16.2 switch windows with MS-WINDOWS key

+
+

3.16.2 switch windows with MS-WINDOWS key

(require 'windmove)
@@ -2027,8 +2027,8 @@ hit C-c C-r then use cursor keys to resize, <ret> to finish
 
-
-

3.16.3 M-o switch window or buffer

+
+

3.16.3 M-o switch window or buffer

via mbork @@ -2106,8 +2106,8 @@ Use only in X11 emacs - setting M-O inside console causes <up> and


-
-

3.16.4 Split window to 4 parts

+
+

3.16.4 Split window to 4 parts

(defun tvd-quarter-windows ()
@@ -2125,8 +2125,8 @@ Use only in  X11 emacs - setting M-O inside console  causes <up> and
 
-
-

3.16.5 Remember and Restore Window Configurations - winner mode

+
+

3.16.5 Remember and Restore Window Configurations - winner mode

(winner-mode 1)
@@ -2141,8 +2141,8 @@ keybindings: C-c right   - winner-redo
 
-
-

3.17 re-read a modified buffer

+
+

3.17 re-read a modified buffer

F5 == reload file if it has been modified by another process, shift @@ -2167,8 +2167,8 @@ because Xmonad


-
-

3.18 global TAB/Indent config

+
+

3.18 global TAB/Indent config

I use spaces everywhere but Makefiles. If I encounter TABs I @@ -2208,8 +2208,8 @@ Use normal tabs in makefiles


-
-

3.19 handy aliases

+
+

3.19 handy aliases

M-x q r <ret> is short enough for me, no need for key bindings for @@ -2240,8 +2240,8 @@ those


-
-

3.20 various settings

+
+

3.20 various settings

point stays while scrolling @@ -2294,8 +2294,8 @@ I'm grown up!


-
-

3.21 load imenu

+
+

3.21 load imenu

(define-key global-map [C-down-mouse-2] 'imenu)
@@ -2305,8 +2305,8 @@ I'm grown up!
 
-
-

3.22 copy/paste Config

+
+

3.22 copy/paste Config

Related: @@ -2373,8 +2373,8 @@ marked region automatically copied, also on win


-
-

3.23 use more mem

+
+

3.23 use more mem

are you from the past? @@ -2387,8 +2387,8 @@ are you from the past?


-
-

3.24 better file name completion

+
+

3.24 better file name completion

Complete filenames case insensitive and ignore certain files during completion. @@ -2418,8 +2418,8 @@ via -

3.25 abbreviations

+
+

3.25 abbreviations

Do I really need those anymore? Added ca 1999… @@ -2449,8 +2449,8 @@ do NOT ask to save abbrevs on exit

-
-

3.26 meaningful names for buffers with the same name

+
-
-

3.27 packages

+
+

3.27 packages

I dont need it all the time and only for experimentation, so lets @@ -2492,8 +2492,8 @@ only use melpa on demand


-
-

3.28 My own global variables

+
+

3.28 My own global variables

narrowed fringe background @@ -2506,11 +2506,11 @@ narrowed fringe background


-
-

3.29 More scratch space

+
+

3.29 More scratch space

-
-

3.29.1 Text scratch

+
+

3.29.1 Text scratch

Sometimes I need a text mode scratch buffer while scratch is @@ -2526,8 +2526,8 @@ this never gets deleted, but cleaned instead.

-
-

3.29.2 Autoscratch

+
+

3.29.2 Autoscratch

use autoscratch otherwise @@ -2557,8 +2557,8 @@ use autoscratch otherwise

-
-

3.29.3 Persistent Scratch

+
+

3.29.3 Persistent Scratch

I also like to be scratch buffers persistent with @@ -2580,8 +2580,8 @@ I also like to be scratch buffers persistent with

-
-

3.30 Recenter config

+
+

3.30 Recenter config

via abo abo @@ -2602,13 +2602,13 @@ I think this is a recenter calculation bug.

-
-

4 Global Key Bindings

+
+

4 Global Key Bindings


-
-

4.1 c-h != delete

+
+

4.1 c-h != delete

(keyboard-translate ?\C-h ?\C-?)
@@ -2619,8 +2619,8 @@ I think this is a recenter calculation bug.
 
-
-

4.2 general keys (re-)mappings

+
+

4.2 general keys (re-)mappings

(global-set-key (kbd "C-s") 'isearch-forward-regexp) @@ -2650,8 +2650,8 @@ I think this is a recenter calculation bug.


-
-

4.3 display a list of my own global key bindings and aliases

+
+

4.3 display a list of my own global key bindings and aliases

via emacswiki @@ -2728,13 +2728,13 @@ more help with: describe-function occur-mode

-
-

5 Productivity Functions

+
+

5 Productivity Functions


-
-

5.1 goto line with tmp line numbers

+
+

5.1 goto line with tmp line numbers

I stole this somewhere, as far as I remember, emacswiki, however, I @@ -2758,8 +2758,8 @@ always had F7 for goto-line


-
-

5.2 invert fore- and background

+
+

5.2 invert fore- and background

Sometimes when sitting in a very dark enviroment, my usual light @@ -2802,8 +2802,8 @@ fast


-
-

5.3 Some useful bindings for Home and End keys Hit the key once to

+
+

5.3 Some useful bindings for Home and End keys Hit the key once to

Go to the beginning/end of a line, hit it twice in a row to go to @@ -2867,8 +2867,8 @@ This is the most natural use for those keys


-
-

5.4 percent function

+
+

5.4 percent function

by Jens Heunemann: jump to percent position into current buffer @@ -2889,8 +2889,8 @@ by Jens Heunemann: jump to percent position into current buffer


-
-

5.5 Simulate vi's % function

+
+

5.5 Simulate vi's % function

There's not a lot about vi[m] I like, but jumping with % to a @@ -2922,8 +2922,8 @@ just insert a literal ?%. Only make sense if bound to %.


-
-

5.6 Move region

+
+

5.6 Move region

Mark a region, then use M-up|down to move it around @@ -3022,8 +3022,8 @@ code from -

5.7 comment-uncomment region with one key binding

+ -
-

5.8 search for symbol at point

+
+

5.8 search for symbol at point

Simulate the # function of vi, marks the symbol at point, C-s then @@ -3090,8 +3090,8 @@ via ergomacs


-
-

5.9 Window Margin

+
+

5.9 Window Margin

Kinda screen reader for the poor. I use this sometimes with info @@ -3117,8 +3117,8 @@ left+right margin on demand (but nothing else)


-
-

5.10 Fill and justify a paragraph

+
+

5.10 Fill and justify a paragraph

this is just a shortcut for: @@ -3147,8 +3147,8 @@ idea via: -

5.11 Make a read-only copy of the current buffer

+
+

5.11 Make a read-only copy of the current buffer

I just create a new read-only buffer and copy the contents of the @@ -3197,8 +3197,8 @@ a file is not maintained via VC anyway.


-
-

5.12 Cleanup, close all windows and kill all buffers

+
+

5.12 Cleanup, close all windows and kill all buffers

From time to time I get annoyed by the many dozen buffers @@ -3231,8 +3231,8 @@ setup accidentally.


-
-

5.13 Cleanup current buffer

+
-
-

5.14 Better newline(s)

+
+

5.14 Better newline(s)

Add newline and jump to indent from wherever I am in the current @@ -3306,8 +3306,8 @@ disabled, interferes with modes.


-
-

5.15 Mouse Rectangle

+
-
-

5.16 DOS <=> UNIX conversion helpers

+
+

5.16 DOS <=> UNIX conversion helpers

(defun dos2unix ()
@@ -3355,8 +3355,8 @@ via stackoverflow
 
-
-

5.17 helper do add the same thing to multiple mode hooks

+
+

5.17 helper do add the same thing to multiple mode hooks

via stackoverflow @@ -3374,8 +3374,8 @@ usage samples below.

-
-

5.18 helper to catch load errors

+
+

5.18 helper to catch load errors

Try to eval 'fn, catch errors, if any but make it possible for @@ -3397,8 +3397,8 @@ emacs to continue undisturbed, used with SMEX, see below.


-
-

5.19 Alignment Wrappers

+
+

5.19 Alignment Wrappers

align-regexp is already a very usefull tool, however, sometimes I @@ -3448,8 +3448,8 @@ wrappers to make this easier.

-
-

5.20 String Helpers

+
+

5.20 String Helpers

Some helper functions I use here and there. @@ -3488,14 +3488,14 @@ Some helper functions I use here and there.

-
-

6 Modes

+
+

6 Modes

-
-

6.1 Programming Languages

+
+

6.1 Programming Languages

-
-

6.1.1 VALA

+
+

6.1.1 VALA

(autoload 'vala-mode "vala-mode" "Major mode for editing Vala code." t)
@@ -3510,8 +3510,8 @@ Some helper functions I use here and there.
 
-
-

6.1.2 python mode

+
+

6.1.2 python mode

Not much configured for python, I'm happy with the defaults as it seems :) @@ -3539,8 +3539,8 @@ Not much configured for python, I'm happy with the defaults as it seems :)

-
-

6.1.3 cperl mode

+
+

6.1.3 cperl mode

I am a perl addict. I love it, therefore, emacs must be prepared @@ -3687,8 +3687,8 @@ and hook them into cperl

-
-

6.1.4 Paredit for lisp only

+
+

6.1.4 Paredit for lisp only

I use paredit in lisp a lot, but are mostly happy with the defaults. @@ -3731,8 +3731,8 @@ sometimes I need to be able to turn it off fast:

-
-

6.1.5 ETAGS

+
+

6.1.5 ETAGS

I use ETAGS for some projects. With etags I can easily jump to the @@ -3809,11 +3809,11 @@ some handy aliases

-
-

6.2 Text Modes

+
+

6.2 Text Modes

-
-

6.2.1 sgml

+
+

6.2.1 sgml

Used for XML and the likes. @@ -3840,8 +3840,8 @@ Used for XML and the likes.

-
-

6.2.2 web-mode (JS, HTML, CSS combined)

+
+

6.2.2 web-mode (JS, HTML, CSS combined)

Web development is shit. Tech involved is a mess, and in most cases @@ -3935,8 +3935,8 @@ convert a text list into a html list.

-
-

6.2.3 Cisco Mode

+
+

6.2.3 Cisco Mode

Written by myself many years ago, but I'm still using it daily to @@ -3954,8 +3954,8 @@ view and prepare cisco configs.

-
-

6.2.4 Markdown

+
+

6.2.4 Markdown

I rarely use markdown, but sometimes I stumble upon such a file and @@ -3991,8 +3991,8 @@ parens and quotes constraints check on save

-
-

6.2.5 POD mode

+
+

6.2.5 POD mode

I LOVE POD! POD is the documentation format of perl and there's a @@ -4126,8 +4126,8 @@ pod mode config


-
-

6.2.6 conf-mode

+
+

6.2.6 conf-mode

conf-mode annoyingly overwrites the global keybinding C-c C-c with @@ -4148,10 +4148,10 @@ configs. Applies for derivates as well.

-
-

6.2.7 Config::General mode

+
+

6.2.7 Config::General mode

-
  1. Config and doc
    +
    1. Config and doc

      config-general-mode (also on Melpa).

      @@ -4170,7 +4170,7 @@ both did not satisfy me. Now (as of 20170625) I solved this mess once and for al
-
  • Convenicence Wrappers
    +
  • Convenicence Wrappers
    (defun config-general-completion-at-point ()
       "Complete word at point using hippie-expand, if not on a comment."
    @@ -4270,7 +4270,7 @@ Bugreport: http://d
     
  • -
  • Mode Hook
    +
  • Mode Hook

    I use TAB for completion AND tab and outshine. Also, the mode enables electric indent automatically, but I disabled it for @@ -4319,8 +4319,8 @@ for config-general-mode (which inherits from conf-mode).


  • -
    -

    6.2.8 Xmodmap Mode

    +
    +

    6.2.8 Xmodmap Mode

    the shortest mode ever, via emacswiki. @@ -4343,10 +4343,10 @@ the shortest mode ever, vi

    -
    -

    6.2.9 MMM Mode

    +
    +

    6.2.9 MMM Mode

    -
    1. MMM configure:
      +
      1. MMM configure:
        (add-to-list 'load-path (concat tvd-lisp-dir "/mmm-mode"))
         
        @@ -4365,7 +4365,7 @@ see doc for class definition in var 'mmm-classes-alist
         

      2. -
      3. MMM config for POD mode
        +
      4. MMM config for POD mode
        (mmm-add-classes
          '((html-pod
        @@ -4383,11 +4383,11 @@ see doc for class definition in var 'mmm-classes-alist
         
        -
        -

        6.3 Text Manupilation

        +
        +

        6.3 Text Manupilation

        -
        -

        6.3.1 expand-region

        +
        +

        6.3.1 expand-region

        One of the best modes I ever discovered. Press C-= multiple times @@ -4406,8 +4406,8 @@ related to ER:

        -
        -

        6.3.2 Mark, Copy, Yank Things

        +
        +

        6.3.2 Mark, Copy, Yank Things

        For a long time this stuff was located here in my emacs config. As @@ -4510,8 +4510,8 @@ it appears as NNN,NN.

        -
        -

        6.3.3 change-inner

        +
        +

        6.3.3 change-inner

        I use change-inner with a prefix key and some wrappers around @@ -4633,8 +4633,8 @@ typing the prefix key twice calls the real change-inner


        -
        -

        6.3.4 Rotate text

        +
        +

        6.3.4 Rotate text

        This one is great as well, I use it to toggle flags and such stuff @@ -4690,8 +4690,8 @@ short command anymore, so C-t would be free now, wouldn't it?

        -
        -

        6.3.5 Word wrapping

        +
        +

        6.3.5 Word wrapping

        same as word-wrap but without the fringe which I hate the most! @@ -4713,8 +4713,8 @@ overwritten by visual-line-mode above for specifics

        -
        -

        6.3.6 Viking Mode

        +
        +

        6.3.6 Viking Mode

        Delete stuff fast. Press the key multiple times - delete more @@ -4732,8 +4732,8 @@ things. Inspired by expand-region. Written by myself.

        -
        -

        6.3.7 HTMLize

        +
        +

        6.3.7 HTMLize

        extracted from debian package emacs-goodies-el-35.2+nmu1, since @@ -4750,8 +4750,8 @@ the current buffer, however it looks.

        -
        -

        6.3.8 iEdit (inline edit multiple searches)

        +
        +

        6.3.8 iEdit (inline edit multiple searches)

        Edit all occurences of something at once. Great for re-factoring. @@ -4792,11 +4792,11 @@ behavior, so, I modify it myself using defadvice.

        -
        -

        6.4 Interactives

        +
        +

        6.4 Interactives

        -
        -

        6.4.1 eShell stuff, or if interactive stuff is needed, use ansi-term

        +
        +

        6.4.1 eShell stuff, or if interactive stuff is needed, use ansi-term

        I am a hardcore bash user, but from time to time eshell is good @@ -5076,8 +5076,8 @@ no need for less or more, this is emacs, isn't it?

        -
        -

        6.4.2 Emacs LISP interactive

        +
        +

        6.4.2 Emacs LISP interactive

        General configuration for all things elisp. @@ -5288,8 +5288,8 @@ opens a new frame with all those buffers already opened and pinned.


        -
        -

        6.4.3 el2markdown

        +
        +

        6.4.3 el2markdown

        el2markdown is a module which @@ -5313,8 +5313,8 @@ README.md. Take care though: it doesn't convert the META section.

        -
        -

        6.4.4 tramp mode

        +
        +

        6.4.4 tramp mode

        Edit remote files, one of the best things in emacs. I use it every day heavily. @@ -5342,8 +5342,8 @@ see also backup section

        -
        -

        6.4.5 org mode

        +
        +

        6.4.5 org mode

        I use org mode to take notes mostly at work. I also track projects @@ -5657,8 +5657,8 @@ always use the latest docs


        -
        -

        6.4.6 org table mode

        +
        +

        6.4.6 org table mode

        I'm so used to lovely org mode tables, I need them everywhere! @@ -5972,8 +5972,8 @@ integers, reals, positives, set via custom

        -
        -

        6.4.7 org mode slideshows

        +
        +

        6.4.7 org mode slideshows

        Making presentations within emacs with org mode is cool as well. @@ -6081,8 +6081,8 @@ Will be inserted as first help slide in a slide show


        -
        -

        6.4.8 outshine mode

        +
        +

        6.4.8 outshine mode

        I maintain my emacs config with outshine mode. It works a lot like @@ -6262,8 +6262,8 @@ posting online, which makes it way easier to read.

        -
        -

        6.4.9 outline mode

        +
        +

        6.4.9 outline mode

        I use the very same cycle style as in org mode: when on a heading, @@ -6360,8 +6360,8 @@ orange fringe when narrowed


        -
        -

        6.4.10 narrowing (no mode but fits here)

        +
        +

        6.4.10 narrowing (no mode but fits here)

        I use narrowing quite frequently, so here are some enhancements. @@ -6401,8 +6401,8 @@ via -

        6.4.11 ANSI-TERM (inferior shells/interpreters and REPLs)

        +
        +

        6.4.11 ANSI-TERM (inferior shells/interpreters and REPLs)

        I use ansi term for inferior shells only. @@ -6518,8 +6518,8 @@ finally the inferior REPLs:

        -
        -

        6.4.12 Puppet

        +
        +

        6.4.12 Puppet

        adds hook for .pp files @@ -6533,8 +6533,8 @@ adds hook for .pp files

        -
        -

        6.4.13 Novel Mode - Screen Reader

        +
        +

        6.4.13 Novel Mode - Screen Reader

        my own emacs screen reader, very handy to read docs on the road. @@ -6550,8 +6550,8 @@ my own emacs screen reader, very handy to read docs on the road.

        -
        -

        6.4.14 Macro Math

        +
        +

        6.4.14 Macro Math

        see macro-math @@ -6574,8 +6574,8 @@ mark something and hit C-x C-0 (which is a reminder to C-x C-= w/o the shift)

        -
        -

        6.4.15 Common-Lisp (SLIME)

        +
        +

        6.4.15 Common-Lisp (SLIME)

        I'm learing CL with slime, start with M-x slime. @@ -6608,8 +6608,8 @@ INSTALL: (see: -

        6.4.16 INFO Mode

        +
        +

        6.4.16 INFO Mode

        (require 'info)
        @@ -6673,8 +6673,8 @@ contains (interactive) code from 'info-display-manual for manual selection.
         
        -
        -

        6.4.17 calc et al.

        +
        +

        6.4.17 calc et al.

        emacs provides 4 ways to calculate: @@ -6724,8 +6724,8 @@ or, inferior perl calc: M-x icalc, see above

        -
        -

        6.4.18 MACROs

        +
        +

        6.4.18 MACROs

        help: emacswiki macro tricks. @@ -6938,8 +6938,8 @@ but only load if in use


        -
        -

        6.4.19 EWW browser stuff

        +
        +

        6.4.19 EWW browser stuff

        Emacs has a builtin browser, which is not too bad. @@ -7007,8 +7007,8 @@ hides menus and distractions! Update emacs.


        -
        -

        6.4.20 Firestarter

        +
        +

        6.4.20 Firestarter

        experimental: do things on save buffer etc. @@ -7017,8 +7017,8 @@ Source: firestarter

        -
        -

        6.4.21 Tabulated List Mode

        +
        +

        6.4.21 Tabulated List Mode

        built-in, used by many interactive major modes @@ -7066,8 +7066,8 @@ we need to kill tablist's binding in order to have ours run (see below)

        -
        -

        6.4.22 Help Mode

        +
        +

        6.4.22 Help Mode

        I even customize help windows! … at least a little :) @@ -7090,8 +7090,8 @@ I even customize help windows! … at least a little :)

        -
        -

        6.4.23 Suggest Mode

        +
        +

        6.4.23 Suggest Mode

        suggest mode is a great @@ -7141,8 +7141,8 @@ I use my own clearing function, since suggest doesn't provide this

        -
        -

        6.4.24 Followcursor Mode

        +
        +

        6.4.24 Followcursor Mode

        source on github @@ -7171,8 +7171,8 @@ The mode is a work-in-progress… -

        -

        6.4.25 Magit

        +
        +

        6.4.25 Magit

        Not much to say about Magit @@ -7251,8 +7251,8 @@ Not much to say about Magit


        -
        -

        6.4.26 Dired

        +
        +

        6.4.26 Dired

        I use dired for two things: from inside magit as a convenient way @@ -7270,7 +7270,7 @@ tune this as well.

        -
        1. dired-k
          +
          1. dired-k

            dired-k is k for dired/emacs: it colorizes files and directory by age, that is, the older the greyer they get. And it displays flags @@ -7288,7 +7288,7 @@ about the git status of each file, which is really handy.

        2. -
        3. dired-hacks
          +
        4. dired-hacks

          Fuco1s dired-hacks is a place to find the really cool stuff, I mostly use the filters. @@ -7308,7 +7308,7 @@ place to find the really cool stuff, I mostly use the filters.

      5. -
      6. dired sort helpers
        +
      7. dired sort helpers

        This sort function by Xah Lee is easy to use and does what it should, great!, However, I added some -desc @@ -7338,7 +7338,7 @@ sister sorts for reverse sorting.

    -
  • dired git helpers
    +
  • dired git helpers

    via bin chen: make git commands available from dired buffer, which can be used in @@ -7395,7 +7395,7 @@ called with "hydras".

  • -
  • dired navigation
    +
  • dired navigation

    I'm used to jump around with pos1+end

    @@ -7415,7 +7415,7 @@ I'm used to jump around with pos1+end
  • -
  • dired buffer names
    +
  • dired buffer names

    This took me a long time to figure out, but I finally got it: I really hate it how dired names its buffers, it just uses the @@ -7443,7 +7443,7 @@ behavior as a bug, but I doubt many people would agree :)

  • -
  • dired config and key bindings
    +
  • dired config and key bindings

    and finally put everything together.

    @@ -7501,8 +7501,8 @@ and finally put everything together.
    -
    -

    6.4.27 Ediff Config

    +
    +

    6.4.27 Ediff Config

    Force ediff to use 1 frame (the current) and not open a new frame @@ -7513,29 +7513,50 @@ open a new frame.

    (eval-after-load "ediff"
       '(progn
    -     (message "doing ediff customisation")
    -     (setq diff-switches               "-u"
    -           ediff-custom-diff-options   "-U3"
    +     (setq ediff-diff-options   "-w"
                ediff-split-window-function 'split-window-horizontally
                ediff-window-setup-function 'ediff-setup-windows-plain)
     
          (add-hook 'ediff-startup-hook 'ediff-toggle-wide-display)
          (add-hook 'ediff-cleanup-hook 'ediff-toggle-wide-display)
          (add-hook 'ediff-suspend-hook 'ediff-toggle-wide-display)
    +
    +     (add-hook 'ediff-mode-hook
    +               (lambda ()
    +                 (ediff-setup-keymap)
    +                 ;; merge left to right
    +                 (define-key ediff-mode-map ">" 'ediff-copy-A-to-B)
    +                 ;; merge right to left
    +                 (define-key ediff-mode-map "<" 'ediff-copy-B-to-A)))
    +
    +     ;; restore window config on quit
    +     (add-hook 'ediff-after-quit-hook-internal 'winner-undo)
          ))
     
    +

    +from emacswiki: +Usage: emacs -diff file1 file2 +

    +
    +
    (defun command-line-diff (switch)
    +  (let ((file1 (pop command-line-args-left))
    +        (file2 (pop command-line-args-left)))
    +    (ediff file1 file2)))
    +(add-to-list 'command-switch-alist '("diff" . command-line-diff))
    +
    +

    -
    -

    6.5 Emacs Interface

    +
    +

    6.5 Emacs Interface

    -
    -

    6.5.1 Parens

    +
    +

    6.5.1 Parens

    display matching braces @@ -7556,8 +7577,8 @@ display matching braces

    -
    -

    6.5.2 highlight todo keywords (such as FIXME)

    +
    +

    6.5.2 highlight todo keywords (such as FIXME)

    Absolutely needed! @@ -7572,8 +7593,8 @@ Absolutely needed!


    -
    -

    6.5.3 UNDO Tree Mode

    +
    +

    6.5.3 UNDO Tree Mode

    Better undo, with redo support. @@ -7616,8 +7637,8 @@ M-_ catched by Xmonad


    -
    -

    6.5.4 Smarter M-x Mode (smex)

    +
    +

    6.5.4 Smarter M-x Mode (smex)

    This is really cool and I don't know how I could ever live without it. @@ -7640,8 +7661,8 @@ fails @win, so wrap it

    -
    -

    6.5.5 Smarter Search

    +
    +

    6.5.5 Smarter Search

    test, replace isearch-forward-regexp first only. @@ -7657,8 +7678,8 @@ dir: ivy/

    -
    -

    6.5.6 Which Func

    +
    +

    6.5.6 Which Func

    display current function - if any - in mode line @@ -7673,8 +7694,8 @@ display current function - if any - in mode line


    -
    -

    6.5.7 Show current-line in the Fringe

    +
    +

    6.5.7 Show current-line in the Fringe

    (require 'fringe-current-line)
    @@ -7693,8 +7714,8 @@ also change the color (matching the mode line
     
    -
    -

    6.5.8 Recent Files

    +
    +

    6.5.8 Recent Files

    You know the file you edited yesterday had "kri" in its name, but @@ -7788,8 +7809,8 @@ exclude some auto generated files

    -
    -

    6.5.9 IDO mode

    +
    +

    6.5.9 IDO mode

    There are other completion enhancement packages available like ivy @@ -7931,8 +7952,8 @@ by howardism: [re]open non-writable file with sudo

    -
    -

    6.5.10 Save cursor position

    +
    +

    6.5.10 Save cursor position

    So the next time I start emacs and open a file I were editing @@ -7953,8 +7974,8 @@ before.

    -
    -

    6.5.11 DoReMi experimentation

    +
    +

    6.5.11 DoReMi experimentation

    I'm not using it a lot, sometimes I tune the background color though. @@ -7983,8 +8004,8 @@ cool ones: doremi-buffers, doremi-all-faces-fg+ [s, h]


    -
    -

    6.5.12 Hightligt TABs

    +
    +

    6.5.12 Hightligt TABs

    not a mode, but however: higlight TABs in certain modes @@ -8007,8 +8028,8 @@ not a mode, but however: higlight TABs in certain modes

    -
    -

    6.5.13 Browse kill-ring

    +
    +

    6.5.13 Browse kill-ring

    when active use n and p to browse, <ret> to select, it's the same @@ -8026,8 +8047,8 @@ as <M-y> and I never really use it…

    -
    -

    6.5.14 goto-last-change

    +
    +

    6.5.14 goto-last-change

    Very handy, jump to last change[s]. @@ -8044,8 +8065,8 @@ Very handy, jump to last change[s].

    -
    -

    6.5.15 Bookmarks

    +
    +

    6.5.15 Bookmarks

    I use the builtin bookmark feature quite a lot and am happy with @@ -8077,8 +8098,8 @@ I use the same aliases as in apparix for bash (since I'm used to them)

    -
    -

    6.5.16 which-key

    +
    +

    6.5.16 which-key

    One of the best unobstrusive modes for key help ever. Just start @@ -8098,8 +8119,8 @@ press from there along with the associated functions.

    -
    -

    6.5.17 iBuffer mode

    +
    +

    6.5.17 iBuffer mode

    iBuffer is a great interactive buffer management tool included with @@ -8309,8 +8330,8 @@ override ibuffer M-o binding

    -
    -

    6.5.18 Printing

    +
    +

    6.5.18 Printing

    overwrites printing default menu, access via menu File => Print @@ -8355,8 +8376,8 @@ via -

    6.5.19 Beacon mode (pointer blink)

    +
    +

    6.5.19 Beacon mode (pointer blink)

    Source: beacon mode @@ -8386,8 +8407,8 @@ editing position.

    -
    -

    6.6 mode-line setup (must be the last mode)

    +
    +

    6.6 mode-line setup (must be the last mode)

    I just append the current version of my emacs config and leave out @@ -8452,13 +8473,13 @@ custom modeline

    -
    -

    7 Emacs Autoconfig / Customizegroup stuff

    +
    +

    7 Emacs Autoconfig / Customizegroup stuff


    -
    -

    7.1 font faces

    +
    +

    7.1 font faces

    Font color config, must always be the last thing so all hook faces are loaded. @@ -8538,8 +8559,8 @@ unless we're on windoze


    -
    -

    7.2 variables

    +
    +

    7.2 variables

    If I ever use custom-group to customize a mode, then I create a @@ -8559,8 +8580,8 @@ here. So, in normal times this should be empty, but needs to exist.

    -
    -

    7.3 done

    +
    +

    7.3 done

    Finally, this message is being displayed. If this isn't the case I @@ -8577,7 +8598,7 @@ know easily that something went wrong.

    Author: Tom

    -

    Created: 2018-02-10 Sa 13:30

    +

    Created: 2018-02-10 Sa 20:31

    Validate