Permalink
Browse files

Removed support for :reload (e.g. removed the C-c C-r binding).

Ignore-this: 50459671421e072670eb540ee31f2255

darcs-hash:20070701053538-c2f2e-0bedd8c4d5ce84e42de0c671c5b1e615d2de48ea.gz
  • Loading branch information...
1 parent bf80267 commit f818e57a2bb717d251fb9d4553e9b2d66e145e4c monnier committed Jul 1, 2007
Showing with 17 additions and 11 deletions.
  1. +7 −0 ChangeLog
  2. +2 −0 NEWS
  3. +4 −2 haskell-mode.el
  4. +4 −9 inf-haskell.el
View
@@ -1,3 +1,10 @@
+2007-06-30 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * haskell-mode.el (haskell-mode-map): Remove C-c C-r binding.
+
+ * inf-haskell.el (inferior-haskell-load-file): Remove reload arg.
+ (inferior-haskell-reload-file): Remove.
+
2007-06-29 Stefan Monnier <monnier@iro.umontreal.ca>
* inf-haskell.el (inferior-haskell-compute-module-alist): Fix regexps.
View
2 NEWS
@@ -1,5 +1,7 @@
Changes since 2.3:
+* Removed support for :reload (e.g. removed the C-c C-r binding).
+
* C-c C-d looks up the symbol at point in the Haddock docs.
* Haddock comments are highlighted with font-lock-doc-face if it exists.
View
@@ -267,8 +267,10 @@ be set to the preferred literate style."
;; (define-key map [?\C-c ?\C-r] 'inferior-haskell-send-region)
(define-key map [?\C-c ?\C-z] 'switch-to-haskell)
(define-key map [?\C-c ?\C-l] 'inferior-haskell-load-file)
- ;; Non standard in other inferior-modes, but traditional in haskell.
- (define-key map [?\C-c ?\C-r] 'inferior-haskell-reload-file)
+ ;; I think it makes sense to bind inferior-haskell-load-and-run to C-c
+ ;; C-r, but since it used to be bound to `reload' until june 2007, I'm
+ ;; going to leave it out for now.
+ ;; (define-key map [?\C-c ?\C-r] 'inferior-haskell-load-and-run)
(define-key map [?\C-c ?\C-b] 'switch-to-haskell)
;; (define-key map [?\C-c ?\C-s] 'inferior-haskell-start-process)
;; That's what M-; is for.
View
@@ -210,7 +210,7 @@ The process PROC should be associated to a comint buffer."
(haskell-cabal-find-file))))))
;;;###autoload
-(defun inferior-haskell-load-file (&optional reload)
+(defun inferior-haskell-load-file ()
"Pass the current buffer's file to the inferior haskell process."
(interactive)
;; Save first, so we're sure that `buffer-file-name' is non-nil afterward.
@@ -233,8 +233,7 @@ The process PROC should be associated to a comint buffer."
(inferior-haskell-send-command
proc (concat ":cd " default-directory)))
(setq file (file-relative-name file)))
- (inferior-haskell-send-command
- proc (if reload ":reload" (concat ":load \"" file "\"")))
+ (inferior-haskell-send-command proc (concat ":load \"" file "\""))
;; Move the parsing-end marker after sending the command so
;; that it doesn't point just to the insertion point.
;; Otherwise insertion may move the marker (if done with
@@ -260,7 +259,8 @@ The process PROC should be associated to a comint buffer."
inferior-haskell-run-command
(read-string "Command to run: " nil nil inferior-haskell-run-command))))
(setq inferior-haskell-run-command command)
- (inferior-haskell-load-file) ;FIXME: Shouldn't that be reload?
+ (inferior-haskell-load-file)
+ ;; FIXME: if the load encountered errors, we should not `run'.
(inferior-haskell-send-command (inferior-haskell-process) command))
(defun inferior-haskell-send-command (proc str)
@@ -272,11 +272,6 @@ The process PROC should be associated to a comint buffer."
(move-marker comint-last-input-end (point))
(comint-send-string proc str)))
-(defun inferior-haskell-reload-file ()
- "Tell the inferior haskell process to reread the current buffer's file."
- (interactive)
- (inferior-haskell-load-file 'reload))
-
;;;###autoload
(defun inferior-haskell-type (expr &optional insert-value)
"Query the haskell process for the type of the given expression.

0 comments on commit f818e57

Please sign in to comment.