@@ -41,16 +41,14 @@ ;; backport some functionality to Emacs 22 if needed (require 'dominating-file) -;; this must be loaded before ELPA since it bundles its own -;; out-of-date js stuff. TODO: fix it to use ELPA dependencies -(load "elpa-to-submit/nxhtml/autostart") - ;; Load up ELPA, the package manager (require 'package) (package-initialize) (require 'starter-kit-elpa) +(load "elpa-to-submit/nxhtml/autostart") + ;; Load up starter kit customizations (require 'starter-kit-defuns) init.el @@ -7,8 +7,8 @@ 'inf-ruby 'js2-mode 'css-mode - ;; 'nxml 'gist + 'nxml-mode 'paredit) "Libraries that should be installed by default.") @@ -38,10 +38,7 @@ just have to assume it's online." ;; On your first run, this should pull in all the base packages. (when (esk-online?) (unless package-archive-contents (package-refresh-contents)) - (starter-kit-elpa-install) - (unless (or (member 'nxml package-activated-list) - (member 'nxml-mode package-activated-list)) - (package-install 'nxml))) + (starter-kit-elpa-install)) ;; Workaround for an ELPA bug that people are reporting but I've been ;; unable to reproduce: starter-kit-elpa.el 5d72d8e65537c702cbdf9f9c5279af12f4a24ad8 Phil Hagelberg technomancy@gmail.com http://github.com/mguterl/emacs-starter-kit/commit/f776b46d24450f0496bb00d84cfba8d1d6470732 f776b46d24450f0496bb00d84cfba8d1d6470732 2009-09-07T15:36:13-07:00 2009-09-07T15:36:13-07:00 Install nxml-mode if it's needed. TODO: elpa bug causes problems if Emacs22 version of nxml-mode is installed when you launch Emacs23. 879b5c043eb03b5e8cfe3addcb977ec4e8b6cd3b Phil Hagelberg technomancy@gmail.com