.emacs.d/json.el .emacs.d/vc-buttons.el .todo @@ -26,14 +26,8 @@ ;; with uniform syntax and a real macro system. ;; - http://ratpoison.nongnu.org/inspiration.html -;;; On with the show: - -;;; Fix for a bug in CVS Emacs 2 April 08; remove when fixed upstream: -(defun handle-shift-selection ()) - -;;; -;;; server singleton -;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; server singleton (unless (string-equal "root" (getenv "USER")) (when (and (> emacs-major-version 22) @@ -42,17 +36,21 @@ 'listen)))) (server-start))) -;;; -;;; load-path, autoloads, and requires -;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;;; Fix for a bug in CVS Emacs 2 April 08; remove when fixed upstream: +(defun handle-shift-selection ()) + +(toggle-debug-on-error) (add-to-list 'load-path "~/.emacs.d") (add-to-list 'load-path "~/.emacs.d/jabber") -(add-to-list 'load-path "~/.emacs.d/nxml/nxml-mode-20041004") -;; Regenerate the autoload file if it doesn't exist or it's too -;; old. (2 weeks or so) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; loading modes +;;; Regenerate the autoload file if it doesn't exist or it's too +;;; old. (2 weeks or so) (let ((autoload-file "~/.emacs.d/loaddefs.el")) (if (or (not (file-exists-p autoload-file)) (< (+ (car (nth 5 (file-attributes autoload-file))) 20) @@ -62,16 +60,10 @@ (update-directory-autoloads "~/.emacs.d/"))) (load autoload-file)) -(autoload 'nxhtml-mode "nxml/autostart" "" t) -(autoload 'nxml-mode "nxml/autostart" "" t) -(autoload 'ruby-mode "ruby-mode" "" t) -(autoload 'javascript-mode "javascript" "" t) - -(autoload 'w3m "w3m-load" "" t) (autoload 'yaml-mode "yaml-mode") (autoload 'moz-minor-mode "moz" "Mozilla Minor and Inferior Mozilla Modes" t) (autoload 'whitespace-mode "whitespace" "Toggle whitespace visualization." t) -(autoload 'tail-file "tail" "Tail a file." t) +(autoload 'tail-file "tail.el" "Tail a file." t) (autoload 'lisppaste-paste-region "lisppaste" "" t) (autoload 'top-mode "top-mode" "" t) (autoload 'jabber-connect "jabber" "" t) @@ -85,16 +77,19 @@ (require 'which-func) (require 'cc-defs) +;; TODO: make this an autoload; it's slow! +;;(load "nxml/autostart.el") + (eval-after-load 'vc - '(progn - (require 'gitsum) - (require 'log-view) - (define-key log-view-mode-map (kbd "RET") 'log-view-find-revision) - (define-key vc-annotate-mode-map (kbd "RET") 'vc-annotate-find-revision-at-line))) + '(progn (require 'vc-buttons) + (require 'gitsum))) + +;; some boxes won't have this installed from CVS +;; if that is so, try roastbeef install w3m && roastbeef install emacs-w3m +(ignore-errors (require 'w3m-load)) -;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; My support files and configurations -;; (require 'my-calendar) (require 'my-eshell) @@ -103,20 +98,13 @@ (require 'my-registers) (require 'my-misc) (require 'my-hook-setup) -(require 'my-lisp) -(eval-after-load 'ruby-mode '(require 'my-ruby)) -(eval-after-load 'javascript-mode '(require 'my-js)) -(eval-after-load 'jabber-connect '(load "jabber-config")) -(eval-after-load 'irc '(load "rcirc-config")) +(require 'my-ruby) +(require 'my-lisp) +(require 'my-js) -;; Well, these autoloads have to get invoked somehow. -(add-to-list 'auto-mode-alist '("\\.rb$" . ruby-mode)) -(add-to-list 'auto-mode-alist '("Rakefile$" . ruby-mode)) -(add-to-list 'auto-mode-alist '("\\.js$" . javascript-mode)) -(add-to-list 'auto-mode-alist '("\\.xml$" . nxml-mode)) -(add-to-list 'auto-mode-alist '("\\.html$" . nxhtml-mode)) -(add-to-list 'auto-mode-alist '("\\.rhtml$" . nxhtml-mode)) +(load "jabber-config") +(load "rcirc-config") (setq system-specific-config (concat "~/.emacs.d/" @@ -125,115 +113,114 @@ (if (file-exists-p system-specific-config) (load system-specific-config)) -;;; -;;; Cheat Sheet -;;; - -;;; General -;; M-z zap to char -;; C-u C-SPC jump to previous edit -;; M-/ autocomplete word -;; M-! insert output of shell command -;; M-| replace region with shell output -;; M-x thumbs -;; M-x follow-mode - -;;; Custom bindings -;; C-c \ align-regexp -;; C-c C-r revert buffer -;; C-x M-k kill buffer and window -;; C-x M-f find file in other window -;; C-c d toggle-dedicated-window -;; C-c p message point - -;;; Rectangles -;; C-x r k Rectangle kill -;; C-x r y Rectangle yank -;; C-x r c Rectangle clear (replace with space) -;; C-x r o Insert space rectangle -;; C-x r t Replace rectangle with string - -;;; temp macros -;; C-m C-m to start recording -;; C-m C-s to stop -;; C-m C-p to play - -;;; Macros -;; C-m C-r to begin -;; name it, and do stuff -;; C-s to save - -;;; Ruby -;; M-C-p, M-C-n back and forward blocks -;; C-c C-s irb when in ruby-mode -;; C-c C-r Send region to inf-ruby -;; C-c M-r Send region to inf-ruby and switch to buffer -;; C-c C-l Load file in ruby -;; C-c C-x Send definition - -;;; Display -;; C-u N C-x $ only display lines with less than N spaces of indentation -;; C-x $ disable above -;; C-x n n narrow visibility of buffer to region -;; C-x n w widen to full buffer - -;;; Dired -;; mark with 'm', press 'Q' for multi-file find/replace -;; C-j launch dired when ido-mode is enabled - -;;; Gnus Namazu -;; G G gnus keyword search -;; G T show context in keyword search - -;; list-colors-display - -;;; VC -;; C-x v g - blame (V to toggle committer data) -;; C-x v d - dired (v t to show all files) -;; C-x v = - diff (C-u to specify revision) -;; C-x v ~ - visit specific revision -;; C-x v l - log -;; C-x v d - vc-status - -;;; Eshell -;; piping: ifconfig > #<buffer interfaces> -;; sudo: cd/sudo:: - -;; Well, we already have `C-x r w R' (window-configuration-to-register) -;; and `C-x r f R' (frame-configuration-to-register) for saving window -;; configurations, and `C-x r j R' for restoring them. - -;; Profiling: time emacs -e save-buffers-kill-terminal - -;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Cheat Sheet + +;;; M-z zap to char +;;; C-u C-SPC jump to previous edit +;;; M-/ autocomplete word +;;; M-! insert output of shell command +;;; M-| replace region with shell output +;;; M-x thumbs +;;; M-x follow-mode + +;;;; Rectangles +;;; C-x r k Rectangle kill +;;; C-x r y Rectangle yank +;;; C-x r c Rectangle clear (replace with space) +;;; C-x r o Insert space rectangle +;;; C-x r t Replace rectangle with string + +;;;; temp macros +;;; C-m C-m to start recording +;;; C-m C-s to stop +;;; C-m C-p to play + +;;;; Macros +;;; C-m C-r to begin +;;; name it, and do stuff +;;; C-s to save + +;;;; Ruby +;;; M-C-p, M-C-n back and forward blocks +;;; C-c C-s irb when in ruby-mode +;;; C-c C-r Send region to inf-ruby +;;; C-c M-r Send region to inf-ruby and switch to buffer +;;; C-c C-l Load file in ruby +;;; C-c C-x Send definition + +;;;; Display +;;; C-u N C-x $ only display lines with less than N spaces of indentation +;;; C-x $ disable above +;;; C-x n n narrow visibility of buffer to region +;;; C-x n w widen to full buffer + +;;;; Dired +;;; mark with 'm', press 'Q' for multi-file find/replace +;;; C-j launch dired when ido-mode is enabled + +;;;; Gnus Namazu +;;; G G gnus keyword search +;;; G T show context in keyword search + +;;; list-colors-display + +;;;; VC +;;; C-x v g - blame (V to toggle committer data) +;;; C-x v d - dired (v t to show all files) +;;; C-x v = - diff (C-u to specify revision) +;;; C-x v ~ - visit specific revision +;;; C-x v l - log +;;; C-x v d - vc-status + +;;;; Eshell +;;; piping: ifconfig > #<buffer interfaces> +;;; sudo: cd/sudo:: + +;;; sudo ionice -c3 -ppid + +;;; Well, we already have `C-x r w R' (window-configuration-to-register) +;;; and `C-x r f R' (frame-configuration-to-register) for saving window +;;; configurations, and `C-x r j R' for restoring them. + +;;; Profiling: time emacs -e save-buffers-kill-terminal + ;;; TODO: -;;; -;; follow Stefan's advice wrt vc-buttons and log-view.el ;; look into adding hyperlinks to vc-blame + +;; find a better dark-on-light color scheme + +;; steal ZSS defadvice in setup-aliases.el for find-file-at-point + +;; fix whitespace-mode. augh. horrible. + ;; fix twittering-mode bugs mentioned in file -;; submit patched rcirc completion -;; scpaste: use tramp functions, finish scpaste-window -;; fix whitespace-mode config to not be horrible ;; allow edits to occur buffer to get propagated to original buffer -;; pcomplete for: kill/killall, git, apt-get -;; unify statuses in twitter and jabber -;;; Minor - -;; find a better dark-on-light color scheme ;; make column-number-mode only active in coding buffers + +;; pcomplete for: kill/killall, git, apt-get + ;; flymake for JS and Ruby -;; steal ZSS defadvice in setup-aliases.el for find-file-at-point + +;; submit patched rcirc completion + +;; scpaste: use tramp functions, finish scpaste-window + ;; fix ruby-get-old-input to not care about what the prompt looks like +;; check out js2-mode.el: http://code.google.com/p/js2-mode/ + +;; disable global-hl-line-mode for shell buffers? + ;;; Long-term: -;; figure out how to get nnml under version control w/o merge conflicts +;; figure out how to get nnml in VC w/o merge conflicts -;; do something about getting a better ruby highlighter: -;; http://rubyforge.org/projects/ruby-tp-dw-gram/ -;; http://cedet.cvs.sourceforge.net/cedet/cedet/contrib/ +;;; do something about getting a better ruby highlighter: +;;; http://rubyforge.org/projects/ruby-tp-dw-gram/ +;;; http://cedet.cvs.sourceforge.net/cedet/cedet/contrib/ -;; make an emacs peepcode +;;; make an emacs peepcode .emacs @@ -26,6 +26,7 @@ (define-derived-mode gitsum-diff-mode diff-mode "gitsum" "Git summary mode is for preparing patches to a Git repository. This mode is meant to be activated by `M-x gitsum' or pressing `s' in git-status. +\\{gitsum-diff-mode-shared-map} \\{gitsum-diff-mode-map}" ;; magic... (lexical-let ((ro-bind (cons 'buffer-read-only gitsum-diff-mode-shared-map))) @@ -38,7 +39,7 @@ This mode is meant to be activated by `M-x gitsum' or pressing `s' in git-status ;; When git.el is loaded, hack into keymap. (when (boundp 'git-status-mode-map) - (define-key git-status-mode-map "s" 'gitsum)) + (define-key git-status-mode-map "s" 'gitsum-switch-from-git-status)) ;; Undo doesn't work in read-only buffers else. (defun gitsum-undo () @@ -50,7 +51,7 @@ A numeric argument serves as a repeat count." (let ((inhibit-read-only t)) (undo))) -(defun gitsum-refresh () +(defun gitsum-refresh (&optional arguments) "Regenerate the patch based on the current state of the index." (interactive) (let ((inhibit-read-only t)) @@ -58,7 +59,7 @@ A numeric argument serves as a repeat count." (insert "# Directory: " default-directory "\n") (insert "# Use n and p to navigate and k to kill a hunk. u is undo, g will refresh.\n") (insert "# Edit the patch as you please and press 'c' to commit.\n\n") - (let ((diff (shell-command-to-string "git diff"))) + (let ((diff (shell-command-to-string (concat "git diff " arguments)))) (if (zerop (length diff)) (insert "## No changes. ##") (insert diff) @@ -156,6 +157,16 @@ A numeric argument serves as a repeat count." (interactive) (git-status default-directory)) +(defun gitsum-switch-from-git-status () + "Switch to gitsum, resticting diff to marked files if any." + (interactive) + (let ((marked (git-get-filenames + (ewoc-collect git-status + (lambda (info) (git-fileinfo->marked info)))))) + (gitsum) + (when marked + (gitsum-refresh (mapconcat 'identity marked " "))))) + (defun gitsum () "Entry point into gitsum-diff-mode." (interactive) @@ -163,4 +174,8 @@ A numeric argument serves as a repeat count." (gitsum-diff-mode) (gitsum-refresh)) +;; viper compatible +(eval-after-load "viper" + '(add-to-list 'viper-emacs-state-mode-list 'gitsum-diff-mode)) + (provide 'gitsum) .emacs.d/gitsum.el @@ -11,7 +11,7 @@ (global-set-key "\C-\M-h" 'backward-kill-word) (global-set-key (kbd "C-c l") (lambda () (interactive) (insert "lambda"))) -(global-set-key (kbd "C-c \\") 'align-regexp) +(global-set-key (kbd "C-x \\") 'align-regexp) ;;; Navigation @@ -27,7 +27,7 @@ (global-set-key (kbd "C-x M-f") 'ido-find-file-other-window) (global-set-key (kbd "C-x C-b") 'bs-show) -(global-set-key (kbd "C-c C-r") 'revert-buffer) +(global-set-key (kbd "C-x M-r") 'revert-buffer) ;;; Window management @@ -35,12 +35,11 @@ (global-set-key "\C-x=" 'enlarge-window) (global-set-key "\C-xO" (lambda () (interactive) (other-window -1))) -(global-set-key "\C-x\C-o" (lambda () (interactive) (other-window 2))) (global-set-key "\C-x." (lambda () (interactive) (enlarge-window 1 t))) (global-set-key "\C-x," (lambda () (interactive) (shrink-window 1 t))) (global-set-key (kbd "C-x M-k") (lambda () (interactive) (kill-buffer (current-buffer)) (delete-window))) -(global-set-key (kbd "C-c d") 'toggle-dedicated-window) +(global-set-key (kbd "C-x d") 'toggle-dedicated-window) ;;; Lisp @@ -52,12 +51,12 @@ (global-set-key (kbd "C-x m") 'eshell) (global-set-key (kbd "C-x M") (lambda () (interactive) (eshell t))) -;;; Web +;; Web (global-set-key (kbd "C-x w") 'w3m) (global-set-key "\C-xh" 'view-url) -(global-set-key "\C-ct" 'twittering-mode) -(global-set-key "\C-cT" 'twittering-update-status-interactive) +(global-set-key "\C-xt" 'twittering-mode) +(global-set-key "\C-xT" 'twittering-update-status-interactive) ;;; Utility @@ -68,11 +67,6 @@ (define-key read-expression-map (kbd "TAB") #'lisp-complete-symbol) (global-set-key (kbd "M-\\") 'my-selective-display) (global-set-key (kbd "C-x v d") 'vc-status) -(global-set-key (kbd "C-x v r") 'vc-resolve-conflicts) -(global-set-key (kbd "C-c j") (lambda () (interactive) - (switch-or-start "*-jabber-*" #'jabber-connect))) -(global-set-key (kbd "C-c g") (lambda () (interactive) - (switch-or-start "*Group*" #'gnus))) (define-key isearch-mode-map (kbd "C-o") ;; occur easily inside isearch (lambda () .emacs.d/my-bindings.el @@ -16,8 +16,17 @@ (interactive "MUrl: ") (switch-to-buffer (url-retrieve-synchronously url)) (rename-buffer url t) - (goto-char (point-min)) - (html-mode)) + (eval ;set major mode + (read + (concat + "(" + (completing-read "Major mode: " + (mapcar (lambda + (x) + (list (symbol-name x))) + (apropos-internal "-mode$" + 'commandp)) + nil t) ")")))) (defun map-coords (lat lng) "Show a Yahoo map marked with the point LAT by LNG." @@ -56,12 +65,17 @@ "Toggle the window-dedicated-p state of current window." (set-window-dedicated-p (current-window) (not (window-dedicated-p (current-window))))) +(defun window-small-and-large () + (interactive) + (if (equal 1 (length (window-list))) + (split-window)) + (set-window-text-height (first (window-list)) (- (frame-height) 20))) + (defun my-coding-hook () "Enable things I consider convenient across all coding buffers." ;; (indent-buffer) - ;; (whitespace-mode t) (hl-line-mode) - (setq indicate-empty-lines t) + ;; (whitespace-mode t) (font-lock-add-keywords nil '(("\\<\\(FIX\\|TODO\\|FIXME\\|HACK\\|REFACTOR\\):" 1 font-lock-warning-face t)))) @@ -87,8 +101,8 @@ ;;; Random stuff -(defun recompile-init () - (interactive) ;; TODO: maybe shouldn't recompile my-* that changes a lot? +(defun my-recompile-init () + (interactive) (byte-recompile-directory (expand-file-name "~/.emacs.d") 0)) (defun my-generate-elisp-tags () @@ -136,10 +150,4 @@ (defun ss () (interactive) (server-start)) -(defun switch-or-start (buffer-name starter-function) - (if (get-buffer buffer-name) - (switch-to-buffer buffer-name) - (funcall starter-function))) - - (provide 'my-defuns) \ No newline at end of file .emacs.d/my-defuns.el @@ -5,7 +5,6 @@ (eval-after-load 'eshell '(progn - (require 'ansi-color) (require 'pcmpl-rake) (require 'em-prompt) (require 'em-cmpl) .emacs.d/my-eshell.el @@ -12,8 +12,7 @@ (add-hook 'comint-mode-hook 'ansi-color-for-comint-mode-on) (add-hook 'js-mode-hook 'moz-minor-mode) (add-hook 'html-mode-hook 'auto-fill-mode) -;;; Don't do this behind my back... sigh. -;;(add-hook 'before-save-hook 'delete-trailing-whitespace) -;;(add-hook 'before-save-hook 'untabify-buffer) +;(add-hook 'before-save-hook 'delete-trailing-whitespace) +;(add-hook 'before-save-hook 'untabify-buffer) (provide 'my-hook-setup) \ No newline at end of file .emacs.d/my-hook-setup.el @@ -31,9 +31,13 @@ (add-to-list 'auto-mode-alist '("\\.js$" . javascript-mode)) (add-to-list 'auto-mode-alist '("\\.json$" . yaml-mode)) +;; for helma +(add-to-list 'auto-mode-alist '("\\.skin$" . html-mode)) +(add-to-list 'auto-mode-alist '("\\.hac$" . javascript-mode)) + (setq javascript-indent-level 2) -;; (require 'flymake-js) +(require 'flymake-js) ;; getting an error 100% of the time now. ;;(add-hook 'javascript-mode-hook 'flymake-js-load) .emacs.d/my-js.el @@ -26,6 +26,7 @@ inhibit-startup-message t transient-mark-mode t color-theme-is-global nil + indicate-empty-lines t save-place t truncate-partial-width-windows nil indent-tabs-mode nil .emacs.d/my-misc.el @@ -10,6 +10,9 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Ruby help +;; syntax highlighting needs to be done before ruby-electric +(global-font-lock-mode t) + (require 'ruby-mode) (require 'ruby-electric) (require 'inf-ruby) .emacs.d/my-ruby.el @@ -1,4 +1,3 @@ -#!/usr/local/bin/ruby1.9 ## ri-emacs.rb helper script for use with ri-ruby.el # # Author: Kristof Bastiaensen <kristof@vleeuwen.org> @@ -24,7 +23,6 @@ # For information on how to use and install see ri-ruby.el # -require 'rubygems' require 'rdoc/ri/ri_paths' require 'rdoc/ri/ri_cache' require 'rdoc/ri/ri_util' .emacs.d/ri-emacs.rb @@ -13,12 +13,10 @@ ;; * the templete string system for status ;; id:masa_edw ;; * twittering-scroll-mode -;; Phil Hagelberg -;; * misc. bug fixes ;; This file 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) +;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; This file is distributed in the hope that it will be useful, @@ -41,13 +39,13 @@ ;; twittering-(icon|scroll)-mode should *not* go in the modeline ;; q to bury-buffer ;; thanks; don't need a message every time HTTP GETs work -;; disable undo for the twittering buffer; it caused overflow ;;; Bugs: ;; should warn if you go over 140 chars -;; should not create a *twittering* buffer when you require, just when you launch. ;; sometimes icons get mixed up +;; should not create a *twittering* buffer when you require it. +;; undo buffer overflows; disable it ;;; Code: @@ -256,7 +254,6 @@ (set-syntax-table twittering-mode-syntax-table) (run-hooks 'twittering-mode-hook) (font-lock-mode -1) - (buffer-disable-undo) (twittering-start) ) .emacs.d/twittering-mode.el @@ -7,7 +7,7 @@ </head> <body> - <outline text="General Tech Folks"> + <outline text="Tech Folks"> <outline text="ongoing" description="Ongoing fragmented essay by Tim Bray." htmlUrl="http://www.tbray.org/ongoing/" @@ -16,6 +16,10 @@ description="Dive into Mark" htmlUrl="http://diveintomark.org" xmlUrl="http://diveintomark.org/feed/" /> + <outline text="Bruce Schneier" + description="Schneier on Security" + htmlUrl="http://www.schneier.com/blog/" + xmlUrl="http://www.schneier.com/blog/index.rdf" /> <outline text="Martin Fowler" description="Bliki" htmlUrl="http://martinfowler.com/bliki/" @@ -23,25 +27,6 @@ <outline text="O'Reily Radar" htmlUrl="http://radar.oreilly.com/" xmlUrl="http://radar.oreilly.com/atom.xml" /> - <outline text="Sam Ruby" - description="Intertwingly" - htmlUrl="http://www.intertwingly.net/blog/" - xmlUrl="http://www.intertwingly.net/blog/index.atom" /> - <outline text="O'Reilly Radar" - description="What's new in tech." - htmlUrl="http://radar.oreilly.com/" - xmlUrl="http://radar.oreilly.com/feed" /> - <outline text="John Resig" - description="ejohn" - htmlUrl="http://ejohn.org" - xmlUrl="http://ejohn.org/index.rdf" /> - <outline text="James Clark" - description="The other XML guy" - htmlUrl="http://blog.jclark.com" - xmlUrl="http://blog.jclark.com/feeds/posts/default" /> - </outline> - - <outline text="Emacs people"> <outline text="Steve Yegge" htmlUrl="http://steve-yegge.blogspot.com/" xmlUrl="http://steve-yegge.blogspot.com/atom.xml" /> @@ -54,6 +39,13 @@ <outline text="epistemologic" htmlUrl="http://epistemologic.com/" xmlUrl="http://epistemologic.com/feed/" /> + <outline text="Intertwingly" + htmlUrl="http://www.intertwingly.net/blog/" + xmlUrl="http://www.intertwingly.net/blog/index.atom" /> + <outline text="O'Reilly Radar" + description="What's new in tech." + htmlUrl="http://radar.oreilly.com/" + xmlUrl="http://radar.oreilly.com/feed" /> <outline text="Hyperstruct" description="Creator of Mozlab" htmlUrl="http://hyperstruct.net/" @@ -62,6 +54,14 @@ description="Platypope" htmlUrl="http://platypope.org/blog/syndicate" xmlUrl="http://platypope.org/blog/syndicate" /> + <outline text="Giles Bowkett" + description="Bad (and Nationwide)" + htmlUrl="http://gilesbowkett.blogspot.com/" + xmlUrl="http://feeds.feedburner.com/gilesbowkett" /> + <outline text="James Clark" + description="The other XML guy" + htmlUrl="http://blog.jclark.com" + xmlUrl="http://blog.jclark.com/feeds/posts/default" /> </outline> <outline text="Friends"> @@ -69,10 +69,10 @@ description="nothingness incarnate" htmlUrl="http://arko.net/" xmlUrl="http://arko.net/feed/atom.xml" /> - <!--<outline text="Joel Watson" + <outline text="Joel Watson" description="bitwise" htmlUrl="http://www.joelmwatson.com/blog/" - xmlUrl="http://www.joelmwatson.com/blog/feed/" />--> + xmlUrl="http://www.joelmwatson.com/blog/feed/" /> <outline text="Forrest Chang" description="Funkworks" htmlUrl="http://funkworks.blogspot.com/" @@ -100,20 +100,13 @@ description="This is totally gonna work" htmlUrl="http://blog.livollmers.net/" xmlUrl="http://blog.livollmers.net/index.php/feed/atom" /> - <outline text="Seth Falcon" - description="User Primary" - htmlUrl="http://userprimary.net/user" - xmlUrl="http://userprimary.net/user/feed/" /> - <outline text="Jedediah Huntington" - htmlUrl="http://blog.jdhuntington.com/" - xmlUrl="http://blog.jdhuntington.com/atom.xml" /> </outline> <outline text="Ruby Luminaries"> <outline text="Dave Thomas" description="PragDave" - htmlUrl="http://pragdave.blogs.pragprog.com/pragdave/" - xmlUrl="http://pragdave.blogs.pragprog.com/pragdave/atom.xml" /> + htmlUrl="http://blogs.pragprog.com/cgi-bin/pragdave.cgi" + xmlUrl="http://blogs.pragprog.com/cgi-bin/pragdave.cgi?rss" /> <outline text="Hackety Org" description="Why for kids" htmlUrl="http://hackety.org/" @@ -136,32 +129,6 @@ <outline text="Ola Bini" htmlUrl="http://ola-bini.blogspot.com/" xmlUrl="http://ola-bini.blogspot.com/atom.xml" /> - <outline text="Ryan Daigle" - description="Ryan's Scraps" - htmlUrl="http://www.ryandaigle.com" - xmlUrl="http://feeds.feedburner.com/RyansScraps" /> - <outline text="Giles Bowkett" - description="Bad (and Nationwide)" - htmlUrl="http://gilesbowkett.blogspot.com/" - xmlUrl="http://feeds.feedburner.com/gilesbowkett" /> - <outline text="Hampton Catlin" - htmlUrl="http://hamptoncatlin.com/" - xmlUrl="http://hamptoncatlin.com/feed/atom.xml" /> - <outline text="Pat Eyler" - description="on ruby" - htmlUrl="http://on-ruby.blogspot.com/" - xmlUrl="http://on-ruby.blogspot.com/feeds/posts/default" /> - <outline text="RoR Podcast" - description="Geoff's talks" - htmlUrl="http://podcast.rubyonrails.org" - xmlUrl="http://feeds.feedburner.com/rubyonrails_transcript" /> - </outline> - - <outline text="Caboooooose"> - <outline text="Caboose Blog" - description="Monkeying around" - htmlUrl="http://blog.caboo.se" - xmlUrl="http://blog.caboo.se/feed/atom.xml" /> <outline text="Ryan Davis" description="Zen Spider" htmlUrl="http://blog.zenspider.com/" @@ -170,24 +137,13 @@ description="Segment 7" htmlUrl="http://blog.segment7.net/" xmlUrl="http://feeds.feedburner.com/segment7/VjcA" /> - <outline text="Wilson Bilkovich" - description="Arrows from the Sun" - htmlUrl="http://metaclass.org" - xmlUrl="http://metaclass.org/feed/atom.xml" /> - <outline text="Ezra Z" - description="brainsplat" - htmlUrl="http://brainspl.at" - xmlUrl="http://brainspl.at/xml/rss20/feed.xml" /> - <outline text="Evan Phoenix" - htmlUrl="http://blog.fallingsnow.net/" - xmlUrl="http://blog.fallingsnow.net/feed/" /> - <outline text="Chad Fowler" - htmlUrl="http://chadfowler.com" - xmlUrl="http://feeds.feedburner.com/Chadfowlercom" /> - <outline text="chris2" - description="a weblog by christian neukirchen" - htmlUrl="http://chneukirchen.org/blog/" - xmlUrl="http://chneukirchen.org/blog/index.atom" /> + <outline text="Ryan Daigle" + description="Ryan's Scraps" + htmlUrl="http://www.ryandaigle.com" + xmlUrl="http://feeds.feedburner.com/RyansScraps" /> + <outline text="Hampton Catlin" + htmlUrl="http://hamptoncatlin.com/" + xmlUrl="http://hamptoncatlin.com/feed/atom.xml" /> <outline text="Josh Susser" description="has_many :through" htmlUrl="http://blog.hasmanythrough.com/" @@ -195,58 +151,18 @@ <outline text="Coda Hale" htmlUrl="http://blog.codahale.com/" xmlUrl="http://feeds.feedburner.com/codablog" /> - <outline text="ReinH" - htmlUrl="http://reinh.com/" - xmlUrl="http://feeds.feedburner.com/reinh" /> - <outline text="Adam Keys" - description="The Real Adam" - htmlUrl="http://therealadam.com" - xmlUrl="http://therealadam.com/feed/" /> - <outline text="Garry Dolley" - htmlUrl="http://scie.nti.st" - xmlUrl="http://feeds.feedburner.com/scientist-home" /> - <outline text="Dr Nic Williams" - htmlUrl="http://drnicwilliams.com" - xmlUrl="http://feeds.feedburner.com/DrNic" /> - <outline text="al3x" - htmlUrl="http://al3x.net" - xmlUrl="http://feeds.feedburner.com/al3x" /> - <outline text="Dave Astels" - htmlUrl="http://blog.daveastels.com/" - xmlUrl="http://blog.daveastels.com/feed" /> - <outline text="Err the Blog" - htmlUrl="http://errtheblog.com/" - xmlUrl="http://feeds.feedburner.com/errtheblog" /> - <outline text="David Goodlad" - htmlUrl="http://david.goodlad.ca/" - xmlUrl="http://david.goodlad.ca/feed/atom.xml" /> - <outline text="Amy Hoy" - description="Slash 7" - htmlUrl="http://www.slash7.com/" - xmlUrl="http://feeds.feedburner.com/slash7/rss" /> - <outline text="Erik Kastner" - description="MetaateM" - htmlUrl="http://metaatem.net/" - xmlUrl="http://metaatem.net/feed/atom" /> - <outline text="Kevin Clark" - description="Gluttonous" - htmlUrl="http://glu.ttono.us/" - xmlUrl="http://feeds.feedburner.com/Gluttonous" /> - <outline text="Tom Preston-Werner" - description="Ruby is Awesome" - htmlUrl="http://rubyisawesome.com/" - xmlUrl="http://feeds.feedburner.com/ruby_is_awesome" /> - <outline text="PJ Hyett" - htmlUrl="http://www.pjhyett.com/" - xmlUrl="http://feeds.feedburner.com/pjhyett" /> - <outline text="Evan Henshaw-Plath" - description="Rabble" - htmlUrl="http://anarchogeek.com/" - xmlUrl="http://anarchogeek.com/feed/atom.xml" /> - <outline text="Rick Olson" - description="technoweenie" - htmlUrl="http://weblog.techno-weenie.net/" - xmlUrl="http://feeds.feedburner.com/TechnoWeenie" /> + <outline text="Pat Eyler" + description="on ruby" + htmlUrl="http://on-ruby.blogspot.com/" + xmlUrl="http://on-ruby.blogspot.com/feeds/posts/default" /> + <outline text="chris2" + description="a weblog by christian neukirchen" + htmlUrl="http://chneukirchen.org/blog/" + xmlUrl="http://chneukirchen.org/blog/index.atom" /> + <outline text="RoR Podcast" + description="Geoff's talks" + htmlUrl="http://podcast.rubyonrails.org" + xmlUrl="http://feeds.feedburner.com/rubyonrails_transcript" /> </outline> <outline text="Philisha Comments" .feeds.opml @@ -30,8 +30,8 @@ (setq nnmail-split-fancy '(| (to "ruby_emacs_dev@yahoogroups\\.com" "emacs-rails") (to "obby-users@list.0x539.de" "obby-users") - (to "phil@localhost" "feeds") - (any "zenspider\\.com" "seattle.rb") + (any "conkeror" "conkeror") + (any "zenspider\\.com" "seattle.rb") (any "mozlab" "mozlab") (any "cartographer" junk) (any "Fyreball" junk) @@ -40,6 +40,7 @@ (any "bus-scheme" "bus-scheme") (any "cron" junk) + (to "phil@localhost" "feeds") (any "zacchaeus.*" "friends") .gnus.el 8cfcba35f182b87b12ada8c6f80ea0344f6e9217 Phil Hagelberg technomancy@gmail.com http://github.com/technomancy/dotfiles/commit/17896fea0a07bb226a5acfe3fe5e3cf77fb8b650 17896fea0a07bb226a5acfe3fe5e3cf77fb8b650 2008-04-14T14:32:09-07:00 2008-04-14T14:32:09-07:00 upgraded to latest gitsum version dff8111e8820ec089d08acdd3268db241ea09667 Phil Hagelberg technomancy@gmail.com