From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 15 Aug 2002 20:18:42 +0000 (+0000)
Subject: (appt-delete): Use substring-no-properties.
X-Git-Tag: ttn-vms-21-2-B4~13673
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bf9a91d015616af8115ce4d73e21c8e389624b63;p=emacs.git

(appt-delete): Use substring-no-properties.
(appt-make-list): Don't use prin1-to-string; use the string unchanged.
---

diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index dbf34107829..95eaeba07ba 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -455,7 +455,12 @@ The time should be in either 24 hour format or am/pm format."
     (while tmp-msg-list
       (let* ((element (car tmp-msg-list))
              (prompt-string (concat "Delete " 
-                                    (prin1-to-string (car (cdr element))) 
+				    ;; We want to quote any doublequotes
+				    ;; in the string, as well as put
+				    ;; doublequotes around it.
+                                    (prin1-to-string
+				     (substring-no-properties
+				      (car (cdr element)) 0)) 
                                     " from list? "))
              (test-input (y-or-n-p prompt-string)))
         (setq tmp-msg-list (cdr tmp-msg-list))
@@ -512,9 +517,7 @@ They specify the range of dates that the diary is being processed for."
 	      (while (and entry-list 
 			  (calendar-date-equal 
 			   (calendar-current-date) (car (car entry-list))))
-		(let ((time-string (substring (prin1-to-string 
-					       (cadr (car entry-list))) 1 -1)))
-
+		(let ((time-string (cadr (car entry-list))))
 		  (while (string-match
 			  "\\([0-9]?[0-9]:[0-9][0-9]\\(am\\|pm\\)?\\).*"
 			  time-string)