unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* Fix for Arithmetic Error while opening org-agenda
@ 2017-03-10 17:14 Narendra Joshi
  2017-03-11 19:11 ` aaermolov
  0 siblings, 1 reply; 2+ messages in thread
From: Narendra Joshi @ 2017-03-10 17:14 UTC (permalink / raw)
  To: emacs-devel

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

Hi,

While opening `org-agenda', I am getting an Arithmetic error if there
are entries in an org file with timestamps of the form <... ++0d>, I
have attached a patch for it. It would be great if someone can submit it
on my behalf.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Fix divide by zero in org timestamps with 0 duration --]
[-- Type: text/x-diff, Size: 800 bytes --]

diff --git a/lisp/org/org.el b/lisp/org/org.el
index 02a7a0c..abb2269 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -17250,11 +17250,11 @@ org-closest-date
 		     (- cday (1+ (floor (/ missing-hours 24)))))
 		n2 (+ cday (floor (/ (- dn missing-hours) 24))))))
        ((eq dw 'day)
-	(setq n1 (+ sday (* dn (floor (/ (- cday sday) dn))))
+	(setq n1 (+ sday (* dn (floor (if (= dn 0) 0 (/ (- cday sday) dn)))))
 	      n2 (+ n1 dn)))
        ((eq dw 'year)
 	(setq d (nth 1 start) m (car start) y1 (nth 2 start) y2 (nth 2 current))
-	(setq y1 (+ (* (floor (/ (- y2 y1) dn)) dn) y1))
+	(setq y1 (+ (* (floor (if (= dn 0) 0 (/ (- y2 y1) dn))) dn) y1))
 	(setq date1 (list m d y1)
 	      n1 (calendar-absolute-from-gregorian date1)
 	      date2 (list m d (+ y1 (* (if (< n1 cday) 1 -1) dn)))

[-- Attachment #3: Type: text/plain, Size: 29 bytes --]



Thanks,
-- 
Narendra Joshi

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: Fix for Arithmetic Error while opening org-agenda
  2017-03-10 17:14 Fix for Arithmetic Error while opening org-agenda Narendra Joshi
@ 2017-03-11 19:11 ` aaermolov
  0 siblings, 0 replies; 2+ messages in thread
From: aaermolov @ 2017-03-11 19:11 UTC (permalink / raw)
  To: Narendra Joshi, emacs-devel

[-- Attachment #1: Type: text/plain, Size: 1342 bytes --]

Hi,

I think you'd better send this patch to the repective maillist, e.g.
emacs-orgmode@gnu.org, for the fix to be applied properly in terms of
Org versions/etc.

regards,
Alex

Narendra Joshi <narendraj9@gmail.com> writes:

> Hi,
>
> While opening `org-agenda', I am getting an Arithmetic error if there
> are entries in an org file with timestamps of the form <... ++0d>, I
> have attached a patch for it. It would be great if someone can submit it
> on my behalf.
>
> diff --git a/lisp/org/org.el b/lisp/org/org.el
> index 02a7a0c..abb2269 100644
> --- a/lisp/org/org.el
> +++ b/lisp/org/org.el
> @@ -17250,11 +17250,11 @@ org-closest-date
>  		     (- cday (1+ (floor (/ missing-hours 24)))))
>  		n2 (+ cday (floor (/ (- dn missing-hours) 24))))))
>         ((eq dw 'day)
> -	(setq n1 (+ sday (* dn (floor (/ (- cday sday) dn))))
> +	(setq n1 (+ sday (* dn (floor (if (= dn 0) 0 (/ (- cday sday) dn)))))
>  	      n2 (+ n1 dn)))
>         ((eq dw 'year)
>  	(setq d (nth 1 start) m (car start) y1 (nth 2 start) y2 (nth 2 current))
> -	(setq y1 (+ (* (floor (/ (- y2 y1) dn)) dn) y1))
> +	(setq y1 (+ (* (floor (if (= dn 0) 0 (/ (- y2 y1) dn))) dn) y1))
>  	(setq date1 (list m d y1)
>  	      n1 (calendar-absolute-from-gregorian date1)
>  	      date2 (list m d (+ y1 (* (if (< n1 cday) 1 -1) dn)))
>
>
> Thanks,
> -- 
> Narendra Joshi

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-03-11 19:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-10 17:14 Fix for Arithmetic Error while opening org-agenda Narendra Joshi
2017-03-11 19:11 ` aaermolov

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).