Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Emacs site-start: Use correct feature name #52448

Merged
merged 1 commit into from Dec 18, 2018
Merged

Emacs site-start: Use correct feature name #52448

merged 1 commit into from Dec 18, 2018

Conversation

jabranham
Copy link
Contributor

Motivation for this change

Tramp upstream recently dropped the autoload cookie from
tramp-remote-path. This makes Emacs error when trying to load tramp.
Using the correct feature name fixes this.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jabranham
Emacs site-start: Use correct feature name
c08ec87 
* pkgs/applications/editors/emacs/site-start.el (tramp-sh): Use
  correct feature name

Tramp upstream recently dropped the autoload cookie from
tramp-remote-path. This makes Emacs error when trying to load tramp.
Using the correct feature name fixes this.
@matthewbauer
Copy link
Member

Can you confirm it still works with this change in emacs 25? (ideally we would also support emacs 24 but not a hard requirement).

@jabranham
Copy link
Contributor Author

@matthewbauer That variable has been defined in tramp-sh.el since at least Emacs 24, so should be all good.

@matthewbauer matthewbauer merged commit a6050ab into NixOS:master Dec 18, 2018
@matthewbauer
Copy link
Member

Ok thanks

@jabranham jabranham deleted the fix-emacs branch December 18, 2018 17:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: emacs 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jabranham @matthewbauer @GrahamcOfBorg