Peter Szilagyi avatar Peter Szilagyi committed 5073572

Switch the default tuareg-indent-comments back to t now that we've fixed M-q.

Comments (0)

Files changed (2)

+changes
+=======
+- added some ocamldoc syntax support to Tuareg: indent code in
+  comments between "[" and "]" (source) and "{[" and "]}"
+  (preformatted source) and don't indent between "{v" and "v}"
+  (verbatim)
+- switched the default tuareg-indent-comments back to t now that we
+  have convenient ways to denote verbatim text and fixed M-q
+  (tuareg-indent-phrase) to avoid accidentally reindenting comments
+  you're not pointing at
+
+bug fixes
+=========
+- fixed a bug in tuareg-compute-indent (M-q) where it indented too far
+  when pointing at the last paragraph of a comment, causing us to
+  accidentally reindent off-screen code and comments
+
 ================================================================================
 2013-01-11 Rolled rev 8925c1113abe to test
 ================================================================================

elisp/jane/jane-ocaml.el

  '(tuareg-type-indent 0)
  '(tuareg-leading-star-in-doc t)
  '(tuareg-display-buffer-on-eval nil)
- ;; CR cfalls: I would prefer that comments that are manually indented
+ ;; XCR cfalls: I would prefer that comments that are manually indented
  ;; just have a column of | characters on the left to keep them from
  ;; being reindented.  In most cases, the automatic indentation is
  ;; useful, and it's easy to add the | with C-xrt.
- '(tuareg-indent-comments nil) ; don't accidentally clobber carefully indented comments
+ ;;
+ ;; pszilagyi: We fixed M-q (tuareg-indent-phrase) so it's harder to
+ ;; accidentally clobber carefully indented comments.  The "|" syntax
+ ;; didn't catch on, but we implemented other, ocamldoc syntax for
+ ;; preformatted verbatim text, "{v" and "v}", to give users a way to
+ ;; have some text never formatted, as well as "{[" and "]}" to have
+ ;; OCaml program text indented accordingly inside comments.  Given
+ ;; these adjustments, we switched the default back to t.
+ '(tuareg-indent-comments t)
  )
 
 ;; This is no longer used by `Omake.compile', but is still used by
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.