From 9d45919310adc631a3ba232cff1c482fa4864396 Mon Sep 17 00:00:00 2001 From: Neil Jerram Date: Thu, 21 Jun 2001 19:39:03 +0000 Subject: [PATCH] * Signal an error if unable to find channel.scm file. --- emacs/ChangeLog | 6 ++++++ emacs/guile.el | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/emacs/ChangeLog b/emacs/ChangeLog index 2b02bf87f..69b67b581 100644 --- a/emacs/ChangeLog +++ b/emacs/ChangeLog @@ -1,3 +1,9 @@ +2001-06-21 Neil Jerram + + * guile.el (guile-channel-file): Signal an error if unable to find + channel.scm. + Change "gulie" typos to "guile". + 2001-05-06 Keisuke Nishida * guile.el (guile:eval): Propagate user interrupt. diff --git a/emacs/guile.el b/emacs/guile.el index efd91fd69..15f866fbb 100644 --- a/emacs/guile.el +++ b/emacs/guile.el @@ -25,7 +25,7 @@ ;;; Low level interface ;;; -(defvar gulie-emacs-file +(defvar guile-emacs-file (catch 'return (mapc (lambda (dir) (let ((file (expand-file-name "guile-emacs.scm" dir))) @@ -33,21 +33,22 @@ load-path) (error "Cannot find guile-emacs.scm"))) -(defvar gulie-channel-file +(defvar guile-channel-file (catch 'return (mapc (lambda (dir) (let ((file (expand-file-name "channel.scm" dir))) (if (file-exists-p file) (throw 'return file)))) - load-path))) + load-path) + (error "Cannot find channel.scm"))) (defvar guile-libs - (nconc (if gulie-channel-file (list "-l" gulie-channel-file) '()) - (list "-l" gulie-emacs-file))) + (nconc (if guile-channel-file (list "-l" guile-channel-file) '()) + (list "-l" guile-emacs-file))) ;;;###autoload (defun guile:make-adapter (command channel) (let* ((buff (generate-new-buffer " *guile object channel*")) - (libs (if gulie-channel-file (list "-l" gulie-channel-file) nil)) + (libs (if guile-channel-file (list "-l" guile-channel-file) nil)) (proc (apply 'start-process "guile-oa" buff command "-q" guile-libs))) (process-kill-without-query proc) (accept-process-output proc) -- 2.20.1