Commits

Anonymous committed 44a9461

fixes

  • Participants
  • Parent commits 5e26d43

Comments (0)

Files changed (4)

File elisp/contrib/tuareg/tuareg.el

                          (looking-at "\\*"))))
           (tuareg-beginning-of-literal-or-comment-fast)
           (if star (re-search-forward "(") (re-search-forward "(\\*+[ \t]*"))
-          (current-column)))
+          (current-column)
+          ))
        (t (current-column))))
      ((tuareg-in-literal-p)
       (current-column))

File elisp/jane/jane-common.el

 
 
 
-;; vgatien-baron:
-(font-lock-add-keywords
- 'tuareg-mode
- '(("\\<nonrec\\>" . tuareg-font-lock-governing-face)))
-
-
-
 (provide 'jane-common)

File elisp/jane/jane-micro-features.el

 ;; (Jane.flyspell)
 (defun Jane.flyspell ()
   "incremental spell checking"
-  (flyspell-prog-mode)
+  (add-hook   'prog-mode-hook 'flyspell-prog-mode) ;; won't work until we upgrade emacs
+  (add-hook 'tuareg-mode-hook 'flyspell-prog-mode) ;; for now we'll just have it working in tuareg-mode
   (set-custom-defaults
    '(flyspell-mark-duplications-flag nil)
    '(flyspell-persistent-highlight nil)
    ))
 
 
+
+;; (Jane.omake-old)
+(defun Jane.omake-old ()
+  (require 'compile)
+  (custom-set-variables '(compile-command "VERSION_UTIL_SUPPORT=false LINK_EXECUTABLES=false X_LIBRARY_INLINING=false jomake -j 7 -P -w"))
+  (global-set-key [(control return)] 'compile)
+  ;; When I run compile, if there's already a compilation in this
+  ;; omake location then it asks if I'd like to kill it and start this
+  ;; new one.  Otherwise, it just starts the new one, allowing
+  ;; multiple compilations at the same time on different trees.  Their
+  ;; buffers will be named sensibly.
+  (defun my-compilation-buffer-name (mode-name)
+    (concat "*" (downcase mode-name) ":" (get-omake-root-or-current-dir) "*"))
+  (custom-set-variables
+   '(compilation-buffer-name-function 'my-compilation-buffer-name)
+   '(compilation-read-command t)
+   '(compilation-ask-about-save nil)
+   '(compilation-scroll-output t)
+   '(next-error-highlight t)
+   ;; recenter buffer with error
+   '(next-error-recenter (quote (4)))
+   ;; ocamlc numbers columns from 0, not from 1 (like, e.g., gcc)
+   '(compilation-first-column 0)
+   )
+)
+
+
 ;; Display page delimiter as a horizontal line instead of "^L"
 ;; Insert page delimiters with C-qC-l
 ;; Page delimiters are a good replacement for "(**********)" comments
    '(ediff-split-window-function 'split-window-horizontally)))
 
 
-;; XCR cfalls for sweeks: I thought this is what jane-deprecated.el is
-;; for. Why do we have two ways of doing this?
-;;
-;; sweeks: moved to jane-deprecated.el.
-
-
 
 ;; (Jane.find)
 (progn

File elisp/jane/jane-ocaml.el

 ;; (setq tuareg-mode-hook nil)
 
 
+
+;; CR cfalls: Why not put this fix in tuareg itself?  We maintain it.
+;; vgatien-baron: fixes a bug in tuareg where it doesn't know about nonrec
+(font-lock-add-keywords
+ 'tuareg-mode
+ '(("\\<nonrec\\>" . tuareg-font-lock-governing-face)))
+
+
 ;; Keybindings
 
 (defun jane-tuareg-load-hook ()
 ;;(setq tuareg-mode-hook nil)
 
 
+
 (provide 'jane-ocaml)
+
 
 ;; Support for pa_ounit