Skip to content
Browse files

(inferior-haskell-load-file): Fix the compilation-parsing-end fiddlin…

…g so it

Ignore-this: fcd0f136e5e9bc05fb3fd3f086931de1
(inferior-haskell-load-file): Fix the compilation-parsing-end fiddling so it
doesn't get moved inadvertently.

darcs-hash:20051121031927-c2f2e-e3dd4ac5ae32bf54aa70adc9907d26397f3d1963.gz
  • Loading branch information...
1 parent f9bced1 commit d8a5cc865d47137f920a7fd99f8ebfbf1e1e5f37 monnier committed Nov 20, 2005
Showing with 24 additions and 6 deletions.
  1. +12 −0 ChangeLog
  2. +12 −6 inf-haskell.el
View
12 ChangeLog
@@ -1,3 +1,15 @@
+2005-11-20 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * inf-haskell.el (inferior-haskell-load-file): Fix the
+ compilation-parsing-end fiddling so it doesn't get moved inadvertently.
+
+ * haskell-font-lock.el (haskell-font-lock-symbols-alist): Some XEmacs
+ versions define make-char but not charsetp.
+ (haskell-font-lock-symbols-keywords): Add a `keep' arg so
+ de-highlighting in strings works correctly even in Emacs-21.
+
+ * haskell-doc.el: Add coding cookie.
+
2005-11-14 Stefan Monnier <monnier@iro.umontreal.ca>
* haskell-decl-scan.el (haskell-ds-get-variable): Massage.
View
18 inf-haskell.el
@@ -158,12 +158,18 @@ setting up the inferior-haskell buffer."
;; (inferior-haskell-send-string
;; proc (concat ":cd " (file-name-directory file) "\n")))
(compilation-forget-errors)
- (if (boundp 'compilation-parsing-end)
- (if (markerp compilation-parsing-end)
- (set-marker compilation-parsing-end (point-max))
- (setq compilation-parsing-end (point-max))))
- (inferior-haskell-send-command
- proc (if reload ":reload" (concat ":load \"" file "\"")))
+ (let ((parsing-end (marker-position (process-mark proc))))
+ (inferior-haskell-send-command
+ proc (if reload ":reload" (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
+ ;; insert-before-markers) and we'd then miss some errors.
+ (message "Moving parsing-end to %d" parsing-end)
+ (if (boundp 'compilation-parsing-end)
+ (if (markerp compilation-parsing-end)
+ (set-marker compilation-parsing-end parsing-end)
+ (setq compilation-parsing-end parsing-end))))
(display-buffer (current-buffer))
(with-selected-window (get-buffer-window (current-buffer) 0)
(goto-char (point-max))))))

0 comments on commit d8a5cc8

Please sign in to comment.
Something went wrong with that request. Please try again.