various updates.

git-svn-id: file:///svn/tfheen/trunk/dotfiles@121 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf

diff --git a/emacs b/emacs
index bb97884ba8d0925ddca3bbdd90e0839bf064e42f..7a771300e1bb09f36621c7e9fc9d3a14078896e8 100644 (file)
--- a/emacs
+++ b/emacs
@@ -50,6 +50,9 @@
         mc-passwd-timeout 600))
 
 (global-set-key "\M-n" 'browse-url-at-point)
+(global-set-key (kbd "C-x C-c")
+#'(lambda () (interactive)
+    (message "you must be kidding")))
 (global-set-key [(control backspace)] 'undo)
 (global-set-key [(control return)] 'find-tag)
 
@@ -165,14 +168,15 @@
 (set-face-foreground font-lock-string-face "Blue")
 
 (cw/requiring-package (tramp)
-                      (setq tramp-multi-file-name-structure (quote ("\\`/r:\\(\\([a-z0-9]+\\)\\)?\\(\\(%s\\)+\\):\\(.*\\)\\'" 2 3 -1))
-                            tramp-make-tramp-file-format "/r:%m/%u@%h:%p"
-                            tramp-file-name-regexp "\\`/r:"
-                            tramp-make-multi-tramp-file-format (quote ("/r:%m" "/%m:%u@%h" ":%p"))
-                            tramp-auto-save-directory "/home/tfheen/tmp"
-                            tramp-make-tramp-file-user-nil-format "/r:%m/%h:%p"
-                            tramp-default-method "rsync"
-                            tramp-file-name-structure '("\\`/r:\\(\\([a-zA-Z0-9]+\\)/\\)?\\(\\([-a-zA-Z0-9_#/:]+\\)@\\)?\\([-a-zA-Z0-9_#/:@.]+\\):\\(.*\\)\\'" 2 4 5 6)))
+  (setq tramp-auto-save-directory "/home/tfheen/tmp"
+        tramp-default-method "rsync"))
+                            
+;;         (setq tramp-multi-file-name-structure (quote ("\\`/r:\\(\\([a-z0-9]+\\)\\)?\\(\\(%s\\)+\\):\\(.*\\)\\'" 2 3 -1))
+;;                             tramp-make-tramp-file-format "/r:%m/%u@%h:%p"
+;;                             tramp-file-name-regexp "\\`/r:"
+;;                             tramp-make-multi-tramp-file-format (quote ("/r:%m" "/%m:%u@%h" ":%p"))
+;;                             tramp-make-tramp-file-user-nil-format "/r:%m/%h:%p"
+;;                             tramp-file-name-structure '("\\`/r:\\(\\([a-zA-Z0-9]+\\)/\\)?\\(\\([-a-zA-Z0-9_#/:]+\\)@\\)?\\([-a-zA-Z0-9_#/:@.]+\\):\\(.*\\)\\'" 2 4 5 6)))
 
 
 (cw/for-emacs-21