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

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 649ddb56ab22f838d1c76d45eee353028322d3bf
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun May 6 12:05:36 2012 +0200

    synchronized master branch with upstream branch
    
    The master branch contained two files from version 2.0.1 of turag-mode,
    probably du to some accident with git-build-package.

diff --git a/append-tuareg.el b/append-tuareg.el
index e43070a..b038156 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\\w?" . tuareg-mode))
+(add-to-list 'auto-mode-alist '("\\.ml[iylp]?" . 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/debian/changelog b/debian/changelog
index 4e620c2..c57b60a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tuareg-mode (1:2.0.4-4) unstable; urgency=low
+
+  * Bring files tuareg.el and append-tuareg.el to upstream version 2.0.4.
+    These two files were left in version 2.0.1 due to an accident.
+    This brings also back upstream's fix of the filename pattern in
+    append-tuareg.el (closes: #671558).
+
+ -- Ralf Treinen <treinen at debian.org>  Sun, 06 May 2012 12:19:06 +0200
+
 tuareg-mode (1:2.0.4-3) unstable; urgency=low
 
   * Really upload to sid.
diff --git a/tuareg.el b/tuareg.el
index f18b576..9a25d59 100644
--- a/tuareg.el
+++ b/tuareg.el
@@ -22,7 +22,7 @@
 (require 'easymenu)
 
 (defconst tuareg-mode-version
-  (concat "Tuareg Version 2.0.1 ("
+  (concat "Tuareg Version 2.0.4 ("
           (eval-when-compile
             (let ((file (or (and (boundp 'byte-compile-current-file)
                                  byte-compile-current-file)
@@ -41,6 +41,8 @@
                              (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))))))
@@ -1013,10 +1015,12 @@ 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)
+      (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"
       ;; To prevent misbehavior in case of error during exploration.
-      (define-key map [(control mouse-2)] 'caml-types-mouse-ignore)
-      (define-key map [(control down-mouse-2)] 'caml-types-explore)
+      (define-key map [?\C-c mouse-1] 'caml-types-mouse-ignore)
+      (define-key map [?\C-c down-mouse-1] 'caml-types-explore)
       ;; Trigger caml-help
       (define-key map [?\C-c ?i] 'ocaml-add-path)
       (define-key map [?\C-c ?\[] 'ocaml-open-module)
@@ -1361,7 +1365,7 @@ For synchronous programming.")
     tuareg-keyword-regexp))
 
 (defconst tuareg-match-pipe-kwop-regexp
-  (concat (tuareg-ro "and" "fun" "function" "type" "with" "parse" "parser")
+  (concat (tuareg-ro "and" "function" "type" "with" "parse" "parser")
           "\\|[[({=]\\||[^!]")
   "Regexp for keywords supporting case match.")
 
@@ -3682,6 +3686,8 @@ 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