Move the last parts of ext.el into init

2 files changed, 36 insertions, 59 deletions

diff --git a/emacs/init.org b/emacs/init.org
index bd4b1d8..11b2dca 100644
--- a/emacs/init.org
+++ b/emacs/init.org
@@ -70,12 +70,9 @@
 * Load other functions
 
   Including all the functions being used here would make this file
-  immens and perhaps also somewhat unclear. In any case there are a
-  number of functions that I have found on the web in ~ext.el~, and a
-  number that I have written myself in ~oni.el~. So load them.
+  immense and perhaps also somewhat unclear.
 
   #+BEGIN_SRC emacs-lisp
-    (require 'ext)
     (require 'oni)
   #+END_SRC
 
@@ -809,6 +806,13 @@
   The emacsredux website had an interesting [[http://emacsredux.com/blog/2013/03/28/indent-defun/][tip]].
 
   #+BEGIN_SRC emacs-lisp
+    (defun ext:indent-defun ()
+      "Indent the current defun."
+      (interactive)
+      (save-excursion
+        (mark-defun)
+        (indent-region (region-beginning) (region-end))))
+
     (global-set-key (kbd "C-M-z") 'ext:indent-defun)
   #+END_SRC
 
@@ -1477,6 +1481,34 @@
     (setq org-special-ctrl-a/e t)
   #+END_SRC
 
+* org                                                            :org:
+
+** Add appointments to the agenda file
+
+   Every time the agenda is generated will add the appropriate
+   appointments to the =appt= system.
+
+   #+BEGIN_SRC emacs-lisp
+     (defadvice org-agenda-redo (after ext:org-agenda-redo-add-appts)
+       "Pressing `r' on the agenda will also add appointments."
+       (progn
+         (setq appt-time-msg-list nil)
+         (org-agenda-to-appt)))
+   #+END_SRC
+
+* Reload current buffer
+
+  Use =<f5>= to reload the current buffer.
+
+  #+BEGIN_SRC emacs-lisp
+    (defun ext:reload-buffer ()
+      "Reload current buffer."
+      (interactive)
+      (revert-buffer nil t nil))
+
+    (global-set-key (kbd "<f5>") 'ext:reload-buffer)
+  #+END_SRC
+
 * All the rest
 
   This still needs to be sorted out and documented, haven't had time
@@ -1550,7 +1582,6 @@
     (global-set-key (kbd "<XF86HomePage>") 'oni:raise-scratch)
     (global-set-key (kbd "<XF86Mail>") 'gnus)
     (global-set-key (kbd "<f10>") 'git-project-show-files)
-    (global-set-key (kbd "<f5>") 'ext:reload-buffer)
     (global-set-key (kbd "<f6>") 'jabber-switch-to-roster-buffer)
     (global-set-key (kbd "<f7>") 'magit-status)
     (global-set-key (kbd "<hiragana>") 'oni:show-org-index)
diff --git a/emacs/site-lisp/ext.el b/emacs/site-lisp/ext.el
deleted file mode 100644
index 9bfbe34..0000000
--- a/emacs/site-lisp/ext.el
+++ /dev/null
@@ -1,54 +0,0 @@
-;;; ext.el --- More emacs functions
-
-;; Copyright (C) 2012  Tom Willemse
-
-;; Author: Tom Willemse <tom@ryuslash.org>
-;; Keywords: local
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;
-
-;;; Code:
-
-(defadvice org-agenda-redo (after ext:org-agenda-redo-add-appts)
-  "Pressing `r' on the agenda will also add appointments."
-  (progn
-    (setq appt-time-msg-list nil)
-    (org-agenda-to-appt)))
-
-(defun ext:flymake-pyflakes-init ()
-  "Initialize function for flymake with pyflakes."
-  (let* ((temp-file (flymake-init-create-temp-buffer-copy
-                     'flymake-create-temp-inplace))
-         (local-file (file-relative-name temp-file (file-name-directory
-                                                    buffer-file-name))))
-    (list "pycheck.sh" (list local-file))))
-
-(defun ext:indent-defun ()
-  "Indent the current defun."
-  (interactive)
-  (save-excursion
-    (mark-defun)
-    (indent-region (region-beginning) (region-end))))
-
-(defun ext:reload-buffer ()
-  "Reload current buffer."
-  (interactive)
-  (revert-buffer nil t nil))
-
-(provide 'ext)
-;;; ext.el ends here