Skip to content

Commit

Permalink
Merge pull request #150 from tpapp/tp/revamp-path-determination
Browse files Browse the repository at this point in the history
Rewrite basedir path determination.
  • Loading branch information
tpapp authored Nov 20, 2024
2 parents bb90cc1 + b49394c commit 1f4f6b4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ jobs:
- 28.1
- 28.2
- 29.1
- 29.2
- 29.3
- 29.4
ignore_warnings:
- true
include:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The julia-repl library is licensed under the MIT License.

> Copyright (c) 2016: Tamas K. Papp
> Copyright (c) 2016–2024: Tamas K. Papp
>
> Permission is hereby granted, free of charge, to any person obtaining
> a copy of this software and associated documentation files (the
Expand Down
19 changes: 9 additions & 10 deletions julia-repl.el
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
;;; julia-repl.el --- A minor mode for a Julia REPL -*- lexical-binding:t; no-byte-compile:t -*-

;; Copyright (C) 2016 Tamas K. Papp
;; Copyright (C) 2016–2024 Tamas K. Papp
;; Author: Tamas Papp <tkpapp@gmail.com>
;; Keywords: languages
;; Version: 1.3.1
;; Version: 1.4.0
;; Package-Requires: ((emacs "25.1")(s "1.12"))
;; URL: https://github.com/tpapp/julia-repl

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

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

0 comments on commit 1f4f6b4

Please sign in to comment.