(riece-command-yank): Don't bind space-width here.

[riece] / lisp / riece-yank.el

diff --git a/lisp/riece-yank.el b/lisp/riece-yank.el
index fdb5b34..12a21cc 100644 (file)
--- a/lisp/riece-yank.el
+++ b/lisp/riece-yank.el
@@ -1,4 +1,4 @@
-;;; riece-kill.el --- enter the element in kill-ring
+;;; riece-yank.el --- enter the element in kill-ring
 ;; Copyright (C) 2004 Masatake YAMATO
 
 ;; Author: Masatake YAMATO <jet@gyve.org>
@@ -23,7 +23,7 @@
 ;;
 ;; In riece's command buffer, you can send the top element of kill-ring
 ;; by C-c y. 
-;; Don't forget do (riece-command-enable-addon 'riece-yank).
+;; Don't forget do (riece-command-enable-addon 'riece-yank) to test.
 ;;
 ;;; Code:
 (require 'riece-commands)
@@ -57,44 +57,47 @@ before/after the first/last non-blank line."
   (define-key riece-command-mode-map "\C-cy" 'undefined)
   (setq riece-yank-enabled nil))
 
-(defun riece-command-yank (prefix)
-  (interactive "sPrefix: ")
+(defun riece-yank-strip-space (string)
+  (with-temp-buffer
+    (insert string)
+    (untabify (point-min) (point-max))
+    ;; Delete blank lines before the first non-blank line.
+    (goto-char (point-min))
+    (while (looking-at " *$")
+      (delete-region (point) (progn (forward-line) (point))))
+    ;; Delete blank lines after the last non-blank line.
+    (goto-char (point-max))
+    (while (progn (beginning-of-line) (looking-at " *$"))
+      (delete-region (point) (progn (end-of-line 0) (point))))
+    ;; Delete common spaces in front of lines.
+    (let ((space-width (point-max)))
+      (while (looking-at " +")
+       (setq space-width (min space-width (length (match-string 0))))
+       (forward-line))
+      (goto-char (point-min))
+      (while (not (eobp))
+       (delete-char space-width)
+       (forward-line)))
+    (buffer-string)))
+
+(defun riece-command-yank (arg prefix)
+  (interactive "P\nsPrefix: ")
   (when (or (not prefix)
            (string= prefix ""))
     (setq prefix " "))
   (let* ((kill (current-kill 0))
-        msg space-width)
+        msg)
     (unless kill
       (error "Nothing to send in kill-ring"))
     (if riece-yank-strip-space
-       (with-temp-buffer
-         (insert kill)
-         (untabify (point-min) (point-max))
-         ;; Delete blank lines before the first non-blank line.
-         (goto-char (point-min))
-         (while (looking-at " *$")
-           (delete-region (point) (progn (forward-line) (point))))
-         ;; Delete blank lines after the last non-blank line.
-         (goto-char (point-max))
-         (while (progn (beginning-of-line) (looking-at " *$"))
-           (delete-region (point) (progn (end-of-line 0) (point))))
-         ;; Delete common spaces in front of lines.
-         (setq space-width (point-max))
-         (while (looking-at " +")
-           (setq space-width (min space-width (length (match-string 0))))
-           (forward-line))
-         (goto-char (point-min))
-         (while (not (eobp))
-           (delete-char space-width)
-           (forward-line))
-         (setq kill (buffer-string))))
+       (setq kill (riece-yank-strip-space kill)))
     (setq msg (split-string kill "\n"))
     (when (y-or-n-p (format "Send \"%s\"\n? " kill))
       (mapcar
        (lambda (x) 
-        (riece-command-send-message (concat prefix x) nil)
+        (riece-command-send-message (concat prefix x) arg)
         ;; Without next line, you will be kicked out from ircd.
-        ;; It may means "Don't send much data at once."
+        ;; It may mean "Don't send much data at once."
         (sit-for riece-yank-tick))
        msg))))