minor updates

diff --git a/emacs-custom.el b/emacs-custom.el
index f69a122..b4b4465 100644 (file)
--- a/emacs-custom.el
+++ b/emacs-custom.el
@@ -51,7 +51,6 @@
  '(global-subword-mode t)
  '(global-visual-line-mode nil)
  '(global-whitespace-mode t)
- '(highlight-changes-colors nil)
  '(highlight-changes-face-list nil)
  '(highlight-changes-global-changes-existing-buffers t)
  '(hippie-expand-dabbrev-as-symbol nil)
@@ -83,7 +82,8 @@
  '(rtags-use-helm nil t)
  '(safe-local-variable-values
    (quote
-    ((elisp-project-autoload-file-name . "cc-autoload.el")
+    ((elisp-project-autoload-file-name . "sqi-autoload.el")
+     (elisp-project-autoload-file-name . "cc-autoload.el")
      (ccide-auto-format-tag . "auto-uncrustify")
      (ccide-uncrustify-config . "~/src/search.uncrustify")
      (ccide-auto-format-tag "auto-uncrustify")
@@ -118,16 +118,8 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(default ((t (:inherit nil :stipple nil :background "#ffffff" :foreground "black" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 97 :width semi-condensed :foundry "misc" :family "6x13"))))
- '(ediff-even-diff-B ((t (:background "yellow"))))
- '(ediff-odd-diff-A ((t (:background "yellow"))))
- '(font-lock-keyword-face ((((class color) (min-colors 8)) (:foreground "Purple"))))
- '(highlight-changes ((t (:background "alice blue"))))
- '(highlight-changes-delete ((t (:background "bisque1"))))
- '(mode-line ((t (:background "gray" :foreground "black"))))
  '(textile-acronym-face ((t (:foreground "medium blue"))))
  '(textile-blockquote-face ((t (:foreground "midnight blue"))))
  '(textile-code-face ((t (:foreground "firebrick4"))))
- '(textile-pre-face ((t (:foreground "dark green"))))
- '(whitespace-line ((t (:background "yellow")))))
+ '(textile-pre-face ((t (:foreground "dark green")))))
 (put 'narrow-to-region 'disabled nil)

diff --git a/emacsstuff b/emacsstuff
index 06ce5c0..d146a44 160000 (submodule)
--- a/emacsstuff
+++ b/emacsstuff
@@ -1 +1 @@
-Subproject commit 06ce5c0ab6894684158e4523aee1f8b6de3845dc
+Subproject commit d146a44807b8c2a2f60584346550a4d65c34475c