Skip to content

Commit 1f4f6b4

Browse files
authored
Merge pull request #150 from tpapp/tp/revamp-path-determination
Rewrite basedir path determination.
2 parents bb90cc1 + b49394c commit 1f4f6b4

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

.github/workflows/CI.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ jobs:
2828
- 28.1
2929
- 28.2
3030
- 29.1
31+
- 29.2
32+
- 29.3
33+
- 29.4
3134
ignore_warnings:
3235
- true
3336
include:

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The julia-repl library is licensed under the MIT License.
22

3-
> Copyright (c) 2016: Tamas K. Papp
3+
> Copyright (c) 2016–2024: Tamas K. Papp
44
>
55
> Permission is hereby granted, free of charge, to any person obtaining
66
> a copy of this software and associated documentation files (the

julia-repl.el

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
;;; julia-repl.el --- A minor mode for a Julia REPL -*- lexical-binding:t; no-byte-compile:t -*-
22

3-
;; Copyright (C) 2016 Tamas K. Papp
3+
;; Copyright (C) 2016–2024 Tamas K. Papp
44
;; Author: Tamas Papp <[email protected]>
55
;; Keywords: languages
6-
;; Version: 1.3.1
6+
;; Version: 1.4.0
77
;; Package-Requires: ((emacs "25.1")(s "1.12"))
88
;; URL: https://github.com/tpapp/julia-repl
99

@@ -326,7 +326,9 @@ Entries have the form
326326
327327
(KEY EXECUTABLE-PATH :BASEDIR BASEDIR)
328328
329-
A missing :BASEDIR will be completed automatically when first used.
329+
`executable-path' is invoked as is, so make sure that it is in the path available to Emacs.
330+
331+
A missing :BASEDIR will be completed automatically when first used, and it assumed to be the same afterwards.
330332
331333
This is used for key lookup for ‘julia-repl-executable-key’. The
332334
first entry is the default.")
@@ -419,13 +421,10 @@ is printed to the *Messages* buffer."
419421
(defun julia-repl--executable-path (executable-record)
420422
"Retrun the Julia executable for the given EXECUTABLE-RECORD.
421423
422-
Return the executable path in the given EXECUTABLE-RECORD if it's
423-
absolute. Else, return the absolute path of the Julia executable
424-
using ‘executable-find’, or NIL."
425-
(let ((executable (cl-second executable-record)))
426-
(if (file-name-absolute-p executable)
427-
executable
428-
(executable-find executable))))
424+
It is checked for being a string."
425+
(let ((executable-path (cl-second executable-record)))
426+
(cl-assert (stringp executable-path) nil "No valid executable path found in %s" executable-record)
427+
executable-path))
429428

430429
(defun julia-repl--complete-executable-record! (executable-record)
431430
"Complete EXECUTABLE-RECORD if necessary.

0 commit comments

Comments
 (0)