hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #45 from himura/fix-buffer-name

Browse Source 
Fixed the conflicts with the package which modify (buffer-name) value.
This commit is contained in:
Kazu Yamamoto 2012-02-14 17:55:26 -08:00
commit 2c870867c1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
elisp/ghc-comp.el
View File

@ -270,12 +270,13 @@ unloaded modules are loaded")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defun ghc-gather-import-modules-all-buffers ()
(let ((bufs (mapcar 'buffer-name (buffer-list)))
(let ((bufs (mapcar (lambda (b) (cons (buffer-name b) (buffer-file-name b)))
(buffer-list)))
ret)
(save-excursion
(dolist (buf bufs (ghc-uniq-lol ret))
(when (string-match "\\.hs$" buf)
(set-buffer buf)
(when (and (cdr buf) (string-match "\\.hs$" (cdr buf)))
(set-buffer (car buf))
(ghc-add ret (ghc-gather-import-modules-buffer)))))))
(defun ghc-gather-import-modules-buffer ()

4
elisp/ghc-info.el
View File

@ -23,7 +23,7 @@
(let* ((expr0 (ghc-things-at-point))
(expr (if ask (ghc-read-expression expr0) expr0))
(cdir default-directory)
(file (buffer-name))
(file buffer-file-name)
(buf (get-buffer-create ghc-error-buffer-name)))
(with-current-buffer buf
(erase-buffer)
@ -120,7 +120,7 @@
(let* ((ln (int-to-string (line-number-at-pos)))
(cn (int-to-string (current-column)))
(cdir default-directory)
(file (buffer-name)))
(file buffer-file-name))
(ghc-read-lisp
(lambda ()
(cd cdir)