@@ -127,7 +127,7 @@ (defmacro deftest (name suite &rest body) "Define a test NAME in SUITE with BODY." `(save-excursion - ;; TODO: Use backtrace info to get line number + ;; TODO: Use backtrace-frame info to get line number (search-backward (concat "deftest " (symbol-name ',name)) nil t) (let ((line (line-number-at-pos)) (file buffer-file-name)) .emacs.d/elunit.el @@ -35,7 +35,7 @@ ;; M-x idle-highlight sets an idle timer that highlights all ;; occurences in the buffer of the word under the point. -;;; Code: +;;; Code: (require 'thingatpt) @@ -47,7 +47,7 @@ (defun idle-highlight-word-at-point () (let* ((target-symbol (symbol-at-point)) ;; need to save this value to check for nil - (target (symbol-name target-symbol))) + (target (symbol-name target-symbol))) (when idle-highlight-last-word (unhighlight-regexp (concat "\\<" (regexp-quote idle-highlight-last-word) "\\>"))) (when (and idle-highlight-timer target target-symbol (not (in-string-p))) .emacs.d/idle-highlight.el @@ -1,4 +1,3 @@ - ;;; My .emacs project ;; by Phil Hagelberg @@ -59,11 +58,11 @@ (let ((autoload-file "~/.emacs.d/loaddefs.el")) (if (or (not (file-exists-p autoload-file)) - (< (+ (car (nth 5 (file-attributes autoload-file))) 20) - (car (current-time)))) + (< (+ (car (nth 5 (file-attributes autoload-file))) 20) + (car (current-time)))) (let ((generated-autoload-file autoload-file)) - (message "Updating autoloads...") - (update-directory-autoloads "~/.emacs.d/"))) + (message "Updating autoloads...") + (update-directory-autoloads "~/.emacs.d/"))) (load autoload-file)) (autoload 'nxhtml-mode "nxml/autostart" "" t) @@ -99,7 +98,8 @@ '(progn (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))) + (define-key vc-annotate-mode-map (kbd "RET") + 'vc-annotate-find-revision-at-line))) (ignore-errors (load "elpa/package.el") @@ -133,7 +133,7 @@ (setq system-specific-config (concat "~/.emacs.d/" - (substring (shell-command-to-string "hostname") 0 -1) ".el")) + (substring (shell-command-to-string "hostname") 0 -1) ".el")) (if (file-exists-p system-specific-config) (load system-specific-config)) @@ -189,6 +189,8 @@ ;; list-colors-display +;; Handy unicode chars: ♪ ♫ ♬ ‽ ☞ + ;;; VC ;; C-x v g - blame (V to toggle committer data) ;; C-x v d - dired (v t to show all files) .emacs.d/init.el @@ -13,6 +13,8 @@ (global-set-key (kbd "C-c l") (lambda () (interactive) (insert "lambda"))) (global-set-key (kbd "C-x \\") 'align-regexp) (global-set-key (kbd "M-/") 'hippie-expand) +(global-set-key (kbd "C-c n") (lambda () + (delete-trailing-whitespace) (untabify-buffer))) ;;; Navigation .emacs.d/my-bindings.el @@ -29,6 +29,19 @@ (w3m-browse-url (concat "http://maps.yahoo.com/maps_result?mag=12&lat=" lat "&lon=" lng))) +(defun steersman-connect (password) + "Make this Emacs instance become controlled by Steersman." + (interactive "MPassword: ") + (setq steersman-password password + steersman-master "phil@hagelb.org" + jabber-server "hagelb.org" + jabber-username "agent" + jabber-password password + jabber-resource + (concat "steersman-" + (substring (shell-command-to-string "hostname") 0 -1))) + (jabber-connect)) + ;;; Buffer/window stuff (defun my-selective-display (column) .emacs.d/my-defuns.el @@ -16,15 +16,15 @@ ;(add-hook 'before-save-hook 'untabify-buffer) (add-hook 'oddmuse-mode-hook - (lambda () - (unless (string-match "question" oddmuse-post) - (setq oddmuse-post (concat "uihnscuskc=1;" oddmuse-post))))) + (lambda () + (unless (string-match "question" oddmuse-post) + (setq oddmuse-post (concat "uihnscuskc=1;" oddmuse-post))))) (eval-after-load 'jabber '(progn (add-hook 'jabber-post-disconnect-hook - (lambda () (kill-buffer "*-jabber-*") - (kill-buffer " *-jabber-process-*"))) + (lambda () (kill-buffer "*-jabber-*") + (kill-buffer " *-jabber-process-*"))) (add-hook 'jabber-post-connect-hook (lambda () (switch-to-buffer "*-jabber-*"))))) .emacs.d/my-hook-setup.el @@ -65,7 +65,8 @@ oddmuse-wikis '(("Technomancy" "http://dev.technomancy.us" utf-8) ("EmacsWiki" "http://www.emacswiki.org/cgi-bin/emacs" utf-8)) - oddmuse-directory "~/.emacs.d/oddmuse") + oddmuse-directory "~/.emacs.d/oddmuse" + install-elisp-repository-directory "~/.emacs.d/") ;; Sorry, I *really* don't care. (defvar twittering-spam-regex "\\(iphone\\|wwdc\\)" .emacs.d/my-misc.el @@ -302,6 +302,7 @@ The variable ruby-indent-level controls the amount of indentation. (set (make-local-variable 'add-log-current-defun-function) 'ruby-add-log-current-method) + (make-local-variable 'before-save-hook) (add-hook 'before-save-hook 'ruby-mode-set-encoding) (set (make-local-variable 'font-lock-defaults) .emacs.d/ruby-mode.el @@ -88,9 +88,9 @@ You must have write-access to this directory via `scp'.") (defvar scpaste-footer (concat "<p style='font-size: 8pt; font-family: monospace;'>Generated by " - user-full-name - " using <a href='http://p.hagelb.org'>scpaste</a> at %s " - (cadr (current-time-zone)) ".</p>") + user-full-name + " using <a href='http://p.hagelb.org'>scpaste</a> at %s " + (cadr (current-time-zone)) ".</p>") "HTML message to place at the bottom of each file.") (defvar scpaste-tmp-dir "/tmp" @@ -101,13 +101,13 @@ You must have write-access to this directory via `scp'.") "Paste the current buffer via `scp' to `scpaste-http-destination'." (interactive "MName (defaults to buffer name): ") (let* ((b (htmlize-buffer)) - (name (url-hexify-string (if (equal "" original-name) - (buffer-name) - original-name))) - (full-url (concat scpaste-http-destination "/" name ".html")) - (scp-destination (concat scpaste-scp-destination "/" name ".html")) - (scp-original-destination (concat scpaste-scp-destination "/" name)) - (tmp-file (concat scpaste-tmp-dir "/" name))) + (name (url-hexify-string (if (equal "" original-name) + (buffer-name) + original-name))) + (full-url (concat scpaste-http-destination "/" name ".html")) + (scp-destination (concat scpaste-scp-destination "/" name ".html")) + (scp-original-destination (concat scpaste-scp-destination "/" name)) + (tmp-file (concat scpaste-tmp-dir "/" name))) ;; Save the file (while adding footer) (save-excursion @@ -121,7 +121,7 @@ You must have write-access to this directory via `scp'.") ;; want to load eshell and you don't mind the popup password prompt. (eshell-command (concat "scp " tmp-file " " scp-destination)) (eshell-command (concat "scp " (buffer-file-name (current-buffer)) - " " scp-original-destination)) + " " scp-original-destination)) (ignore-errors (kill-buffer "*EShell Command Output*")) ;; Notify user and put the URL on the kill ring @@ -139,15 +139,15 @@ You must have write-access to this directory via `scp'.") (flush-lines "^Password: $" (point-min) (point-max)) (flush-lines "private" (point-min) (point-max)) (let ((file-list (split-string (buffer-string) "\n"))) - (with-temp-buffer - (insert-file-contents "~/.emacs.d/scpaste.el") ;; TODO: find elisp's __FILE__ - (goto-char (point-min)) - (search-forward ";;; Commentary") - (forward-line -1) - (insert "\n;;; Pasted Files\n\n") - (mapc (lambda (file) (insert (concat ";; * <" scpaste-http-destination "/" file ">\n"))) file-list) - (emacs-lisp-mode) (font-lock-fontify-buffer) (rename-buffer "SCPaste") - (scpaste "index"))) + (with-temp-buffer + (insert-file-contents "~/.emacs.d/scpaste.el") ;; TODO: find elisp's __FILE__ + (goto-char (point-min)) + (search-forward ";;; Commentary") + (forward-line -1) + (insert "\n;;; Pasted Files\n\n") + (mapc (lambda (file) (insert (concat ";; * <" scpaste-http-destination "/" file ">\n"))) file-list) + (emacs-lisp-mode) (font-lock-fontify-buffer) (rename-buffer "SCPaste") + (scpaste "index"))) (ignore-errors (kill-buffer "*EShell Command Output*"))))) (provide 'scpaste) .emacs.d/scpaste.el @@ -43,8 +43,8 @@ ;; (setq steersman-password "secret" ;; steersman-master "phil@hagelb.org" -;; jabber-server "jabber.org" -;; jabber-username "my-steersman" +;; jabber-server "hagelb.org" +;; jabber-username "agent" ;; jabber-resource ;; (concat "steersman-" ;; (substring (shell-command-to-string "hostname") 0 -1))) .emacs.d/steersman.el @@ -102,4 +102,12 @@ ;; (elunit "meta-suite") ;; (assert-in-buffer ".." "*elunit*")) ;; (elunit-get-test (intern ms1) -;; (intern ms2)) \ No newline at end of file +;; (intern ms2)) + +(defun my-trace (n) + (backtrace-frame n)) + +(defun my-trr (n) + (my-trace n)) + +(my-trr 6) \ No newline at end of file .emacs.d/test/elunit-test.el @@ -8,10 +8,6 @@ <body> <outline text="General Tech Folks"> - <outline text="ongoing" - description="Ongoing fragmented essay by Tim Bray." - htmlUrl="http://www.tbray.org/ongoing/" - xmlUrl="http://www.tbray.org/ongoing/ongoing.atom" /> <outline text="Mark Pilgrim" description="Dive into Mark" htmlUrl="http://diveintomark.org" .feeds.opml @@ -1,3 +1,3 @@ -export PATH=$PATH:/sbin:/usr/sbin:~/bin:/bin:/usr/bin:/usr/local/bin:/usr/local/sbin:/home/phil/bin/jruby-1.1.2/bin:/var/lib/gems/1.8/bin +export PATH=$PATH:/sbin:/usr/sbin:~/bin:/bin:/usr/bin:/usr/local/bin:/usr/local/sbin:/home/phil/bin/jruby-1.1.2/bin:/var/lib/gems/1.8/bin:/home/phil/.gem/ruby/1.8/bin export EDITOR="emacsclient" export JRUBY_HOME=/home/phil/bin/jruby-1.1.2 \ No newline at end of file .profile @@ -30,15 +30,15 @@ ;; (set-numlock! #f or #t) ;; (set-scrolllock! #f or #t) ;; (set-capslock! #f or #t) -;; +;; ;; Shell command key: ;; (xbindkey key "foo-bar-command [args]") ;; (xbindkey '(modifier* key) "foo-bar-command [args]") -;; +;; ;; Scheme function key: ;; (xbindkey-function key function-name-or-lambda-function) ;; (xbindkey-function '(modifier* key) function-name-or-lambda-function) -;; +;; ;; Other functions: ;; (remove-xbindkey key) ;; (run-command "foo-bar-command [args]") @@ -62,6 +62,7 @@ (xbindkey '(mod4 e) "emacs") (xbindkey '(mod4 f) "firefox") +(xbindkey '(mod4 s) "f-spot") (xbindkey '(mod4 c) "~/src/conkeror/conkeror -E 'default_pref(\"conkeror.rcfile\",\"/home/phil/.conkeror.d\")'") (xbindkey '(mod4 d) "ruby ~/bin/dlaunch.rb") (xbindkey '(mod4 x) "xournal") .xbindkeysrc.scm 2f212da8ef53e9a5b5b598338e333f17f4dff293 Phil Hagelberg technomancy@gmail.com http://github.com/technomancy/dotfiles/commit/d8cfb99008438deef04d30b97b3f73d91954dfb9 d8cfb99008438deef04d30b97b3f73d91954dfb9 2008-07-16T13:40:34-07:00 2008-07-16T13:40:34-07:00 mostly just whitespace cleanups 50d110a2b44c37b0ea7d1560f6737ca803439e30 Phil Hagelberg technomancy@gmail.com