From da1f5081156bc43369860958c59178169163daf8 Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Fri, 23 Mar 2012 18:19:31 +0900
Subject: [PATCH] misc changes

---
 conkyrc   | 3 ++-
 emacs.el  | 7 +++----
 xprograms | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/conkyrc b/conkyrc
index 15dc8c2..8765694 100644
--- a/conkyrc
+++ b/conkyrc
@@ -70,5 +70,6 @@ ${color #888888}${downspeedgraph ff0000 0000ff}
 ${color2}up   ${color1}|${color0} ${upspeed}/s
 ${color #888888}${upspeedgraph 0000ff ff0000}
 ${color0}${hr}
-${alignr}conky ${conky_version} on Page${desktop}
+${alignr}conky ${conky_version}
+# on Page${desktop}
 #${color0}${alignr}${execi 900 cal -1}
diff --git a/emacs.el b/emacs.el
index af9515e..7e6645e 100644
--- a/emacs.el
+++ b/emacs.el
@@ -116,10 +116,10 @@
 ;; display date
 (add-hook 'after-init-hook
           (lambda ()
-            ;; (setq display-time-string-forms
-            ;;       '(dayname ", " day " " monthname " " year " " 24-hours ":"minutes ":" seconds))
             (setq display-time-string-forms
-                  '((my-format-time-string)))
+                  '(dayname ", " day " " monthname " " year " " 24-hours ":"minutes ":" seconds))
+            ;; (setq display-time-string-forms
+            ;;       '((my-format-time-string)))
             (when display-time-mode
               (display-time-update))
             ))
@@ -534,7 +534,6 @@ return nil if LIB unfound and downloading failed, otherwise the path of LIB."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; share clipboard with x
 (when (and window-system
-           ;; (getenv "DESKTOP_SESSION")
            (not (eq window-system 'mac))
            )
   (setq x-select-enable-clipboard t     ; these settings seems to be useless when using emacs in terminal
diff --git a/xprograms b/xprograms
index 8dc6556..056d3bf 100755
--- a/xprograms
+++ b/xprograms
@@ -24,3 +24,4 @@ if ! pgrep -lf "udisks-daemon: polling /dev/sr0"; then
 fi
 udisksvm >/dev/null &
 
+xcompmgr -c &