[nongnu] externals/caml 2694442 023/197: MAJ avec la derniere version de Jacques

[Stefan Monnier]

branch: externals/caml
commit 269444204bbd13f4344a07fd457326e118455e1b
Author: Xavier Leroy <xavier.leroy@inria.fr>
Commit: Xavier Leroy <xavier.leroy@inria.fr>

    MAJ avec la derniere version de Jacques
    
    
    git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2439 
f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 Makefile     | 6 ++++--
 README       | 2 +-
 caml.el      | 2 +-
 ocamltags.in | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index b1bfb72..c028bd0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+include ../config/Makefile
+
 # Files to install
 FILES= caml-font.el caml-hilit.el caml.el camldebug.el \
        inf-caml.el caml-compat.el
@@ -9,7 +11,7 @@ FILES= caml-font.el caml-hilit.el caml.el camldebug.el \
 EMACS=emacs
 
 # Where to install ocamltags script
-SCRIPTDIR = /usr/local/bin
+SCRIPTDIR = $(BINDIR)
 
 # Command for byte-compiling the files
 COMPILECMD=(progn \
@@ -44,7 +46,7 @@ ocamltags:    ocamltags.in
 
 install-ocamltags: ocamltags
 
-       cp ocamltags $(SCRIPTDIR)/olabltags
+       cp ocamltags $(SCRIPTDIR)/ocamltags
 
 clean:
        rm -f ocamltags *~ #*#
diff --git a/README b/README
index efde8fc..f86ac62 100644
--- a/README
+++ b/README
@@ -28,7 +28,7 @@ To install the mode itself, edit the Makefile and do
 
        % make install
 
-To install ocamltags, set SCRIPTDIR in the Makefile and do
+To install ocamltags, do
 
        % make install-ocamltags
 
diff --git a/caml.el b/caml.el
index 54abbb1..adc76d6 100644
--- a/caml.el
+++ b/caml.el
@@ -619,7 +619,7 @@ variable caml-mode-indentation."
 ;; This function switches to monobyte mode
 
 (if (not (fboundp 'char-bytes))
-    (defalias 'forward-byte forward-char)
+    (defalias 'forward-byte 'forward-char)
   (defun caml-char-bytes (ch)
     (let ((l (char-bytes ch)))
       (if (> l 1) (- l 1) l)))
diff --git a/ocamltags.in b/ocamltags.in
index c3b90a2..8da00e2 100644
--- a/ocamltags.in
+++ b/ocamltags.in
@@ -29,8 +29,9 @@
 
 (defun caml-tags-file (filename)
   (let* ((output-buffer (current-buffer))
+         (basename (file-name-nondirectory filename))
          (backpatch (prog2
-                        (insert "\n" filename)
+                        (insert "\n" basename)
                         (point))))
     (find-file-read-only filename)
     (caml-mode)