X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-ruby.el;h=699ddd08c3db4ce50a5d84373e3c4c4a726f6173;hb=e6d2b6db02a2ac6cc70cb3030d5fc9a786deaf3d;hp=aa7a8382ac258effaa8706132100b141d1f4ac87;hpb=14b5328514b738b8acbde5d588b263a9c34fa52a;p=elisp%2Friece.git diff --git a/lisp/riece-ruby.el b/lisp/riece-ruby.el index aa7a838..699ddd0 100644 --- a/lisp/riece-ruby.el +++ b/lisp/riece-ruby.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -52,6 +52,7 @@ (defgroup riece-ruby nil "Interact with Ruby interpreter." + :prefix "riece-" :group 'riece) (defcustom riece-ruby-command "ruby" @@ -242,7 +243,7 @@ Use `riece-ruby-set-property' to set this variable.") (format "%s-output-handler" name)) (cdr handler-entry) name output time) (if entry - (setcdr entry (cons output (cdr entry))) + (setcdr entry (cons (cons output time) (cdr entry))) (setq riece-ruby-output-queue-alist (cons (list name (cons output time)) riece-ruby-output-queue-alist)))))) @@ -261,13 +262,8 @@ Return a string name assigned by the server." (setq riece-ruby-process (apply #'start-process "riece-ruby" (generate-new-buffer " *Ruby*") riece-ruby-command - (if (file-name-absolute-p riece-ruby-server-program) - riece-ruby-server-program - (expand-file-name - riece-ruby-server-program - (file-name-directory - (locate-library - (symbol-file 'riece-ruby-execute))))) + (expand-file-name riece-ruby-server-program + riece-data-directory) riece-ruby-server-program-arguments)) (process-kill-without-query riece-ruby-process) (set-process-filter riece-ruby-process #'riece-ruby-filter)