Minor changes

.gitignore

@@ -1,29 +1,29 @@
-/devel/
-/elpa/
 *.elc
 *~
-autoloads.el
-cus-dirs.el
+/auto-save-list/
+/devel/
+/elpa/
+/image-dired/
+/network-security.data
+/projectile-bookmarks.eld
+/projectile.cache
 archive/
+autoloads.el
 backups/
+broken.el
 compile.log
+cus-dirs.el
 data-alt/
 data-dev/
 data/
 ede-projects.el
 emms/
 eshell/
 info/
+logs/
 mirror
 override/cc-mode/
 site-lisp/.loaddefs.el
 site-lisp/.status.el
 srecode-map.el
 var/
-broken.el
-logs/
-/projectile.cache
-/auto-save-list/
-/image-dired/
-/projectile-bookmarks.eld
-/network-security.data

init.el

@@ -3993,7 +3993,7 @@ Inspired by Erik Naggum's `recursive-edit-with-single-window'."
 
   :config
   (yas-load-directory "~/.emacs.d/snippets/")
-  (yas-global-mode -1)
+  (yas-global-mode 1)
 
   (bind-key "C-i" #'yas-next-field-or-maybe-expand yas-keymap))
 

lisp/inventory.el

@@ -29,6 +29,21 @@ tradeoff."
   (mapcar #'cdr (sort (mapcar #'(lambda (x) (cons (funcall accessor x) x)) seq)
                       #'(lambda (x y) (funcall predicate (car x) (car y))))))
 
+(defun sort-on* (seq predicate accessor)
+  "Sort SEQ using PREDICATE applied to values returned by ACCESSOR.
+This is a destructive version of `sort-on', which attempts to
+reuse storage as much as possible."
+  (let ((seq2 seq))
+    (while seq2
+      (setcar seq2 (cons (funcall accessor (car seq2)) (car seq2)))
+      (setq seq2 (cdr seq2))))
+  (setq seq (sort* seq #'(lambda (x y) (funcall predicate (car x) (car y)))))
+  (let ((seq2 seq))
+    (while seq2
+      (setcar seq2 (cdar seq2))
+      (setq seq2 (cdr seq2)))
+    seq))
+
 (defun package-inventory (&optional conversions builtin ignored)
   (interactive)
   (let ((pkgs (make-hash-table :test #'equal))

settings.el

@@ -814,6 +814,7 @@
  '(ns-command-modifier (quote meta))
  '(ns-right-alternate-modifier (quote super))
  '(ns-right-control-modifier (quote hyper))
+ '(nsm-settings-file "/Users/johnw/.emacs.d/data/network-security.data")
  '(nxml-sexp-element-flag t)
  '(nxml-slash-auto-complete-flag t)
  '(pabbrev-idle-timer-verbose nil)