File tree Expand file tree Collapse file tree 5 files changed +17
-7
lines changed Expand file tree Collapse file tree 5 files changed +17
-7
lines changed Original file line number Diff line number Diff line change 29
29
30
30
; ;; Code:
31
31
32
+ (eval-when-compile
33
+ (require 'rx ))
34
+ (require 'subr-x )
32
35
(require 'map )
33
36
34
- (declare-function string-remove-suffix " subr-x" )
35
-
36
37
(defgroup nix3 nil
37
38
" Interface to experimental commands of Nix."
38
39
:prefix " nix3-"
39
40
:group 'nix )
40
41
42
+ (defgroup nix3-face nil
43
+ " Faces for nix3."
44
+ :group 'nix3 )
45
+
41
46
; ;;; Custom variables
42
47
43
48
(defcustom nix3-nix-executable " nix"
Original file line number Diff line number Diff line change 50
50
51
51
(defface nix3-flake-lock-file-heading
52
52
'((t (:inherit magit-diff-file-heading)))
53
- " Face for flake.lock file paths." )
53
+ " Face for flake.lock file paths."
54
+ :group 'nix3-face )
54
55
55
56
(defface nix3-flake-lock-node-heading
56
57
'((t (:inherit magit-section-heading)))
57
- " Face for flake.lock nodes." )
58
+ " Face for flake.lock nodes."
59
+ :group 'nix3-face )
58
60
59
61
; ;;;
60
62
Original file line number Diff line number Diff line change 61
61
(error " Failed to parse nix --help " ))
62
62
(goto-char (point-min ))
63
63
(re-search-forward start-heading)
64
- (delete-region (point-min ) (pos-eol ))
64
+ (delete-region (point-min ) (line-end-position ))
65
65
(when end-heading
66
66
(re-search-forward end-heading)
67
- (delete-region (pos-bol ) (point-max )))
67
+ (delete-region (line-beginning-position ) (point-max )))
68
68
(goto-char (point-min ))
69
69
; ; Parse outputs
70
70
(while (re-search-forward regexp nil t )
71
- (delete-region (pos-bol ) (pos-eol )))
71
+ (delete-region (line-beginning-position ) (line-end-position )))
72
72
(goto-char (point-min ))
73
73
(let (last-end
74
74
outputs)
Original file line number Diff line number Diff line change 34
34
(require 'nix3-core )
35
35
(require 'nix3-utils )
36
36
(require 'nix3-browse-url )
37
+ (require 'pp )
37
38
38
39
(declare-function nix3-realise-and-show-store " nix3" )
39
40
(declare-function nix3-vterm-shell-command " nix3-utils" )
Original file line number Diff line number Diff line change 32
32
(require 'cl-lib )
33
33
(require 'subr-x )
34
34
(require 'nix3-core )
35
+ (eval-when-compile
36
+ (require 'rx ))
35
37
36
38
(declare-function vterm " ext:vterm" )
37
39
(declare-function vterm-send-string " ext:vterm" )
You can’t perform that action at this time.
0 commit comments