Commit 211a23d3eeb2

@@ -1033,23 +1033,23 @@
          :group 'org-faces)
 
        (setq org-todo-keywords
-             (quote ((sequence "TODO(t)" "PROGRESS(p)" "BLOCKED" "REVIEW" "|" "DONE(d)" "ARCHIVED")
-                     (sequence "REPORT" "BUG" "KNOWNCAUSE" "|" "FIXED")
-                     (sequence "|" "CANCELLED"))))
+             (quote ((sequence "TODO(t!)" "PROGRESS(p!)" "BLOCKED" "REVIEW" "|" "DONE(d!)" "ARCHIVED")
+                     (sequence "REPORT(r!)" "BUG" "KNOWNCAUSE" "|" "FIXED(f!)")
+                     (sequence "|" "CANCELLED(c@)"))))
 
 
        (setq org-todo-keyword-faces
-             (quote (("TODO(t!)" . org-todo)
+             (quote (("TODO" . org-todo)
                      ("PROGRESS" . org-progress)
                      ("BLOCKED" . org-blocked)
                      ("REVIEW" . org-review)
-                     ("DONE(d!)" . org-done)
+                     ("DONE" . org-done)
                      ("ARCHIVED" . org-done)
-                     ("CANCELLED(c!)" . org-cancelled)
-                     ("REPORT(r!)" . org-todo)
+                     ("CANCELLED" . org-cancelled)
+                     ("REPORT" . org-todo)
                      ("BUG" . org-blocked)
                      ("KNOWNCAUSE" . org-review)
-                     ("FIXED(f!)" . org-done))))
+                     ("FIXED" . org-done))))
 
        (setq org-todo-state-tags-triggers
              (quote (("CANCELLED" ("CANCELLED" . t)))))

@@ -1,38 +0,0 @@
-;; -*- emacs-lisp -*- <14/03/03 11:57:55 /home/vincent/.emacs.d/tramp>
-;; Tramp connection history.  Don't change this file.
-;; You can delete it, forcing Tramp to reapply the checks.
-
-((["scpc" nil "sif" nil nil]
-  ("uname" "Linux 3.2.0-4-amd64")
-  ("test" "test")
-  ("remote-path"
-   ("/bin" "/usr/bin" "/sbin" "/usr/sbin" "/usr/local/bin" "/usr/local/sbin"))
-  ("remote-shell" "/bin/sh")
-  ("busybox" nil)
-  ("perl-file-spec" t)
-  ("perl-cwd-realpath" t)
-  ("perl" "\\perl")
-  ("~" "/home/vincent")
-  ("readlink" "\\readlink")
-  ("stat" "\\stat")
-  ("file-exists" "test -e")
-  ("id" "/usr/bin/id")
-  ("gid-integer" 1000))
- (["scpc" "vincent" "sif" nil nil]
-  ("uname" "Linux 3.2.0-4-amd64")
-  ("test" "test")
-  ("remote-path"
-   ("/bin" "/usr/bin" "/sbin" "/usr/sbin" "/usr/local/bin" "/usr/local/sbin"))
-  ("remote-shell" "/bin/sh")
-  ("busybox" nil)
-  ("~" "/home/vincent")
-  ("file-exists" "test -e")
-  ("stat" "\\stat")
-  ("ls" "/bin/ls --color=never")
-  ("id" "/usr/bin/id")
-  ("uid-integer" 1000)
-  ("gid-integer" 1000)
-  ("readlink" "\\readlink")
-  ("perl-file-spec" t)
-  ("perl-cwd-realpath" t)
-  ("perl" "\\perl")))