[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/nix-mode aaf2b741fb 410/500: nix-shell: skip non-default p
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/nix-mode aaf2b741fb 410/500: nix-shell: skip non-default packages integration |
Date: |
Sat, 29 Jan 2022 08:27:50 -0500 (EST) |
branch: elpa/nix-mode
commit aaf2b741fb9eb5ecef6c65682546cd485700042c
Author: Tristan Cacqueray <tdecacqu@redhat.com>
Commit: Tristan Cacqueray <tdecacqu@redhat.com>
nix-shell: skip non-default packages integration
This change enables nix-shell to work when woman or irony-mode is
not active, otherwise it is failing with:
Symbol’s value as variable is void: irony-additional-clang-options
---
nix-shell.el | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/nix-shell.el b/nix-shell.el
index 1a996e3891..e8b5c8d21f 100644
--- a/nix-shell.el
+++ b/nix-shell.el
@@ -179,11 +179,13 @@ The DRV file to use."
(add-to-list 'exec-path bin)
(setq-local eshell-path-env
(format "%s:%s" bin eshell-path-env))
- (add-to-list 'woman-manpath man)
+ (when (boundp 'woman-manpath)
+ (add-to-list 'woman-manpath man))
(add-to-list 'ffap-c-path include)
(add-to-list 'Man-header-file-path include)
- (add-to-list 'irony-additional-clang-options
- (format "-I%s" include))))
+ (when (boundp 'irony-additional-clang-options)
+ (add-to-list 'irony-additional-clang-options
+ (format "-I%s" include)))))
(when (bound-and-true-p flycheck-mode)
(flycheck-buffer))
- [nongnu] elpa/nix-mode ea649349b5 156/500: Fix syntax issue, (continued)
- [nongnu] elpa/nix-mode ea649349b5 156/500: Fix syntax issue, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 9d0668f1d8 181/500: Ignore ''' in mmm-mode, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 3294f8a2f8 180/500: Merge pull request #37 from dieggsy/cl-lib, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode b580c8045b 192/500: Prefer derived-mode-p when checking for specific major modes, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode d14dd9ce95 196/500: Don't assign to unbound variable: let-bind it locally instead, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 664fa51cfa 199/500: Remove mmm-mode/company feature detection, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 1e72a297d7 238/500: update, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 9242165717 359/500: Don’t skip over > in angle-path, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 1ebfda9810 368/500: Inline use of `signum`., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 3022b9ef74 409/500: Skip descriptions in nix completions, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode aaf2b741fb 410/500: nix-shell: skip non-default packages integration,
ELPA Syncer <=
- [nongnu] elpa/nix-mode 458c83f8bd 396/500: Correct pacakge lint for dep., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 59f3ea4da9 401/500: make run: use -Q, ELPA Syncer, 2022/01/29