* riece-kakasi.el (riece-kakasi-convert-string): Suppress

[riece] / lisp / riece-ruby.el

diff --git a/lisp/riece-ruby.el b/lisp/riece-ruby.el
index 12d29ef..0b7ae64 100644 (file)
--- 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"
@@ -141,8 +142,7 @@ Use `riece-ruby-set-property' to set this variable.")
     data))
 
 (defun riece-ruby-reset-process-buffer ()
-  (save-excursion
-    (set-buffer (process-buffer riece-ruby-process))
+  (with-current-buffer (process-buffer riece-ruby-process)
     (buffer-disable-undo)
     (make-local-variable 'riece-ruby-response)
     (setq riece-ruby-response nil)
@@ -179,8 +179,7 @@ Use `riece-ruby-set-property' to set this variable.")
                       (concat "EXIT " name "\r\n")))
 
 (defun riece-ruby-filter (process input)
-  (save-excursion
-    (set-buffer (process-buffer process))
+  (with-current-buffer (process-buffer process)
     (goto-char (point-max))
     (insert input)
     (goto-char (point-min))
@@ -242,7 +241,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))))))
@@ -257,24 +256,17 @@ Return a string name assigned by the server."
               (eq (process-status riece-ruby-process) 'run))
     (let (selective-display
          (coding-system-for-write 'binary)
-         (coding-system-for-read 'binary)
-         process-connection-type)
+         (coding-system-for-read 'binary))
       (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)
+      (riece-set-process-query-on-exit-flag riece-ruby-process nil)
       (set-process-filter riece-ruby-process #'riece-ruby-filter)
       (set-process-sentinel riece-ruby-process #'riece-ruby-sentinel)))
-  (save-excursion
-    (set-buffer (process-buffer riece-ruby-process))
+  (with-current-buffer (process-buffer riece-ruby-process)
     (riece-ruby-reset-process-buffer)
     (make-local-variable 'riece-ruby-lock)
     (setq riece-ruby-lock t)
@@ -292,8 +284,7 @@ The car is protocol response line which looks like:
   \(ERR 103 \"Not implemented\").
 The cadr is data from the server, that is, the result of the program.
 The caddr is status from the server."
-  (save-excursion
-    (set-buffer (process-buffer riece-ruby-process))
+  (with-current-buffer (process-buffer riece-ruby-process)
     (riece-ruby-reset-process-buffer)
     (make-local-variable 'riece-ruby-lock)
     (setq riece-ruby-lock t)
@@ -308,8 +299,7 @@ The caddr is status from the server."
   "Clear a result of program execution distinguished by NAME.
 Note that riece-ruby-clear is automatically called iff an exit-handler
 is specified.  Otherwise, it should be called explicitly."
-  (save-excursion
-    (set-buffer (process-buffer riece-ruby-process))
+  (with-current-buffer (process-buffer riece-ruby-process)
     (riece-ruby-reset-process-buffer)
     (make-local-variable 'riece-ruby-lock)
     (setq riece-ruby-lock t)