[PATCH v3 part1 0/3] Fixes

[PATCH v3 part1 0/3] Fixes

[Jan Malakhovski]

Hello.

This is a fixes-only piece of "[PATCH v2 0/9] mail, clock and calc
changes" updated with Aaron Ecay's suggestions.

Other pieces will follow shortly.

I'm pretty sure FSF processed my copyright assignment.

Cheers,
  Jan

Jan Malakhovski (3):
  org-clock: fix a typo
  ob-calc: don't leave garbage on the stack
  org-contacts: fix org-contacts-matcher for BIRTHDAYs

 contrib/lisp/org-contacts.el | 14 ++++++++------
 lisp/ob-calc.el              |  4 +++-
 lisp/org-clock.el            |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

-- 
2.6.4

[PATCH 1/3] org-clock: fix a typo

[Jan Malakhovski]

TINYCHANGE
---
 lisp/org-clock.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index eb7d9c3..823a386 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -2762,7 +2762,7 @@ following structure:
   \(LEVEL HEADLINE TIMESTAMP TIME)
 
 LEVEL:     The level of the headline, as an integer.  This will be
-           the reduced leve, so 1,2,3,... even if only odd levels
+           the reduced level, so 1,2,3,... even if only odd levels
            are being used.
 HEADLINE:  The text of the headline.  Depending on PARAMS, this may
            already be formatted like a link.
-- 
2.6.4

Re: [PATCH 1/3] org-clock: fix a typo

[Nicolas Goaziou]

Hello,

Jan Malakhovski <oxij@oxij.org> writes:

>  lisp/org-clock.el | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lisp/org-clock.el b/lisp/org-clock.el
> index eb7d9c3..823a386 100644
> --- a/lisp/org-clock.el
> +++ b/lisp/org-clock.el
> @@ -2762,7 +2762,7 @@ following structure:
>    \(LEVEL HEADLINE TIMESTAMP TIME)
>  
>  LEVEL:     The level of the headline, as an integer.  This will be
> -           the reduced leve, so 1,2,3,... even if only odd levels
> +           the reduced level, so 1,2,3,... even if only odd levels
>             are being used.

Applied. Thank you.

Regards,

-- 
Nicolas Goaziou

[PATCH 2/3] ob-calc: don't leave garbage on the stack

[Jan Malakhovski]

* lisp/ob-calc.el (org-babel-calc-eval-string): Clean up the stack after expression
  evaluation.
---
 lisp/ob-calc.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el
index a8c50da..99d0a09 100644
--- a/lisp/ob-calc.el
+++ b/lisp/ob-calc.el
@@ -89,7 +89,9 @@
 	     (split-string (org-babel-expand-body:calc body params) "[\n\r]"))))
   (save-excursion
     (with-current-buffer (get-buffer "*Calculator*")
-      (calc-eval (calc-top 1)))))
+      (prog1
+        (calc-eval (calc-top 1))
+        (calc-pop 1)))))
 
 (defun org-babel-calc-maybe-resolve-var (el)
   (if (consp el)
-- 
2.6.4

Re: [PATCH 2/3] ob-calc: don't leave garbage on the stack

[Nicolas Goaziou]

Hello,

Jan Malakhovski <oxij@oxij.org> writes:

> * lisp/ob-calc.el (org-babel-calc-eval-string): Clean up the stack after expression
>   evaluation.

Applied. Thank you.

Regards,

-- 
Nicolas Goaziou

[PATCH 3/3] org-contacts: fix org-contacts-matcher for BIRTHDAYs

[Jan Malakhovski]

* contrib/lisp/org-contacts.el (org-contacts-matcher): Fix expression to work for BIRTHDAY-only contacts.
---
 contrib/lisp/org-contacts.el | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/contrib/lisp/org-contacts.el b/contrib/lisp/org-contacts.el
index ebc7bcd..96e163b 100644
--- a/contrib/lisp/org-contacts.el
+++ b/contrib/lisp/org-contacts.el
@@ -159,12 +159,14 @@ The following replacements are available:
   :group 'org-contacts)
 
 (defcustom org-contacts-matcher
-  (mapconcat 'identity (list org-contacts-email-property
-			     org-contacts-alias-property
-			     org-contacts-tel-property
-			     org-contacts-address-property
-			     org-contacts-birthday-property)
-			     "<>\"\"|")
+  (mapconcat 'identity
+	     (mapcar (lambda (x) (concat x "<>\"\""))
+		     (list org-contacts-email-property
+			   org-contacts-alias-property
+			   org-contacts-tel-property
+			   org-contacts-address-property
+			   org-contacts-birthday-property))
+			   "|")
   "Matching rule for finding heading that are contacts.
 This can be a tag name, or a property check."
   :type 'string
-- 
2.6.4

Re: [PATCH 3/3] org-contacts: fix org-contacts-matcher for BIRTHDAYs

[Nicolas Goaziou]

Hello,

Jan Malakhovski <oxij@oxij.org> writes:

> * contrib/lisp/org-contacts.el (org-contacts-matcher): Fix expression
> to work for BIRTHDAY-only contacts.

Applied. Thank you.

Regards,

-- 
Nicolas Goaziou