Merge branch 'master' of https://github.com/bbatsov/prelude

* 'master' of https://github.com/bbatsov/prelude:
  Reflect flx upstream variable name fix.
  autosave undo history
  Auto install protobuf-mode

README.md

@@ -637,11 +637,11 @@ Prelude swaps the default `ido` flex matching with the more powerful
 
 The sorting algorithm `flx` uses is more complex, but yields better results.
 
-On slower machines, it may be necessary to lower `flx-ido-threshhold` to
+On slower machines, it may be necessary to lower `flx-ido-threshold` to
 ensure a smooth experience.
 
 ```lisp
-(setq flx-ido-threshhold 1000)
+(setq flx-ido-threshold 1000)
 ```
 
 You can always disable the improved sorting algorithm all together like this:

core/prelude-editor.el

@@ -57,6 +57,11 @@
 (setq auto-save-file-name-transforms
       `((".*" ,temporary-file-directory t)))
 
+;; autosave the undo-tree history
+(setq undo-tree-history-directory-alist
+      `((".*" . ,temporary-file-directory)))
+(setq undo-tree-auto-save-history t)
+
 ;; revert buffers automatically when underlying files are changed externally
 (global-auto-revert-mode t)
 

core/prelude-packages.el

@@ -151,6 +151,7 @@ PACKAGE is installed only if not already present.  The file is opened in MODE."
     ("\\.ml\\'" tuareg tuareg-mode)
     ("\\.pp\\'" puppet-mode puppet-mode)
     ("\\.php\\'" php-mode php-mode)
+    ("\\.proto\\'" protobuf-mode protobuf-mode)
     ("PKGBUILD\\'" pkgbuild-mode pkgbuild-mode)
     ("\\.rs\\'" rust-mode rust-mode)
     ("\\.sass\\'" sass-mode sass-mode)