haskal
/
utop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improvements for loading packages from the file local variables 

Ignore-this: 8795ff387135ceb2b99ff8ae7f322875

darcs-hash:20120731231800-33bd9-adf29b40d61f7f63be893a8473edb6e77863b930
This commit is contained in:
wojciech.meyer 2012-08-01 01:18:00 +02:00
parent 50963c9059
commit 82cccd480a
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/uTop_main.ml
View File

@ -869,5 +869,5 @@ let main () =
exit 2 exit 2
(* Local variables: *) (* Local variables: *)
(* utop-package-list: ("camomile" "lwt" "lwt.react" "lambda-term" "zed") *) (* utop-package-list: ("camlp4" "camomile" "lwt" "lwt.react" "lwt.syntax" "lambda-term" "zed") *)
(* End: *) (* End: *)

13
src/top/utop.el
View File

@ -79,6 +79,11 @@ This hook is only run if exiting actually kills the buffer."
:type 'hook :type 'hook
:group 'utop) :group 'utop)
(defcustom utop-load-packages-without-asking nil
"Load packages from file local variables without asking"
:type 'boolean
:group 'utop)
(defface utop-prompt (defface utop-prompt
'((((background dark)) (:foreground "Cyan1")) '((((background dark)) (:foreground "Cyan1"))
(((background light)) (:foreground "blue"))) (((background light)) (:foreground "blue")))
@ -821,6 +826,8 @@ To automatically do that just add these lines to your .emacs:
;; Redefine this variable so menu will work ;; Redefine this variable so menu will work
(set (utop-choose "interactive-buffer-name") utop-buffer-name) (set (utop-choose "interactive-buffer-name") utop-buffer-name)
(make-local-variable 'utop-package-list) (make-local-variable 'utop-package-list)
(make-local-variable 'utop-camlp)
(add-hook 'hack-local-variables-hook 'utop-query-load-package-list)
nil) nil)
;; +-----------------------------------------------------------------+ ;; +-----------------------------------------------------------------+
@ -948,7 +955,8 @@ defaults to 0."
(insert (elt cols 1) "\n"))) (insert (elt cols 1) "\n")))
(defun utop-load-package (package) (defun utop-load-package (package)
(when (y-or-n-p (format "Load package `%s'? " package)) (when (or utop-load-packages-without-asking
(y-or-n-p (format "Load package `%s'? " package)))
;; Load it ;; Load it
(utop-send-command (format "require:%s\n" package)))) (utop-send-command (format "require:%s\n" package))))
@ -972,7 +980,8 @@ defaults to 0."
(y-or-n-p (y-or-n-p
"You've defined utop-package-list variable, but uTop toplevel is not running, would you like me to start the toplevel?")) "You've defined utop-package-list variable, but uTop toplevel is not running, would you like me to start the toplevel?"))
(with-current-buffer (utop)) (with-current-buffer (utop))
(mapc 'utop-load-package utop-package-list))) (mapc 'utop-load-package utop-package-list)
(message "OCaml packages loaded by file local variables")))
;; +-----------------------------------------------------------------+ ;; +-----------------------------------------------------------------+
;; | Menu | ;; | Menu |