Auto commit by The Sugar System.

diff --git a/GNUmakefile b/GNUmakefile
index 8d1bdb76085ae881990efa421094823b25320f41..1d927bfb50eefaf8792a3452f8be0796f45380d6 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -3,14 +3,17 @@ help:
        @echo "  .:. Sugar - The Dot-Files Manager .:."
        @echo
        @echo "Usage:"
-       @echo "  make lint    - lint The Sugar System"
-       @echo "  make update  - update repository with the current dot files"
-       @echo "  make commit  - commit changes to the repository"
-       @echo "  make install - update the current dot files with the repository"
+       @echo "  make lint    - lint The Sugar System."
+       @echo "  make update  - update repository with the current dot files."
+       @echo "  make commit  - commit changes to the repository."
+       @echo "  make install - update the current dot files with the repository."
        @echo "  make import FILES=<FILES>"
-       @echo "               - import the dot files into the repository"
+       @echo "               - import the dot files into the repository."
+       @echo "  make import-all"
+       @echo "               - import every uncontrolled dot files, which aren't"
+       @echo "                 ignored, into the repository."
        @echo "  make diff FILE=<FILE>"
-       @echo "               - show diff of the dot file"
+       @echo "               - show diff of the dot file."
        @echo
 
 lint:
@@ -41,10 +44,17 @@ import:
        @exit 1
 else
 import:
-       perl ./tools/import.pl $(FILES)
+       (for i in $(FILES); do echo $i; done) | perl ./tools/import.pl
        -git status
 endif
 
+import-all:
+       perl ./tools/list-files.pl | \
+               perl ./tools/find-missing.pl | \
+               cut -b 3- | \
+               perl ./tools/import.pl
+       -git status
+
 ifeq ($(FILE),)
 diff:
        @echo "Specify one file."

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 352263c6cc08c1c22d7c570498da712a9af84ede..75b0e620679143115c956db1b4696976d032076e 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -88,6 +88,9 @@
 ;; flyspell
 (require-if-present 'flyspell)
 
+;; jaspace
+(require-if-present 'jaspace)
+
 ;; mic-paren
 (require-if-present 'mic-paren)
 (if (featurep 'mic-paren)
@@ -100,6 +103,13 @@
 ;; MPC
 ;(require-if-present 'mpc-autoloads)
 
+;; rst-mode
+(autoload 'rst-mode "rst"
+  "mode for editing reStructuredText documents" t)
+(setq auto-mode-alist
+      (append '(("\\.rst$" . rst-mode)
+                ("\\.rest$" . rst-mode)) auto-mode-alist))
+
 ;; twittering-mode
 (require-if-present 'twittering-mode)
 (setq twittering-username "phonohawk")
@@ -367,6 +377,7 @@
  '(jabber-resource "emacs")
  '(jabber-server "jabber.jp")
  '(jabber-username "phonohawk")
+ '(jaspace-highlight-tabs t)
  '(js2-basic-offset 4)
  '(js2-indent-on-enter-key t)
  '(js2-use-font-lock-faces t)
@@ -412,4 +423,5 @@
   ;; Your init file should contain only one such instance.
   ;; If there is more than one, they won't work right.
  '(flyspell-incorrect ((t (:foreground "OrangeRed" :overline t))))
+ '(jaspace-highlight-tab-face ((((class color) (background dark)) (:foreground "gray70" :underline t))))
  '(which-func-face ((t (:background "black" :foreground "dark orange")))))

diff --git a/tools/import.pl b/tools/import.pl
index c1bacaebf7824b323969ead4177ba7a715bbe528..5a1e0dcaf6ac35d4ec02001c04aee410112dd120 100644 (file)
--- a/tools/import.pl
+++ b/tools/import.pl
@@ -8,9 +8,9 @@ use File::Copy;
 use File::Path;
 
 sub main {
-    my @args = @_;
+    while (defined(my $arg = <>)) {
+        chomp $arg;
 
-    foreach my $arg (@args) {
         my $rel   = File::Spec->abs2rel($arg, $ENV{HOME});
         my $abs   = File::Spec->rel2abs($rel, $ENV{HOME});
         my $saved = rel2saved($rel);
@@ -23,4 +23,4 @@ sub main {
     }
 }
 
-main(@ARGV);
+main();