From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Rajeev Narang via "Emacs development discussions." Newsgroups: gmane.emacs.devel Subject: icalendar.el bug fix patch Date: Wed, 23 Oct 2019 09:33:52 -0400 Message-ID: <875zkfd1rz.fsf@hm.sivalik.com> Reply-To: Rajeev Narang Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="168309"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 23 17:52:14 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iNIvk-000hcY-9U for ged-emacs-devel@m.gmane.org; Wed, 23 Oct 2019 17:52:12 +0200 Original-Received: from localhost ([::1]:40010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNIvh-0000Ab-8Y for ged-emacs-devel@m.gmane.org; Wed, 23 Oct 2019 11:52:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:47595) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNGm1-00065h-8l for emacs-devel@gnu.org; Wed, 23 Oct 2019 09:34:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNGlz-00015f-Go for emacs-devel@gnu.org; Wed, 23 Oct 2019 09:34:01 -0400 Original-Received: from vr0.sivalik.com ([104.238.130.12]:55402 helo=smtp.sivalik.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNGlz-00010M-Cn for emacs-devel@gnu.org; Wed, 23 Oct 2019 09:33:59 -0400 Original-Received: from hp (unknown [IPv6:2001:470:1f07:199:100b:811e:2a63:eebc]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: rajeev@sivalik.com) by smtp.sivalik.com (Postfix) with ESMTPSA id 289245DC10; Wed, 23 Oct 2019 09:33:53 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=sivalik.com; s=svlk; t=1571837633; bh=Bx/dmYd4X26Ej637/HoyGSom1MloLORP8TwvVdyCJtQ=; h=From:To:Subject:Date:From; b=aLQhVL/3s1WCKg3lMbXPXiy93zf1r/+BTru4pPfP0mxAJXvmErdkHvn8NdrGKOvkW b+/9j761n/NMVhenvm/EUKKbPGH+dFE182SBTKqmJfJ8k5gpzv5nzEwZlQtnpPCjq8 c8k5pH/MIuYQTZlZ4SWLa14H8c3hvNkdBYb/5+aE= Autocrypt: addr=rajeev@sivalik.com; prefer-encrypt=mutual; keydata= mDMEXY/p8RYJKwYBBAHaRw8BAQdAlFYwkqD8/0y1MdafU4WTVvICG8LZQYu1vV/Dn3VSGma0IlJh amVldiBOYXJhbmcgPHJhamVldkBzaXZhbGlrLmNvbT6IkAQTFggAOBYhBOwUZZj+t/w2sUew/gG0 SjjfOwhuBQJdj+nxAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEAG0SjjfOwhuUhoBAN5B NNRLuwLW8bVHtg3oeTOnriCshGVuw/fLJ/kvSBk2AQD18Ka0p4xvS0Mkbjk5Bh5jodSsJF1mn2Dn eTV0tZZtC7g4BF2P6fESCisGAQQBl1UBBQEBB0C6GxvZvUHywnRGwBcUKpknKK7K90iCcY8Zh9cP zxekagMBCAeIeAQYFggAIBYhBOwUZZj+t/w2sUew/gG0SjjfOwhuBQJdj+nxAhsMAAoJEAG0Sjjf Owhu1AUA/3IEIOwvwC815T7X05NpAZ1ThN+lx7iXC9SYl2ZlXvevAP9b0y80MEQ+MPX/PmVZRWM4 sisOHz/ecKYEDvcTGP3bBQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 104.238.130.12 X-Mailman-Approved-At: Wed, 23 Oct 2019 11:13:27 -0400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:241360 Archived-At: icalendar-export-region does not export multi-line Desc as it is imported by icalendar-import-file. The following patch fixes the issue. If acceptable, please commit. Thanks. diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el index 1186ced3fb..1f4e582aa5 100644 --- a/lisp/calendar/icalendar.el +++ b/lisp/calendar/icalendar.el @@ -1244,7 +1244,7 @@ icalendar--parse-summary-and-rest (concat "\\(" icalendar-import-format-uid "\\)??")))) ;; Need the \' regexp in order to detect multi-line items (setq s (concat "\\`" - (replace-regexp-in-string "%s" "\\(.*?\\)" s nil t) + (replace-regexp-in-string "%s" "\\([^z-a]*?\\)" s nil t) "\\'")) (if (string-match s summary-and-rest) (let (cla des loc org sta url uid) ;; sum