[Pkg-ocaml-maint-commits] r2320 - in trunk/packages/tuareg-mode/trunk/debian: . patches

[Ralf Treinen]

Author: treinen
Date: 2005-12-22 19:05:35 +0000 (Thu, 22 Dec 2005)
New Revision: 2320

Added:
   trunk/packages/tuareg-mode/trunk/debian/patches/04-line-number.dpatch
Modified:
   trunk/packages/tuareg-mode/trunk/debian/NEWS
   trunk/packages/tuareg-mode/trunk/debian/changelog
   trunk/packages/tuareg-mode/trunk/debian/patches/00list
Log:
towards tuareg 1.45.1-1


Modified: trunk/packages/tuareg-mode/trunk/debian/NEWS
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/NEWS	2005-12-20 22:10:53 UTC (rev 2319)
+++ trunk/packages/tuareg-mode/trunk/debian/NEWS	2005-12-22 19:05:35 UTC (rev 2320)
@@ -1,12 +1,15 @@
 tuareg-mode (1.45.0-final-1) unstable; urgency=low
   
-  * The emacs mode tuareg-mode is now autoloaded by default on files with
-    file name extension ".ml\w?". Users have no longer to include the file
-    "append-tuareg" in their .emacs files. The file "append-tuareg" is now
-    an empty dummy file such that existing user .emacs files won't break.
-  
- -- Ralf Treinen <treinen at debian.org>  Sat, 20 Aug 2005 22:35:45 +0200
+  * The emacs mode tuareg-mode is now automatically loaded on all files
+    with filename extension .ml[iylp]?. If the debian package
+    "ocaml-mode", which provides an alternative emacs mode for (O)Caml
+    files, is installed together with the tuareg-mode package then tuareg
+    takes precedence.  Users who wish to overwrite this behaviour should
+    consult the instuctions given in the file 
+    /usr/share/doc/ocaml-mode/README.Debian.
 
+  -- Ralf Treinen <treinen at debian.org>  Thu, 22 Dec 2005 20:00:15 +0100
+
 tuareg-mode (1.40.5.1-1) unstable; urgency=low
 
   * New function called tuareg-narrow-to-phrase, bound to C-xnd (normally

Modified: trunk/packages/tuareg-mode/trunk/debian/changelog
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/changelog	2005-12-20 22:10:53 UTC (rev 2319)
+++ trunk/packages/tuareg-mode/trunk/debian/changelog	2005-12-22 19:05:35 UTC (rev 2320)
@@ -1,13 +1,15 @@
-tuareg-mode (1.45.0-final-1) NOTRELEASED; urgency=low
+tuareg-mode (1.45.1-1) NOTRELEASED; urgency=low
 
   * New upstream release.
   * Install an emacs startup file with priority 51, and replace the installed 
     append-tuareg.el file by an empty file. Adapt NEWS.Debian accordingly.
   * Some improvements in long package description.
   * Patch 03_autoload_pattern: Narrow autoload-pattern down to what is really
-    needed for OCaml files. Adpar README.
+    needed for OCaml files. 
+  * Patch 04_line-number: work around the missing line-number function
+    in emacs (closes: #341203).
 
- -- Ralf Treinen <treinen at debian.org>  Fri,  2 Sep 2005 20:37:39 +0200
+ -- Ralf Treinen <treinen at debian.org>  Thu, 22 Dec 2005 20:03:54 +0100
 
 tuareg-mode (1.45.0-beta3-1) unstable; urgency=low
 

Modified: trunk/packages/tuareg-mode/trunk/debian/patches/00list
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/patches/00list	2005-12-20 22:10:53 UTC (rev 2319)
+++ trunk/packages/tuareg-mode/trunk/debian/patches/00list	2005-12-22 19:05:35 UTC (rev 2320)
@@ -1,5 +1,4 @@
 01_camldebug
 02_localdoc
 03_autoload_pattern
-
-
+04-line-number

Added: trunk/packages/tuareg-mode/trunk/debian/patches/04-line-number.dpatch
===================================================================
--- trunk/packages/tuareg-mode/trunk/debian/patches/04-line-number.dpatch	2005-12-20 22:10:53 UTC (rev 2319)
+++ trunk/packages/tuareg-mode/trunk/debian/patches/04-line-number.dpatch	2005-12-22 19:05:35 UTC (rev 2320)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04-line-number.dpatch by Ralf Treinen <treinen at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: work around missing "line-number" function in emacs
+
+ at DPATCH@
+diff -urNad trunk~/tuareg.el trunk/tuareg.el
+--- trunk~/tuareg.el	2005-12-22 19:38:49.000000000 +0100
++++ trunk/tuareg.el	2005-12-22 19:40:39.000000000 +0100
+@@ -3301,7 +3301,9 @@
+ 	  (goto-char last-and)))
+       (if scan-error
+ 	  (message "Parse error when scanning definitions: line %s!"
+-		   (line-number))
++		   (if tuareg-with-xemacs
++		       (line-number)
++		     (1+ (count-lines 1 (point)))))
+ 	;; Sort and build lists
+ 	(mapcar (lambda (pair)
+ 		  (if (cdr pair)


Property changes on: trunk/packages/tuareg-mode/trunk/debian/patches/04-line-number.dpatch
___________________________________________________________________
Name: svn:executable
   + *