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

["Sebastian Pipping" <sping@gentoo.org>]

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 ###