0
@@ -1,9 +1,14 @@
0
-personal_ws-1.1 en 8 
0
+personal_ws-1.1 en 13 
0
 http
0
 Evrinid
0
 rdoc
0
+Peepcode
0
+dotfiles
0
+Dotfiles
0
 rubygems
0
 JRuby
0
+init
0
+precompiled
0
 rubyist
0
 Hagelberg
0
 triaged

0
@@ -24,12 +24,22 @@ add_delicious_webjumps ("technomancy");
0
 
0
 url_remoting_fn = load_url_in_new_buffer;
0
 url_completion_use_history = true;
0
+url_completion_use_bookmarks = false;
0
 can_kill_last_buffer = false;
0
 
0
 register_user_stylesheet(
0
     "data:text/css,"+
0
         escape("#minibuffer, tree.completions, .mode-line { font-family: Inconsolata; font-size: 12pt; }"));
0
 
0
+interactive("toggle-stylesheets",
0
+            "Toggle whether conkeror uses style sheets (CSS) for the " +
0
+            "current buffer.  It is sometimes useful to turn off style " +
0
+            "sheets when the web site makes obnoxious choices.",
0
+            function(I) {
0
+  var s = I.buffer.document.styleSheets;
0
+  for (var i = 0; i < s.length; i++)
0
+    s[i].disabled = !s[i].disabled;
0
+});
0
 
0
 function killstyle () {
0
   var ss =

0
@@ -122,9 +122,6 @@
0
 
0
 (setq system-specific-config (concat "~/.emacs.d/" system-name ".el"))
0
 
0
-;; Having some trouble with nxml-mode in current Emacs CVS
0
-(add-to-list 'auto-mode-alist '("\\.xml$" . xml-mode))
0
-
0
 (if (file-exists-p system-specific-config)
0
     (load system-specific-config))
0
 

0
@@ -21,9 +21,6 @@
0
 
0
 ;;; Navigation
0
 
0
-(global-set-key "\M-g" 'goto-line)
0
-(global-set-key "\C-x\C-r" 'jump-to-register)
0
-
0
 (global-set-key "\C-s" 'isearch-forward-regexp)
0
 (global-set-key "\C-r" 'isearch-backward-regexp)
0
 (global-set-key "\C-\M-s" 'isearch-forward)
0
@@ -73,7 +70,7 @@
0
 
0
 (global-set-key (kbd "C-x w") 'w3m)
0
 (global-set-key (kbd "C-x h") 'view-url)
0
-(global-set-key (kbd "C-c S-T") 'twittering-update-status-interactive)
0
+(global-set-key (kbd "C-c M-t") 'twittering-update-status-interactive)
0
 (global-set-key (kbd "C-c o") 'google-region)
0
 
0
 ;;; Utility

0
@@ -20,7 +20,7 @@
0
                                nil)))))
0
 
0
 (font-lock-add-keywords
0
- 'ruby-mode
0
+ 'javascript-mode
0
  '(("\\<\\(FIX\\|TODO\\|FIXME\\|HACK\\|REFACTOR\\):"
0
     1 font-lock-warning-face t)))
0
 

0
@@ -60,6 +60,7 @@
0
 (put 'narrow-to-region 'disabled nil)
0
 (put 'downcase-region 'disabled nil)
0
 (set-default 'indent-tabs-mode nil)
0
+(set-default 'indicate-empty-lines t)
0
 (defalias 'yes-or-no-p 'y-or-n-p)
0
 (defalias 'qrr 'query-replace-regexp)
0
 (random t)
0
@@ -108,6 +109,9 @@
0
 (add-to-list 'auto-mode-alist '("\\.html$" . nxhtml-mode))
0
 (add-to-list 'auto-mode-alist '("\\.rhtml$" . nxhtml-mode))
0
 
0
+;; Having some trouble with nxml-mode in current Emacs CVS
0
+(add-to-list 'auto-mode-alist '("\\.xml$" . xml-mode))
0
+
0
 ;; w3m
0
 (setq w3m-use-cookies t
0
       w3m-default-save-directory "~/"

0
@@ -11,11 +11,12 @@
0
 ;;     registers (C-x C-r)
0
 
0
 (mapc (lambda (args) (apply #'set-register args))
0
-      '((?e (file . "~/.emacs.d/init.el"))
0
+      '((?i (file . "~/.emacs.d/init.el"))
0
   (?d (file . "~/.emacs.d"))
0
   (?g (file . "~/.gnus.el"))
0
         (?c (file . "~/.conkeror.js"))
0
   (?r (file . "~/.emacs.d/my-registers.el"))
0
-	(?x (file . "~/.xbindkeys.scm"))))
0
+        (?b (file . "~/.emacs.d/my-bindings.el"))
0
+	(?x (file . "~/.xbindkeysrc.scm"))))
0
 
0
 (provide 'my-registers)
0
\ No newline at end of file

0
@@ -66,7 +66,9 @@
0
 (xbindkey '(mod4 s) "f-spot")
0
 (xbindkey '(mod4 c) "~/src/conkeror/conkeror")
0
 (xbindkey '(mod4 space) "ruby ~/bin/dlaunch.rb")
0
+(xbindkey '(mod4 p) "emacs -q -l ~/src/peepcode/dotfiles/init.el")
0
 (xbindkey '(mod4 x) "xournal")
0
+(xbindkey '(mod4 g) "gmpc")
0
 (xbindkey '(mod4 t) "fetchmail")
0
 (xbindkey '(mod4 grave) "gnome-terminal -e \"screen -xRR\"")
0