aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/nixos/modules/services/editors/emacs.xml
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/nixos/modules/services/editors/emacs.xml')
-rw-r--r--nixpkgs/nixos/modules/services/editors/emacs.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/nixpkgs/nixos/modules/services/editors/emacs.xml b/nixpkgs/nixos/modules/services/editors/emacs.xml
index 74c60014dce..302aa1ed7c4 100644
--- a/nixpkgs/nixos/modules/services/editors/emacs.xml
+++ b/nixpkgs/nixos/modules/services/editors/emacs.xml
@@ -53,11 +53,11 @@
<varname>emacs</varname>
</term>
<term>
- <varname>emacs25</varname>
+ <varname>emacs</varname>
</term>
<listitem>
<para>
- The latest stable version of Emacs 25 using the
+ The latest stable version of Emacs using the
<link
xlink:href="http://www.gtk.org">GTK 2</link>
widget toolkit.
@@ -66,11 +66,11 @@
</varlistentry>
<varlistentry>
<term>
- <varname>emacs25-nox</varname>
+ <varname>emacs-nox</varname>
</term>
<listitem>
<para>
- Emacs 25 built without any dependency on X11 libraries.
+ Emacs built without any dependency on X11 libraries.
</para>
</listitem>
</varlistentry>
@@ -79,11 +79,11 @@
<varname>emacsMacport</varname>
</term>
<term>
- <varname>emacs25Macport</varname>
+ <varname>emacsMacport</varname>
</term>
<listitem>
<para>
- Emacs 25 with the "Mac port" patches, providing a more native look and
+ Emacs with the "Mac port" patches, providing a more native look and
feel under macOS.
</para>
</listitem>
@@ -322,7 +322,7 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
If you want, you can tweak the Emacs package itself from your
<filename>emacs.nix</filename>. For example, if you want to have a
GTK 3-based Emacs instead of the default GTK 2-based binary and remove the
- automatically generated <filename>emacs.desktop</filename> (useful is you
+ automatically generated <filename>emacs.desktop</filename> (useful if you
only use <command>emacsclient</command>), you can change your file
<filename>emacs.nix</filename> in this way:
</para>