Emacs: removal of the 'light' config ema.

.emacs.d/init-light.el

@@ -1,56 +0,0 @@
-;; -*- mode:emacs-lisp -*-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Emacs lighweight config
-;;
-;; Load everything but the slowest config parts. Useful when non-client emacs is
-;; required.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar my-keys-minor-mode-map (make-keymap)
-  "Keymap for my-keys-minor-mode. See its docstring for more
-details.")
-
-(define-minor-mode my-keys-minor-mode
-  "A minor mode so that all bindings assingned on the
-my-keys-minor-mode-map override undesired major modes
-bindings. We use a minor mode to override global keys. This is
-also rather useful to list all personal global bindings: just
-rgrep `my-keys-minor-mode-map' over `~/.emacs.d'.
-
-Example: to assign some-function to C-i, use
-
-  (define-key my-keys-minor-mode-map (kbd \"C-i\") 'some-function)"
-  t " my-keys" 'my-keys-minor-mode-map)
-(add-hook 'minibuffer-setup-hook (lambda () (my-keys-minor-mode 0) ) )
-
-(defvar emacs-cache-folder "~/.cache/emacs/"
-  "Cache folder is everything we do not want to track along with
-  the configuration files.")
-(if (not (file-directory-p emacs-cache-folder))
-    (make-directory emacs-cache-folder t))
-
-;; Local plugin folder for quick install. All files in this folder will be
-;; accessible to Emacs config.
-(add-to-list 'load-path "~/.emacs.d/plugins")
-
-
-(load "~/.emacs.d/functions" nil t)
-(load "~/.emacs.d/main" nil t)
-(load "~/.emacs.d/mode-cc.el" nil t)
-(load "~/.emacs.d/mode-dot.el" nil t)
-(load "~/.emacs.d/mode-mediawiki.el" nil t)
-(load "~/.emacs.d/mode-perl.el" nil t)
-(load "~/.emacs.d/mode-python.el" nil t)
-(load "~/.emacs.d/mode-shell.el" nil t)
-(load "~/.emacs.d/mode-tex.el" nil t)
-(load "~/.emacs.d/mode-texinfo.el" nil t)
-(load "~/.emacs.d/personal" nil t)
-;; (load "~/.emacs.d/snippets.el" nil t)
-(load "~/.emacs.d/theme" nil t)
-
-;; We need to put it at the end to make sure it doesn't get overriden by other
-;; minor modes.
-(my-keys-minor-mode 1)
-
-;; End of file
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

.gitconfig

@@ -24,9 +24,8 @@
 ## See:
 ##   http://kerneltrap.org/mailarchive/git/2007/7/1/250424
 ##   http://stackoverflow.com/questions/1817370/using-ediff-as-git-mergetool
-## 'ema' is emacs with lightweight configuration.
 [mergetool.ediff]
-    cmd = ema --eval \" (progn (defun ediff-write-merge-buffer () (let ((file ediff-merge-store-file)) (set-buffer ediff-buffer-C) (write-region (point-min) (point-max) file) (message \\\"Merge buffer saved in: %s\\\" file) (set-buffer-modified-p nil) (sit-for 1))) (setq ediff-quit-hook 'kill-emacs ediff-quit-merge-hook 'ediff-write-merge-buffer) (ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\"))\"
+    cmd = emacs --eval \" (progn (defun ediff-write-merge-buffer () (let ((file ediff-merge-store-file)) (set-buffer ediff-buffer-C) (write-region (point-min) (point-max) file) (message \\\"Merge buffer saved in: %s\\\" file) (set-buffer-modified-p nil) (sit-for 1))) (setq ediff-quit-hook 'kill-emacs ediff-quit-merge-hook 'ediff-write-merge-buffer) (ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\"))\"
 
 [merge]
     tool = ediff

.scripts/ediff

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-ema --eval "(ediff \"$1\" \"$2\")"
+emacs --eval "(ediff \"$1\" \"$2\")"

.scripts/ema

@@ -1,2 +0,0 @@
-#!/bin/sh
-emacs -q -l ~/.emacs.d/init-light.el "$@"