Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ocamldebug.el: Try and partially sync with camldebug.el (#227) #319

Merged
merged 2 commits into from
Feb 27, 2025

Conversation

monnier
Copy link
Contributor

@monnier monnier commented Feb 26, 2025

Add a binding to "backstep" by sync'ing with camldebug.el.

Align GPL version with that of tuareg.el.
Use macroexp-file-name when available.
Add backstep (C-k) and display (C-d) commands.
(ocamldebug-track-frame): Mark it as a user option.
(ocamldebug-mode-map): Comment out broken M-? binding.
(ocamldebug-mode): Make sure \[..] refs are resolved relative to the mode map rather than the current map.
(def-ocamldebug): Prefer when.
(ocamldebug-complete-filter): Use push.
(ocamldebug-complete): Use declare.
(ocamldebug): Rename arg to file, to match the docstring.
Try and behave a bit better when make-comint returns another buffer than the one we expected.
(ocamldebug-set-current-event): Remove pos argument.
Use before instead (in the tty case) to decide whether to use spos or epos, like we already did in the GUI case. Also, set overlay-arrow-position in the current buffer only.
(ocamldebug-display-line): Adjust caller accordingly.

* tuareg.el (tuareg-font-lock-label-face): Remove odd `keep` element.
* ocamldebug.el (ocamldebug-event): Use `:inverse-video`.
Align GPL version with that of `tuareg.el`.
Use `macroexp-file-name` when available.
Add `backstep` (C-k) and `display` (C-d) commands.
(ocamldebug-track-frame): Mark it as a user option.
(ocamldebug-mode-map): Comment out broken `M-?` binding.
(ocamldebug-mode): Make sure \\[..] refs are resolved relative to the
mode map rather than the current map.
(def-ocamldebug): Prefer `when`.
(ocamldebug-complete-filter): Use `push`.
(ocamldebug-complete): Use `declare`.
(ocamldebug): Rename arg to `file`, to match the docstring.
Try and behave a bit better when `make-comint` returns another buffer
than the one we expected.
(ocamldebug-set-current-event): Remove `pos` argument.
Use `before` instead (in the tty case) to decide whether to use `spos`
or `epos`, like we already did in the GUI case.  Also, set
`overlay-arrow-position` in the current buffer only.
(ocamldebug-display-line): Adjust caller accordingly.
@monnier monnier merged commit f661844 into master Feb 27, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant