Mercurial > emacs

annotate etc/emacs.desktop @ 112231:f4a73cf7587b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively. (smerge-resolve--normalize-re): New var. (smerge-resolve--extract-comment, smerge-resolve--normalize): New funs. (smerge-resolve): Use them. * lisp/newcomment.el (comment-only-p): New function. (comment-or-uncomment-region): Use it.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 13:10:15 -0500
parents 385097a8a31f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
87172
b8b9765bb434 New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1 [Desktop Entry]
b8b9765bb434 New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
2 Name=Emacs
b8b9765bb434 New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
3 GenericName=Text Editor
b8b9765bb434 New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
4 Comment=Edit text
b8b9765bb434 New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
5 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++;
87184
11bbc862a517 * emacs.desktop (Exec, Icon, Categories): Fix entries.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87172
diff changeset
6 Exec=emacs %F
87527
385097a8a31f * emacs.desktop (Icon): Update icon name.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87184
diff changeset
7 Icon=emacs
87172
b8b9765bb434 New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
8 Type=Application
b8b9765bb434 New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
9 Terminal=false
87184
11bbc862a517 * emacs.desktop (Exec, Icon, Categories): Fix entries.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87172
diff changeset
10 Categories=Development;TextEditor;
87172
b8b9765bb434 New file.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
11 StartupWMClass=Emacs