Permalink
Browse files

Merge branch 'master' of moesenle@atradig124:.emacs.d into home

Conflicts:
	init.el
  • Loading branch information...
2 parents cf2ca41 + 6c21a40 commit 7e7a956c237db5b848bcbf8d37ff50759e7327b1 @moesenle committed Jan 23, 2010
Showing with 62,568 additions and 6,220 deletions.
  1. BIN bin/ditaa.jar
  2. +53 −11 init.el
  3. +3 −4 site/Makefile
  4. +0 −132 site/egg-grep.el
  5. +0 −6,073 site/egg.el
  6. +3 −0 site/org-mode/Makefile
  7. +7,294 −0 site/org-mode/org-agenda.el
  8. +460 −0 site/org-mode/org-archive.el
  9. +625 −0 site/org-mode/org-ascii.el
  10. +416 −0 site/org-mode/org-attach.el
  11. +387 −0 site/org-mode/org-bbdb.el
  12. +205 −0 site/org-mode/org-bibtex.el
  13. +1,953 −0 site/org-mode/org-clock.el
  14. +1,697 −0 site/org-mode/org-colview-xemacs.el
  15. +1,491 −0 site/org-mode/org-colview.el
  16. +403 −0 site/org-mode/org-compat.el
  17. +177 −0 site/org-mode/org-crypt.el
  18. +199 −0 site/org-mode/org-datetree.el
  19. +1,414 −0 site/org-mode/org-docbook.el
  20. +83 −0 site/org-mode/org-docview.el
  21. +346 −0 site/org-mode/org-exp-blocks.el
  22. +2,936 −0 site/org-mode/org-exp.el
  23. +643 −0 site/org-mode/org-faces.el
  24. +663 −0 site/org-mode/org-feed.el
  25. +578 −0 site/org-mode/org-footnote.el
  26. +1,137 −0 site/org-mode/org-freemind.el
  27. +197 −0 site/org-mode/org-gnus.el
  28. +344 −0 site/org-mode/org-habit.el
  29. +2,097 −0 site/org-mode/org-html.el
  30. +604 −0 site/org-mode/org-icalendar.el
  31. +618 −0 site/org-mode/org-id.el
  32. +281 −0 site/org-mode/org-indent.el
  33. +83 −0 site/org-mode/org-info.el
  34. +235 −0 site/org-mode/org-inlinetask.el
  35. +1,348 −0 site/org-mode/org-install.el
  36. +256 −0 site/org-mode/org-irc.el
  37. +210 −0 site/org-mode/org-jsinfo.el
  38. +2,096 −0 site/org-mode/org-latex.el
  39. +1,379 −0 site/org-mode/org-list.el
  40. +219 −0 site/org-mode/org-mac-message.el
  41. +302 −0 site/org-mode/org-macs.el
  42. +130 −0 site/org-mode/org-mew.el
  43. +221 −0 site/org-mode/org-mhe.el
  44. +974 −0 site/org-mode/org-mobile.el
  45. +1,150 −0 site/org-mode/org-mouse.el
  46. +354 −0 site/org-mode/org-plot.el
  47. +680 −0 site/org-mode/org-protocol.el
  48. +690 −0 site/org-mode/org-publish.el
  49. +1,139 −0 site/org-mode/org-remember.el
  50. +110 −0 site/org-mode/org-rmail.el
  51. +619 −0 site/org-mode/org-src.el
  52. +4,272 −0 site/org-mode/org-table.el
  53. +329 −0 site/org-mode/org-timer.el
  54. +133 −0 site/org-mode/org-vm.el
  55. +172 −0 site/org-mode/org-w3m.el
  56. +145 −0 site/org-mode/org-wl.el
  57. +126 −0 site/org-mode/org-xoxo.el
  58. +17,884 −0 site/org-mode/org.el
  59. +5 −0 snippets/text-mode/lisp-mode/defclass
View
Binary file not shown.
View
64 init.el
@@ -26,6 +26,7 @@
(global-unset-key "\C-x\C-z")
(setq minibuffer-max-depth nil)
+
(custom-set-variables
;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
@@ -41,11 +42,15 @@
'(desktop-save-mode nil)
'(diary-file "~/.emacs.d/diary")
'(ecb-tip-of-the-day nil)
- '(egg-buffer-hide-section-type-on-start (quote ((egg-status-buffer-mode . :diff) (egg-commit-buffer-mode . :diff))))
+ '(gdb-many-windows t)
'(gnuserv-program (concat exec-directory "/gnuserv") t)
'(ido-use-filename-at-point (quote guess))
'(ido-use-url-at-point t)
'(indent-tabs-mode nil)
+ '(gud-tooltip-mode t)
+ '(ido-default-buffer-method (quote samewindow))
+ '(ido-default-file-method (quote samewindow))
+ '(ido-show-dot-for-dired t)
'(ispell-local-dictionary "american")
'(kept-new-versions 3)
'(kept-old-versions 3)
@@ -59,6 +64,7 @@
'(pc-select-selection-keys-only t)
'(pc-selection-mode t nil (pc-select))
'(safe-local-variable-values (quote ((TeX-PDF . t) (readtable . nisp) (readtable . :nisp) (Package . NISP) (Syntax . Common-Lisp) (Package . SAX) (Encoding . utf-8) (Syntax . COMMON-LISP) (Package . CL-PPCRE) (package . rune-dom) (readtable . runes) (Syntax . ANSI-Common-Lisp) (Base . 10))))
+ '(standard-indent 2)
'(tool-bar-mode nil)
'(transient-mark-mode t)
'(version-control t)
@@ -100,7 +106,7 @@
("\\.launch" . xml-mode)
) auto-mode-alist))
-(setq default-tab-width 4)
+(setq default-tab-width 2)
(setq initial-major-mode 'text-mode)
(setq default-major-mode 'text-mode)
(setq scroll-step 1)
@@ -137,17 +143,49 @@
(modify-syntax-entry ?\[ "(] " lisp-mode-syntax-table)
(modify-syntax-entry ?\] ")[ " lisp-mode-syntax-table)
-(slime-setup '(slime-fancy slime-asdf))
+(slime-setup '(slime-fancy slime-asdf slime-indentation))
(setq slime-complete-symbol-function 'slime-fuzzy-complete-symbol)
(setq slime-multiprocessing t)
-(add-hook 'slime-mode-hook
+
+;;; adjust lisp indentation
+(put 'make-instance 'common-lisp-indent-function '(4 &rest 2))
+
+(define-key slime-mode-map "\r" 'newline-and-indent)
+(define-key slime-mode-map [tab] (lambda ()
+ (interactive)
+ (unless (yas/expand)
+ (slime-fuzzy-indent-and-complete-symbol))))
+
+(define-key slime-mode-map (kbd "M-,")
(lambda ()
- (put 'make-instance 'common-lisp-indent-function '(4 &rest 2))
- (put 'with-failure-handling 'common-lisp-indent-function '((&whole 4 &rest (&whole 1 1 2)) &body))
+ (interactive)
+ (condition-case nil
+ (slime-pop-find-definition-stack)
+ (error (tags-loop-continue)))))
- (define-key slime-mode-map "\r" 'newline-and-indent)
- (define-key slime-mode-map [tab] 'slime-fuzzy-indent-and-complete-symbol)))
+(define-key lisp-mode-map (kbd "M-a")
+ (lambda ()
+ (interactive)
+ (let ((ppss (syntax-ppss)))
+ (if (nth 3 ppss)
+ (goto-char (1+ (nth 8 ppss)))
+ (progn
+ (backward-up-list 1)
+ (down-list 1))))))
+
+(define-key lisp-mode-map (kbd "M-e")
+ (lambda ()
+ (interactive)
+ (let ((ppss (syntax-ppss)))
+ (if (nth 3 ppss)
+ (progn
+ (goto-char (nth 8 ppss))
+ (forward-sexp 1)
+ (backward-char 1))
+ (progn
+ (up-list 1)
+ (backward-down-list 1))))))
;; use internal w3m browser (used in particular for clhs lookup)
(setq browse-url-browser-function (lambda (url &optional new-window)
@@ -210,9 +248,6 @@
;;(setq flyspell-default-dictionary "american")
-;; Load cool git frontend
-(require 'egg)
-
;; Set ispell default dictionary
(ispell-change-dictionary "american")
@@ -254,6 +289,13 @@
(require 'pymacs)
(pymacs-load "ropemacs" "rope-")
+(require 'org)
+(setq org-ditaa-jar-path "~/.emacs.d/bin/ditaa.jar")
+
+(require 'yasnippet)
+(yas/initialize)
+(yas/load-directory "~/.emacs.d/snippets")
+
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
View
@@ -4,10 +4,9 @@ elc_files = $(files:.el=.elc)
all: $(elc_files)
-mail-addons.elc: mail-addons.el
- @echo "Ignoring $<."
-
+#mail-addons.elc: mail-addons.el
+# @echo "Ignoring $<."
%.elc: %.el
- emacs --batch --eval '(byte-compile-file "$<")'
+ emacs --batch -L . -q --eval '(byte-compile-file "$<")'
View
@@ -1,132 +0,0 @@
-;;; egg -- Emacs Got Git
-;;; A magit fork
-
-;; Copyright (C) 2008 Linh Dang
-;;
-;; Egg 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, or (at your option)
-;; any later version.
-;;
-;; Egg 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 GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Commentary
-;;; This is my fork of Marius's excellent magit. his work is at:
-;;; http://zagadka.vm.bytemark.co.uk/magit
-;;;
-(require 'egg)
-(require 'compile)
-(require 'grep)
-(require 'cl)
-
-(defvar egg-grep-saved-find-file-func nil)
-
-(defun egg-grep-find-file (marker rev:name dir formats)
- (save-match-data
- (let* ((rev-name-lst (split-string rev:name ":" t))
- (rev (car rev-name-lst))
- (file (cadr rev-name-lst)))
- (unless file
- (setq file rev)
- (setq rev nil))
- (if rev
- (egg-file-get-other-version file rev nil t)
- (apply egg-grep-saved-find-file-func marker file dir formats)))))
-
-(defun egg-grep-next-error-function (n &optional reset)
- (interactive "P")
- (let ((egg-grep-saved-find-file-func
- (symbol-function 'compilation-find-file)))
- (flet ((compilation-find-file (marker file-name dir &rest formats)
- (egg-grep-find-file marker
- file-name
- dir formats)))
- (compilation-next-error-function n reset))))
-
-;;;###autoload
-(defun egg-grep-process-setup ()
- "Setup compilation variables and buffer for `egg-grep'.
-Set up `compilation-exit-message-function' and run `egg-grep-setup-hook'."
- (set (make-local-variable 'compilation-exit-message-function)
- (lambda (status code msg)
- (if (eq status 'exit)
- (cond ((zerop code)
- '("finished (matches found)\n" . "matched"))
- ((= code 1)
- '("finished with no matches found\n" . "no match"))
- (t
- (cons msg code)))
- (cons msg code))))
-
- (run-hooks 'egg-grep-setup-hook))
-
-
-
-(defvar egg-grep-mode-map
- (let ((map (make-sparse-keymap "Egg:Grep")))
- (set-keymap-parent map compilation-minor-mode-map)
- (define-key map (kbd "SPC") 'scroll-up)
- (define-key map (kbd "DEL") 'scroll-down)
-
- (define-key map (kbd "RET") 'compile-goto-error)
- (define-key map "n" 'next-error-no-select)
- (define-key map "p" 'previous-error-no-select)
- (define-key map "{" 'compilation-previous-file)
- (define-key map "}" 'compilation-next-file)
- (define-key map (kbd "TAB") 'compilation-next-error)
- map)
- "Keymap for git-grep buffers.
-`compilation-minor-mode-map' is the parent keymap.")
-
-;;;###autoload
-(define-compilation-mode egg-grep-mode "Git-Grep"
- "Sets `compilation-last-buffer' and `compilation-window-height'."
- (setq compilation-last-buffer (current-buffer))
- (set (make-local-variable 'compilation-error-face)
- grep-hit-face)
- (set (make-local-variable 'compilation-error-regexp-alist)
- grep-regexp-alist)
- (set (make-local-variable 'compilation-process-setup-function)
- 'egg-grep-process-setup)
- (set (make-local-variable 'compilation-disable-input) t)
- (set (make-local-variable 'next-error-function)
- 'egg-grep-next-error-function))
-
-;;;###autoload
-(defun egg-grep (level)
- (interactive "p")
- (let ((git-dir (or (egg-git-dir)
- (error "Dir NOT in a git repo: %s"
- default-directory)))
- (cmd "git --no-pager grep -n ")
- rev term)
-
- (when (> level 15)
- (setq rev (egg-read-rev "grep in revision: " "HEAD"))
- (when (= (aref rev 0) ?:)
- (setq cmd (concat cmd "--cached "))
- (setq rev nil)))
-
- (when (and (> level 3) (setq term (symbol-at-point)))
- (when term
- (setq term (symbol-name term))
- (setq cmd (concat cmd term " "))))
-
- (when rev
- (setq cmd (concat cmd " " rev)))
-
- (setq cmd
- (read-string "run git grep (like this) : " cmd))
-
- (compilation-start cmd 'egg-grep-mode
- `(lambda (name)
- (format "*git-grep@%s*" ,git-dir)))))
-
Oops, something went wrong.

0 comments on commit 7e7a956

Please sign in to comment.