From xemacs-m  Sun Jun 15 13:59:18 1997
Received: from bittersweet.inetarena.com (karlheg@bittersweet.inetarena.com [206.129.216.38])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id NAA15808
	for <xemacs-beta@xemacs.org>; Sun, 15 Jun 1997 13:59:16 -0500 (CDT)
Received: (from karlheg@localhost)
	by bittersweet.inetarena.com (8.8.5/8.8.5) id LAA07434;
	Sun, 15 Jun 1997 11:59:00 -0700
Date: Sun, 15 Jun 1997 11:59:00 -0700
Message-Id: <199706151859.LAA07434@bittersweet.inetarena.com>
From: "Karl M. Hegbloom" <karlheg@inetarena.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
To: <xemacs-beta@xemacs.org>
Subject: [patch] calendar/diary-lib.el
X-Mailer: VM 6.32 under 20.3 "Oslo" XEmacs Lucid (beta7)
X-Face: /Q}=yl}1_v7nP)xXo5XjG8+tl@=uVu7o5u6)f]zN?+<hB!K.m9:[|*p34jVN`O;:XZXVSy>/\R>qDt(t8w!-i{(y0"`jFw^uk8inzO9wXabd'CdjUWfC\GHi:6nO*YC89#-qD>Q4r%9!V"<RYJ=7D#$";q=zML5'!=wvXk^$`6FT=5CMofQX)WUKt0p:OKl.mFOXx/D


 (Changelogs pending...)

8<----------------------------------------------------------------->8
*** diary-lib.el.orig	Sun Jun 15 11:55:40 1997
--- diary-lib.el	Sun Jun 15 11:55:56 1997
***************
*** 219,226 ****
                         (goto-char (point-min))
                         (while (re-search-forward regexp nil t)
                           (if backup (re-search-backward "\\<" nil t))
!                          (if (and (or (char-equal (preceding-char) ?\^M)
!                                       (char-equal (preceding-char) ?\n))
                                    (not (looking-at " \\|\^I")))
                               ;;  Diary entry that consists only of date.
                               (backward-char 1)
--- 219,226 ----
                         (goto-char (point-min))
                         (while (re-search-forward regexp nil t)
                           (if backup (re-search-backward "\\<" nil t))
!                          (if (and (or (char-equal (char-before (point)) ?\^M)
!                                       (char-equal (char-before (point)) ?\n))
                                    (not (looking-at " \\|\^I")))
                               ;;  Diary entry that consists only of date.
                               (backward-char 1)
***************
*** 657,664 ****
            (re-search-backward "\^M\\|\n\\|\\`")
            (setq line-start (point)))
          (forward-char 1)
!         (if (and (or (char-equal (preceding-char) ?\^M)
!                      (char-equal (preceding-char) ?\n))
                   (not (looking-at " \\|\^I")))
              (progn;; Diary entry consists only of the sexp
                (backward-char 1)
--- 657,664 ----
            (re-search-backward "\^M\\|\n\\|\\`")
            (setq line-start (point)))
          (forward-char 1)
!         (if (and (or (char-equal (char-before (point)) ?\^M)
!                      (char-equal (char-before (point)) ?\n))
                   (not (looking-at " \\|\^I")))
              (progn;; Diary entry consists only of the sexp
                (backward-char 1)
***************
*** 853,860 ****
                   (goto-char (point-min))
                   (while (re-search-forward regexp nil t)
                     (if backup (re-search-backward "\\<" nil t))
!                    (if (and (or (char-equal (preceding-char) ?\^M)
!                                 (char-equal (preceding-char) ?\n))
                              (not (looking-at " \\|\^I")))
                         ;;  Diary entry that consists only of date.
                         (backward-char 1)
--- 853,860 ----
                   (goto-char (point-min))
                   (while (re-search-forward regexp nil t)
                     (if backup (re-search-backward "\\<" nil t))
!                    (if (and (or (char-equal (char-before (point)) ?\^M)
!                                 (char-equal (char-before (point)) ?\n))
                              (not (looking-at " \\|\^I")))
                         ;;  Diary entry that consists only of date.
                         (backward-char 1)
***************
*** 1217,1224 ****
            (re-search-backward "\^M\\|\n\\|\\`")
            (setq line-start (point)))
          (forward-char 1)
!         (if (and (or (char-equal (preceding-char) ?\^M)
!                      (char-equal (preceding-char) ?\n))
                   (not (looking-at " \\|\^I")))
              (progn;; Diary entry consists only of the sexp
                (backward-char 1)
--- 1217,1224 ----
            (re-search-backward "\^M\\|\n\\|\\`")
            (setq line-start (point)))
          (forward-char 1)
!         (if (and (or (char-equal (char-before (point)) ?\^M)
!                      (char-equal (char-before (point)) ?\n))
                   (not (looking-at " \\|\^I")))
              (progn;; Diary entry consists only of the sexp
                (backward-char 1)
***************
*** 1744,1751 ****
                   (goto-char (point-min))
                   (while (re-search-forward regexp nil t)
                     (if backup (re-search-backward "\\<" nil t))
!                    (if (and (or (char-equal (preceding-char) ?\^M)
!                                 (char-equal (preceding-char) ?\n))
                              (not (looking-at " \\|\^I")))
                         ;;  Diary entry that consists only of date.
                         (backward-char 1)
--- 1744,1751 ----
                   (goto-char (point-min))
                   (while (re-search-forward regexp nil t)
                     (if backup (re-search-backward "\\<" nil t))
!                    (if (and (or (char-equal (char-before (point)) ?\^M)
!                                 (char-equal (char-before (point)) ?\n))
                              (not (looking-at " \\|\^I")))
                         ;;  Diary entry that consists only of date.
                         (backward-char 1)
8<----------------------------------------------------------------->8

-- 
Karl M. Hegbloom <karlheg@inetarena.com>
http://www.inetarena.com/~karlheg
Portland, OR  USA
Debian GNU 1.3  Linux 2.1.36 AMD K5 PR-133

