diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2013-01-17 02:56:00 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2013-01-17 02:56:00 +0000 |
| commit | 6970ac6e719eec7955a483fe59eb90c7abf8b328 (patch) | |
| tree | bd34a9ff8f0b9741b710fc5595f68fa416ccafb5 /emacs/caml-emacs.el | |
| parent | dfed25213f1642efd3e4d37cbe94f2bfdadce303 (diff) | |
merge patch by Stefan Monnier from PR#5884
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13253 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'emacs/caml-emacs.el')
| -rw-r--r-- | emacs/caml-emacs.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/emacs/caml-emacs.el b/emacs/caml-emacs.el index 13dc297a3..7166d1a87 100644 --- a/emacs/caml-emacs.el +++ b/emacs/caml-emacs.el @@ -25,7 +25,7 @@ (defalias 'caml-mouse-movement-p 'mouse-movement-p) (defalias 'caml-sit-for 'sit-for) -(defmacro caml-track-mouse (&rest body) (cons 'track-mouse body)) +(defalias 'caml-track-mouse 'track-mouse) (defun caml-event-window (e) (posn-window (event-start e))) (defun caml-event-point-start (e) (posn-point (event-start e))) @@ -37,8 +37,7 @@ (or (member 'drag modifiers) (member 'click modifiers))))) -(if (fboundp 'string-to-number) - (defalias 'caml-string-to-int 'string-to-number) - (defalias 'caml-string-to-int 'string-to-int)) +(defalias 'caml-string-to-int (if (fboundp 'string-to-number) + 'string-to-number 'string-to-int)) (provide 'caml-emacs) |