[Pkg-ocaml-maint-commits] [SCM] tuareg-mode packaging branch, master, updated. debian/1%2.0.4-1-5-g378d11c

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 378d11cd3ec78358d7da3acab1f3fd321ce0724a
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Feb 8 21:52:58 2011 +0100

    unapply quilt patches

diff --git a/append-tuareg.el b/append-tuareg.el
index b038156..e43070a 100644
--- a/append-tuareg.el
+++ b/append-tuareg.el
@@ -1,7 +1,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; append-tuareg.el - Tuareg quick installation: Append this file to .emacs.
 
-(add-to-list 'auto-mode-alist '("\\.ml[iylp]?" . tuareg-mode))
+(add-to-list 'auto-mode-alist '("\\.ml\\w?" . tuareg-mode))
 (autoload 'tuareg-mode "tuareg" "Major mode for editing Caml code" t)
 (autoload 'camldebug "camldebug" "Run the Caml debugger" t)
 (dolist (ext '(".cmo" ".cmx" ".cma" ".cmxa" ".cmi"))
diff --git a/tuareg.el b/tuareg.el
index 9a25d59..f18b576 100644
--- a/tuareg.el
+++ b/tuareg.el
@@ -22,7 +22,7 @@
 (require 'easymenu)
 
 (defconst tuareg-mode-version
-  (concat "Tuareg Version 2.0.4 ("
+  (concat "Tuareg Version 2.0.1 ("
           (eval-when-compile
             (let ((file (or (and (boundp 'byte-compile-current-file)
                                  byte-compile-current-file)
@@ -41,8 +41,6 @@
                              (call-process "hg" nil t nil "id" "-i" "--debug"))
                             ((file-directory-p ".svn")
                              (shell-command "svn info | grep Revision: | sed 's/Revision: //'" t))
-			    ((file-directory-p ".bzr")
-                             (shell-command "bzr log -l -1 | grep revno:" t))
                             (t (insert "unknown\n")))))
                 (buffer-substring-no-properties
                  (point-min) (1- (point-max))))))
@@ -1015,12 +1013,10 @@ Regexp match data 0 points to the chars."
     (define-key map "\C-c.t" 'tuareg-insert-try-form)
     (when tuareg-with-caml-mode-p
       ;; Trigger caml-types
-      (define-key map [?\C-c ?\C-t] 'caml-types-show-type)  ; "type"
-      (define-key map [?\C-c ?\C-f] 'caml-types-show-call)  ; "function"
-      (define-key map [?\C-c ?\C-l] 'caml-types-show-ident) ; "let"
+      (define-key map [?\C-c ?\C-t] 'caml-types-show-type)
       ;; To prevent misbehavior in case of error during exploration.
-      (define-key map [?\C-c mouse-1] 'caml-types-mouse-ignore)
-      (define-key map [?\C-c down-mouse-1] 'caml-types-explore)
+      (define-key map [(control mouse-2)] 'caml-types-mouse-ignore)
+      (define-key map [(control down-mouse-2)] 'caml-types-explore)
       ;; Trigger caml-help
       (define-key map [?\C-c ?i] 'ocaml-add-path)
       (define-key map [?\C-c ?\[] 'ocaml-open-module)
@@ -1365,7 +1361,7 @@ For synchronous programming.")
     tuareg-keyword-regexp))
 
 (defconst tuareg-match-pipe-kwop-regexp
-  (concat (tuareg-ro "and" "function" "type" "with" "parse" "parser")
+  (concat (tuareg-ro "and" "fun" "function" "type" "with" "parse" "parser")
           "\\|[[({=]\\||[^!]")
   "Regexp for keywords supporting case match.")
 
@@ -3686,8 +3682,6 @@ Short cuts for interaction within the toplevel:
      "---"
      [ "Show type at point" caml-types-show-type
        tuareg-with-caml-mode-p]
-     [ "Show fully qualified ident at point" caml-types-show-ident
-       tuareg-with-caml-mode-p]
      "---"
      [ "Complete identifier" caml-complete
        tuareg-with-caml-mode-p]

-- 
tuareg-mode packaging