Merge pull request mono#858 from rneatherway/emacs-1.5.0

Bump version numbers for emacs 1.5.0
alimbada · Nov 26, 2014 · 27f670c · 27f670c
2 parents cc1389b + 3841144
commit 27f670c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/FSharp.AutoComplete/Options.fs b/FSharp.AutoComplete/Options.fs
@@ -6,7 +6,7 @@ namespace FSharp.InteractiveAutocomplete
 open System
 
 module Version =
-  let string = "FSharp.AutoComplete 0.13.2"
+  let string = "FSharp.AutoComplete 0.13.3"
 
 module Options =
 

diff --git a/emacs/CHANGELOG.md b/emacs/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 1.5.0 (2014-11-25)
+
+Incorporate FSharp.AutoComplete version 0.13.3, which has corrected help text for the parse command and uses FCS 0.0.79.
+
+Features:
+  - #235: Support multiple projects simultaneously
+
+Bugfixes:
+  - #824: Emacs should give a better error message if fsautocomplete not found
+  - #808: C-c C-p gives an error if no project file above current file's directory
+  - #790: Can't make fsac requests in indirect buffers
+  - #754: Compiler warnings when installing fsharp-mode from MELPA
+
 ## 1.4.2 (2014-10-30)
 
 Incorporate FSharp.AutoComplete version 0.13.2, which returns more information if the project parsing fails.

diff --git a/emacs/fsharp-mode-pkg.el b/emacs/fsharp-mode-pkg.el
@@ -1,6 +1,6 @@
 (define-package
   "fsharp-mode"
-  "1.4.2"
+  "1.5.0"
   "F# mode for Emacs"
   '((auto-complete "1.4")
     (popup      "0.5")

diff --git a/emacs/fsharp-mode.el b/emacs/fsharp-mode.el
@@ -7,7 +7,7 @@
 ;;         2012-2014 Robin Neatherway <robin.neatherway@gmail.com>
 ;; Maintainer: Robin Neatherway
 ;; Keywords: languages
-;; Version: 1.4.2
+;; Version: 1.5.0
 
 ;; This file is not part of GNU Emacs.