From 2b47f310c57553aa86e0f9f8674ea93bbfb0000d Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sun, 26 Aug 2012 15:41:01 +0200 Subject: [PATCH] Simplify ein:kernelinfo-update-ccwd --- lisp/ein-kernelinfo.el | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lisp/ein-kernelinfo.el b/lisp/ein-kernelinfo.el index e5c39ad..b7eb2ed 100644 --- a/lisp/ein-kernelinfo.el +++ b/lisp/ein-kernelinfo.el @@ -74,16 +74,17 @@ (ein:kernel-request-stream (oref kerinfo :kernel) "__import__('sys').stdout.write(__import__('os').getcwd())" - (lambda (cwd kernel kerinfo buffer) - (setq cwd (ein:kernel-filename-from-python kernel cwd)) - (oset kerinfo :ccwd cwd) - ;; sync buffer's `default-directory' with CWD - ;; FIXME: Support multiple buffers. - (when (buffer-live-p buffer) - (with-current-buffer buffer - (when (file-accessible-directory-p cwd) - (setq default-directory (file-name-as-directory cwd)))))) - (list (oref kerinfo :kernel) kerinfo (oref kerinfo :buffer)))) + (lambda (cwd kerinfo) + (with-slots (kernel buffer) kerinfo + (setq cwd (ein:kernel-filename-from-python kernel cwd)) + (oset kerinfo :ccwd cwd) + ;; sync buffer's `default-directory' with CWD + ;; FIXME: Support multiple buffers. + (when (buffer-live-p buffer) + (with-current-buffer buffer + (when (file-accessible-directory-p cwd) + (setq default-directory (file-name-as-directory cwd))))))) + (list kerinfo))) (defun ein:kernelinfo-update-hostname (kerinfo) "Get hostname in which kernel is running and store it in KERINFO."