summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2007-12-05 20:17:09 +0000
committerUlrich Müller <ulm@gentoo.org>2007-12-05 20:17:09 +0000
commitba7f571e1fb24e2bcb746448ae92590adb15bdc1 (patch)
treed3bd2c8905e4885ef87c6b0588cea9292bf1c828 /app-emacs
parentx86 stable, bug #201312 (diff)
downloadgentoo-2-ba7f571e1fb24e2bcb746448ae92590adb15bdc1.tar.gz
gentoo-2-ba7f571e1fb24e2bcb746448ae92590adb15bdc1.tar.bz2
gentoo-2-ba7f571e1fb24e2bcb746448ae92590adb15bdc1.zip
Use SITELISP variable in site-init file. Remove stale file.
(Portage version: 2.1.4_rc7)
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/haskell-mode/ChangeLog6
-rw-r--r--app-emacs/haskell-mode/files/50haskell-mode-gentoo.el13
-rw-r--r--app-emacs/haskell-mode/files/51haskell-mode-gentoo.el5
3 files changed, 8 insertions, 16 deletions
diff --git a/app-emacs/haskell-mode/ChangeLog b/app-emacs/haskell-mode/ChangeLog
index c3c948a8d3b2..6b1d9d914593 100644
--- a/app-emacs/haskell-mode/ChangeLog
+++ b/app-emacs/haskell-mode/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emacs/haskell-mode
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/haskell-mode/ChangeLog,v 1.25 2007/07/04 23:32:02 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/haskell-mode/ChangeLog,v 1.26 2007/12/05 20:17:09 ulm Exp $
+
+ 05 Dec 2007; Ulrich Mueller <ulm@gentoo.org>
+ -files/50haskell-mode-gentoo.el, files/51haskell-mode-gentoo.el:
+ Use SITELISP variable in site-init file. Remove stale file.
04 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
haskell-mode-2.3.ebuild:
diff --git a/app-emacs/haskell-mode/files/50haskell-mode-gentoo.el b/app-emacs/haskell-mode/files/50haskell-mode-gentoo.el
deleted file mode 100644
index 39692f6b5ecc..000000000000
--- a/app-emacs/haskell-mode/files/50haskell-mode-gentoo.el
+++ /dev/null
@@ -1,13 +0,0 @@
-
-;;; haskell-mode site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(setq auto-mode-alist
- (append auto-mode-alist
- '(("\\.[hg]s$" . haskell-mode)
- ("\\.hi$" . haskell-mode)
- ("\\.l[hg]s$" . literate-haskell-mode))))
-(autoload 'haskell-mode "haskell-mode"
- "Major mode for editing Haskell scripts." t)
-(autoload 'literate-haskell-mode "haskell-mode"
- "Major mode for editing literate Haskell scripts." t)
diff --git a/app-emacs/haskell-mode/files/51haskell-mode-gentoo.el b/app-emacs/haskell-mode/files/51haskell-mode-gentoo.el
index 6f42b549c995..a3f4f1bea433 100644
--- a/app-emacs/haskell-mode/files/51haskell-mode-gentoo.el
+++ b/app-emacs/haskell-mode/files/51haskell-mode-gentoo.el
@@ -1,3 +1,4 @@
-;;; app-emacs/haskell-mode site file initialisation
-(load "/usr/share/emacs/site-lisp/haskell-mode/haskell-site-file")
+;;; haskell-mode site-lisp configuration
+
+(load "@SITELISP@/haskell-site-file" nil t)