Fix JavaScript load bug, and bind Sinasi finders under ?\s-s

emk · Mar 9, 2010 · 6cc3e86 · 6cc3e86
1 parent a5a171b
commit 6cc3e86
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/3rd-party/javascript.el → 3rd-party/javascript-mode.el b/3rd-party/javascript.el → 3rd-party/javascript-mode.el
diff --git a/3rd-party/sinasi b/3rd-party/sinasi
diff --git a/dotemacs b/dotemacs
@@ -197,7 +197,7 @@
 (when-feature *select*
   (load "select")
   (global-set-key [?\s-`] 'next-error)
-  (global-set-key [?\s-s] (select:make-switch-command '("ss" "scm")))
+  ;;(global-set-key [?\s-s] (select:make-switch-command '("ss" "scm")))
   (global-set-key [?\s-t] (select:make-switch-command '("txt"))))
 
 (autoload 'halyard-mode
@@ -282,11 +282,13 @@
   )
 
 (when-feature *javascript*
-  (autoload 'javascript-mode "javascript" nil t)
+  (autoload 'javascript-mode "javascript-mode" nil t)
   (safe-add-to-alist auto-mode-alist
     ("\\.js\\'" . javascript-mode))
+
   (push-3rd-party-elisp-directory "sinasi")
-  (require 'sinasi))
+  (require 'sinasi)
+  (sinasi-bind-finders-with-prefix ?\s-s))
 
 (when-feature *planetary*
   (push "~/src/planetary/tools" load-path)