Permalink
Browse files

Some minor fixups

  • Loading branch information...
1 parent 6a8ed3e commit 48523e1aaa42c994a3a98ab26d05ea2ce0fcc70f @rneatherway rneatherway committed Mar 23, 2013
Showing with 11 additions and 10 deletions.
  1. +1 −1 emacs/Makefile
  2. +5 −5 emacs/fsharp-mode-completion.el
  3. +5 −4 emacs/fsharp-mode.el
View
@@ -45,7 +45,7 @@ install : $(ac_exe) $(dest_root) $(dest_bin)
cp $$f $(dest_root) ;\
done
# Copy bin folder.
- cp -R $(bin_d) $(dest_root)
+ cp -R $(bin_d) $(dest_root)/bin
$(dest_root) :; mkdir -p $(dest_root)
@@ -46,7 +46,7 @@
"Display tooltips using a popup at point. If set to nil,
display in a help buffer instead.")
-(defvar fsharp-ac-autocompletion-automatically t
+(defvar fsharp-ac-intellisense-enabled t
"Whether autocompletion is automatically triggered on '.'")
(defface fsharp-error-face
@@ -143,7 +143,7 @@ display in a help buffer instead.")
(defun fsharp-ac--valid-project-p (file)
(and file
(file-exists-p file)
- (string-match-p (rx "." (or "fsproj" "sln") eol) file)))
+ (string-match-p (rx "." "fsproj" eol) file)))
(defun fsharp-ac--script-file-p (file)
(and file
@@ -281,7 +281,7 @@ display in a help buffer instead.")
(when (fsharp-ac-can-make-request)
(fsharp-ac-parse-current-buffer)
(fsharp-ac-send-pos-request "tooltip"
- (buffer-file-name)
+ (expand-file-name (buffer-file-name))
(- (line-number-at-pos) 1)
(current-column))))
@@ -291,7 +291,7 @@ display in a help buffer instead.")
(when (fsharp-ac-can-make-request)
(fsharp-ac-parse-current-buffer)
(fsharp-ac-send-pos-request "finddecl"
- (buffer-file-name)
+ (expand-file-name (buffer-file-name))
(- (line-number-at-pos) 1)
(current-column))))
@@ -311,7 +311,7 @@ display in a help buffer instead.")
(interactive)
(if (and (fsharp-ac-can-make-request)
(eq fsharp-ac-status 'idle)
- fsharp-ac-autocompletion-automatically)
+ fsharp-ac-intellisense-enabled)
(fsharp-ac--ac-start)
(setq fsharp-ac-status 'preempted)))
@@ -232,8 +232,6 @@ and whether it is in a project directory.")
fsharp-last-comment-start (make-marker)
fsharp-last-comment-end (make-marker)
- ac-use-comphist nil
- ;ac-auto-show-menu t
)
;; Error navigation
@@ -260,9 +258,12 @@ and whether it is in a project directory.")
"Attempt to load FILE using the F# compiler binding.
If FILE is part of an F# project, load the project.
Otherwise, treat as a stand-alone file."
- (or (fsharp-ac/load-project (fsharp-mode/find-fsproj file))
+ (or (when (not (fsharp-ac--process-live-p))
+ fsharp-ac/load-project (fsharp-mode/find-fsproj file))
(fsharp-ac/load-file file))
- (auto-complete-mode 1))
+ (auto-complete-mode 1)
+ (setq ac-auto-start nil
+ ac-use-comphist nil))
(defun fsharp-mode-choose-compile-command (file)
"Format an appropriate compilation command, depending on several factors:

0 comments on commit 48523e1

Please sign in to comment.