From: PHO <pho@cielonegro.org>
Date: Tue, 3 Feb 2009 05:42:22 +0000 (+0900)
Subject: Merge ssh://www@nem.cielonegro.org/home/www/git.cielonegro.org/htdocs/sugar
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=sugar.git;a=commitdiff_plain;h=ec27386ff93bb2fc2b29bc62ca5e2244af8ae983;hp=-c

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

ec27386ff93bb2fc2b29bc62ca5e2244af8ae983
diff --combined dot-files/_emacs_el
index e9feb7f,5b5e2e2..a836dec
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@@ -81,7 -81,8 +81,8 @@@
  
  ;; mic-paren
  (require-if-present 'mic-paren)
- (paren-activate)
+ (if (featurep 'mic-paren)
+ 	(paren-activate))
  
  ;; elscreen
  (load "elscreen" "ElScreen" t)
@@@ -98,9 -99,6 +99,9 @@@
  (let* ((hosts '(("netbsd." .
                   (("~/sandbox/yxmimeproc" "yxmimeproc")
                    ))
 +                ("g1.cuenote.jp" .
 +                 (("~/sandbox/MR/engine/libycom" "libycom")
 +                  ))
                  ("aria.cielonegro.org" .
                   (("~/sandbox/_web-app/Rakka"           "Rakka")
                    ("~/sandbox/_haskell/Lucu"            "Lucu")
@@@ -149,7 -147,7 +150,7 @@@
  (setq sokoban-playerfiles-dir "/usr/local/var/games/emacs-sokoban")
  
  ;; nXML
- (load "/usr/pkg/share/emacs/site-lisp/nxml-mode/rng-auto.el")
+ (load-file-if-present "/usr/pkg/share/emacs/site-lisp/nxml-mode/rng-auto.el")
  (defalias 'xml-mode 'nxml-mode)
  (add-to-list 'auto-mode-alist '("\\.xml$" . nxml-mode))
  (add-to-list 'auto-mode-alist '("\\.xi$" . nxml-mode))