Merge ssh://nem.cielonegro.org/home/www/git.cielonegro.org/htdocs/sugar

diff --git a/IGNORE b/IGNORE
index d6ab803721682c05743618f9a945c1dd75776b19..f07d285ced2de973ed5db22ecb237cc0cef921f6 100644 (file)
--- a/IGNORE
+++ b/IGNORE
@@ -28,7 +28,7 @@
 .cpanplus
 .cups/lpoptions
 .cvspass
-.dbus
+.dbus*
 .dillo/cookiesrc
 .dmrc
 .dropbox

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index e840b5466ea019d5a8727a5e440f4513fd574e3f..08bda2a45dd96e539e1d21f7a415efadb31be527 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -46,7 +46,6 @@
                         '("rd8" nil "/sshx:pho@yebisu1.ymir.jp:"))
            (add-to-list 'tramp-default-proxies-alist
                         '("yebisu1\\.ymir\\.jp" nil "/sshx:pho@boss:"))))))
-                        
 
 ;; Settings for Browser --------------------------------------------------------
 (setq browse-url-browser-function 'w3m-browse-url)
@@ -481,6 +480,7 @@
  '(tramp-auto-save-directory "/tmp/tramp-auto-save")
  '(tramp-completion-reread-directory-timeout 2)
  '(tramp-default-host "localhost")
+ '(tramp-default-method "sshx")
  '(w3m-bookmark-file-coding-system (quote utf-8))
  '(w3m-coding-system (quote utf-8))
  '(w3m-coding-system-priority-list (quote (utf-8)))