Browse Source

deleted emacs21 emacs22

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6321 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 12 years ago
parent
commit
a1b38433ac

+ 0 - 617
e/emacs21/emacs21-vl.spec

@@ -1,617 +0,0 @@
-%define with_emcws %{?_with_emcws:1}%{!?_with_emcws:0}
-
-%define emacsversion 21.4
-%define emacsrelese 1%{?_dist_release}
-
-%define _noVersionedDependencies 1
-%define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
-
-%define infodir %{_infodir}/emacs-%{emacsversion}
-
-Summary:      GNU Emacs editor 
-Summary(ja):  GNU Emacs エディタ
-Name:         emacs21
-Version:      %{emacsversion}
-Release:      %{emacsrelese}
-Source0:      ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}a.tar.gz
-Source1:      ftp://ftp.gnu.org/pub/gnu/emacs/leim-%{version}.tar.gz
-Source3:      emacs.wmconfig
-Source4:      emacs.desktop
-
-## Sources from Rawhide 21.2-11
-Source10:     site-start.el
-Source11:     python-mode.el
-Source12:     http://www.tihlde.org/~stigb/rpm-spec-mode.el
-Source13:     ftp://ftp.gnu.org/gnu/emacs/elisp-manual-21-2.8.tar.bz2
-# 1.0.2 - http://prdownloads.sourceforge.net/php-mode/php-mode-102.el
-Source14:     php-mode.el
-Source15:     php-mode-init.el
-Source16:     ssl.el
-Source17:     po-mode.el
-Source18:     po-mode-init.el
-
-# Enable Japanese Menu
-Source100:    http://phe.phyas.aichi-edu.ac.jp/~cyamauch/arch/menu-tree.el
-
-## Emcws
-Patch0:	      emcws-21.3-20031213.gz
-
-## Vine Patch(es)
-Patch10:      emacs-21.1-ppc-nocombreloc.patch
-Patch11:      emacs-21.2-emcws-version.patch
-Patch12:      emacs-21.2-emcws-locallisppath.patch
-Patch13:      emacs-21.4-locallisppath.patch
-Patch20:      emacs-21.3-fixed-resolution.patch
-
-# Enable Japanese Menu
-Patch101:     http://phe.phyas.aichi-edu.ac.jp/~cyamauch/arch/emacs-21.1-xim-useXim.patch
-Patch102:     http://phe.phyas.aichi-edu.ac.jp/~cyamauch/arch/emacs-21.2-isearch-x.el.patch
-Patch103:     emacs-21.3-fontset-20020319.patch.gz
-
-# security patches (from Debian)
-Patch501:     CVE-2007-2833.diff
-Patch502:     CVE-2007-6109.diff
-Patch503:     CVE-2008-1694.diff
-Patch504:     CVE-2008-2142.diff
-
-# patches from Mandrake
-Patch1001:    emacs-21.1-bzip2.patch.bz2
-Patch1002:    emacs-altmeta.patch.bz2
-Patch1003:    emacs-21.1-fix-autoconf.patch.bz2
-Patch1004:    emacs-21.2-infofix.bz2
-Patch1005:    emacs-21.2-browse-url.bz2
-Patch1006:    emacs-21.2-x86_64.patch.bz2
-
-License:    GPL
-Group:        Applications/Editors/Emacs
-
-Distribution: Vine
-Vendor:       Project Vine
-Packager:     Daisuke SUZUKI <daisuke@linux.or.jp>
-
-BuildRoot:    %{_tmppath}/%{name}-%{version}-root
-# Requires:     tamago >= 4.0.6
-Obsoletes:    mule-base, mule-canna, mule-wnn6, mule, emacs-beta
-Obsoletes:    emacs <= 21.2-0vl11
-Provides:     emacs = %{version}
-Provides:     emacsen = 0.1
-%prereq_ge    emacsen-common
-
-# Emcws
-%if %{with_emcws}
-Requires:     libcanna
-BuildPreReq:  Canna-devel
-%endif
-
-BuildPreReq:  autoconf213
-BuildPrereq:  libpng >= 1.2.5
-
-PreReq:       Xaw3d  >= 1.5E-4vl1
-BuildPreReq:  Xaw3d-devel
-
-%description
-GNU Emacs is the extensible, customizable, self-documenting real-time
-display editor. 
-
-In order to input Japanese with Wnn, you should also install
-tamago package.
-%if %{with_emcws}
-This is Canna enabled Emacs - Emcws version.
-%endif
-
-
-%description -l ja 
-Emacs は拡張性が高く、さまざまなカスタマイズが可能な高機能エディタです。
-
-Wnn で日本語入力するためには tamago をinstall してください。 
-%if %{with_emcws}
-この Emacs は Emcws パッチによって Canna 対応になっています。
-%endif
-
-
-%prep
-
-%setup -q -b 1 -n emacs-%{version}
-
-%if %{with_emcws}
-%patch0 -p1
-%patch11 -p1
-%patch12 -p1
-%else
-%patch13 -p1
-%endif
-
-%ifarch ppc
-%patch10 -p1
-%endif
-
-%patch20 -p1
-
-%patch101 -p1
-%patch102 -p4
-%patch103 -p1
-
-%patch501 -p1
-%patch502 -p1
-%patch503 -p1
-%patch504 -p1
-
-%patch1001 -p1
-%patch1003 -p1
-%patch1004 -p1
-%patch1005 -p1
-%patch1006 -p1
-
-autoconf-2.13
-
-
-%build
-
-##CFLAGS="$RPM_OPT_FLAGS" CPPFLAGS="-O2" LDFLAGS=-s \
-##./configure --prefix=%{_prefix} --libexecdir=%{_libdir} --infodir=%{infodir} \
-##    --x-includes=%{_includedir} --x-libraries=/usr/X11R6/lib \
-##    --with-x-toolkit=athena ${RPM_ARCH}-vine-linux 
-
-export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS"
-#to find installinfo
-export PATH="$PATH:/sbin:/usr/sbin"
-
-%configure --with-gcc --with-pop --with-sound \
-	--libexecdir=%{_libdir} --infodir=%{infodir} \
-	%{with_emcws:--with-canna} \
-	--disable-rename
-
-make
-
-
-%define recompile src/emacs -batch --no-init-file --no-site-file -f batch-byte-compile
-
-# recompile patched .el files
-%{recompile} lisp/net/browse-url.el
-
-# bytecompile python-mode, ssl, php-mode and rpm-spec-mode
-#cp %SOURCE12  %SOURCE14 %SOURCE16 %SOURCE17 .
-##%%{recompile} rpm-spec-mode.el php-mode.el ssl.el po-mode.el
-
-
-%install
-[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
-
-ARCHDIR=${RPM_ARCH}-vine-linux
-
-%makeinstall libexecdir=$RPM_BUILD_ROOT%{_libdir} \
-	infodir=${RPM_BUILD_ROOT}%{infodir} 
-
-(cd $RPM_BUILD_ROOT%{_mandir}/man1/; mv ctags.1 gctags.1)
-(cd $RPM_BUILD_ROOT%{_bindir}/; mv ctags gctags)
-
-mkdir -p  $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/etc
-mkdir -p  $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp
-cp %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp
-
-# The elisp reference manual
-bzcat %{SOURCE13} | tar xf -
-pushd elisp-manual-21-2.8
-install -m 644 elisp elisp-? elisp-?? $RPM_BUILD_ROOT/%{infodir}
-popd
-
-# some modifications of installed files
-
-rm -f $RPM_BUILD_ROOT%{infodir}/dir
-gzip -9nf $RPM_BUILD_ROOT%{infodir}/*
-
-install -m 644 %{SOURCE10} \
-	$RPM_BUILD_ROOT/%{_datadir}/emacs-%{version}/site-lisp/site-start.el
-
-# no-python-mode patch
-#(cd $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/
-#patch -p0 < %{PATCH13}
-#sed -e "s|/usr/share/emacs/site-lisp|%{_datadir}/emacs-%{version}/site-lisp|g" \
-#	site-start.el > site-start.tmp
-#mv -f site-start.tmp site-start.el
-#)
-
-## create site-start.d directory
-install -m 755 -d ${RPM_BUILD_ROOT}/etc/emacs-%{version}/site-start.d
-
-## Python mode, php mode and rpm-spec mode
-
-#install -c -m0644 po-mode.el po-mode.elc php-mode.el php-mode.elc \
-#     rpm-spec-mode.el rpm-spec-mode.elc ssl.el ssl.elc \
-#     $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/
-#install -m0644 %SOURCE15 \
-#     $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/site-start.d/php-mode-init.el
-#install -m0644 %SOURCE18 \
-#     $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/site-start.d/po-mode-init.el
-
-## make file list
-strip $RPM_BUILD_ROOT%{_bindir}/* || :
-
-# wmconfig file
-mkdir -p $RPM_BUILD_ROOT/etc/X11/wmconfig
-#install -m 0644 $RPM_SOURCE_DIR/emacs.wmconfig $RPM_BUILD_ROOT/etc/X11/wmconfig/emacs
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/etc/X11/wmconfig/emacs
-
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
-%{__install} -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/applications/
-
-# Remove ctags
-#rm -f $RPM_BUILD_ROOT/usr/bin/ctags
-#rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/*ctags*
-#rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/etc/ctags*
-
-DIR="${RPM_BUILD_ROOT}/usr/share/emacs ${RPM_BUILD_ROOT}/usr/share/emacs-%{version}"
-BIN=${RPM_BUILD_ROOT}%{_bindir}
-LIB=${RPM_BUILD_ROOT}%{_libdir}
-EL="*.el"
-
-## prepare file list for emacs
-
-echo "/usr/bin/b2m
-/usr/bin/etags
-/usr/bin/rcs-checkin
-/usr/bin/emacs
-/usr/bin/emacsclient
-/usr/bin/gctags"|
-    sed -e "s#[^\n]*#mv ${RPM_BUILD_ROOT}\0 ${RPM_BUILD_ROOT}\0.emacs-%{version}#"| 
-    awk '{system($_)}'  
-
-
-# find ${RPM_BUILD_ROOT}/%{_mandir} -type f |
-# sed -e "s#\.gz##"|
-# sed -e "s#[^\n]*#mv \0.gz \0-emacs-%{version}.gz#"|
-#    awk '{system($_)}'
-
-
-
-
-#find ${RPM_BUILD_ROOT}/%{_infodir} -type f |
-#sed -e "s#\.gz##"|
-#sed -e "s#[^\n]*#mv \0.gz \0-e21.gz#"|
-#    awk '{system($_)}' 
-
-
-
-
-
-find $DIR $BIN $LIB -type d |
-  sed -e "s#^${RPM_BUILD_ROOT}#%dir #" > rpm-files
-
-find $DIR $BIN $LIB -type f |
-  sed -e "
-    s#^${RPM_BUILD_ROOT}\(.*movemail\)#%attr(2755, root, mail) \1#
-    s#^${RPM_BUILD_ROOT}##
-  " >> rpm-files
-
-
-%clean
-[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
-
-
-%define info_files ccmode cl dired-x ediff emacs forms gnus info message mh-e reftex sc vip viper widget
-
-
-%pre
-
-if [ -L /usr/share/emacs-%{version}/site-lisp ] ; then
-    rm -f /usr/share/emacs-%{version}/site-lisp
-fi
-
-if [ -d /usr/share/emacs/%{version}/site-lisp ] ; then
-    find /usr/share/emacs/%{version}/site-lisp/* -maxdepth 0 | grep -v subdirs.el | \
-	xargs rm -rf
-fi
-
-
-%post
-
-if [ "$1" = 1 ]; then
-
-%_addflavorslist emacs-%{version}
-
-export PRIORITY=20
-
-%_installemacs emacs-%{version}
-
-unset PRIORITY
-
-
-for f in %{info_files}; do
-  /sbin/install-info %{infodir}/$f.gz %{infodir}/dir --section="Emacs"
-done
-
-
-
-fi
-
-if [ "$1" = 2 ]; then
-
-#  export PRIORITY=20
-  
-#  %_installemacs emacs-%{version}
-  
-#  unset PRIORITY
-    
-  echo emacs-%{version} >  /var/lib/emacsen-common/doinstaflavor-emacs
-    
-fi
-
-
-%postun
-
-if [ $1 = 1 ]; then
-# run upgrade install time
-
-# old version uninstall
-
-%_removeflavorslist emacs-%{version}
-
-%_removeemacs emacs-%{version}
-
-
-#new version install
-if [ -f /var/lib/emacsen-common/doinstaflavor-emacs ] ; then
-
-NEWFLAVOR=$(cat /var/lib/emacsen-common/doinstaflavor-emacs)
-
-%_addflavorslist $NEWFLAVOR
-
-export PRIORITY=20
-
-%_installemacs $NEWFLAVOR
-
-unset PRIORITY
-
-rm -rf /var/lib/emacsen-common/doinstaflavor-emacs
-
-fi
-
-fi
-
-
-%preun
-if [ $1 = 0 ]; then
-
-%_removeflavorslist emacs-%{version}
-
-%_removeemacs emacs-%{version}
-
-for f in %{info_files}; do
-  /sbin/install-info --delete %{infodir}/$f.gz %{infodir}/dir \
-    --section="Emacs"
-done
-
-fi
-
-
-%files -f rpm-files 
-%defattr(-,root,root)
-%doc INSTALL README BUGS ChangeLog
-%dir /etc/emacs-%{version}/site-start.d
-%{_infodir}/*
-# These man pages are no longer maintained, so not to be included.
-# %{_mandir}/*/*
-%config(missingok) /etc/X11/wmconfig/emacs
-%config(missingok) %{_datadir}/applications/emacs.desktop
-# %{_datadir}/emacs-%{version}/site-lisp
-
-
-%changelog
-* Mon Aug 25 2008 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 21.4-1
-- new versioning policy; spec in UTF-8
-- updated to emacs-21.4a
-- import security fixes from Debian
-  CVE-2008-2142: fix insecure setting of fast-lock-cache-directories
-  CVE-2008-1694: fix insecure temporary file creation in vcdiff script
-                 leading to possible symlink attacks
-  CVE-2007-6109: a stack-based buffer overflow in the format function
-                 when dealing with high precision values could lead to
-                 arbitrary code execution
-  CVE-2007-2833: fix a crash when determining the size of some GIF images
-
-* Mon Jun 04 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 21.4-0vl12
-- rename to emacs21 from emacs
-- Pbsoletes: emacs <= 21.4-0vl11, Provides: emacs = %%{version}
-
-* Sun May 20 2007 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 21.4-0vl11
-- rebuilt with new toolchain
-
-* Sun Mar 11 2007 KAZUKI SHIMURA <kazuki@ma.ccnw.ne.jp> 21.4-0vl10
-- rebuild with Xaw3d-1.5E
-- update PreReq: Xaw3d (>= 1.5E-4vl1)
-
-* Tue Jan 16 2007 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 21.4-0vl9
-- separete .desktop as Source4 to use UTF-8 encoding.
-
-* Sat Jan 13 2007 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 21.4-0vl8
-- change .desktop installation directory. <BTS:VineLinux:405>
-
-* Sat Oct 14 2006 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 21.4-0vl7
-- recompile patched browse-url.el in the %%build section (<BTS:175>)
-
-* Fri Jul 28 2006 NAKAMURA Kenta <kenta@vinelinux.org> 21.4-0vl6
-- added PreReq: Xaw3d >= 1.5-17vl3
-
-* Sun Jul 23 2006 NAKAMURA Kenta <kenta@vinelinux.org> 21.4-0vl5
-- rebuild with Xaw3d-1.5-17vl3 (libXaw3d.so.8)
-
-* Fri Jun 23 2006 Daisuke SUZUKI <daisuke@linux.or.jp> 21.4-0vl4
-- add %%with_emcws build switch to enable/disable emcws patch.
-  - switch default to disable emcws (do not link with libcanna)
-
-* Sat Sep  3 2005 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 21.4-0vl3
-- create site-start.d directory on %%install
-
-* Thu Feb 17 2005 Hiroaki Irokawa <irorin@terra.dti.ne.jp> 21.4-0vl2
-- included leim-21.4
-- update emcws-21.3-20031213.gz
-
-* Wed Feb 16 2005 Hiroaki Irokawa <irorin@terra.dti.ne.jp> 21.4-0vl1
-- update
-
-* Sat Jul 24 2004 Daisuke SUZUKI <daisuke@linux.or.jp> 21.3-0vl7
-- rebuild with Xaw3d, add BuildRequires: Xaw3d-devel
-
-* Fri Jul 23 2004 Daisuke SUZUKI <daisuke@linux.or.jp> 21.3-0vl6
-- add Patch20 to fix display resolutions. (set to 96dpi)
-  (do not compute dynamically from display's size)
-
-* Tue Mar 16 2004 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 21.3-0vl5
-- rebuilt with new toolchain environment
-
-* Thu Jul 17 2003 Hiroaki Irokawa <irorin@terra.dti.ne.jp> 21.3-0vl4
-- use site-start.el(reading /etc/emacs-21.3/site-start.d/*.el)
-
-* Wed May  7 2003 AKIYAMA Kazuhito <akiyama@yb3.so-net.ne.jp> 21.3-0vl3
-- add BuildPrereq: libpng >= 1.2.5
-
-* Tue Apr 15 2003 Daisuke SUZUKI <daisuke@linux.or.jp> 21.3-0vl2
-- fixed %%pre script
-
-* Tue Mar 25 2003 Daisuke SUZUKI <daisuke@linux.or.jp> 21.3-0vl1
-- new upstream release
-- remove patch14 whick included in upstream
-
-* Thu Jan 16 2003 Daisuke SUZUKI <daisuke@linux.or.jp> 21.2-0vl11
-- add patch14 to fix frame title text encoding.
-  - http://tsukuba.m17n.org/mule-ja-archive/2002-10/msg00004.html
-
-* Tue Dec 10 2002 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 21.2-0vl10
-- autoconf-2.13, not autoconf in %%setup section
-- BuildPreReq: autoconf213
-
-* Mon Dec  9 2002 Daisuke SUZUKI <daisuke@linux.or.jp> 21.2-0vl9
-- modifiy rpm scripts.
-
-* Mon Dec  9 2002 Daisuke SUZUKI <daisuke@linux.or.jp> 21.2-0vl8
-- rename to emacs
-- obsoletes emacs21 <= 21.2-0vl7, provides emacs21 = %%{version}
-
-* Sun Dec  1 2002 Daisuke SUZUKI <daisuke@linux.or.jp> 21.2-0vl7
-- enable menubar fontset patch (Patch103)
-
-* Sat Nov 30 2002 Daisuke SUZUKI <daisuke@linux.or.jp> 21.2-0vl6
-- add requires/buildprereq tags.
-
-* Sat Nov 30 2002 Daisuke SUZUKI <daisuke@linux.or.jp> 21.2-0vl5
-- add emcws-20021014
-
-* Sun Jul 21 2002 KOBAYASHI R. Taizo <tkoba@vinelinux.org> 21.2-0vl4
-- removed *-mode 
-
-* Sat Jul 20 2002 KOBAYASHI R. Taizo <tkoba@vinelinux.org> 21.2-0vl3
-- python-mode was made pending
-- some additional *.el files was moved from "emacs/site-lisp" to
-  "emacs-(version)/site-lisp"
-
-* Sat Jul 13 2002 KOBAYASHI R. Taizo <tkoba@vinelinux.org> 21.2-0vl2
-- added some sources and patches from rawhide 21.2-11 and mandrake 21.2-7mdk
-
-* Sat May 11 2002 Hiroaki Irokawa <irorin@terra.dti.ne.jp> 21.2-0vl1
-- update.
-- Package Name emacs-beta -> emacs21
-- Add Patch100,101,102, Source100(default = Disable)
-- (from http://phe.phyas.aichi-edu.ac.jp/~cyamauch/pl2.html#emacs21)
-- --infodir=%{_infodir}/emacs-21.2(VineSeed-Plus:00723)
-
-* Thu Dec 27 2001 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 21.1-0vl7
-- site-lisp moved under /usr/share/emacs-21.1/ (Patch11 and %%pre section)
-
-* Thu Dec 06 2001 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 21.1-0vl5
-- move /tmp -> /var/lib/emacsen-common (IP(package)C file)
-
-* Fri Nov 02 2001 Tomoya TAKA <tomoya@olive.plala.or.jp> 21.1-0vl4
-- replace patch10 with patch11, posted to gnu.emacs.bug
-  Message-Id: <jebsiza3db.fsf@sykes.suse.de>
-  (reported by ABE Yuji <cbo46560@pop12.odn.ne.jp>)
-
-* Fri Oct 26 2001 Kazuhisa TAKEI <takei@vinelinux.org> 21.1-0vl3
-- fixed build to fail in alpha( only apply patch0 to ppc) 
-
-* Tue Oct 23 2001 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 21.1-0vl2
-- added Patch10 (thanks Kitame-san)
-
-* Mon Oct 22 2001 Kazuhisa TAKEI <takei@vinelinux.org> 21.1-0vl1
-- update to 21.1
-
-* Sun Sep 9 2001 Kazuhisa TAKEI <takei@vinelinux.org> 21.0.104-0vl14
-- support  shared installing otheremacsen.
-
-* Mon Jul 23 2001 Kazuhisa TAKEI <takei@vinelinux.org> 21.0.104-0vl3
-- update 21.0.104
-
-* Thu Jul 19 2001 Kazuhisa TAKEI <takei@vinelinux.org> 21.0.103-0vl2
-- support emacsen-common
-
-* Wed May 16 2001 MATSUBAYASHI 'Shaolin' Kohji <shaolin@vinelinux.org>
-- 21.0.103-0vl1
-- updated to 21.0.103
-- revamped and cleaned up spec file :-)
-- Requires: tamago >= 4.0.6 (...is it reasonable? Mmm...)
-
-* Mon Jan 22 2001 Kazuhisa TAKEI <takei@vinelinux.org> 21.0.95-0vl2
-- fixed .spec bugs( _libdir)
-
-* Fri Jan 12 2001 Kazuhisa TAKEI <takei@vinelinux.org> 21.0.95-0vl1
-- updated to 21.0.95 
-
-* Wed Dec 20 2000 Kazuhisa TAKEI <takei@vinelinux.org> 21.0.93-0vl3
-- fixed emacs-beta.spec
-
-* Sat Dec 16 2000 Kazuhisa TAKEI <takei@vinelinux.org> 21.0.93-0vl2
-- 21.0.93 test packaging.
-
-* Fri Jun 30 2000 T.R. Kobayashi <tkoba@ike-dyn.ritsumei.ac.jp>
-- added linespace-patch
-
-* Mon Jun 19 2000 MACHINO, Satoshi <mac@netfort.gr.jp>
-- updated to emacs 20.7
-
-* Thu Apr 20 2000 Yasuyuki Furukawa <furukawa@vinelinux.org>
-- updated to emacs 20.6
-
-* Mon Feb 28 2000 kenji KITAYAMA <kenji@gandalf.doshisha.ac.jp>
-- [emacs-20.5a-2]
-- Modified reference of Emacs Info
-
-* Sun Jan 23 2000 MATSUBAYASHI 'Shaolin' Kohji <shaolin@rhythmaning.org>
-- [emacs-20.5a-2]
-- added ppc patch
-
-* Fri Jan  7 2000 MATSUBAYASHI 'Shaolin' Kohji <shaolin@rins.st.ryukoku.ac.jp>
-- [emacs-20.5a-1]
-- change version from 20.5 to 20.5a
-- added Mule-4.1 patch
-
-* Fri Jan  7 2000 Yasuyuki Furukawa <yasu@on.cs.keio.ac.jp>
-- [emacs-20.5-1]
-- add desktop-link files for desktop menu.
-
-* Thu Dec 24 1999 MATSUBAYASHI 'Shaolin' Kohji <shaolin@rins.st.ryukoku.ac.jp>
-- [emacs-20.4-16]
-- replaced Y2K savvy timezone.{el,elc} with one from brand-new apel-10.0
-
-* Tue Dec 21 1999 Jun Nishii <jun@vinelinux.org>
-- added documents
-- strip bins
-
-* Wed Dec  1 1999 MATSUBAYASHI 'Shaolin' Kohji <shaolin@rins.st.ryukoku.ac.jp>
-- [emacs-20.4-14]
-- Change Group to Applications/Editors/Emacs
-
-* Sat Nov  6 1999 MATSUBAYASHI 'Shaolin' Kohji <shaolin@rins.st.ryukoku.ac.jp>
-- [emacs-20.4-13]
-- included Y2K savvy timezone.{el,elc},
-  modified by Mr. Youichi Teranishi <teranishi@gohome.org>
-
-* Tue Oct 12 1999 Yasuhide OOMORI <dasen@typhoon.co.jp>
-- [emacs-20.4-12]
-- Modified info-dir.
-- Removed -c option from %setup.
-
-* Sun Sep 20 1999 Kazuhisa TAKEI<takei@hh.iij4u.or.jp>
-- fixed XIM support patch
-* Sun Sep 19 1999 Kazuhisa TAKEI<takei@hh.iij4u.or.jp>
-- fixed postinst bug and fontset patch
-* Sun Jul 18 1999 Kazuhisa TAKEI<takei@hh.iij4u.or.jp>
-- first build

BIN
e/emacs22/emacs-21.1-bzip2.patch.bz2


+ 0 - 11
e/emacs22/emacs-22.0.50-fixed-resolution.patch

@@ -1,11 +0,0 @@
---- emacs-22.0.50.20050907/src/xterm.c.orig	2005-09-07 13:46:42.000000000 +0900
-+++ emacs-22.0.50.20050907/src/xterm.c	2005-09-07 16:49:25.000000000 +0900
-@@ -10405,6 +10405,8 @@
-     /* Mac OS X 10.3's Xserver sometimes reports 0.0mm.  */
-     mm = DisplayWidthMM (dpyinfo->display, screen_number);
-     dpyinfo->resx = (mm < 1) ? 100 : pixels * 25.4 / mm;
-+    dpyinfo->resy = 96;
-+    dpyinfo->resx = 96;
-   }
- 
-   dpyinfo->Xatom_wm_protocols

+ 0 - 40
e/emacs22/emacs-22.1-locallisppath.patch

@@ -1,40 +0,0 @@
---- emacs-22.1/configure.in.orig	2007-05-25 21:43:29.000000000 +0900
-+++ emacs-22.1/configure.in	2007-06-04 14:04:10.000000000 +0900
-@@ -32,7 +32,7 @@
- AC_ARG_PROGRAM
- 
- lispdir='${datadir}/emacs/${version}/lisp'
--locallisppath='${datadir}/emacs/${version}/site-lisp:'\
-+locallisppath='${datadir}/emacs-${version}/site-lisp:'\
- '${datadir}/emacs/site-lisp'
- lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim'
- etcdir='${datadir}/emacs/${version}/etc'
---- emacs-22.1/Makefile.in.orig	2007-05-14 23:56:28.000000000 +0900
-+++ emacs-22.1/Makefile.in	2007-06-04 14:06:19.000000000 +0900
-@@ -455,14 +455,14 @@
- 	done
- 	-rm -f $(DESTDIR)${lispdir}/subdirs.el
- 	$(srcdir)/update-subdirs $(DESTDIR)${lispdir}
--	if [ -f $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el ]; \
-+	if [ -f $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el ]; \
- 	then true; \
- 	else \
- 	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
- 	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
--	    > $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el; \
-+	    > $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el; \
- 	fi
--	chmod a+r $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el
-+	chmod a+r $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el
- 	-if [ -f $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el ]; \
- 	then true; \
- 	else \
-@@ -559,7 +559,7 @@
- 	$(srcdir)/mkinstalldirs ${COPYDESTS} $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
- 	  $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
- 	  $(DESTDIR)${datadir}/emacs/site-lisp \
--	  $(DESTDIR)${datadir}/emacs/${version}/site-lisp \
-+	  $(DESTDIR)${datadir}/emacs-${version}/site-lisp \
- 	  $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
- 
- ### Delete all the installed files that the `install' target would

+ 0 - 23
e/emacs22/emacs-22.3-gcc44.patch

@@ -1,23 +0,0 @@
-diff -up emacs-22.3/configure.in\~ emacs-22.3/configure.in
---- emacs-22.3/configure.in~	2010-04-02 10:33:25.000000000 +0900
-+++ emacs-22.3/configure.in	2010-04-02 11:19:48.000000000 +0900
-@@ -3388,7 +3388,7 @@ echo creating lib-src/Makefile
-   sed -e '1,/start of cpp stuff/d'\
-       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
-       < Makefile.c > junk.c
--  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-+  $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
-   cat junk1.c junk2.c > Makefile.new
-   rm -f junk.c junk1.c junk2.c
-@@ -3404,7 +3404,7 @@ echo creating src/Makefile
-   sed -e '1,/start of cpp stuff/d'\
-       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
-       < Makefile.c > junk.c
--  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-+  $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
-   cat junk1.c junk2.c > Makefile.new
-   rm -f junk.c junk1.c junk2.c
-
-Diff finished.  Fri Apr  2 11:19:52 2010

+ 0 - 22
e/emacs22/emacs22-local.el

@@ -1,22 +0,0 @@
-;; 
-;; GNU Emacs EMACS_VERSION local configuration file
-;; 
-;; This configuration is read at the end of site-start.el. 
-;; Emacs configuration files are read
-;;   - distribution wide from site-start.el 
-;;   - system wide from this configuration file
-;;   - per user from ~/.emacs.d/init.el, 
-;; where per user settings override system wide settings, 
-;; and system wide settings override site-start.el. 
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; Local Variables:
-;; mode: emacs-lisp
-;; End:

+ 0 - 681
e/emacs22/emacs22-vl.spec

@@ -1,681 +0,0 @@
-%define emacsversion 22.3
-#%%define cvsdate 20060403
-%define emacsrelease 15%{?_dist_release}
-
-%define _noVersionedDependencies 1
-%define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
-
-%define infodir %{_infodir}/emacs-%{emacsversion}
-
-%define menutreeelversion 0.97
-
-Summary:      GNU Emacs editor 
-Summary(ja):  GNU Emacs エディタ
-Name:         emacs22
-Version:      %{emacsversion}
-Release:      %{emacsrelease}
-Source0:      ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}.tar.gz
-
-## Sources from Rawhide 21.2-11
-Source10:     site-start.el.emacs22
-Source11:     python-mode.el
-Source12:     http://www.tihlde.org/~stigb/rpm-spec-mode.el
-Source13:     ftp://ftp.gnu.org/gnu/emacs/elisp-manual-21-2.8.tar.bz2
-# 1.0.2 - http://prdownloads.sourceforge.net/php-mode/php-mode-102.el
-Source14:     php-mode.el
-Source15:     php-mode-init.el
-Source16:     ssl.el
-Source17:     po-mode.el
-Source18:     po-mode-init.el
-
-## local settings for local system
-Source20:     emacs22-local.el
-
-# desktop file
-Source50:     emacs22.desktop.in
-
-## Enable Japanese Menu
-## http://www11.atwiki.jp/s-irie/pages/13.html
-Source100:    menu-tree-el-%{menutreeelversion}.tar.gz
-Source110:    menu-tree-init.el.emacs22
-
-## default settings for Vine Linux
-Source150:    vine-default-base.el
-Source151:    vine-default-faces.el
-
-## Vine Patch(es)
-Patch10:      emacs-21.1-ppc-nocombreloc.patch
-Patch11:      emacs-22.1-locallisppath.patch
-#Patch12:      emacs-21.2-emcws-version.patch
-# remove this patch, if python-2.2 arrives
-Patch13:      no-python-mode.patch
-Patch20:      emacs-22.0.50-fixed-resolution.patch
-Patch30:      emacs-22.3-gcc44.patch
-
-# security patches (from Debian)
-
-# security patches (from Ubuntu)
-# http://www.vupen.com/english/advisories/2010/0734
-# https://code.launchpad.net/~ubuntu-branches/ubuntu/karmic/emacs23/karmic-security
-Patch501:      emacs22-CVE-2010-0825-fix-movemail-race.diff
-
-# patches from Mandrake
-Patch1001:    emacs-21.1-bzip2.patch.bz2
-
-License:      GPL
-Group:        Applications/Editors/Emacs
-
-Distribution: Vine
-Vendor:       Project Vine
-Packager:     munepi, daisuke
-
-BuildRoot:    %{_tmppath}/%{name}-%{version}-root
-# Requires:     tamago >= 4.0.6
-Obsoletes:    mule-base, mule-canna, mule-wnn6, mule, emacs-beta
-Obsoletes:    emacs21 <= 21.2-0vl7
-Obsoletes:    emacs22 <= 22.0.50
-Provides:     emacs22 = %{version}
-Provides:     emacsen = 0.1
-Requires(post):    emacsen-common
-Requires(postun):    emacsen-common
-
-# Emcws
-#Requires:     libcanna
-#BuildPreReq:  Canna-devel
-
-BuildRequires: autoconf
-BuildRequires: nkf
-BuildRequires: libpng >= 1.2.5
-BuildRequires: gtk2-devel, cairo-devel
-BuildRequires: freetype-devel, fontconfig-devel
-BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel, giflib-devel
-BuildRequires: libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel
-BuildRequires: libXt-devel, libXpm-devel, ncurses-devel
-BuildRequires: xorg-x11-proto-devel, zlib-devel
-BuildRequires: texinfo
-
-%description
-GNU Emacs is the extensible, customizable, self-documenting real-time
-display editor. 
-
-%description -l ja 
-GNU Emacs は拡張性が高く、さまざまなカスタマイズが可能な高機能エディタです。
-
-
-%prep
-
-%setup -q -n emacs-%{version}
-
-%ifarch ppc
-%patch10 -p1
-%endif
-
-%patch11 -p1
-#%patch12 -p1
-%patch20 -p1
-
-%if %{?_dist_release} == "vl6"
-%patch30 -p1 -b .gcc44
-%endif
-
-%patch501 -p1 -b .movemail
-
-%patch1001 -p1
-
-autoconf
-
-
-%build
-
-export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS"
-#to find installinfo
-export PATH="$PATH:/sbin:/usr/sbin"
-
-%configure --with-gcc --with-pop --with-sound \
-	--libexecdir=%{_libdir} --infodir=%{infodir} \
-	--disable-rename --with-gtk
-
-make bootstrap
-make
-
-
-#%define recompile src/emacs -batch --no-init-file --no-site-file -f batch-byte-compile
-
-# recompile patched .el files
-#%{recompile} lisp/mail/mh-utils.el lisp/progmodes/make-mode.el
-
-# bytecompile python-mode, ssl, php-mode and rpm-spec-mode
-#cp %SOURCE12  %SOURCE14 %SOURCE16 %SOURCE17 .
-##%%{recompile} rpm-spec-mode.el php-mode.el ssl.el po-mode.el
-
-
-%install
-[ "${RPM_BUILD_ROOT}" != "/" ] && %__rm -rf ${RPM_BUILD_ROOT}
-
-ARCHDIR=${RPM_ARCH}-vine-linux
-
-%makeinstall libexecdir=$RPM_BUILD_ROOT%{_libdir} \
-	infodir=${RPM_BUILD_ROOT}%{infodir} 
-
-## This is a duplicate of the file in FLAVOR/site-lisp
-%__rm -f $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/subdirs.el || exit 1
-
-(cd $RPM_BUILD_ROOT%{_mandir}/man1/; %__mv ctags.1 gctags.1)
-(cd $RPM_BUILD_ROOT%{_bindir}/; %__mv ctags gctags)
-
-%__mkdir_p  $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/etc
-%__mkdir_p  $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp
-# cp %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tree.el
-# nkf -w %{SOURCE100} > $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tree-utf8.el
-%__tar zxvf %{SOURCE100}
-%__cp -a menu-tree-el-%{menutreeelversion}/menu-tree.el $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/
-nkf -w --overwrite $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tree.el
-
-## vine default
-%__cp -a %{SOURCE150} %{SOURCE151} \
-    $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/
-
-# The elisp reference manual
-#bzcat %{SOURCE13} | tar xf -
-#pushd elisp-manual-21-2.8
-#install -m 644 elisp elisp-? elisp-?? $RPM_BUILD_ROOT/%{infodir}
-#popd
-
-# some modifications of installed files
-
-#rm -f $RPM_BUILD_ROOT%{infodir}/dir
-#gzip -9nf $RPM_BUILD_ROOT%{infodir}/*
-
-%__install -m 644 %{SOURCE10} \
-	$RPM_BUILD_ROOT/%{_datadir}/emacs-%{version}/site-lisp/site-start.el
-%__sed -i -e 's/EMACS_VERSION/%{version}/g' \
-	$RPM_BUILD_ROOT/%{_datadir}/emacs-%{version}/site-lisp/site-start.el
-
-# no-python-mode patch
-#(cd $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/
-#patch -p0 < %{PATCH13}
-#sed -e "s|/usr/share/emacs/site-lisp|%{_datadir}/emacs-%{version}/site-lisp|g" \
-#	site-start.el > site-start.tmp
-#mv -f site-start.tmp site-start.el
-#)
-
-## create site-start.d directory
-%__install -m 755 -d ${RPM_BUILD_ROOT}/etc/emacs-%{version}/site-start.d
-
-# install coding-system init.el
-%__install -m644 %{SOURCE110} \
-    $RPM_BUILD_ROOT/%{_datadir}/emacs-%{version}/site-lisp/menu-tree-init.el
-%__ln_s -f %{_datadir}/emacs-%{version}/site-lisp/menu-tree-init.el \
-    ${RPM_BUILD_ROOT}/etc/emacs-%{version}/site-start.d/60menu-tree-init.el
-
-## install system-wide configure file
-%__install -m755 -d ${RPM_BUILD_ROOT}/etc/emacs
-%__install -m644 %{SOURCE20} ${RPM_BUILD_ROOT}/etc/emacs/emacs22-local.el
-%__sed -i -e 's/EMACS_VERSION/%{version}/g' \
-    ${RPM_BUILD_ROOT}/etc/emacs/emacs22-local.el
-
-## Python mode, php mode and rpm-spec mode
-
-#install -c -m0644 po-mode.el po-mode.elc php-mode.el php-mode.elc \
-#     rpm-spec-mode.el rpm-spec-mode.elc ssl.el ssl.elc \
-#     $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/
-#install -m0644 %SOURCE15 \
-#     $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/site-start.d/php-mode-init.el
-#install -m0644 %SOURCE18 \
-#     $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/site-start.d/po-mode-init.el
-
-## make file list
-strip $RPM_BUILD_ROOT%{_bindir}/* || :
-
-# install desktop file
-%__mkdir_p $RPM_BUILD_ROOT%{_datadir}/applications
-%__sed -e "s/@@EMACS_VERSION@@/%{emacsversion}/g" %{SOURCE50} > \
-    $RPM_BUILD_ROOT%{_datadir}/applications/$(basename %{SOURCE50} .in)
-# [ -f $RPM_BUILD_ROOT%{_datadir}/applications/emacs.desktop ] && \
-#     %__rm -f $RPM_BUILD_ROOT%{_datadir}/applications/emacs.desktop || exit 1
-
-# install icons
-%__mkdir_p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%__install -m644 etc/images/icons/*.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%__ln_s -f emacs_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/emacs22.png
-
-## remove man files
-%__rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/* || exit 1
-
-## Remove ctags
-#rm -f $RPM_BUILD_ROOT/usr/bin/ctags
-#rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/*ctags*
-#rm -f $RPM_BUILD_ROOT/%{_datadir}/emacs/%{version}/etc/ctags*
-
-DIR="${RPM_BUILD_ROOT}%{_datadir}/emacs \
-     ${RPM_BUILD_ROOT}%{_datadir}/emacs-%{version}"
-BIN=${RPM_BUILD_ROOT}%{_bindir}
-LIB=${RPM_BUILD_ROOT}%{_libdir}
-EL="*.el"
-
-## prepare file list for emacs
-
-echo "/usr/bin/b2m
-/usr/bin/ebrowse
-/usr/bin/etags
-/usr/bin/rcs-checkin
-/usr/bin/emacs
-/usr/bin/emacsclient
-/usr/bin/gctags
-/usr/bin/grep-changelog"|
-    %__sed -e "s#[^\n]*#mv ${RPM_BUILD_ROOT}\0 ${RPM_BUILD_ROOT}\0.emacs-%{version}#"| 
-    awk '{system($_)}'  
-
-
-# find ${RPM_BUILD_ROOT}/%{_mandir} -type f |
-# sed -e "s#\.gz##"|
-# sed -e "s#[^\n]*#mv \0.gz \0-emacs-%{version}.gz#"|
-#    awk '{system($_)}'
-
-
-
-
-#find ${RPM_BUILD_ROOT}/%{_infodir} -type f |
-#sed -e "s#\.gz##"|
-#sed -e "s#[^\n]*#mv \0.gz \0-e21.gz#"|
-#    awk '{system($_)}' 
-
-
-
-
-
-find $DIR $BIN $LIB -type d |
-  %__sed -e "s#^${RPM_BUILD_ROOT}#%dir #" > rpm-files
-
-find $DIR $BIN $LIB -type f |
-  %__sed -e "
-    s#^${RPM_BUILD_ROOT}\(.*movemail\)#%attr(2755, root, mail) \1#
-    s#^${RPM_BUILD_ROOT}##
-  " >> rpm-files
-
-
-%clean
-[ "${RPM_BUILD_ROOT}" != "/" ] && %__rm -rf ${RPM_BUILD_ROOT}
-
-
-%define info_files ccmode cl dired-x ediff emacs forms gnus info message mh-e reftex sc vip viper widget
-
-
-%pre
-
-if [ -L %{_datadir}/emacs-%{version}/site-lisp ] ; then
-    %__rm -f %{_datadir}/emacs-%{version}/site-lisp
-fi
-
-if [ -d %{_datadir}/emacs/%{version}/site-lisp ] ; then
-    find %{_datadir}/emacs/%{version}/site-lisp/* -maxdepth 0 | grep -v subdirs.el | \
-	xargs %__rm -rf
-fi
-
-
-%post
-
-if [ "$1" = 1 ]; then
-
-%_addflavorslist emacs-%{version}
-
-export PRIORITY=30
-
-%_installemacs emacs-%{version}
-
-unset PRIORITY
-fi
-
-if [ "$1" = 2 ]; then
-
-#  export PRIORITY=30
-  
-#  %_installemacs emacs-%{version}
-  
-#  unset PRIORITY
-    
-  echo emacs-%{version} >  /var/lib/emacsen-common/doinstaflavor-emacs
-    
-fi
-
-
-%postun
-
-if [ $1 = 1 ]; then
-# run upgrade install time
-
-# old version uninstall
-
-%_removeflavorslist emacs-%{version}
-
-%_removeemacs emacs-%{version}
-
-#new version install
-if [ -f /var/lib/emacsen-common/doinstaflavor-emacs ] ; then
-
-NEWFLAVOR=$(cat /var/lib/emacsen-common/doinstaflavor-emacs)
-
-%_addflavorslist $NEWFLAVOR
-
-export PRIORITY=30
-
-%_installemacs $NEWFLAVOR
-
-unset PRIORITY
-
-%__rm -rf /var/lib/emacsen-common/doinstaflavor-emacs
-
-fi
-
-fi
-
-
-%preun
-if [ $1 = 0 ]; then
-
-%_removeflavorslist emacs-%{version}
-
-%_removeemacs emacs-%{version}
-
-fi
-
-
-%files -f rpm-files 
-%defattr(-,root,root)
-%doc INSTALL README BUGS ChangeLog
-%dir %{_sysconfdir}/emacs-%{version}
-%dir %{_sysconfdir}/emacs-%{version}/site-start.d
-%{_sysconfdir}/emacs-%{version}/site-start.d/*.el
-%config(noreplace) %{_sysconfdir}/emacs/emacs22-local.el
-%{_infodir}/*
-# %{_mandir}/*/*
-%{_datadir}/applications/emacs22.desktop
-%{_datadir}/pixmaps/emacs*.png
-# %{_datadir}/emacs-%{version}/site-lisp
-
-
-%changelog
-* Sun Dec 05 2010 Munehiro Yamamoto <munepi@vinelinux.org> 22.3-15
-- applied new vine-default system
-  - updated site-start.el
-  - updated vine-default-{base,faces}.el
-  - dropped showvdefaultemacs
-    - merged to emacsen-common package as show-vine-default.sh
-  - renamed local wide configration file to emacs22-local.el
-- updated menu-tree.el to version 0.97
-- updated emacs22.desktop.in and menu-tree-init.el.emacs22, little
-
-* Sun Apr 18 2010 Munehiro Yamamoto <munepi@vinelinux.org> 22.3-14
-- removed /usr/share/emacs/site-lisp/subdirs.el
-
-* Fri Apr 02 2010 Munehiro Yamamoto <munepi@vinelinux.org> 22.3-13
-- new toolchain build for VineSeed
-  - applied emacs-22.3-gcc44.patch
-
-* Thu Apr 01 2010 Munehiro Yamamoto <munepi@vinelinux.org> 22.3-12
-- applied security fix emacs23-CVE-2010-0825-fix-movemail-race.diff from Ubuntu
-
-* Wed Feb 10 2010 Munehiro Yamamoto <munepi@vinelinux.org> 22.3-11
-- added Requires(post): emacsen-common, Requires(postun): emacsen-common
-
-* Mon Jan 18 2010 Munehiro Yamamoto <munepi@vinelinux.org> 22.3-10
-- updated vine-default-base.el (See [vine-users:079919])
-- renamed emacs22.desktop to emacs22.desktop.in
-
-* Tue Sep 01 2009 Munehiro Yamamoto <munepi@vinelinux.org> 22.3-9
-- rebuilt to add signature
-
-* Fri Aug 19 2009 Munehiro Yamamoto <munepi@vinelinux.org> 22.3-8
-- added BuildRequires: nkf
-- updated menu-tree-init.el.emacs22
-  - fixed menu-tree encoding <BTS:VineLinux:766>
-- set Exec=emacs-@@EMACS_VERSION@@ in emacs22.desktop
-
-* Wed Aug 19 2009 Munehiro Yamamoto <munepi@vinelinux.org> 22.3-7
-- replaced BR: libungif-devel with BR: giflib-devel
-
-* Sat Jul 25 2009 Munehiro Yamamoto <munepi@vinelinux.org> 22.3-6
-- enable default settings for Vine Linux
-  - added site-start.el.emacs22
-  - updated site-start.el
-  - added vine-default-base.el
-  - added vine-default-faces.el for some ambiguous character on utf-8
-
-* Wed May 06 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 22.3-5
-- changed menu-tree-init.el from hard copy to symbolic link 
-  on /etc/emacs-22.3/site-start.d
-
-* Sat May 02 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 22.3-4
-- updated menu-tree.el to v0.93
-
-* Sun Apr 26 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 22.3-3
-- installed system-wide configure file in /etc/emacs
-
-* Tue Apr 21 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 22.3-2
-- renamed from emacs to emacs22
-
-* Sun Sep 07 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 22.3-1
-- new upstream release
-
-* Mon Aug 25 2008 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 22.2-3
-- import security fixes from Debian
-  CVE-2008-2142: fix insecure setting of fast-lock-cache-directories
-  CVE-2008-1694: fix insecure temporary file creation in vcdiff script
-                 leading to possible symlink attacks
-
-* Tue Jun 25 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 22.2-2
-- update menu-tree.el
-- add 60menu-tree-init.el to sed coding-system and load menu-tree
-- build with xorg-x11-7.3
-  - update BuildRequires
-
-* Sun Mar 30 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 22.2-1
-- new upstream release
-
-* Wed Nov 28 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 22.1-0vl2
-- add Patch10000 to fix local variable processing security bypass
-  vulnerability.
-  - http://www.frsirt.com/english/advisories/2007/3715
-  - http://bugs.debian.org/449008
-
-* Mon Jun 04 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 22.1-0vl1
-- new upstream release
-- rename to emacs from emacs22 (emacs-21.x would be renameed to emacs21)
-- drop emcws support
-
-* Sun May 20 2007 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 22.0.50-0.20060403vl3
-- rebuilt with new toolchain
-
-* Sat May 06 2006 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 22.0.50-0.20060403vl2
-- changed Group:
-
-* Mon Apr 03 2006 Daisuke SUZUKI <daisuke@linux.or.jp> 22.0.50-0.20060403vl1
-- update to CVS-20060403
-- update emacs22.desktop
-
-* Wed Sep 28 2005 Daisuke SUZUKI <daisuke@linux.or.jp> 22.0.50-0.20050927vl2
-- fix site-start.el
-
-* Tue Sep 27 2005 Daisuke SUZUKI <daisuke@linux.or.jp> 22.0.50-0.20050927vl1
-- update to CVS-20050927
-
-* Thu Sep  8 2005 Daisuke SUZUKI <daisuke@linux.or.jp> 22.0.50-0.20050907vl1
-- initial build for Vine Linux based on emacs package.
-  - emacs-22.0.50 on CVS-20050907
-
-* Sat Sep  3 2005 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 21.4-0vl3
-- create site-start.d directory on %install
-
-* Thu Feb 17 2005 Hiroaki Irokawa <irorin@terra.dti.ne.jp> 21.4-0vl2
-- included leim-21.4
-- update emcws-21.3-20031213.gz
-
-* Wed Feb 16 2005 Hiroaki Irokawa <irorin@terra.dti.ne.jp> 21.4-0vl1
-- update
-
-* Sat Jul 24 2004 Daisuke SUZUKI <daisuke@linux.or.jp> 21.3-0vl7
-- rebuild with Xaw3d, add BuildRequires: Xaw3d-devel
-
-* Fri Jul 23 2004 Daisuke SUZUKI <daisuke@linux.or.jp> 21.3-0vl6
-- add Patch20 to fix display resolutions. (set to 96dpi)
-  (do not compute dynamically from display's size)
-
-* Tue Mar 16 2004 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 21.3-0vl5
-- rebuilt with new toolchain environment
-
-* Thu Jul 17 2003 Hiroaki Irokawa <irorin@terra.dti.ne.jp> 21.3-0vl4
-- use site-start.el(reading /etc/emacs-21.3/site-start.d/*.el)
-
-* Wed May  7 2003 AKIYAMA Kazuhito <akiyama@yb3.so-net.ne.jp> 21.3-0vl3
-- add BuildPrereq: libpng >= 1.2.5
-
-* Tue Apr 15 2003 Daisuke SUZUKI <daisuke@linux.or.jp> 21.3-0vl2
-- fixed %%pre script
-
-* Tue Mar 25 2003 Daisuke SUZUKI <daisuke@linux.or.jp> 21.3-0vl1
-- new upstream release
-- remove patch14 whick included in upstream
-
-* Thu Jan 16 2003 Daisuke SUZUKI <daisuke@linux.or.jp> 21.2-0vl11
-- add patch14 to fix frame title text encoding.
-  - http://tsukuba.m17n.org/mule-ja-archive/2002-10/msg00004.html
-
-* Tue Dec 10 2002 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 21.2-0vl10
-- autoconf-2.13, not autoconf in %%setup section
-- BuildPreReq: autoconf213
-
-* Mon Dec  9 2002 Daisuke SUZUKI <daisuke@linux.or.jp> 21.2-0vl9
-- modifiy rpm scripts.
-
-* Mon Dec  9 2002 Daisuke SUZUKI <daisuke@linux.or.jp> 21.2-0vl8
-- rename to emacs
-- obsoletes emacs21 <= 21.2-0vl7, provides emacs21 = %%{version}
-
-* Sun Dec  1 2002 Daisuke SUZUKI <daisuke@linux.or.jp> 21.2-0vl7
-- enable menubar fontset patch (Patch103)
-
-* Sat Nov 30 2002 Daisuke SUZUKI <daisuke@linux.or.jp> 21.2-0vl6
-- add requires/buildprereq tags.
-
-* Sat Nov 30 2002 Daisuke SUZUKI <daisuke@linux.or.jp> 21.2-0vl5
-- add emcws-20021014
-
-* Sun Jul 21 2002 KOBAYASHI R. Taizo <tkoba@vinelinux.org> 21.2-0vl4
-- removed *-mode 
-
-* Sat Jul 20 2002 KOBAYASHI R. Taizo <tkoba@vinelinux.org> 21.2-0vl3
-- python-mode was made pending
-- some additional *.el files was moved from "emacs/site-lisp" to
-  "emacs-(version)/site-lisp"
-
-* Sat Jul 13 2002 KOBAYASHI R. Taizo <tkoba@vinelinux.org> 21.2-0vl2
-- added some sources and patches from rawhide 21.2-11 and mandrake 21.2-7mdk
-
-* Sat May 11 2002 Hiroaki Irokawa <irorin@terra.dti.ne.jp> 21.2-0vl1
-- update.
-- Package Name emacs-beta -> emacs21
-- Add Patch100,101,102, Source100(default = Disable)
-- (from http://phe.phyas.aichi-edu.ac.jp/~cyamauch/pl2.html#emacs21)
-- --infodir=%{_infodir}/emacs-21.2(VineSeed-Plus:00723)
-
-* Thu Dec 27 2001 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 21.1-0vl7
-- site-lisp moved under /usr/share/emacs-21.1/ (Patch11 and %%pre section)
-
-* Thu Dec 06 2001 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 21.1-0vl5
-- move /tmp -> /var/lib/emacsen-common (IP(package)C file)
-
-* Fri Nov 02 2001 Tomoya TAKA <tomoya@olive.plala.or.jp> 21.1-0vl4
-- replace patch10 with patch11, posted to gnu.emacs.bug
-  Message-Id: <jebsiza3db.fsf@sykes.suse.de>
-  (reported by ABE Yuji <cbo46560@pop12.odn.ne.jp>)
-
-* Fri Oct 26 2001 Kazuhisa TAKEI <takei@vinelinux.org> 21.1-0vl3
-- fixed build to fail in alpha( only apply patch0 to ppc) 
-
-* Tue Oct 23 2001 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 21.1-0vl2
-- added Patch10 (thanks Kitame-san)
-
-* Mon Oct 22 2001 Kazuhisa TAKEI <takei@vinelinux.org> 21.1-0vl1
-- update to 21.1
-
-* Sun Sep 9 2001 Kazuhisa TAKEI <takei@vinelinux.org> 21.0.104-0vl14
-- support  shared installing otheremacsen.
-
-* Mon Jul 23 2001 Kazuhisa TAKEI <takei@vinelinux.org> 21.0.104-0vl3
-- update 21.0.104
-
-* Thu Jul 19 2001 Kazuhisa TAKEI <takei@vinelinux.org> 21.0.103-0vl2
-- support emacsen-common
-
-* Wed May 16 2001 MATSUBAYASHI 'Shaolin' Kohji <shaolin@vinelinux.org>
-- 21.0.103-0vl1
-- updated to 21.0.103
-- revamped and cleaned up spec file :-)
-- Requires: tamago >= 4.0.6 (...is it reasonable? Mmm...)
-
-* Mon Jan 22 2001 Kazuhisa TAKEI <takei@vinelinux.org> 21.0.95-0vl2
-- fixed .spec bugs( _libdir)
-
-* Fri Jan 12 2001 Kazuhisa TAKEI <takei@vinelinux.org> 21.0.95-0vl1
-- updated to 21.0.95 
-
-* Wed Dec 20 2000 Kazuhisa TAKEI <takei@vinelinux.org> 21.0.93-0vl3
-- fixed emacs-beta.spec
-
-* Sat Dec 16 2000 Kazuhisa TAKEI <takei@vinelinux.org> 21.0.93-0vl2
-- 21.0.93 test packaging.
-
-* Fri Jun 30 2000 T.R. Kobayashi <tkoba@ike-dyn.ritsumei.ac.jp>
-- added linespace-patch
-
-* Mon Jun 19 2000 MACHINO, Satoshi <mac@netfort.gr.jp>
-- updated to emacs 20.7
-
-* Thu Apr 20 2000 Yasuyuki Furukawa <furukawa@vinelinux.org>
-- updated to emacs 20.6
-
-* Mon Feb 28 2000 kenji KITAYAMA <kenji@gandalf.doshisha.ac.jp>
-- [emacs-20.5a-2]
-- Modified reference of Emacs Info
-
-* Sun Jan 23 2000 MATSUBAYASHI 'Shaolin' Kohji <shaolin@rhythmaning.org>
-- [emacs-20.5a-2]
-- added ppc patch
-
-* Fri Jan  7 2000 MATSUBAYASHI 'Shaolin' Kohji <shaolin@rins.st.ryukoku.ac.jp>
-- [emacs-20.5a-1]
-- change version from 20.5 to 20.5a
-- added Mule-4.1 patch
-
-* Fri Jan  7 2000 Yasuyuki Furukawa <yasu@on.cs.keio.ac.jp>
-- [emacs-20.5-1]
-- add desktop-link files for desktop menu.
-
-* Thu Dec 24 1999 MATSUBAYASHI 'Shaolin' Kohji <shaolin@rins.st.ryukoku.ac.jp>
-- [emacs-20.4-16]
-- replaced Y2K savvy timezone.{el,elc} with one from brand-new apel-10.0
-
-* Tue Dec 21 1999 Jun Nishii <jun@vinelinux.org>
-- added documents
-- strip bins
-
-* Wed Dec  1 1999 MATSUBAYASHI 'Shaolin' Kohji <shaolin@rins.st.ryukoku.ac.jp>
-- [emacs-20.4-14]
-- Change Group to Applications/Editors/Emacs
-
-* Sat Nov  6 1999 MATSUBAYASHI 'Shaolin' Kohji <shaolin@rins.st.ryukoku.ac.jp>
-- [emacs-20.4-13]
-- included Y2K savvy timezone.{el,elc},
-  modified by Mr. Youichi Teranishi <teranishi@gohome.org>
-
-* Tue Oct 12 1999 Yasuhide OOMORI <dasen@typhoon.co.jp>
-- [emacs-20.4-12]
-- Modified info-dir.
-- Removed -c option from %setup.
-
-* Sun Sep 20 1999 Kazuhisa TAKEI<takei@hh.iij4u.or.jp>
-- fixed XIM support patch
-* Sun Sep 19 1999 Kazuhisa TAKEI<takei@hh.iij4u.or.jp>
-- fixed postinst bug and fontset patch
-* Sun Jul 18 1999 Kazuhisa TAKEI<takei@hh.iij4u.or.jp>
-- first build

+ 0 - 12
e/emacs22/emacs22.desktop.in

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Emacs22 Editor
-Name[ja]=Emacs22 エディタ
-Comment=popular, very full featured text editor
-Comment[ja]=有名で高機能なテキストエディタ
-Icon=emacs22.png
-Exec=emacs-@@EMACS_VERSION@@
-Type=Application
-MimeType=text/plain;
-Categories=Application;Utility;TextEditor;
-Terminal=false

+ 0 - 40
e/emacs22/menu-tree-init.el.emacs22

@@ -1,40 +0,0 @@
-;;
-;; menu-tree-init.el
-;;  set default coding system and load menu-tree
-;;
-
-(set-language-environment 'Japanese)
-
-(if (equal (getenv "LANG") "ja_JP.eucJP")
-  (progn
-    (prefer-coding-system  'euc-jp-unix)
-    ;; (set-default-coding-systems 'euc-jp)
-    ;; (set-buffer-file-coding-system 'euc-jp-unix)
-    ;; (set-terminal-coding-system 'euc-jp)
-    ;; (set-keyboard-coding-system 'euc-jp)
-    ;; (setq menu-tree-coding-system 'euc-jp)
-    )
-  (progn
-    (cond ((<= emacs-major-version 21)
-      (require 'un-define)))
-    (prefer-coding-system  'utf-8-unix)
-    ;; (set-default-coding-systems 'utf-8)
-    ;; (set-buffer-file-coding-system 'utf-8-unix)
-    ;; (set-terminal-coding-system 'utf-8)
-    ;; (set-keyboard-coding-system 'utf-8)
-    ;; (setq menu-tree-coding-system 'utf-8)
-    (if window-system
-        (setq menu-tree-coding-system 'utf-8))
-    )
-)
-
-(if (and (>= emacs-major-version 21)
-         (equal (substring (concat (getenv "LANG") "__") 0 2) "ja"))
-    (progn
-      (require 'menu-tree)
-      )
-  )
-
-;; Local Variables:
-;; mode: emacs-lisp
-;; End:

+ 0 - 72
e/emacs22/site-start.el.emacs22

@@ -1,72 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; GNU Emacs EMACS_VERSION default settings for Vine Linux
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defcustom emacs-ime (getenv "EMACS_IME")
-  "A variable of default Input Method Editor"
-  :type 'string)
-(if (null emacs-ime)
-    (setq emacs-ime "scim"))
-
-(defcustom vine-default t
-  "A boolean for all Vine Linux default settings"
-  :type 'boolean)
-(if (equal (getenv "LOGNAME") "root") 
-    (setq vine-default nil))
-
-(defcustom vine-default-base t
-  "A boolean for vine-default-base"
-  :type 'boolean)
-
-(defcustom vine-default-faces t
-  "A boolean for vine-default-faces"
-  :type 'boolean)
-
-(defvar vine-default-setup-hook nil
-  "List of functions to be called at vine-default-setup")
-
-(defvar after-vine-default-setup-hook nil 
-  "This hook is obsolete! Please do not use this hook. 
-   List of functions to be called at the end of vine-default-setup")
-
-(defun vine-default-setup ()
-  "A function for setup to default configurations of Vine Linux"
-  (if vine-default
-      (progn
-	(message "Starting vine-default-setup ...")
-	(if vine-default-base (require 'vine-default-base))
-	(if vine-default-faces (require 'vine-default-faces))
-	(run-hooks 'vine-default-setup-hook)
-	(run-hooks 'after-vine-default-setup-hook);; obsolete
-	)
-    )
-  )
-
-(defun show-vine-default ()
-  "A function to show current vine-default configurations"
-  (interactive)
-  (shell-command 
-   "/usr/lib/emacsen-common/show-vine-default.sh EMACS_VERSION"))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;; run functions from the /etc/emacs-EMACS_VERSION/site-start.d directory
-;;; Files in this directory ending with ".el" are run on startup
-(mapc 'load (directory-files "/etc/emacs-EMACS_VERSION/site-start.d" t "\\.el\\'"))
-
-;;; load local configuration
-(if (file-exists-p (expand-file-name "/etc/emacs/emacs23-local.el"))
-    (load (expand-file-name "/etc/emacs/emacs22-local.el")))
-
-;;; load vine-default configuration per user before vine-default-setup
-(if (file-exists-p (expand-file-name "~/.emacs.d/emacs22-vine-default.el"))
-    (load (expand-file-name "~/.emacs.d/emacs22-vine-default.el")))
-
-;;; run vine-default-setup
-(vine-default-setup)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; Local Variables:
-;; mode: emacs-lisp
-;; End:

+ 0 - 155
e/emacs22/vine-default-base.el

@@ -1,155 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;  -*- coding: utf-8-unix -*-
-;;  FSF Emacs 22 用 Vine Linux 基本設定
-;;    Munehiro Yamamoto <munepi@vinelinux.org>
-;;	$Id: vine-default-base.el,v 1.4 2010/01/04 11:21:29 munepi Exp $
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;; emacsclient サーバを起動
-;(server-start)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;; メニューバーを消す
-;(menu-bar-mode 0)
-
-;;; emacs -nw で起動した時にメニューバーを消す
-(unless window-system (menu-bar-mode 0))
-
-;;; 画面最下行で[↓]を押したときのスクロール数
-;(setq scroll-step 1)
-
-;; ;;; ツールバーを消す
-;; (tool-bar-mode 0)
-
-;;; cursor の blink を止める
-(blink-cursor-mode 0)
-
-;;; active でない window の空 cursor を出さない
-(setq cursor-in-non-selected-windows 0)
-
-;;; フォントのスケールをしない
-(setq scalable-fonts-allowed 0)
-
-;;; image.el における JPEG の判定基準を緩める
-;(eval-after-load "image"
-; '(setq image-type-regexps
-;   (cons (cons "^\377\330" 'jpeg) image-type-regexps)))
-
-;;; 表示の行間を拡げる
-(setq line-spacing 2)
-
-;;; タブ幅
-;(setq tab-width 4)
-
-;;; [Home] Key と [End] Key を従来の動作に戻す
-(define-key global-map [home] 'beginning-of-buffer)
-(define-key global-map [end] 'end-of-buffer)
-
-;;; C-h と Del の入れ替え
-;;; Help が Shift + Ctrl + h および Del に割当てられ、
-;;; 前一文字削除が Ctrl + h に割当てられます
-;(load-library "term/keyswap")
-;(if (eq window-system 'x)
-;    (progn
-;      (define-key function-key-map [delete] [8])
-;      (put 'delete 'ascii-character 8)))
-
-;;; Ctrl-H を前1文字削除に変更
-(define-key global-map "" 'backward-delete-char)
-
-;; ;;; Ctrl-z で undo
-;; (global-set-key "\C-z" 'undo)
-
-;; ;;; \M-p, \M-n でパラグラフ単位で移動
-;; (global-set-key "\M-p" 'backward-paragraph)
-;; (global-set-key "\M-n" 'forward-paragraph)
-
-;;; Emacs23 からは C-n や C-p での移動が物理行単位になっていたので、
-;;; 以前と同じ論理行単位の移動へ変更
-(setq line-move-visual 0)
-
-;;; スクロールバーを右側に表示する
-(set-scroll-bar-mode 'right)
-
-;;; gzファイルも編集できるように
-(auto-compression-mode 1)
-
-;;; visible-bell
-(setq visible-bell 1)
-
-;;; 行番号を表示する
-(line-number-mode 1)
-
-;; ;;; diff -up 
-;; (setq diff-switches "-up")
-
-;;; Dired の設定
-;; Dired のリストフォーマット設定 (ls へのオプション)
-;; (setq dired-listing-switches "-aoFLt")
-;; ls の出力を英語にする(ls を LANG=C で実行)
-(add-hook 'dired-mode-hook  '(lambda ()(setenv "LANG" "C")))
-
-;;; diredでディレクトリを先に表示
-(setq ls-lisp-dirs-first 1)
-
-;; ;;; 一行が 80 字以上になった時には自動改行する
-;; (setq fill-column 80)
-;; (setq text-mode-hook 'turn-on-auto-fill)
-;; (setq default-major-mode 'text-mode)
-
-;; ;;; ステータスラインに時間を表示する
-;; (if (or (and (>= emacs-major-version 20)
-;;              (not (equal (getenv "LANG") "ja_JP.UTF-8")))
-;;         (>= emacs-major-version 22))
-;;     (progn
-;;       (setq dayname-j-alist
-;;            '(("Sun" . "日") ("Mon" . "月") ("Tue" . "火") ("Wed" . "水")
-;;              ("Thu" . "木") ("Fri" . "金") ("Sat" . "土")))
-;;       (setq display-time-string-forms
-;;            '((format "%s年%s月%s日(%s) %s:%s %s"
-;;                      year month day
-;;                      (cdr (assoc dayname dayname-j-alist))
-;;                      24-hours minutes
-;; 		     load)))
-;;       ))
-;; (display-time)
-
-;;; 印刷設定
-;(setq-default lpr-switches '("-Pepson"))
-(setq-default lpr-switches '("-2P"))
-(setq-default lpr-command "mpage")
-
-;;; ps-print
-(setq ps-multibyte-buffer 'non-latin-printer)
-(if (>= emacs-major-version 21)
-    (progn
-      (require 'ps-mule)
-      (defalias 'ps-mule-header-string-charsets 'ignore)))
-
-;; ;;; バッファの最後では next-line で新規行を追加しない
-;; (setq next-line-add-newlines nil); default: nil
-
-;;; mark 領域に色付け
-;(setq transient-mark-mode 1)
-
-;; ;;; 最終更新日の自動挿入
-;; ;;;   ファイルの先頭から 8 行以内に Time-stamp: <> または
-;; ;;;   Time-stamp: " " と書いてあれば、セーブ時に自動的に日付が挿入されます
-;; (if (not (memq 'time-stamp write-file-hooks))
-;;     (setq write-file-hooks
-;;           (cons 'time-stamp write-file-hooks)))
-
-;;; shell-mode
-;; shell の出力するエスケープシーケンスによる色付き文字を
-;; 正しく表示する
-(autoload 'ansi-color-for-comint-mode-on "ansi-color" nil t)
-(add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on)
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(provide 'vine-default-base)
-
-;; Local Variables:
-;; mode: emacs-lisp
-;; End:

+ 0 - 73
e/emacs22/vine-default-faces.el

@@ -1,73 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;  -*- coding: utf-8-unix -*-
-;;  FSF Emacs 22 用 Vine Linux フォント/カラー設定
-;;    Munehiro Yamamoto <munepi@vinelinux.org>
-;;	$Id: vine-default-faces.el,v 1.11 2009/07/25 14:04:04 munepi Exp $	
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;; (if (and window-system
-;; 	 (string-match "^23\." emacs-version))
-;;     (progn
-;;       (setq desktop-gnome-interface-monospace-font-name 
-;; 	    (replace-regexp-in-string "\n" "" 
-;; 		(shell-command-to-string 
-;; 		   "bash -c \'gconftool-2 --get /desktop/gnome/interface/monospace_font_name 2> /dev/null\'")))
-;;       (if (null desktop-gnome-interface-monospace-font-name)
-;; 	  (setq desktop-gnome-interface-monospace-font-name "Monospace 10"));; default
-
-;;       (set-frame-font desktop-gnome-interface-monospace-font-name)
-
-;;       (unless (assoc 'font default-frame-alist)
-;; 	(add-to-list 'default-frame-alist 
-;; 		     '(font . desktop-gnome-interface-monospace-font-name))
-;; 	(setcdr (assoc 'font default-frame-alist) 
-;; 		desktop-gnome-interface-monospace-font-name))
-
-;;       ;; (set-fontset-font (frame-parameter nil 'font)
-;;       ;; 			'japanese-jisx0208
-;;       ;; 			'("VLゴシック regular" . "iso10646-1"))
-;;       ;; (set-fontset-font (frame-parameter nil 'font)
-;;       ;; 			'katakana-jisx0201
-;;       ;; 			'("VLゴシック regular" . "iso10646-1"))
-;;       ;; (set-fontset-font (frame-parameter nil 'font)
-;;       ;; 			'japanese-jisx0213-1
-;;       ;; 			'("VLゴシック regular" . "iso10646-1"))
-;;       ;; (set-fontset-font (frame-parameter nil 'font)
-;;       ;; 			'japanese-jisx0213-2
-;;       ;; 			'("VLゴシック regular" . "iso10646-1"))
-;;       )
-;;   )
-
-(if (string-match "^22\." emacs-version)
-  (progn
-    (utf-translate-cjk-mode t)
-    (utf-translate-cjk-set-unicode-range
-     '((#x00a2 . #x00a3)                    ; ¢, £
-       (#x00a7 . #x00a8)                    ; §, ¨
-       (#x00ac . #x00ac)                    ; ¬
-       (#x00b0 . #x00b1)                    ; °, ±
-       (#x00b4 . #x00b4)                    ; ´
-       (#x00b6 . #x00b6)                    ; ¶
-       (#x00d7 . #x00d7)                    ; ×
-       (#X00f7 . #x00f7)                    ; ÷
-       (#x0370 . #x03ff)                    ; Greek and Coptic
-       (#x0400 . #x04FF)                    ; Cyrillic
-       (#x2000 . #x206F)                    ; General Punctuation
-       (#x2100 . #x214F)                    ; Letterlike Symbols
-       (#x2190 . #x21FF)                    ; Arrows
-       (#x2200 . #x22FF)                    ; Mathematical Operators
-       (#x2300 . #x23FF)                    ; Miscellaneous Technical
-       (#x2500 . #x257F)                    ; Box Drawing
-       (#x25A0 . #x25FF)                    ; Geometric Shapes
-       (#x2600 . #x26FF)                    ; Miscellaneous Symbols
-       (#x2e80 . #xd7a3) (#xff00 . #xffef)))
-    )
-  )
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(provide 'vine-default-faces)
-
-;; Local Variables:
-;; mode: emacs-lisp
-;; End: