|
Line
Link Here
|
| 0 |
-- utop-1.11-orig/src/top/utop.el |
0 |
++ utop-1.11/src/top/utop.el |
|
Lines 729-734
Link Here
|
| 729 |
;; | Caml/Tuareg/Typerex integration | |
729 |
;; | Caml/Tuareg/Typerex integration | |
| 730 |
;; +-----------------------------------------------------------------+ |
730 |
;; +-----------------------------------------------------------------+ |
| 731 |
|
731 |
|
|
|
732 |
(eval-and-compile |
| 732 |
(defun utop-choose (symbol) |
733 |
(defun utop-choose (symbol) |
| 733 |
"Be best at resolving caml, tuareg or typerex dependencies even |
734 |
"Be best at resolving caml, tuareg or typerex dependencies even |
| 734 |
when byte-compiling." |
735 |
when byte-compiling." |
|
Lines 745-751
Link Here
|
| 745 |
(intern (concat "typerex-" symbol))) |
746 |
(intern (concat "typerex-" symbol))) |
| 746 |
((require 'caml nil t) |
747 |
((require 'caml nil t) |
| 747 |
(intern (concat "caml-" symbol))) |
748 |
(intern (concat "caml-" symbol))) |
| 748 |
(error (concat "unsupported mode: " (symbol-name major-mode) ", utop support only caml, tuareg and typerex modes")))) |
749 |
(t (error (concat "unsupported mode: " (symbol-name major-mode) ", utop support only caml, tuareg and typerex modes"))))) |
|
|
750 |
) |
| 749 |
|
751 |
|
| 750 |
(defmacro utop-choose-symbol (symbol) |
752 |
(defmacro utop-choose-symbol (symbol) |
| 751 |
(utop-choose symbol)) |
753 |
(utop-choose symbol)) |
