Changes

removed org sharing from .emacs
added lua-mode to .emacs.d files
changed timestamp to [mm:ss] to match status bar in irssi/custom.theme
added newsbeuter configuration

1 files changed, 42 insertions, 17 deletions

diff --git a/emacs b/emacs
index ec2dc6a..24751c8 100644
--- a/emacs
+++ b/emacs
@@ -12,7 +12,7 @@
 (require 'lua-mode)
 (require 'tabbar)
 (require 'minimap)
-(require 'manage-org)
+;(require 'manage-org)
 
 ;; Auto complete
 (require 'auto-complete-config)
@@ -27,7 +27,7 @@
 (autoload 'javascript-mode
   "javascript.elc"   "A Major mode for editing JavaScript files"  t)
 (autoload 'sqlplus-mode
-  "sqlplus,elc"      "A Major mode for communicating with Oracle" t)
+  "sqlplus.elc"      "A Major mode for communicating with Oracle" t)
 (autoload 'batch-mode
   "batch-mode.elc"   "A Major mode for editing Batch files"       t)
 (autoload 'rainbow-mode
@@ -37,8 +37,8 @@
 (require 'functions)
 
 ;; Platform specifics
-(if (eq system-type 'gnu/linux)         ; if we're running linux
-    (set-frame-font "-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*"))
+;(if (eq system-type 'gnu/linux)         ; if we're running linux
+(set-default-font "-*-terminus-medium-*-*-*-14-*-*-*-*-*-*-*");)
 
 ;; Variables
 (setq
@@ -246,6 +246,22 @@
 ;;(require 'color-theme-weirdness)
 (color-theme-zenburn)
 
+;; Test for frame fonts
+(defun setup-system-frame-colours (&rest frame)
+  (let ((f (if (car frame)
+               (car frame)
+             (selected-frame))))
+    (progn
+      (set-frame-font "-*-terminus-medium-*-*-*-14-*-*-*-*-*-*-*"))))
+(require 'server)
+(defadvice server-create-window-system-frame
+  (after set-system-frame-colours ())
+  "Set custom frame colours when creating the first frame on a display"
+  (message "Running after frame-initialize")
+  (setup-system-frame-colours))
+(ad-activate 'server-create-window-system-frame)
+(add-hook 'after-make-frame-functions 'setup-system-frame-colours t)
+
 ;; Hooks
 (add-hook 'find-file-hook 'flymake-find-file-hook)
 (add-hook 'find-file-hook
@@ -258,6 +274,15 @@
 
             (if (string-equal suffix "el")
                 (byte-compile-file fname))))
+;(add-hook 'after-make-frame-hook
+;          (lambda ()
+;            (set-default-font "-*-terminus-medium-*-*-*-14-*-*-*-*-*-*-*")
+;            (message "hello")
+;            (set-frame-font "-*-terminus-medium-*-*-*-14-*-*-*-*-*-*-*")))
+;(add-hook 'after-make-frame-functions
+;          (lambda (&rest frame)
+;            (message "world")
+;            (set-frame-font "-*-terminus-medium-*-*-*-14-*-*-*-*-*-*-*")) t)
 ;;; C
 (add-hook 'c-mode-hook
           (lambda ()
@@ -284,19 +309,19 @@
             (auto-fill-mode 1)
             (message "org-mode started")))
 
-(defvar org-loaded nil)
-(add-hook 'org-agenda-mode-hook
-          (lambda ()
-            (if (not org-loaded)
-                (progn
-                  (add-hook 'kill-emacs-hook
-                            (lambda ()
-                              (save-org-files)
-                              (push-org-files)))
-                  (get-org-files)
-                  (setq org-loaded t)))))
-(if (not (file-exists-p "~/prj/org"))
-  (clone-org-files))
+;(defvar org-loaded nil)
+;(add-hook 'org-agenda-mode-hook
+;          (lambda ()
+;            (if (not org-loaded)
+;                (progn
+;                  (add-hook 'kill-emacs-hook
+;                            (lambda ()
+;                              (save-org-files)
+;                              (push-org-files)))
+;                  (get-org-files)
+;                  (setq org-loaded t)))))
+;(if (not (file-exists-p "~/prj/org"))
+;  (clone-org-files))
 
 (custom-set-variables
   ;; custom-set-variables was added by Custom.