Skip to content

Commit 09fec6c

Browse files
Merge branch 'do-not-run-hooks-ourselves'
2 parents 6e3fd91 + 7623e1d commit 09fec6c

5 files changed

+7
-10
lines changed

eglot-fsharp.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; eglot-fsharp.el --- fsharp-mode eglot integration -*- lexical-binding: t; -*-
22

3-
;; Copyright (C) 2019-2022 Jürgen Hötzel
3+
;; Copyright (C) 2019-2023 Jürgen Hötzel
44

55
;; Author: Jürgen Hötzel <juergen@hoetzel.info>
66
;; Package-Requires: ((emacs "27.1") (eglot "1.4") (fsharp-mode "1.10") (jsonrpc "1.0.14"))

fsharp-mode.el

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
;; Author: 1993-1997 Xavier Leroy, Jacques Garrigue and Ian T Zimmerman
66
;; 2010-2011 Laurent Le Brun <laurent@le-brun.eu>
77
;; 2012-2014 Robin Neatherway <robin.neatherway@gmail.com>
8-
;; 2017-2022 Jürgen Hötzel
8+
;; 2017-2023 Jürgen Hötzel
99
;; Maintainer: Jürgen Hötzel
1010
;; Package-Requires: ((emacs "25"))
1111
;; Keywords: languages
@@ -239,11 +239,8 @@ If set to t, the buffer will always be saved, silently."
239239
;; has no deterministic indentation.
240240
(when (boundp 'electric-indent-inhibit) (setq electric-indent-inhibit t))
241241

242-
(let ((file (buffer-file-name)))
243-
(when file
244-
(setq compile-command (fsharp-mode-choose-compile-command file))))
245-
246-
(run-hooks 'fsharp-mode-hook))
242+
(when-let ((file (buffer-file-name)))
243+
(setq compile-command (fsharp-mode-choose-compile-command file))))
247244

248245
(defun fsharp-mode-choose-compile-command (file)
249246
"Format an appropriate compilation command, depending on several factors:

test/eglot-fsharp-integration-util.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; eglot-fsharp-integration-util.el --- Helper for eglot integration tests -*- lexical-binding: t; -*-
22

3-
;; Copyright (C) 2022 Jürgen Hötzel
3+
;; Copyright (C) 2022-2023 Jürgen Hötzel
44

55
;; Author: Jürgen Hötzel <juergen@hoetzel.info>
66
;; Keywords: processes

test/fsi-tests.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; fsi-tests.el --- Tests for F# interactive -*- lexical-binding: t; -*-
22

3-
;; Copyright (C) 2022 Jürgen Hötzel
3+
;; Copyright (C) 2022-2023 Jürgen Hötzel
44

55
;; Author: Jürgen Hötzel <juergen@hoetzel.info>
66
;; Keywords: processes

test/integration-tests.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
;;; integration-tests.el --- -*- lexical-binding: t; -*-
22

3-
;; Copyright (C) 2019-2022 Jürgen Hötzel
3+
;; Copyright (C) 2019-2023 Jürgen Hötzel
44

55
;; Author: Jürgen Hötzel <juergen@hoetzel.info>
66
;; Keywords: abbrev, abbrev

0 commit comments

Comments
 (0)