From bf7f308caf984e3dca374d02ac35a2f866f40fea Mon Sep 17 00:00:00 2001 From: Chris Barrett Date: Sun, 31 Mar 2013 12:55:50 +1300 Subject: [PATCH] Fix errors in fsharp-ac--can-make-request. Ensure buffer-file-name is not nil before processing it. --- emacs/fsharp-mode-completion.el | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/emacs/fsharp-mode-completion.el b/emacs/fsharp-mode-completion.el index dc37a9de..87e39f75 100644 --- a/emacs/fsharp-mode-completion.el +++ b/emacs/fsharp-mode-completion.el @@ -282,13 +282,15 @@ display in a help buffer instead.") (when (eq ?\. c) (point))))) - (defun fsharp-ac-can-make-request () - (and (fsharp-ac--process-live-p) - (or - (member (expand-file-name (buffer-file-name)) fsharp-ac-project-files) - (string-match-p (rx (or "fsx" "fsscript")) - (file-name-extension (buffer-file-name)))))) + "Test whether it is possible to make a request with the compiler binding. +The current buffer must be an F# file that exists on disk." + (let ((file (buffer-file-name))) + (and file + (fsharp-ac--process-live-p) + (or (member (expand-file-name file) fsharp-ac-project-files) + (string-match-p (rx (or "fsx" "fsscript")) + (file-name-extension file)))))) (defvar fsharp-ac-awaiting-tooltip nil)