@@ -288,19 +288,10 @@ interested in the actual code implementing the starter kit.
288
288
("melpa" . "http://melpa.milkbox.net/packages/")))
289
289
(package-initialize)
290
290
291
- (defvar starter-kit-packages
292
- (list 'yasnippet)
293
- "Libraries that should be installed by default.")
291
+ (defvar starter-kit-packages nil
292
+ "Libraries that should be installed by default (currently none).")
294
293
295
- ;; If `yasnippet-bundle' has previously been installed through ELPA,
296
- ;; delete it before installing the new `yasnippet'
297
- (let ((yas-bundle-desc (assq 'yasnippet-bundle package-alist)))
298
- (when yas-bundle-desc
299
- (package-delete "yasnippet-bundle"
300
- (package-version-join
301
- (package-desc-vers (cdr yas-bundle-desc))))))
302
-
303
- (unless package-archive-contents
294
+ (unless (or (null starter-kit-packages) package-archive-contents)
304
295
(package-refresh-contents))
305
296
(dolist (package starter-kit-packages)
306
297
(unless (or (starter-kit-loadable-p package) (package-installed-p package))
@@ -397,42 +388,6 @@ everyone using the starter kit.
397
388
(starter-kit-load "starter-kit-registers.org")
398
389
#+end_src
399
390
400
- - [[http://code.google.com/p/yasnippet/][yasnippet]] is yet another snippet expansion system for Emacs. It is
401
- inspired by TextMate's templating syntax.
402
- - watch the [[http://www.youtube.com/watch?v=vOj7btx3ATg][video on YouTube]]
403
- - see the [[http://yasnippet.googlecode.com/svn/trunk/doc/index.html][intro and tutorial]]
404
-
405
- load the yasnippet bundle
406
- #+begin_src emacs-lisp
407
- (add-to-list 'load-path
408
- (expand-file-name "yasnippet"
409
- (expand-file-name "src"
410
- starter-kit-dir)))
411
- (require 'yasnippet)
412
- (yas-global-mode 1)
413
- #+end_src
414
-
415
- load the snippets defined in the =./snippets/= directory
416
- #+begin_src emacs-lisp
417
- (yas/load-directory (expand-file-name "snippets" starter-kit-dir))
418
- #+end_src
419
-
420
- The latest version of yasnippets doesn't play well with Org-mode, the
421
- following function allows these two to play nicely together.
422
- #+begin_src emacs-lisp
423
- (defun yas/org-very-safe-expand ()
424
- (let ((yas/fallback-behavior 'return-nil)) (yas/expand)))
425
-
426
- (defun yas/org-setup ()
427
- ;; yasnippet (using the new org-cycle hooks)
428
- (make-variable-buffer-local 'yas/trigger-key)
429
- (setq yas/trigger-key [tab])
430
- (add-to-list 'org-tab-first-hook 'yas/org-very-safe-expand)
431
- (define-key yas/keymap [tab] 'yas/next-field))
432
-
433
- (add-hook 'org-mode-hook #'yas/org-setup)
434
- #+end_src
435
-
436
391
** Load User/System Specific Files
437
392
*** System/User specific customizations
438
393
You can keep system- or user-specific customizations here in either
0 commit comments