CVS update by scop packages/xemacs-packages/text-modes, desktop-entry-mode.el ...

[xemacs-cvs at xemacs.org]

  User: scop    
  Date: 06/10/31 23:00:42

  Modified:    packages/xemacs-packages/text-modes ChangeLog
                        desktop-entry-mode.el
Log:
Sync desktop-entry-mode with spec 0.9.8 <1162332004.20102.7.camel at viper.local>

Revision  Changes    Path
1.160     +4 -0      XEmacs/packages/xemacs-packages/text-modes/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/text-modes/ChangeLog,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- ChangeLog	2005/11/02 07:07:36	1.159
+++ ChangeLog	2006/10/31 22:00:41	1.160
@@ -1,3 +1,7 @@
+2006-10-31  Ville Skyttä  <scop at xemacs.org>
+
+	* desktop-entry-mode.el: Sync with desktop entry spec v0.9.8.
+
 2005-11-02  Norbert Koch  <viteno at xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.90 released.



1.6       +30 -21    XEmacs/packages/xemacs-packages/text-modes/desktop-entry-mode.el

Index: desktop-entry-mode.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/text-modes/desktop-entry-mode.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- desktop-entry-mode.el	2004/04/18 19:26:09	1.5
+++ desktop-entry-mode.el	2006/10/31 22:00:41	1.6
@@ -1,8 +1,8 @@
 ;;; desktop-entry-mode.el --- freedesktop.org desktop entry editing
 
-;; Copyright (C) 2003-2004, Ville Skyttä, <scop at xemacs.org>
+;; Copyright (C) 2003-2004, 2006, Ville Skyttä <scop at xemacs.org>
 
-;; Author:   Ville Skyttä, <scop at xemacs.org>
+;; Author:   Ville Skyttä <scop at xemacs.org>
 ;; Keywords: unix, desktop entry
 
 ;; This file is part of XEmacs.
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301 USA.
 
 ;;; Commentary:
 
@@ -45,11 +45,11 @@
 ;; For more information about desktop entry files, see
 ;;   <http://www.freedesktop.org/Standards/desktop-entry-spec>
 ;;
-;; This version is up to date with version 0.9.4 of the specification.
+;; This version is up to date with version 0.9.8 of the specification.
 
 ;;; Code:
 
-(defconst desktop-entry-mode-version "0.94 (spec 0.9.4)"
+(defconst desktop-entry-mode-version "0.98 (spec 0.9.8)"
   "Version of `desktop-entry-mode'.")
 
 (defgroup desktop-entry nil
@@ -97,39 +97,48 @@
       '(
         "Type"
         "Version"
-        "Encoding"
         "Name"
         "GenericName"
         "NoDisplay"
         "Comment"
         "Icon"
         "Hidden"
-        "FilePattern"
+        "OnlyShowIn"
+        "NotShowIn"
         "TryExec"
         "Exec"
         "Path"
         "Terminal"
-        "SwallowTitle"
-        "SwallowExec"
-        "Actions"
         "MimeType"
-        "SortOrder"
-        "Dev"
-        "FSType"
-        "MountPoint"
-        "ReadOnly"
-        "UnmountIcon"
-        "URL"
         "Categories"
-        "OnlyShowIn"
-        "NotShowIn"
         "StartupNotify"
         "StartupWMClass"
-        ;; Reserved for use with KDE as of spec 0.9.4.
+        "URL"
+        ;; Reserved for use with KDE
         "ServiceTypes"
         "DocPath"
         "KeyWords"
         "InitialPreference"
+        ;; Used by KDE for entries of the FSDevice type
+        "Dev"
+        "FSType"
+        "MountPoint"
+        "ReadOnly"
+        "UnmountIcon"
+        ;; Deprecated
+        "Patterns"
+        "DefaultApp"
+        "Encoding"
+        "MiniIcon"
+        "TerminalOptions"
+        "Protocols"
+        "Extensions"
+        "BinaryPattern"
+        "MapNotify"
+        "SwallowTitle"
+        "SwallowExec"
+        "SortOrder"
+        "FilePattern"
         ) 'words)
      "\\|X-[A-Za-z0-9-]+\\)"))
   "Expression for matching desktop entry keys.")