X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-yank.el;h=914d05f02ca48a7ed83d1f92632e42bcd1f813f9;hb=8052c56a80af6ecf101643ed060e6ea0afc8aa3a;hp=a03c71f8a1a8cb9654acecca9ab487d99a57bf27;hpb=246317fc4abbf794d5d496dec50790bba4a2c710;p=elisp%2Friece.git

diff --git a/lisp/riece-yank.el b/lisp/riece-yank.el
index a03c71f..914d05f 100644
--- a/lisp/riece-yank.el
+++ b/lisp/riece-yank.el
@@ -1,4 +1,4 @@
-;;; riece-yank.el --- enter the element in kill-ring
+;;; riece-yank.el --- enter the element of kill-ring
 ;; Copyright (C) 2004 Masatake YAMATO
 
 ;; Author: Masatake YAMATO <jet@gyve.org>
@@ -16,20 +16,18 @@
 
 ;; 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:
-;;
-;; 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) to test.
-;;
+
+;; NOTE: This is an add-on module for Riece.
+
 ;;; Code:
 (require 'riece-commands)
 
 (defgroup riece-yank nil
-  "Enter the element of `kill-ring'"
+  "Enter the element of kill-ring."
   :tag "Yank"
   :prefix "riece-"
   :group 'riece)
@@ -45,17 +43,17 @@ before/after the first/last non-blank line."
   :type 'boolean
   :group 'riece-yank)
 
-(defvar riece-yank-enabled nil)
+(defconst riece-yank-description
+  "Enter the element of kill-ring.")
 
 (defun riece-yank-insinuate ()
   )
 
+(defvar riece-command-mode-map)
 (defun riece-yank-enable ()
-  (define-key riece-command-mode-map "\C-cy" 'riece-command-yank)
-  (setq riece-yank-enabled t))
+  (define-key riece-command-mode-map "\C-cy" 'riece-command-yank))
 (defun riece-yank-disable ()
-  (define-key riece-command-mode-map "\C-cy" 'undefined)
-  (setq riece-yank-enabled nil))
+  (define-key riece-command-mode-map "\C-cy" 'undefined))
 
 (defun riece-yank-strip-space (string)
   (with-temp-buffer
@@ -70,14 +68,14 @@ before/after the first/last non-blank line."
     (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))
+    (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)
@@ -86,7 +84,7 @@ before/after the first/last non-blank line."
 	    (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