Merge from origin/emacs-25

[gnu-emacs] / etc / emacs.desktop

diff --git a/etc/emacs.desktop b/etc/emacs.desktop
index 630d3c78834eb5f29305888b562a321d73a416ec..2e6496e58c9991e38edba386c230e32071f503af 100644 (file)
--- a/etc/emacs.desktop
+++ b/etc/emacs.desktop
@@ -3,10 +3,10 @@ Name=Emacs
 GenericName=Text Editor
 Comment=Edit text
 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=emacs %f
-Icon=emacs_32.png
+Exec=emacs %F
+Icon=emacs
 Type=Application
 Terminal=false
-Categories=Application;Development;TextEditor;
-Encoding=UTF-8
+Categories=Development;TextEditor;
 StartupWMClass=Emacs
+Keywords=Text;Editor;