rpms/emacs-common-tuareg/devel tuareg-mode-no-sym-lock.patch, NONE, 1.1 emacs-common-tuareg.spec, 1.2, 1.3

[Richard W.M. Jones (rjones)]

Author: rjones

Update of /cvs/pkgs/rpms/emacs-common-tuareg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5193/devel

Modified Files:
	emacs-common-tuareg.spec 
Added Files:
	tuareg-mode-no-sym-lock.patch 
Log Message:
* Thu Feb 21 2008 Richard W.M. Jones <rjones at redhat.com> - 1.45.6-4
- Disable sym-lock in xemacs - this fixes xemacs support.


tuareg-mode-no-sym-lock.patch:

--- NEW FILE tuareg-mode-no-sym-lock.patch ---
diff -ur tuareg-mode-1.45.6/append-tuareg.el tuareg-mode-1.45.6.new/append-tuareg.el
--- tuareg-mode-1.45.6/append-tuareg.el	2008-01-12 23:08:15.000000000 +0000
+++ tuareg-mode-1.45.6.new/append-tuareg.el	2008-02-21 08:36:17.000000000 +0000
@@ -4,9 +4,3 @@
 (setq auto-mode-alist (cons '("\\.ml\\w?" . tuareg-mode) auto-mode-alist))
 (autoload 'tuareg-mode "tuareg" "Major mode for editing Caml code" t)
 (autoload 'camldebug "camldebug" "Run the Caml debugger" t)
-
-(if (and (boundp 'window-system) window-system)
-    (when (string-match "XEmacs" emacs-version)
-       	(if (not (and (boundp 'mule-x-win-initted) mule-x-win-initted))
-            (require 'sym-lock))
-       	(require 'font-lock)))


Index: emacs-common-tuareg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-common-tuareg/devel/emacs-common-tuareg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emacs-common-tuareg.spec	20 Feb 2008 22:09:07 -0000	1.2
+++ emacs-common-tuareg.spec	21 Feb 2008 08:41:07 -0000	1.3
@@ -30,9 +30,8 @@
 
 Name:           emacs-common-%{pkg}
 Version:        1.45.6
-Release:        3%{?dist}
-Summary:        Emacs mode for editing ocaml
-#Summary:        Emacs and XEmacs mode for editing ocaml
+Release:        4%{?dist}
+Summary:        Emacs and XEmacs mode for editing ocaml
 
 Group:          Development/Libraries
 License:        GPLv2+
@@ -40,15 +39,17 @@
 Source0:        http://www-rocq.inria.fr/~acohen/tuareg/mode/tuareg-mode-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         tuareg-mode-no-sym-lock.patch
+
 BuildArch:      noarch
 BuildRequires:  emacs emacs-el
 BuildRequires:  xemacs xemacs-devel
 
 
 %description
-%{pkgname} is an add-on package for GNU Emacs for editing OCaml source
-files.  It is much better than the default mode included in Emacs or
-the one provided by INRIA.
+%{pkgname} is an add-on package for GNU Emacs and XEmacs for
+editing OCaml source files.  It is much better than the
+default mode included in Emacs or the one provided by INRIA.
 
 This package contains the common files.  Install emacs-%{pkg} to get
 the complete package.
@@ -102,6 +103,7 @@
 
 %prep
 %setup -q -n %{pkg}-mode-%{version}
+%patch0 -p1
 for f in HISTORY README LISEZMOI; do
   mv $f $f.old; iconv -f iso-8859-1 -t utf-8 < $f.old > $f
 done
@@ -109,7 +111,7 @@
 %build
 # 'append-tuareg.el' and 'custom-tuareg.el' are example config
 # files, so they will end up in the documentation directory.
-# 'sym-lock.el' is used but not required by XEmacs.
+# 'sym-lock.el' is broken.
 emacs --no-site-file -q -batch -L . -f batch-byte-compile \
   tuareg.el camldebug.el
 
@@ -166,6 +168,9 @@
 
 
 %changelog
+* Thu Feb 21 2008 Richard W.M. Jones <rjones at redhat.com> - 1.45.6-4
+- Disable sym-lock in xemacs - this fixes xemacs support.
+
 * Wed Feb 20 2008 Richard W.M. Jones <rjones at redhat.com> - 1.45.6-3
 - Reenable support for xemacs.