[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     f3866a87f210bb94f48dd9c6b335f7c4c4c3e3aa
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 23 21:50:49 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Mar 23 21:50:49 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=f3866a87

Desktop file for emacsclient.

svn path=/emacs-extra/eselect-emacs/; revision=149

---
 ChangeLog           |    1 +
 emacsclient.desktop |   10 ++++++++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ddb3fa6..cc10c7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,3 +44,4 @@ Version 0.4 (22 Mar 2007)
 	Added some comments to emacs.eselect.
 	23 Mar 2007
 	MimeType and TryExec keys added to emacs.desktop.
+	Desktop file for emacsclient.

diff --git a/emacsclient.desktop b/emacsclient.desktop
new file mode 100644
index 0000000..ead11e6
--- /dev/null
+++ b/emacsclient.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Emacsclient
+Comment=Tell a running Emacs to visit a file.
+Icon=emacs.png
+NoDisplay=true
+TryExec=/usr/bin/emacsclient
+Exec=/usr/bin/emacsclient -n -a /usr/bin/emacs %F
+Terminal=false
+Type=Application
+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++;

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     b9853755f535669f7f007dcc285580eef47ba1e1
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 27 09:26:46 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 09:26:46 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=b9853755

Call env.eselect to update the environment from env.d files.

svn path=/emacs-extra/eselect-emacs/; revision=178

---
 ChangeLog     |    2 ++
 README.icons  |    6 +++---
 emacs.eselect |   31 ++++++++++++++++---------------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ba855b..2b17af6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,3 +47,5 @@ Version 0.4 (22 Mar 2007)
 	Desktop file for emacsclient.
 Version 0.5 (24 Mar 2007)
 	Removed -n option in emacsclient.desktop.
+	27 Mar 2007
+	Call env.eselect to update the environment from env.d files.

diff --git a/README.icons b/README.icons
index 8439829..9d5dbbb 100644
--- a/README.icons
+++ b/README.icons
@@ -4,17 +4,17 @@ File: emacs.png
   Taken from GNOME (gnome-emacs.png)
   Authors: Garrett LeSage <garrett@linux.com>
            Tuomas Kuosmanen <tigert@gimp.org>
-  License: GNU General Public License version 2 or later (see COPYING)
+  License: GNU General Public License version 2 or later
 
 Files: emacs_16.png emacs_24.png emacs_32.png emacs_48.png
   Taken from Emacs 22
   Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
   Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
-  License: GNU General Public License version 2 or later (see COPYING)
+  License: GNU General Public License version 2 or later
 
 File: gnured_48.png
   Based on splash.xpm from Emacs 22
   Author: Luis Fernandes <elf@ee.ryerson.ca>
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
-  License: GNU General Public License version 2 or later (see COPYING)
+  License: GNU General Public License version 2 or later

diff --git a/emacs.eselect b/emacs.eselect
index 4a97796..6ff6fd9 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -85,7 +85,7 @@ set_man_symlinks() {
 	done
 }
 
-# Set symlinks to binaries and man pages
+# Set symlinks to binaries and man pages, update info path
 set_symlinks() {
 	local target="${1}" targets
 	# target may be specified by its name or its index
@@ -96,21 +96,22 @@ set_symlinks() {
 	fi
 
 	# is the target valid, i.e. does an Emacs binary with this name exist?
-	if [[ -f "${ROOT}/usr/bin/${target}" ]]; then
-		remove_symlinks
-		# the main /usr/bin/emacs symlink is only set for Emacs binaries
-		# (but not for other providers of auxiliary programs, e.g., XEmacs)
-		if [[ ${target} == emacs-* ]]; then
-			ln -s "${target}" "${ROOT}/usr/bin/emacs" ||
-				die "Couldn't set ${target} /usr/bin/emacs symlink"
-		fi
-		set_bin_symlinks "${target}"
-		set_man_symlinks "${target}"
-		set_infopath "${target}"
-		return 0
-	else
-		die -q "Target \"${1}\" doesn't appear to be valid!"
+	[[ -f "${ROOT}/usr/bin/${target}" ]] \
+		|| die -q "Target \"${1}\" doesn't appear to be valid!"
+
+	remove_symlinks
+	# the main /usr/bin/emacs symlink is only set for Emacs binaries
+	# (but not for other providers of auxiliary programs, e.g., XEmacs)
+	if [[ ${target} == emacs-* ]]; then
+		ln -s "${target}" "${ROOT}/usr/bin/emacs" \
+			|| die "Couldn't set ${target} /usr/bin/emacs symlink"
 	fi
+	set_bin_symlinks "${target}"
+	set_man_symlinks "${target}"
+	set_infopath "${target}"
+	# call env.eselect to update the environment from env.d files
+	do_action env update >/dev/null
+	return 0
 }
 
 ### show action ###

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     dcebd1abb2765643773f49b469901178ead6f9fe
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 19:33:31 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Mar 25 19:33:31 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=dcebd1ab

Removed -n option in emacsclient.desktop.

svn path=/emacs-extra/eselect-emacs/; revision=152

---
 ChangeLog           |    1 +
 emacsclient.desktop |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 10a4ece..2ba855b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,3 +46,4 @@ Version 0.4 (22 Mar 2007)
 	MimeType and TryExec keys added to emacs.desktop.
 	Desktop file for emacsclient.
 Version 0.5 (24 Mar 2007)
+	Removed -n option in emacsclient.desktop.

diff --git a/emacsclient.desktop b/emacsclient.desktop
index ead11e6..1a690cb 100644
--- a/emacsclient.desktop
+++ b/emacsclient.desktop
@@ -4,7 +4,7 @@ Comment=Tell a running Emacs to visit a file.
 Icon=emacs.png
 NoDisplay=true
 TryExec=/usr/bin/emacsclient
-Exec=/usr/bin/emacsclient -n -a /usr/bin/emacs %F
+Exec=/usr/bin/emacsclient -a /usr/bin/emacs %F
 Terminal=false
 Type=Application
 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++;

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     ac994f3a1ced6442bd86c271e9e330fef90d2c30
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 07:08:36 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 07:08:36 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=ac994f3a

eselect-emacs-0.5.ebuild

svn path=/emacs-extra/eselect-emacs/; revision=150

---
 ChangeLog |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cc10c7f..10a4ece 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,3 +45,4 @@ Version 0.4 (22 Mar 2007)
 	23 Mar 2007
 	MimeType and TryExec keys added to emacs.desktop.
 	Desktop file for emacsclient.
+Version 0.5 (24 Mar 2007)

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     1a76c57b9291354dd894b4bbc4f7fd86e5fb4161
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 27 21:39:36 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 21:39:36 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=1a76c57b

Use env-update instead of env.eselect. Check for being root.

svn path=/emacs-extra/eselect-emacs/; revision=180

---
 ChangeLog     |    2 ++
 emacs.eselect |    9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db69dc0..44474dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,3 +50,5 @@ Version 0.5 (24 Mar 2007)
 	27 Mar 2007
 	Call env.eselect to update the environment from env.d files.
 	Brought do_set and do_update more in line.
+	Check for root in do_set and do_update.
+	env.eselect seems to be buggy; use env-update instead.

diff --git a/emacs.eselect b/emacs.eselect
index fee497c..3f6d7af 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -109,8 +109,11 @@ set_symlinks() {
 	set_bin_symlinks "${target}"
 	set_man_symlinks "${target}"
 	set_infopath "${target}"
-	# call env.eselect to update the environment from env.d files
-	do_action env update >/dev/null
+
+	# update /etc/profile.env from /etc/env.d files
+	#do_action env update >/dev/null
+	env-update --no-ldconfig
+
 	return 0
 }
 
@@ -178,6 +181,7 @@ describe_set_parameters() {
 do_set() {
 	[[ -z "${1}" ]] && die -q "You didn't tell me what to set the symlink to"
 	[[ -n "${2}" ]] && die -q "Too many parameters"
+	[[ -w "${ROOT}/usr/bin" ]] || die -q "You need to be root!"
 
 	if [[ -L "${ROOT}/usr/bin/emacs" ]]; then
 		remove_symlinks || die -q "Couldn't remove existing symlink"
@@ -201,6 +205,7 @@ describe_update_options() {
 do_update() {
 	[[ -z "${1}" || ( -z "${2}" && "${1}" == "--if-unset" ) ]] ||
 		die -q "Usage error"
+	[[ -w "${ROOT}/usr/bin" ]] || die -q "You need to be root!"
 
 	if [[ -L "${ROOT}/usr/bin/emacs" ]]; then
 		[[ ${1} == "--if-unset" \

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     911dc4f105485bf5778f1cd1a52ad4e1221abbda
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 28 09:27:20 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Mar 28 09:27:20 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=911dc4f1

Redundant remove_symlinks removed.

svn path=/emacs-extra/eselect-emacs/; revision=181

---
 ChangeLog     |    2 ++
 emacs.eselect |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 44474dd..14aeecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,3 +52,5 @@ Version 0.5 (24 Mar 2007)
 	Brought do_set and do_update more in line.
 	Check for root in do_set and do_update.
 	env.eselect seems to be buggy; use env-update instead.
+	Redundant remove_symlinks removed.
+Version 0.6 (28 Mar 2007)

diff --git a/emacs.eselect b/emacs.eselect
index 3f6d7af..544bba7 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -184,7 +184,7 @@ do_set() {
 	[[ -w "${ROOT}/usr/bin" ]] || die -q "You need to be root!"
 
 	if [[ -L "${ROOT}/usr/bin/emacs" ]]; then
-		remove_symlinks || die -q "Couldn't remove existing symlink"
+		true
 	elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then
 		die -q "Sorry, ${ROOT}/usr/bin/emacs confuses me"
 	fi
@@ -210,7 +210,6 @@ do_update() {
 	if [[ -L "${ROOT}/usr/bin/emacs" ]]; then
 		[[ ${1} == "--if-unset" \
 			&& -e "$(canonicalise ${ROOT}/usr/bin/emacs)" ]] && return
-		remove_symlinks || die -q "Couldn't remove existing symlink"
 	elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then
 		die -q "Sorry, ${ROOT}/usr/bin/emacs confuses me"
 	fi

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     5f4befa210e82badab42b82bac78cdbc9d8ccc22
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 06:16:17 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 06:16:17 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=5f4befa2

Added emacs.eselect.5 man page.

svn path=/emacs-extra/eselect-emacs/; revision=188

---
 ChangeLog       |    1 +
 emacs.eselect   |    1 +
 emacs.eselect.5 |   64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 32aaec3..967c045 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,3 +56,4 @@ Version 0.5 (24 Mar 2007)
 Version 0.6 (28 Mar 2007)
 	28 Mar 2007
 	Undo previous change.
+	Added man page.

diff --git a/emacs.eselect b/emacs.eselect
index 3f6d7af..991fbbb 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -99,6 +99,7 @@ set_symlinks() {
 	[[ -f "${ROOT}/usr/bin/${target}" ]] \
 		|| die -q "Target \"${1}\" doesn't appear to be valid!"
 
+	echo "Switching to ${target}..."
 	remove_symlinks
 	# the main /usr/bin/emacs symlink is only set for Emacs binaries
 	# (but not for other providers of auxiliary programs, e.g., XEmacs)

diff --git a/emacs.eselect.5 b/emacs.eselect.5
new file mode 100644
index 0000000..1539b59
--- /dev/null
+++ b/emacs.eselect.5
@@ -0,0 +1,64 @@
+.TH "ESELECT" "5" "March 2007" "Gentoo Linux" "eselect"
+.SH "NAME"
+emacs.eselect \- The emacs management module for Gentoo's eselect
+.SH "SYNOPSIS"
+\fBeselect emacs\fR [\fBhelp\fR|\fBusage\fR]
+.br 
+\fBeselect emacs list\fR
+.br
+\fBeselect emacs set\fR \fItarget\fR
+.br
+\fBeselect emacs show\fR
+.br
+\fBeselect emacs update\fR [\fI--if-unset\fR]
+.SH "DESCRIPTION"
+\fBeselect\fR is Gentoo's configuration and management tool. It features
+modules that care for the individual administrative tasks.
+.SH "ACTION: LIST"
+\fBeselect emacs list\fR
+.br
+List all installed version of emacs.
+
+# eselect emacs list
+.br
+Available Emacs symlink targets:
+.br
+  [1]   emacs-18
+  [2]   emacs-21 *
+  [3]   emacs-22
+.SH "ACTION: SET"
+\fBeselect emacs set\fR \fItarget\fR
+.br
+Activates the selected version of emacs. \fItarget\fR can be either an
+identification number given by \fBeselect emacs list\fR or the name of
+one installed version.
+
+# eselect emacs set 3
+.br
+Switching to emacs-22...
+.SH "ACTION: SHOW"
+\fBeselect emacs show\fR [\fItarget\fR]
+.br
+Prints the currently activated emacs version.
+
+# eselect emacs show
+.br
+Current target of symlink:
+.br
+emacs-22
+.SH "ACTION: UPDATE"
+\fBeselect emacs update\fR [\fI--if-unset\fR]
+.br
+Update the Emacs symlink to the last available version. If option
+[\fI--if-unset\fR] is given, an existing implementation is not
+overridden.
+
+# eselect emacs update
+.br
+Switching to emacs-22...
+.SH "AUTHOR"
+Christian Faulhammer <opfer@gentoo.org>
+.br
+Ulrich Mueller <ulm@kph.uni-mainz.de>
+.SH "REVISION"
+$Id: $

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     42b3eda29ef6017a8016c46649bd234121fcdbc5
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 28 11:16:36 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Mar 28 11:16:36 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=42b3eda2

Undo changeset 181.

svn path=/emacs-extra/eselect-emacs/; revision=183

---
 ChangeLog     |    2 ++
 emacs.eselect |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 14aeecf..32aaec3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,3 +54,5 @@ Version 0.5 (24 Mar 2007)
 	env.eselect seems to be buggy; use env-update instead.
 	Redundant remove_symlinks removed.
 Version 0.6 (28 Mar 2007)
+	28 Mar 2007
+	Undo previous change.

diff --git a/emacs.eselect b/emacs.eselect
index 544bba7..3f6d7af 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -184,7 +184,7 @@ do_set() {
 	[[ -w "${ROOT}/usr/bin" ]] || die -q "You need to be root!"
 
 	if [[ -L "${ROOT}/usr/bin/emacs" ]]; then
-		true
+		remove_symlinks || die -q "Couldn't remove existing symlink"
 	elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then
 		die -q "Sorry, ${ROOT}/usr/bin/emacs confuses me"
 	fi
@@ -210,6 +210,7 @@ do_update() {
 	if [[ -L "${ROOT}/usr/bin/emacs" ]]; then
 		[[ ${1} == "--if-unset" \
 			&& -e "$(canonicalise ${ROOT}/usr/bin/emacs)" ]] && return
+		remove_symlinks || die -q "Couldn't remove existing symlink"
 	elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then
 		die -q "Sorry, ${ROOT}/usr/bin/emacs confuses me"
 	fi

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     202509f38e753661418f6a299f1d324d58a92b42
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 27 12:37:47 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 12:37:47 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=202509f3

Brought do_set and do_update more in line.

svn path=/emacs-extra/eselect-emacs/; revision=179

---
 ChangeLog     |    1 +
 emacs.eselect |   32 +++++++++++---------------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2b17af6..db69dc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,3 +49,4 @@ Version 0.5 (24 Mar 2007)
 	Removed -n option in emacsclient.desktop.
 	27 Mar 2007
 	Call env.eselect to update the environment from env.d files.
+	Brought do_set and do_update more in line.

diff --git a/emacs.eselect b/emacs.eselect
index 6ff6fd9..fee497c 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -176,25 +176,16 @@ describe_set_parameters() {
 }
 
 do_set() {
-	if [[ -z "${1}" ]]; then
-		die -q "You didn't tell me what to set the symlink to"
-
-	elif [[ -n "${2}" ]]; then
-		die -q "Too many parameters"
-
-	elif [[ -L "${ROOT}/usr/bin/emacs" ]]; then
-		if ! remove_symlinks; then
-			die -q "Couldn't remove existing symlink"
-		elif ! set_symlinks "${1}"; then
-			die -q "Couldn't set a new symlink"
-		fi
+	[[ -z "${1}" ]] && die -q "You didn't tell me what to set the symlink to"
+	[[ -n "${2}" ]] && die -q "Too many parameters"
 
+	if [[ -L "${ROOT}/usr/bin/emacs" ]]; then
+		remove_symlinks || die -q "Couldn't remove existing symlink"
 	elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then
 		die -q "Sorry, ${ROOT}/usr/bin/emacs confuses me"
-
-	else
-		set_symlinks "${1}" || die -q "Couldn't set a new symlink"
 	fi
+
+	set_symlinks "${1}" || die -q "Couldn't set a new symlink"
 }
 
 ### update action ###
@@ -212,12 +203,11 @@ do_update() {
 		die -q "Usage error"
 
 	if [[ -L "${ROOT}/usr/bin/emacs" ]]; then
-		[[ ${1} == "--if-unset" &&
-			-e "$(canonicalise ${ROOT}/usr/bin/emacs)" ]] && return
-		remove_symlinks || die -q "Couldn't remove existing link"
-	fi
-	if [[ -e "${ROOT}/usr/bin/emacs" ]]; then
-		die -q "Couldn't set a new symlink"
+		[[ ${1} == "--if-unset" \
+			&& -e "$(canonicalise ${ROOT}/usr/bin/emacs)" ]] && return
+		remove_symlinks || die -q "Couldn't remove existing symlink"
+	elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then
+		die -q "Sorry, ${ROOT}/usr/bin/emacs confuses me"
 	fi
 
 	local targets=( $(find_targets) )

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     a289f8c8ea64359dacb3598fe36ef06d9e013f4c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 06:52:13 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 06:52:13 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=a289f8c8

Spelling corrections in man page; copyright notice added.

svn path=/emacs-extra/eselect-emacs/; revision=193

---
 ChangeLog       |    3 ++-
 emacs.eselect.5 |   18 +++++++++++-------
 emacs_16.png    |  Bin 783 -> 632 bytes
 emacs_24.png    |  Bin 1068 -> 820 bytes
 emacs_32.png    |  Bin 2488 -> 2235 bytes
 emacs_48.png    |  Bin 3526 -> 3100 bytes
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 28b7f0b..9b1318d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,4 +59,5 @@ Version 0.6 (28 Mar 2007)
 	Added man page.
 Version 0.7 (29 Mar 2007)
 	Svn keywords activated.
-	Fixed typo.
+	Fixed typo and capitalised "Emacs" where appropriate.
+	Added copyright notice.

diff --git a/emacs.eselect.5 b/emacs.eselect.5
index c7df963..2755015 100644
--- a/emacs.eselect.5
+++ b/emacs.eselect.5
@@ -1,9 +1,13 @@
+.\" Copyright 1999-2007 Gentoo Foundation
+.\" Distributed under the terms of the GNU General Public License v2
+.\" $Id$
+.\"
 .TH "ESELECT" "5" "March 2007" "Gentoo Linux" "eselect"
 .SH "NAME"
-emacs.eselect \- The emacs management module for Gentoo's eselect
+emacs.eselect \- The Emacs management module for Gentoo's eselect
 .SH "SYNOPSIS"
 \fBeselect emacs\fR [\fBhelp\fR|\fBusage\fR]
-.br 
+.br
 \fBeselect emacs list\fR
 .br
 \fBeselect emacs set\fR \fItarget\fR
@@ -17,7 +21,7 @@ modules that care for the individual administrative tasks.
 .SH "ACTION: LIST"
 \fBeselect emacs list\fR
 .br
-List all installed versions of emacs.
+List all installed Emacs versions.
 
 # eselect emacs list
 .br
@@ -29,7 +33,7 @@ Available Emacs symlink targets:
 .SH "ACTION: SET"
 \fBeselect emacs set\fR \fItarget\fR
 .br
-Activates the selected version of emacs. \fItarget\fR can be either an
+Activates the selected Emacs version. \fItarget\fR can be either an
 identification number given by \fBeselect emacs list\fR or the name of
 one installed version.
 
@@ -39,7 +43,7 @@ Switching to emacs-22...
 .SH "ACTION: SHOW"
 \fBeselect emacs show\fR [\fItarget\fR]
 .br
-Prints the currently activated emacs version.
+Prints the currently activated Emacs version.
 
 # eselect emacs show
 .br
@@ -49,14 +53,14 @@ emacs-22
 .SH "ACTION: UPDATE"
 \fBeselect emacs update\fR [\fI--if-unset\fR]
 .br
-Update the Emacs symlink to the last available version. If option
+Update the emacs symlink to the last available version. If option
 [\fI--if-unset\fR] is given, an existing implementation is not
 overridden.
 
 # eselect emacs update
 .br
 Switching to emacs-22...
-.SH "AUTHOR"
+.SH "AUTHORS"
 Christian Faulhammer <opfer@gentoo.org>
 .br
 Ulrich Mueller <ulm@kph.uni-mainz.de>

diff --git a/emacs_16.png b/emacs_16.png
index ca5122b..77c1a66 100644
Binary files a/emacs_16.png and b/emacs_16.png differ

diff --git a/emacs_24.png b/emacs_24.png
index 95c72d3..fe12a33 100644
Binary files a/emacs_24.png and b/emacs_24.png differ

diff --git a/emacs_32.png b/emacs_32.png
index 17b4686..4eb3c9d 100644
Binary files a/emacs_32.png and b/emacs_32.png differ

diff --git a/emacs_48.png b/emacs_48.png
index 56c6de6..6e8acbe 100644
Binary files a/emacs_48.png and b/emacs_48.png differ

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     10134e1f60d0e81beeecdaf081565ac388a8b463
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 31 16:44:08 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Mar 31 16:44:08 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=10134e1f

Makefiles for building of tarballs.

svn path=/emacs-extra/emacs-desktop/; revision=206

---
 Makefile |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..40a89b5
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,19 @@
+PN = emacs-desktop
+PV = $(shell sed '/^Version/h;$$!d;g;s/[^0-9.]*\([0-9.]*\).*/\1/' ChangeLog)
+P = $(PN)-$(PV)
+
+DISTFILES = emacs.desktop emacsclient.desktop \
+	README.icons emacs.png \
+	emacs_16.png emacs_24.png emacs_32.png emacs_48.png gnured_48.png
+
+
+.PHONY: all dist clean
+
+all:
+
+dist: $(DISTFILES)
+	tar -czf $(P).tar.gz --transform='s%^%$(P)/%' $^
+	tar -tzvf $(P).tar.gz
+
+clean:
+	-rm -f *~ *.tmp *.gz *.bz2

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     0766dd7a1bc39d595c1a302359f61eb800330800
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 06:38:49 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 06:38:49 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=0766dd7a

eselect-emacs-0.7

svn path=/emacs-extra/eselect-emacs/; revision=189

---
 ChangeLog |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 967c045..3c0323d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,3 +57,4 @@ Version 0.6 (28 Mar 2007)
 	28 Mar 2007
 	Undo previous change.
 	Added man page.
+Version 0.7 (29 Mar 2007)

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     4feb353816d8fe6b48bfd22f814072e4ed8aa47b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 18:46:32 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 18:46:32 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=4feb3538

Desktop and icon files moved to emacs-desktop.

svn path=/emacs-extra/emacs-desktop/; revision=197

---
 ChangeLog       |   65 +---------------
 emacs.eselect   |  226 -------------------------------------------------------
 emacs.eselect.5 |   68 -----------------
 3 files changed, 2 insertions(+), 357 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b1318d..1a5a4a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,63 +1,2 @@
-Version 0.1 (15 Mar 2007)
-	based on Vi's eselect module
-	has actions:
-		show: currently used implementation
-		set: set a specific version to be symlinked from
-		/usr/bin/emacs
-		update: set the highest version automatically
-		list: list available implementations
-	automatically symlink all needed executables
-	automatically symlink man pages
-	automatically set correct INFOPATH
-	16 Mar 2007
-	Remove man symlinks with all possible compress extensions.
-	Honour ${ROOT} in set_man_symlinks.
-	Don't test for -z ${extension} since the empty string
-	  is a legal value (meaning no compression).
-	We don't have "providers" but versions.
-	Create symlinks for existing binaries only.
-	Added gfdl to MANPAGELIST.
-	Use MANPAGELIST instead of BINARYLIST for manpage removal.
-	17 Mar 2007
-	do_update() now updates to the newest available version.
-	Cleanup env.d file in do_update().
-Version 0.2 (18 Mar 2007)
-	18 Mar 2007
-	If Emacs was not found, link {c,e}tags to XEmacs versions.
-	Suffix changed from ".emacs-${SLOT}" to "-emacs-${SLOT}".
-	Removal of man page symlinks in remove_symlinks() simplified.
-	19 Mar 2007
-	Use emacs-${SLOT} instead of emacs-emacs-${SLOT} as symlink target.
-	Test if Info directory exists.
-Version 0.3 (19 Mar 2007)
-	Make linking to XEmacs auxiliary programs really work.
-	21 Mar 2007
-	Some cleanup.
-	Set Type=Application only in desktop file.
-	Added two alternative icons (not used yet):
-	  emacs_48.png is from etc/images/icons of the Emacs sources,
-	  gnured_48.png is based on an image taken from
-	  http://www.ee.ryerson.ca/~elf/emacs/logo/ and scaled down.
-	22 Mar 2207
-	Handling of compression extensions made more robust.
-Version 0.4 (22 Mar 2007)
-	Added some comments to emacs.eselect.
-	23 Mar 2007
-	MimeType and TryExec keys added to emacs.desktop.
-	Desktop file for emacsclient.
-Version 0.5 (24 Mar 2007)
-	Removed -n option in emacsclient.desktop.
-	27 Mar 2007
-	Call env.eselect to update the environment from env.d files.
-	Brought do_set and do_update more in line.
-	Check for root in do_set and do_update.
-	env.eselect seems to be buggy; use env-update instead.
-	Redundant remove_symlinks removed.
-Version 0.6 (28 Mar 2007)
-	28 Mar 2007
-	Undo previous change.
-	Added man page.
-Version 0.7 (29 Mar 2007)
-	Svn keywords activated.
-	Fixed typo and capitalised "Emacs" where appropriate.
-	Added copyright notice.
+Version 0.1 (30 Mar 2007)
+	Split off from eselect-emacs.

diff --git a/emacs.eselect b/emacs.eselect
deleted file mode 100644
index 084461e..0000000
--- a/emacs.eselect
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# DOCUMENTATION
-# Following actions possible
-# * show		do_show()
-# * list		do_list()
-# * set			do_set()
-# * update		do_update()
-#
-# Behaviour:
-# do_show():
-#  Checks if /usr/bin/emacs is a link and if the target exists,
-#  if yes, it outputs the currently linked Emacs version.
-#  If it is no symlink, the user is told so, the same if there is
-#  no /usr/bin/emacs or the target does not exist.
-# do_list():
-# do_set():
-# do_update():
-
-DESCRIPTION="Manage /usr/bin/emacs implementations"
-MAINTAINER="emacs@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-BINARYLIST="emacsclient etags ctags b2m ebrowse rcs-checkin grep-changelog"
-MANPAGELIST="emacs emacsclient etags ctags gfdl"
-
-# Return the list of available Emacs binaries
-find_targets() {
-	local j
-	for j in ${ROOT}/usr/bin/emacs-[0-9]*; do
-		[[ -f ${j} ]] && basename ${j}
-	done
-}
-
-remove_infopath() {
-	rm -f ${ROOT}/etc/env.d/50emacs
-}
-
-# Define INFOPATH environment variable in env file
-set_infopath() {
-	[[ -d ${ROOT}/usr/share/info/${1} ]] || return 1
-	echo "INFOPATH=/usr/share/info/${1}" >${ROOT}/etc/env.d/50emacs
-}
-
-# Remove existing symlinks to binaries, man pages, and the env file
-remove_symlinks() {
-	local f
-	rm -f "${ROOT}"/usr/bin/emacs
-	for f in ${BINARYLIST}; do
-		rm -f "${ROOT}"/usr/bin/${f}
-	done
-	for f in ${MANPAGELIST}; do
-		rm -f "${ROOT}"/usr/share/man/man1/${f}.1*
-	done
-	remove_infopath
-}
-
-# Set symlinks to binaries in /usr/bin
-set_bin_symlinks() {
-	local target=${1} f
-	for f in ${BINARYLIST}; do
-		# set symlink only if target binary actually exists
-		if [[ -f "${ROOT}/usr/bin/${f}-${target}" ]]; then
-			ln -s "${f}-${target}" "${ROOT}/usr/bin/${f}" ||
-				die "Couldn't set ${f}-${target} /usr/bin/${f} symlink"
-		fi
-	done
-}
-
-# Set symlinks to man pages
-set_man_symlinks() {
-	local target=${1} extension f i
-	for f in ${MANPAGELIST}; do
-		for i in ${ROOT}/usr/share/man/man1/${f}-${target}.1*; do
-			if [[ -f ${i} ]]; then
-				# target file exists; determine compress extension
-				extension=${i##*/${f}-${target}.1}
-				ln -s "${f}-${target}.1${extension}" \
-					"${ROOT}/usr/share/man/man1/${f}.1${extension}"
-			fi
-		done
-	done
-}
-
-# Set symlinks to binaries and man pages, update info path
-set_symlinks() {
-	local target="${1}" targets
-	# target may be specified by its name or its index
-	if is_number "${target}" && [[ ${target} -ge 1 ]]; then
-		# numeric index, find the target's name
-		targets=( $(find_targets) )
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-
-	# is the target valid, i.e. does an Emacs binary with this name exist?
-	[[ -f "${ROOT}/usr/bin/${target}" ]] \
-		|| die -q "Target \"${1}\" doesn't appear to be valid!"
-
-	echo "Switching to ${target}..."
-	remove_symlinks
-	# the main /usr/bin/emacs symlink is only set for Emacs binaries
-	# (but not for other providers of auxiliary programs, e.g., XEmacs)
-	if [[ ${target} == emacs-* ]]; then
-		ln -s "${target}" "${ROOT}/usr/bin/emacs" \
-			|| die "Couldn't set ${target} /usr/bin/emacs symlink"
-	fi
-	set_bin_symlinks "${target}"
-	set_man_symlinks "${target}"
-	set_infopath "${target}"
-
-	# update /etc/profile.env from /etc/env.d files
-	#do_action env update >/dev/null
-	env-update --no-ldconfig
-
-	return 0
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current target of the Emacs symlink"
-}
-
-do_show() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	write_list_start "Current target of symlink:"
-	if [[ -L "${ROOT}/usr/bin/emacs" && \
-		  -e $(canonicalise "${ROOT}/usr/bin/emacs") ]]; then
-		write_kv_list_entry \
-			"$(basename $(canonicalise ${ROOT}/usr/bin/emacs) )" ""
-	elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then
-		write_kv_list_entry \
-			"(not a symlink or target of symlink does not exist)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available Emacs symlink targets"
-}
-
-do_list() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	local i targets
-	targets=( $(find_targets) )
-
-	if [[ -n ${targets[@]} ]]; then
-		for (( i = 0; i < ${#targets[@]}; i = i + 1 )); do
-			[[ ${targets[${i}]} = \
-				$(basename $(canonicalise ${ROOT}/usr/bin/emacs) ) ]] &&
-				targets[${i}]="${targets[${i}]} $(highlight '*')"
-		done
-		write_list_start "Available Emacs symlink targets:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new Emacs symlink"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	[[ -z "${1}" ]] && die -q "You didn't tell me what to set the symlink to"
-	[[ -n "${2}" ]] && die -q "Too many parameters"
-	[[ -w "${ROOT}/usr/bin" ]] || die -q "You need to be root!"
-
-	if [[ -L "${ROOT}/usr/bin/emacs" ]]; then
-		remove_symlinks || die -q "Couldn't remove existing symlink"
-	elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then
-		die -q "Sorry, ${ROOT}/usr/bin/emacs confuses me"
-	fi
-
-	set_symlinks "${1}" || die -q "Couldn't set a new symlink"
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the Emacs symlink"
-}
-
-describe_update_options() {
-	echo "--if-unset : Do not override existing implementation"
-}
-
-do_update() {
-	[[ -z "${1}" || ( -z "${2}" && "${1}" == "--if-unset" ) ]] ||
-		die -q "Usage error"
-	[[ -w "${ROOT}/usr/bin" ]] || die -q "You need to be root!"
-
-	if [[ -L "${ROOT}/usr/bin/emacs" ]]; then
-		[[ ${1} == "--if-unset" \
-			&& -e "$(canonicalise ${ROOT}/usr/bin/emacs)" ]] && return
-		remove_symlinks || die -q "Couldn't remove existing symlink"
-	elif [[ -e "${ROOT}/usr/bin/emacs" ]]; then
-		die -q "Sorry, ${ROOT}/usr/bin/emacs confuses me"
-	fi
-
-	local targets=( $(find_targets) )
-	if [[ ${#targets[@]} -gt 0 ]]; then
-		set_symlinks ${#targets[@]} || die -q "Couldn't set a new symlink"
-	elif [[ -f "${ROOT}/usr/bin/xemacs" ]]; then
-		# no Emacs target found - link ctags, etags etc. to XEmacs versions
-		set_symlinks xemacs
-	fi
-}

diff --git a/emacs.eselect.5 b/emacs.eselect.5
deleted file mode 100644
index 2755015..0000000
--- a/emacs.eselect.5
+++ /dev/null
@@ -1,68 +0,0 @@
-.\" Copyright 1999-2007 Gentoo Foundation
-.\" Distributed under the terms of the GNU General Public License v2
-.\" $Id$
-.\"
-.TH "ESELECT" "5" "March 2007" "Gentoo Linux" "eselect"
-.SH "NAME"
-emacs.eselect \- The Emacs management module for Gentoo's eselect
-.SH "SYNOPSIS"
-\fBeselect emacs\fR [\fBhelp\fR|\fBusage\fR]
-.br
-\fBeselect emacs list\fR
-.br
-\fBeselect emacs set\fR \fItarget\fR
-.br
-\fBeselect emacs show\fR
-.br
-\fBeselect emacs update\fR [\fI--if-unset\fR]
-.SH "DESCRIPTION"
-\fBeselect\fR is Gentoo's configuration and management tool. It features
-modules that care for the individual administrative tasks.
-.SH "ACTION: LIST"
-\fBeselect emacs list\fR
-.br
-List all installed Emacs versions.
-
-# eselect emacs list
-.br
-Available Emacs symlink targets:
-.br
-  [1]   emacs-18
-  [2]   emacs-21 *
-  [3]   emacs-22
-.SH "ACTION: SET"
-\fBeselect emacs set\fR \fItarget\fR
-.br
-Activates the selected Emacs version. \fItarget\fR can be either an
-identification number given by \fBeselect emacs list\fR or the name of
-one installed version.
-
-# eselect emacs set 3
-.br
-Switching to emacs-22...
-.SH "ACTION: SHOW"
-\fBeselect emacs show\fR [\fItarget\fR]
-.br
-Prints the currently activated Emacs version.
-
-# eselect emacs show
-.br
-Current target of symlink:
-.br
-emacs-22
-.SH "ACTION: UPDATE"
-\fBeselect emacs update\fR [\fI--if-unset\fR]
-.br
-Update the emacs symlink to the last available version. If option
-[\fI--if-unset\fR] is given, an existing implementation is not
-overridden.
-
-# eselect emacs update
-.br
-Switching to emacs-22...
-.SH "AUTHORS"
-Christian Faulhammer <opfer@gentoo.org>
-.br
-Ulrich Mueller <ulm@kph.uni-mainz.de>
-.SH "REVISION"
-$Id$

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     cbee8b474e9552a261225f853fc27e7b551c7088
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 08:37:31 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 08:37:31 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=cbee8b47

Svn keywords.

svn path=/emacs-extra/eselect-emacs/; revision=192

---
 ChangeLog       |    2 ++
 emacs.eselect   |    4 ++--
 emacs.eselect.5 |    4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3c0323d..28b7f0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,3 +58,5 @@ Version 0.6 (28 Mar 2007)
 	Undo previous change.
 	Added man page.
 Version 0.7 (29 Mar 2007)
+	Svn keywords activated.
+	Fixed typo.

diff --git a/emacs.eselect b/emacs.eselect
index 991fbbb..084461e 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: $
+# $Id$
 
 # DOCUMENTATION
 # Following actions possible
@@ -21,7 +21,7 @@
 
 DESCRIPTION="Manage /usr/bin/emacs implementations"
 MAINTAINER="emacs@gentoo.org"
-SVN_DATE='$Date: 2007/03/15 11:47:15 $'
+SVN_DATE='$Date$'
 VERSION=$(svn_date_to_version "${SVN_DATE}" )
 
 BINARYLIST="emacsclient etags ctags b2m ebrowse rcs-checkin grep-changelog"

diff --git a/emacs.eselect.5 b/emacs.eselect.5
index 1539b59..c7df963 100644
--- a/emacs.eselect.5
+++ b/emacs.eselect.5
@@ -17,7 +17,7 @@ modules that care for the individual administrative tasks.
 .SH "ACTION: LIST"
 \fBeselect emacs list\fR
 .br
-List all installed version of emacs.
+List all installed versions of emacs.
 
 # eselect emacs list
 .br
@@ -61,4 +61,4 @@ Christian Faulhammer <opfer@gentoo.org>
 .br
 Ulrich Mueller <ulm@kph.uni-mainz.de>
 .SH "REVISION"
-$Id: $
+$Id$

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     2852d86f19251dadd921cfb5ef0a9e6a978b771d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 07:09:13 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 07:09:13 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=2852d86f

emacs-desktop-0.2

svn path=/emacs-extra/emacs-desktop/; revision=255

---
 ChangeLog |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a5a4a4..b733626 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,2 +1,3 @@
 Version 0.1 (30 Mar 2007)
 	Split off from eselect-emacs.
+Version 0.2 (15 Apr 2007)

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     b1620a82798b38e5a300831bfd72cf38376187ec
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 15:19:13 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu May 24 15:19:13 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=b1620a82

New ChangeLog format and Makefile adapted.

svn path=/emacs-extra/emacs-desktop/; revision=328

---
 ChangeLog |   16 +++++++++++++---
 Makefile  |    4 +++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b733626..c486f87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
-Version 0.1 (30 Mar 2007)
-	Split off from eselect-emacs.
-Version 0.2 (15 Apr 2007)
+2007-05-24  Ulrich Mueller  <ulm@gentoo.org>
+
+	* Makefile (PV): Extract PV from new ChangeLog format.
+
+2007-04-15  Ulrich Mueller  <ulm@gentoo.org>
+
+	* version 0.2
+
+2007-03-30  Ulrich Mueller  <ulm@gentoo.org>
+
+	* Split off from eselect-emacs.
+	* version 0.1
+

diff --git a/Makefile b/Makefile
index 40a89b5..b6e71e1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 PN = emacs-desktop
-PV = $(shell sed '/^Version/h;$$!d;g;s/[^0-9.]*\([0-9.]*\).*/\1/' ChangeLog)
+#PV = $(shell sed '/^Version/h;$$!d;g;s/[^0-9.]*\([0-9.]*\).*/\1/' ChangeLog)
+PV = $(shell sed '/^[ \t]*\* [Vv]ersion/!d;s/[^0-9.]*\([0-9.]*\).*/\1/;q' \
+	ChangeLog)
 P = $(PN)-$(PV)
 
 DISTFILES = emacs.desktop emacsclient.desktop \

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     b599eaf8e2dad344ad30825007b874eb92ab0397
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  6 18:37:58 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Dec  6 18:37:58 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=b599eaf8

(Comment): German and Spanish translation added, others welcome

(Icon): Extension removed

(Categories): Application removed as it is obsolete

svn path=/emacs-extra/emacs-desktop/; revision=835

---
 ChangeLog     |    7 +++++++
 emacs.desktop |    6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c486f87..8c05440 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-06  Christian Faulhammer  <opfer@gentoo.org>
+
+	* emacs.desktop (Comment): German and Spanish translation added,
+	others welcome
+	(Icon): Extension removed
+	(Categories): Application removed as it is obsolete
+
 2007-05-24  Ulrich Mueller  <ulm@gentoo.org>
 
 	* Makefile (PV): Extract PV from new ChangeLog format.

diff --git a/emacs.desktop b/emacs.desktop
index 672950c..4a0d8e3 100644
--- a/emacs.desktop
+++ b/emacs.desktop
@@ -2,10 +2,12 @@
 Name=GNU Emacs
 GenericName=Emacs
 Comment=Emacs is the extensible, customizable, self-documenting real-time display editor.
-Icon=emacs.png
+Comment[de]=Emacs ist der erweiterbare, anpassbare, selbst-dokumentierende Echtzeit-Editor
+Comment[es]=Emacs es un editor ampliable, adaptable, mismo documentado, de tiempo real
+Icon=emacs
 TryExec=/usr/bin/emacs
 Exec=/usr/bin/emacs %F
 Terminal=false
 Type=Application
-Categories=Application;Development;TextEditor;
+Categories=Development;TextEditor;
 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++;

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     87b53f0aafa0143ccd47636fcc95ae735ed2dab0
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  6 18:40:44 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Dec  6 18:40:44 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=87b53f0a

(Comment): German and Spanish translation added, others welcome

(Icon): Extension removed

svn path=/emacs-extra/emacs-desktop/; revision=836

---
 ChangeLog           |    4 ++++
 emacsclient.desktop |    4 +++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8c05440..dee2547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-12-06  Christian Faulhammer  <opfer@gentoo.org>
 
+	* emacsclient.desktop (Comment): German and Spanish translation
+	added, others welcome
+	(Icon): Extension removed
+
 	* emacs.desktop (Comment): German and Spanish translation added,
 	others welcome
 	(Icon): Extension removed

diff --git a/emacsclient.desktop b/emacsclient.desktop
index 1a690cb..8936ace 100644
--- a/emacsclient.desktop
+++ b/emacsclient.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]
 Name=Emacsclient
 Comment=Tell a running Emacs to visit a file.
-Icon=emacs.png
+Comment[de]=In einer laufenden Emacs-Instanz eine Datei öffnen.
+Comment[es]=Abrir un archivo en en Emacs corriente.
+Icon=emacs
 NoDisplay=true
 TryExec=/usr/bin/emacsclient
 Exec=/usr/bin/emacsclient -a /usr/bin/emacs %F

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     f87ac26650d406fe14dfa581bb9fdb115a591ea4
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 09:13:14 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 09:13:14 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=f87ac266

Remove version tag since 0.3 is not released yet.

svn path=/emacs-extra/emacs-desktop/; revision=888

---
 ChangeLog |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a51db59..f5020d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,8 +13,6 @@
 
 2007-12-06  Christian Faulhammer  <opfer@gentoo.org>
 
-	* version 0.3
-
 	* emacsclient.desktop (Comment): German and Spanish translation
 	added, others welcome
 	(Icon): Extension removed

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     986d5f5629d49334c125bfe540e389c79ced5c93
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  7 14:32:33 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Dec  7 14:32:33 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=986d5f56

Set charset to UTF-8.

svn path=/emacs-extra/emacs-desktop/; revision=840

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     577fe8c5dfe8059cb70eeebd9aac598298970109
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 10 17:05:25 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Dec 10 17:05:25 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=577fe8c5

(Comment): Correct typo in Spanish translation, pointed out by ulm

svn path=/emacs-extra/emacs-desktop/; revision=841

---
 ChangeLog           |    5 +++++
 emacsclient.desktop |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ceed51b..a51db59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-10  Christian Faulhammer  <opfer@gentoo.org>
+
+	* emacsclient.desktop (Comment): Correct typo in Spanish
+	translation, pointed out by ulm
+
 2007-12-07  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacsclient.desktop: Remove -a option from Exec since it does

diff --git a/emacsclient.desktop b/emacsclient.desktop
index ebfa37c..a9fefbb 100644
--- a/emacsclient.desktop
+++ b/emacsclient.desktop
@@ -2,7 +2,7 @@
 Name=Emacsclient
 Comment=Tell a running Emacs to visit a file
 Comment[de]=In einer laufenden Emacs-Instanz eine Datei öffnen
-Comment[es]=Abrir un archivo en en Emacs corriente
+Comment[es]=Abrir un archivo en un Emacs corriente
 Comment[fr]=Ouvre un fichier dans une instance d'Emacs qui est déjà lancée
 Icon=emacs
 NoDisplay=true

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     8bfe909fe12dc443a6a73e18a0d39d63b5e509fa
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  7 14:16:50 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Dec  7 14:16:50 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=8bfe909f

Add French translation.

svn path=/emacs-extra/emacs-desktop/; revision=839

---
 ChangeLog           |    8 ++++++++
 emacs.desktop       |    1 +
 emacsclient.desktop |    9 +++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8393173..ceed51b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-07  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacsclient.desktop: Remove -a option from Exec since it does
+	not work properly anyway. Remove trailing full stop from comments.
+	Add French translation.
+
+	* emacs.desktop: Add French translation.
+
 2007-12-06  Christian Faulhammer  <opfer@gentoo.org>
 
 	* version 0.3

diff --git a/emacs.desktop b/emacs.desktop
index 4a0d8e3..bf7fbc3 100644
--- a/emacs.desktop
+++ b/emacs.desktop
@@ -4,6 +4,7 @@ GenericName=Emacs
 Comment=Emacs is the extensible, customizable, self-documenting real-time display editor.
 Comment[de]=Emacs ist der erweiterbare, anpassbare, selbst-dokumentierende Echtzeit-Editor
 Comment[es]=Emacs es un editor ampliable, adaptable, mismo documentado, de tiempo real
+Comment[fr]=Emacs est l'éditeur plein écran avancé, auto-documenté, personnalisable et extensible
 Icon=emacs
 TryExec=/usr/bin/emacs
 Exec=/usr/bin/emacs %F

diff --git a/emacsclient.desktop b/emacsclient.desktop
index 8936ace..ebfa37c 100644
--- a/emacsclient.desktop
+++ b/emacsclient.desktop
@@ -1,12 +1,13 @@
 [Desktop Entry]
 Name=Emacsclient
-Comment=Tell a running Emacs to visit a file.
-Comment[de]=In einer laufenden Emacs-Instanz eine Datei öffnen.
-Comment[es]=Abrir un archivo en en Emacs corriente.
+Comment=Tell a running Emacs to visit a file
+Comment[de]=In einer laufenden Emacs-Instanz eine Datei öffnen
+Comment[es]=Abrir un archivo en en Emacs corriente
+Comment[fr]=Ouvre un fichier dans une instance d'Emacs qui est déjà lancée
 Icon=emacs
 NoDisplay=true
 TryExec=/usr/bin/emacsclient
-Exec=/usr/bin/emacsclient -a /usr/bin/emacs %F
+Exec=/usr/bin/emacsclient %F
 Terminal=false
 Type=Application
 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++;

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     5b8a03fe64c300ea09691f5146276fd1f59024a9
Author:     Christian Faulhammer <opfer <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  6 18:42:31 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Dec  6 18:42:31 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=5b8a03fe

raise version number and add an additional empty line

svn path=/emacs-extra/emacs-desktop/; revision=837

---
 ChangeLog |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dee2547..8393173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-12-06  Christian Faulhammer  <opfer@gentoo.org>
 
+	* version 0.3
+
 	* emacsclient.desktop (Comment): German and Spanish translation
 	added, others welcome
 	(Icon): Extension removed
@@ -20,5 +22,5 @@
 2007-03-30  Ulrich Mueller  <ulm@gentoo.org>
 
 	* Split off from eselect-emacs.
-	* version 0.1
 
+	* version 0.1

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1233 commit in: /

[Sebastian Pipping]

commit:     1a76c57b9291354dd894b4bbc4f7fd86e5fb4161
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 27 21:39:36 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 21:39:36 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=1a76c57b

Use env-update instead of env.eselect. Check for being root.

svn path=/emacs-extra/eselect-emacs/; revision=180

---
 ChangeLog     |    2 ++
 emacs.eselect |    9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db69dc0..44474dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,3 +50,5 @@ Version 0.5 (24 Mar 2007)
 	27 Mar 2007
 	Call env.eselect to update the environment from env.d files.
 	Brought do_set and do_update more in line.
+	Check for root in do_set and do_update.
+	env.eselect seems to be buggy; use env-update instead.

diff --git a/emacs.eselect b/emacs.eselect
index fee497c..3f6d7af 100644
--- a/emacs.eselect
+++ b/emacs.eselect
@@ -109,8 +109,11 @@ set_symlinks() {
 	set_bin_symlinks "${target}"
 	set_man_symlinks "${target}"
 	set_infopath "${target}"
-	# call env.eselect to update the environment from env.d files
-	do_action env update >/dev/null
+
+	# update /etc/profile.env from /etc/env.d files
+	#do_action env update >/dev/null
+	env-update --no-ldconfig
+
 	return 0
 }
 
@@ -178,6 +181,7 @@ describe_set_parameters() {
 do_set() {
 	[[ -z "${1}" ]] && die -q "You didn't tell me what to set the symlink to"
 	[[ -n "${2}" ]] && die -q "Too many parameters"
+	[[ -w "${ROOT}/usr/bin" ]] || die -q "You need to be root!"
 
 	if [[ -L "${ROOT}/usr/bin/emacs" ]]; then
 		remove_symlinks || die -q "Couldn't remove existing symlink"
@@ -201,6 +205,7 @@ describe_update_options() {
 do_update() {
 	[[ -z "${1}" || ( -z "${2}" && "${1}" == "--if-unset" ) ]] ||
 		die -q "Usage error"
+	[[ -w "${ROOT}/usr/bin" ]] || die -q "You need to be root!"
 
 	if [[ -L "${ROOT}/usr/bin/emacs" ]]; then
 		[[ ${1} == "--if-unset" \

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     9d2f78e1a08b8b1dbdb8bc81acf2b1036de1b8de
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 28 11:16:02 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Dec 28 11:16:02 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=9d2f78e1

Canonical ordering for desktop entry keys. Version key added.
Release version 0.3.

svn path=/emacs-extra/emacs-desktop/; revision=892

---
 ChangeLog           |   11 +++++++++++
 Makefile            |    8 ++++++--
 emacs.desktop       |    7 ++++---
 emacsclient.desktop |    5 +++--
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f5020d0..e4b1451 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-12-28  Ulrich Mueller  <ulm@gentoo.org>
+
+	* version 0.3
+
+	* Makefile (DESKTOPFILES): Validate with desktop-file-validate.
+
+	* emacsclient.desktop: Ditto.
+
+	* emacs.desktop: Canonical ordering for desktop entry keys.
+	(Version): Key added.
+
 2007-12-10  Christian Faulhammer  <opfer@gentoo.org>
 
 	* emacsclient.desktop (Comment): Correct typo in Spanish

diff --git a/Makefile b/Makefile
index b6e71e1..4eca6f4 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,13 @@ PV = $(shell sed '/^[ \t]*\* [Vv]ersion/!d;s/[^0-9.]*\([0-9.]*\).*/\1/;q' \
 	ChangeLog)
 P = $(PN)-$(PV)
 
-DISTFILES = emacs.desktop emacsclient.desktop \
+DESKTOPFILES = emacs.desktop emacsclient.desktop
+DISTFILES = $(DESKTOPFILES) \
 	README.icons emacs.png \
 	emacs_16.png emacs_24.png emacs_32.png emacs_48.png gnured_48.png
 
 
-.PHONY: all dist clean
+.PHONY: all dist clean $(DESKTOPFILES)
 
 all:
 
@@ -17,5 +18,8 @@ dist: $(DISTFILES)
 	tar -czf $(P).tar.gz --transform='s%^%$(P)/%' $^
 	tar -tzvf $(P).tar.gz
 
+$(DESKTOPFILES):
+	desktop-file-validate $@
+
 clean:
 	-rm -f *~ *.tmp *.gz *.bz2

diff --git a/emacs.desktop b/emacs.desktop
index 4192803..2e7318f 100644
--- a/emacs.desktop
+++ b/emacs.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]
+Type=Application
+Version=1.0
 Name=GNU Emacs
 GenericName=Emacs
-Comment=Emacs is the extensible, customizable, self-documenting real-time display editor.
+Comment=Emacs is the extensible, customizable, self-documenting real-time display editor
 Comment[de]=Emacs ist der erweiterbare, anpassbare, selbst-dokumentierende Echtzeit-Editor
 Comment[es]=Emacs es un editor ampliable, adaptable, mismo documentado, de tiempo real
 Comment[fr]=Emacs est l'éditeur plein écran avancé, auto-documenté, personnalisable et extensible
@@ -9,6 +11,5 @@ Icon=emacs
 TryExec=/usr/bin/emacs
 Exec=/usr/bin/emacs %F
 Terminal=false
-Type=Application
-Categories=Development;TextEditor;
 MimeType=text/css;text/english;text/html;text/plain;text/x-c;text/x-chdr;text/x-csrc;text/x-c++;text/x-c++hdr;text/x-c++src;text/x-java;text/x-makefile;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;
+Categories=Development;TextEditor;

diff --git a/emacsclient.desktop b/emacsclient.desktop
index 4a43404..cc03ba0 100644
--- a/emacsclient.desktop
+++ b/emacsclient.desktop
@@ -1,13 +1,14 @@
 [Desktop Entry]
+Type=Application
+Version=1.0
 Name=Emacsclient
+NoDisplay=true
 Comment=Tell a running Emacs to visit a file
 Comment[de]=In einer laufenden Emacs-Instanz eine Datei öffnen
 Comment[es]=Abrir un archivo en un Emacs corriente
 Comment[fr]=Ouvre un fichier dans une instance d'Emacs qui est déjà lancée
 Icon=emacs
-NoDisplay=true
 TryExec=/usr/bin/emacsclient
 Exec=/usr/bin/emacsclient %F
 Terminal=false
-Type=Application
 MimeType=text/css;text/english;text/html;text/plain;text/x-c;text/x-chdr;text/x-csrc;text/x-c++;text/x-c++hdr;text/x-c++src;text/x-java;text/x-makefile;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;

[gentoo-commits] proj/emacs-tools:backups/emacs-common-gentoo@1030 commit in: /

[Sebastian Pipping]

commit:     0ab5122f32741c3e68d5ee2f359b8d97c4fdfeba
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 09:37:52 2007 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 09:37:52 2007 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=0ab5122f

Add MIME types for css and html, sort the list.

svn path=/emacs-extra/emacs-desktop/; revision=889

---
 emacs.desktop       |    2 +-
 emacsclient.desktop |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emacs.desktop b/emacs.desktop
index bf7fbc3..4192803 100644
--- a/emacs.desktop
+++ b/emacs.desktop
@@ -11,4 +11,4 @@ Exec=/usr/bin/emacs %F
 Terminal=false
 Type=Application
 Categories=Development;TextEditor;
-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++;
+MimeType=text/css;text/english;text/html;text/plain;text/x-c;text/x-chdr;text/x-csrc;text/x-c++;text/x-c++hdr;text/x-c++src;text/x-java;text/x-makefile;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;

diff --git a/emacsclient.desktop b/emacsclient.desktop
index a9fefbb..4a43404 100644
--- a/emacsclient.desktop
+++ b/emacsclient.desktop
@@ -10,4 +10,4 @@ TryExec=/usr/bin/emacsclient
 Exec=/usr/bin/emacsclient %F
 Terminal=false
 Type=Application
-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++;
+MimeType=text/css;text/english;text/html;text/plain;text/x-c;text/x-chdr;text/x-csrc;text/x-c++;text/x-c++hdr;text/x-c++src;text/x-java;text/x-makefile;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;