X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mu-register.el;h=fff102320ebbc29502d7f004061a8d96e9d87861;hb=f502672a0fac987b5d287d35d1d083667ca65f15;hp=5488dd353ef64992887ad19fac9f4a6d373bce74;hpb=f3d74fb4e89670d4f0805ffa8ea03dd39a5772df;p=elisp%2Fmu-cite.git

diff --git a/mu-register.el b/mu-register.el
index 5488dd3..fff1023 100644
--- a/mu-register.el
+++ b/mu-register.el
@@ -110,12 +110,18 @@
 	    (symbol-name mu-registration-symbol)
 	    "\n      '(")
     (insert (mapconcat
-	     (function prin1-to-string)
+	     (function
+	      (lambda (elem)
+		(format "(%s . %s)"
+			(prin1-to-string
+			 (mu-cite-remove-text-properties (car elem)))
+			(prin1-to-string
+			 (mu-cite-remove-text-properties (cdr elem))))))
 	     (symbol-value mu-registration-symbol) "\n        "))
     (insert "\n        ))\n\n")
     (insert ";;; "
 	    (file-name-nondirectory mu-registration-file)
-	    " ends here.\n")
+	    " ends here\n")
     (write-region-as-coding-system mu-registration-file-coding-system
 				   (point-min)(point-max)
 				   mu-registration-file nil 'nomsg)
@@ -149,31 +155,36 @@
 (defun mu-cite-get-prefix-register-method ()
   (let ((addr (mu-cite-get-value 'address)))
     (or (mu-register-get-citation-name addr)
-	(let ((return
-	       (read-string "Citation name? "
-			    (or (mu-cite-get-value 'x-attribution)
-				(mu-cite-get-value 'full-name))
-			    'mu-register-history)))
-	  (when (and (or mu-cite-allow-null-string-registration
-			 (not (string-equal return "")))
-		     (y-or-n-p (format "Register \"%s\"? " return)))
-	    (mu-register-add-citation-name return addr))
+	(let* ((minibuffer-allow-text-properties nil)
+	       (return
+		(mu-cite-remove-text-properties
+		 (read-string "Citation name? "
+			      (or (mu-cite-get-value 'x-attribution)
+				  (mu-cite-get-value 'full-name))
+			      'mu-register-history))))
+
+	  (if (and (or mu-cite-allow-null-string-registration
+		       (not (string-equal return "")))
+		   (y-or-n-p (format "Register \"%s\"? " return)))
+	      (mu-register-add-citation-name return addr))
 	  return))))
 
 ;;;###autoload
 (defun mu-cite-get-prefix-register-verbose-method ()
   (let* ((addr (mu-cite-get-value 'address))
 	 (return1 (mu-register-get-citation-name addr))
-	 (return (read-string "Citation name? "
-			      (or return1
-				  (mu-cite-get-value 'x-attribution)
-				  (mu-cite-get-value 'full-name))
-			      'mu-register-history)))
-    (when (and (or mu-cite-allow-null-string-registration
-		   (not (string-equal return "")))
-	       (not (string-equal return return1))
-	       (y-or-n-p (format "Register \"%s\"? " return)))
-      (mu-register-add-citation-name return addr))
+	 (minibuffer-allow-text-properties nil)
+	 (return (mu-cite-remove-text-properties
+		  (read-string "Citation name? "
+			       (or return1
+				   (mu-cite-get-value 'x-attribution)
+				   (mu-cite-get-value 'full-name))
+			       'mu-register-history))))
+    (if (and (or mu-cite-allow-null-string-registration
+		 (not (string-equal return "")))
+	     (not (string-equal return return1))
+	     (y-or-n-p (format "Register \"%s\"? " return)))
+	(mu-register-add-citation-name return addr))
     return))