diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-04-29 15:41:48 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-04-29 15:41:48 +0200 |
| commit | 2c11e7be745a790320a42a357635997310d731d0 (patch) | |
| tree | 226aafaccf6f77758ab6e0e174ff8f08318a1772 /guix/diagnostics.scm | |
| parent | e12210dc92098d8581cea3007d57dbb6be16bb41 (diff) | |
| parent | 041d62f7cc244d7f6c0bd6d60cdf08e72d400313 (diff) | |
Merge remote-tracking branch 'origin/master' into wip-ungrafting
Diffstat (limited to 'guix/diagnostics.scm')
| -rw-r--r-- | guix/diagnostics.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/guix/diagnostics.scm b/guix/diagnostics.scm index 7b9ffc61b5..6a792febd4 100644 --- a/guix/diagnostics.scm +++ b/guix/diagnostics.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -233,6 +233,10 @@ etc." (make-location file (+ line 1) col))) (#f #f) + (#(file line column) + ;; Guile >= 3.0.6 uses vectors instead of alists internally, which can be + ;; seen in the arguments to 'syntax-error' exceptions. + (location file (+ 1 line) column)) (_ (let ((file (assq-ref loc 'filename)) (line (assq-ref loc 'line)) |