Merge branch 'master' of orgmode.org:org-mode

contrib/README

@@ -24,6 +24,7 @@ org-contacts.el          --- Contacts management
 org-contribdir.el        --- Dummy file to mark the org contrib Lisp directory
 org-depend.el            --- TODO dependencies for Org-mode
 org-drill.el             --- Self-testing with org-learn
+org-effectiveness.el     --- Measuring your personal effectiveness
 org-element.el           --- Parser and applications for Org syntax
 org-elisp-symbol.el      --- Org links to emacs-lisp symbols
 org-eval-light.el        --- Evaluate in-buffer code on demand
@@ -36,6 +37,7 @@ org-interactive-query.el --- Interactive modification of tags query
 org-invoice.el           --- Help manage client invoices in OrgMode
 org-jira.el              --- Add a jira:ticket protocol to Org
 org-learn.el             --- SuperMemo's incremental learning algorithm
+org-license.el		 --- Insert free licenses to your org documents
 org-mac-iCal.el          --- Imports events from iCal.app to the Emacs diary
 org-mac-link.el          --- Grab links and URLs from various Mac applications
 org-mairix.el 	         --- Hook mairix search into Org for different MUAs

lisp/ob-J.el

@@ -39,7 +39,7 @@ PROCESSED-PARAMS isn't used yet."
 
 (defun org-babel-J-interleave-echos-except-functions (body)
   "Interleave echo'' between source lines of BODY that aren't functions."
-  (if (string-match-m "\\(?:^\\|\n\\)[^\n]*\\(?:1\\|2\\|3\\|4\\) : 0\n.*)" body)
+  (if (obj-string-match-m "\\(?:^\\|\n\\)[^\n]*\\(?:1\\|2\\|3\\|4\\) : 0\n.*)" body)
       (let ((s1 (substring body 0 (match-beginning 0)))
 	    (s2 (match-string 0 body))
 	    (s3 (substring body (match-end 0))))
@@ -121,6 +121,13 @@ This function is called by `org-babel-execute-src-block'"
   (and (string-match "^ *\\([^ ].*\\)" s)
        (match-string 1 s)))
 
+(defun obj-string-match-m (regexp string &optional start)
+  "Like `sting-match', only .* includes newlines too."
+  (string-match
+   (replace-regexp-in-string "\\.\\*" "[\0-\377[:nonascii:]]*" regexp)
+   string
+   start))
+
 (defun org-babel-j-initiate-session (&optional session)
   "Initiate a J session.
 SESSION is a parameter given by org-babel."