summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2020-08-21 01:26:44 +0200
committerGitHub <noreply@github.com>2020-08-21 01:26:44 +0200
commit7d6e7b3cd3573236a24a3ff39a3a04bcc1a4c9b6 (patch)
tree2e8f535dd6b3479bd54d530ba9c6e7db7d83d800 /nixos
parentb87b6abd176b0f2be28039e7e4e6da68a9d856bf (diff)
parentedd6216a00437161ddbb658f6d9c9271daa70942 (diff)
downloadnixpkgs-7d6e7b3cd3573236a24a3ff39a3a04bcc1a4c9b6.tar
nixpkgs-7d6e7b3cd3573236a24a3ff39a3a04bcc1a4c9b6.tar.gz
nixpkgs-7d6e7b3cd3573236a24a3ff39a3a04bcc1a4c9b6.tar.bz2
nixpkgs-7d6e7b3cd3573236a24a3ff39a3a04bcc1a4c9b6.tar.lz
nixpkgs-7d6e7b3cd3573236a24a3ff39a3a04bcc1a4c9b6.tar.xz
nixpkgs-7d6e7b3cd3573236a24a3ff39a3a04bcc1a4c9b6.tar.zst
nixpkgs-7d6e7b3cd3573236a24a3ff39a3a04bcc1a4c9b6.zip
Merge pull request #95878 from adisbladis/emacs-26
emacs: Fix emacs26 attribute(s)
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/editors/emacs.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index 74c60014dce..05f87df43bc 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/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>