Auto commit by The Sugar System.

diff --git a/IGNORE b/IGNORE
index 7b73c30e9e48dfdcdca762a9530205accd15ac3a..84ac2d2a951b0b075e317a02fa331a63df29f856 100644 (file)
--- a/IGNORE
+++ b/IGNORE
@@ -29,6 +29,7 @@
 .cups/lpoptions
 .cvspass
 .dbus*
+.designer
 .dillo/cookiesrc
 .dmrc
 .dropbox
@@ -60,6 +61,7 @@
 .gitk
 .glimpse*
 .gmpc
+.gnome-commander
 .gnome2*
 .gnucash
 .gnupg
@@ -114,7 +116,9 @@
 .snes*
 .ssh
 .subversion
+.synfig
 .texmf-var
+.themes/*.qtcurve
 .thumbnails
 .thunderbird
 .tome

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index a1d8165e57725e84d2249f5d4d71a4aa870eef52..a488ab28b332a23c62cc295c52a3ffa513987230 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -344,6 +344,7 @@
 
 ;; SKK
 (require 'skk-autoloads)
+(require 'skk-study)
 (global-set-key "\C-x\C-j" 'skk-mode)
 (global-set-key "\C-xj" 'skk-auto-fill-mode)
 (global-set-key "\C-xt" 'skk-tutorial)

diff --git a/dot-files/_hgrc b/dot-files/_hgrc
index b4329b06b536e69fd35799698471e93f28a74d3f..3c7576bbeda719ae7b5fb067cd97b618e053bc0b 100644 (file)
--- a/dot-files/_hgrc
+++ b/dot-files/_hgrc
@@ -12,12 +12,13 @@ git = True
 
 [extensions]
 hgext.color=
-hgext.mq=
 hgext.fetch=
-hgext.hgshelve=
 hgext.graphlog=
-hgext.record=
+hgext.hgshelve=
+hgext.mq=
 hgext.pager=
+hgext.record=
+hgext.transplant=
 
 [pager]
 attend = annotate, cat, diff, export, glog, qdiff