fixes for emacs-23

2 files changed, 25 insertions, 5 deletions

diff --git a/Xdefaults b/Xdefaults
index dbae06a..6b747ae 100644
--- a/Xdefaults
+++ b/Xdefaults
@@ -4,6 +4,10 @@ Xft*hinting:            true
 Xft*hintstyle:		hintfull
 Xft*rgba:		rgb
 
+! E M A C S - Fonts, Toolbar
+Emacs*font: -xos4-terminus-*-*-*-*-16-160-*-*-*-*-*-*
+Emacs*toolBar: 0
+
 ! T E R M - Colors
 !black
 *color0:         rgb:19/19/19
diff --git a/emacs b/emacs
index c31c101..78f8d97 100644
--- a/emacs
+++ b/emacs
@@ -33,14 +33,14 @@
  '(display-time-interval 60)
  '(display-time-mail-file (quote none))
  '(display-time-string-forms (quote ((if (and (not display-time-format) display-time-day-and-date) (format-time-string "---%a %b %e " now) "") (propertize (format-time-string (or display-time-format (if display-time-24hr-format "%H:%M" "%-I:%M%p")) now) (quote help-echo) (format-time-string "%a %b %e, %Y" now)) load (if mail (concat " " (propertize display-time-mail-string (quote display) (\` (when (and display-time-use-mail-icon (display-graphic-p)) (\,@ display-time-mail-icon) (\,@ (if (and display-time-mail-face (memq (plist-get (cdr display-time-mail-icon) :type) (quote (pbm xbm)))) (let ((bg (face-attribute display-time-mail-face :background))) (if (stringp bg) (list :background bg))))))) (quote face) display-time-mail-face (quote help-echo) "You have new mail; mouse-2: Read mail" (quote mouse-face) (quote mode-line-highlight) (quote local-map) (make-mode-line-mouse-map (quote mouse-2) read-mail-command))) ""))))
- '(double-mode nil nil (double))
+ '(double-mode nil t (double))
  '(ecb-compile-window-height 6)
  '(ecb-compile-window-width (quote frame))
  '(ecb-directories-menu-user-extension (quote (("Version Control" (ecb-dir-popup-cvs-status "CVS Status") (ecb-dir-popup-cvs-examine "CVS Examine") (ecb-dir-popup-cvs-update "CVS Update")))))
  '(ecb-history-sort-method nil)
  '(ecb-layout-name "left7")
  '(ecb-layout-window-sizes (quote (("left7" (0.21844660194174756 . 0.5873015873015873) (0.21844660194174756 . 0.15873015873015872) (0.21844660194174756 . 0.23809523809523808)))))
- '(ecb-options-version "2.32")
+ '(ecb-options-version "2.40")
  '(ecb-primary-secondary-mouse-buttons (quote mouse-1--mouse-2))
  '(ecb-process-non-semantic-files t)
  '(ecb-show-help-format (quote info))
@@ -54,7 +54,6 @@
  '(font-lock-support-mode (quote jit-lock-mode))
  '(frame-background-mode nil)
  '(fringe-mode nil nil (fringe))
- '(general-holidays (quote ((holiday-fixed 1 1 "New Year's Day") (holiday-fixed 2 14 "Valentine's Day") (holiday-fixed 4 1 "April Fools' Day") (holiday-float 5 0 2 "Mother's Day") (holiday-fixed 10 31 "Halloween"))))
  '(global-font-lock-mode t nil (font-lock))
  '(global-hl-line-mode t nil (hl-line))
  '(gnus-audio-au-player "/usr/bin/aplay")
@@ -62,6 +61,7 @@
  '(grep-command "grep --color -nH -e ")
  '(gud-tooltip-mode nil)
  '(hl-line-face (quote highlight))
+ '(holiday-general-holidays (quote ((holiday-fixed 1 1 "New Year's Day") (holiday-fixed 2 14 "Valentine's Day") (holiday-fixed 4 1 "April Fools' Day") (holiday-float 5 0 2 "Mother's Day") (holiday-fixed 10 31 "Halloween"))))
  '(indicate-buffer-boundaries (quote left))
  '(indicate-empty-lines t)
  '(inhibit-eol-conversion nil)
@@ -109,7 +109,7 @@
  '(timeclock-relative nil)
  '(timeclock-workday 0)
  '(tls-process-connection-type t)
- '(tool-bar-mode nil nil (tool-bar))
+ '(tab-bar-mode -1)
  '(tooltip-delay 0.5)
  '(tooltip-frame-parameters (quote ((name . "tooltip") (internal-border-width . 1) (border-width . 1))))
  '(tooltip-use-echo-area nil)
@@ -209,7 +209,13 @@
 
 ; load-path anpassen
 (setq load-path (cons "/usr/share/maxima/5.9.0/emacs" load-path))
-(setq load-path (cons "~/.emacs.d/lisp" load-path))
+(let* ((my-lisp-dir "~/.emacs.d/lisp")
+       (default-directory my-lisp-dir)
+       (orig-load-path load-path))
+  (setq load-path (cons my-lisp-dir nil))
+  (normal-top-level-add-subdirs-to-load-path)
+  (nconc load-path orig-load-path))
+
 
 (autoload 'maxima-mode "maxima" "Maxima mode" t)
 (autoload 'maxima "maxima" "Maxima interactive" t)
@@ -344,3 +350,13 @@
 
 ; emacs code browser
 (ecb-activate)
+
+; smex
+(setq smex-save-file "~/.emacs.d/smex.save")
+(require 'smex)
+(smex-initialize)
+(global-set-key (kbd "M-X") 'smex)
+
+; snippets
+(yas/initialize)
+(yas/load-directory "/usr/share/emacs/etc/yasnippet/snippets")