aboutsummaryrefslogtreecommitdiff
path: root/orgmode-backports.org
diff options
context:
space:
mode:
Diffstat (limited to 'orgmode-backports.org')
-rw-r--r--orgmode-backports.org23
1 files changed, 22 insertions, 1 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index a38f51c..229f5a0 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,11 +54,32 @@ After resolving the conflict, run
NOTE: Look for "ONSYNC" for changes that should be considered when
syncing, but that don't seem appropriate for Org backport.
-** master branch [31/31]
+** master branch [34/34]
:PROPERTIES:
:ref: origin/master
:END:
+- [X] 844e82f5a837a16c64e32ff9dd41a9e9b3ad3432
+
+ * lisp/org/ob-ruby.el (org-babel-ruby-initiate-session): Use :ruby header arg.
+ Juri Linkov
+ Sat Nov 14 22:18:38 2020 +0200
+
+ Required resolving conflicts with 3ce495cc4 (ob-ruby.el: allow
+ specification of ruby command w/header arg, 2020-10-20).
+
+- [X] 61dca6e92ac972b832e889fbeab9b6131fc896fa
+
+ Don't quote lambdas in several places
+ Stefan Kangas
+ Sat Nov 14 17:04:23 2020 +0100
+
+- [X] 79d04ae13ff33a93f631061d912168e9703251dd
+
+ Don't set file name variable in org-element-parse-secondary-string (bug#44524)
+ Juri Linkov
+ Tue Nov 10 21:27:37 2020 +0200
+
- [X] dd16e46bb9d0099baea06d780ad8f62728addc2e
; Prefer https to http in more URLs