Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 050dad290137
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a6050ab9d0e2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 17, 2018

  1. Emacs site-start: Use correct feature name 

    * 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.
    @jabranham
    jabranham committed Dec 17, 2018
    Copy the full SHA
    c08ec87 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2018

  1. Merge pull request #52448 from jabranham/fix-emacs 

    Emacs site-start: Use correct feature name
    @matthewbauer
    matthewbauer committed Dec 18, 2018
    Copy the full SHA
    a6050ab View commit details
    Browse the repository at this point in the history