Re: [O] [PATCH] Better handling labels in source code blocks + A suggestion

2016-08-01 Thread Bernard Hurley
>>>>> "Bernard" == Bernard Hurley <bern...@marcade.biz> writes:

Bernard> #+BEGIN_SRC ruby -f -l "#(ref:%s)"

Sorry that should have been:

#+BEGIN_SRC ruby -r -l "#(ref:%s)"

-- 

Your fortune cookie for today:

Bridge ahead.  Pay troll.

** Fortune cookies are brought to you by GNU/Linux "fortunes" **



[O] [PATCH] Better handling labels in source code blocks + A suggestion

2016-08-01 Thread Bernard Hurley
Hi all,

At present the value of org-coderef-label-format in a source code
editing buffer does not inherit its value from the value in the
corresponding org-mode buffer but instead, if it is not specified by a
-l option, defaults to the global value. Note that it is the value in the
org mode buffer and not the global value that is used for such things as
exporting so this can lead to inconsistent behaviour.

The following patch on org-src.el will fix this, and, as far as I can
tell, it doesn’t break anything else:

(N.B. I’m using org-plus-contrib-20160725 and Emacs 25.1.50.1)

= snip=
*** org-src.old.el  2016-08-01 13:23:35.596041600 +0100
--- org-src.el  2016-08-01 13:34:08.420047376 +0100
***
*** 828,834 
  name of the sub-editing buffer."
(interactive)
(let* ((element (org-element-at-point))
!(type (org-element-type element)))
  (unless (and (memq type '(example-block src-block))
 (org-src--on-datum-p element))
(user-error "Not in a source or example block"))
--- 828,835 
  name of the sub-editing buffer."
(interactive)
(let* ((element (org-element-at-point))
!(type (org-element-type element))
!(local-coderef-label-format org-coderef-label-format))
  (unless (and (memq type '(example-block src-block))
 (org-src--on-datum-p element))
(user-error "Not in a source or example block"))
***
*** 862,868 
;; Finalize buffer.
(org-set-local 'org-coderef-label-format
 (or (org-element-property :label-fmt element)
!org-coderef-label-format))
(when (eq type 'src-block)
(org-set-local 'org-src--babel-info babel-info)
(let ((edit-prep-func (intern (concat "org-babel-edit-prep:" lang
--- 863,869 
;; Finalize buffer.
(org-set-local 'org-coderef-label-format
 (or (org-element-property :label-fmt element)
!local-coderef-label-format))
(when (eq type 'src-block)
(org-set-local 'org-src--babel-info babel-info)
(let ((edit-prep-func (intern (concat "org-babel-edit-prep:" lang
 snip ===

After this you can do things like the following in an org-mode buffer,
so that the labels are embedded in comments and the code block will
still execute:

# Local Variables:
# org-coderef-label-format: "#(ref:%s)"
# End:

and you could write something like:

#+BEGIN_SRC ruby -r

instead of:

#+BEGIN_SRC ruby -f -l "#(ref:%s)"

which is quite convenient if you have lots of blocks

A Suggestion:


In addition it would be nice if there were some way of giving a default
value for org-coderef-label-format that depends on the language of the
code block it is associated with, but I’m not sure what the best way to
implement this would be.

-- 

Your fortune cookie for today:

To code the impossible code,This is my quest --
To bring up a virgin machine,   To debug that code,
To pop out of endless recursion,No matter how hopeless,
To grok what appears on the screen, No matter the load,
To write those routines
To right the unrightable bug,   Without question or pause,
To endlessly twiddle and thrash,To be willing to hack FORTRAN IV
To mount the unmountable magtape,   For a heavenly cause.
To stop the unstoppable crash!  And I know if I'll only be true
To this glorious quest,
And the queue will be better for this,  That my code will run CUSPy and calm,
That one man, scorned and   When it's put to the test.
destined to lose,
Still strove with his last allocation
To scrap the unscrappable kludge!
-- To "The Impossible Dream", from Man of La Mancha

** Fortune cookies are brought to you by GNU/Linux "fortunes" **



[O] [PATCH] Fix to allow ob-babel-shell-names to be customised.

2016-07-22 Thread Bernard Hurley
Hi all,

At present customisation of the variable ob-babel-shell-names in
ob-shell.el doesn't work properly.  You can actually change its value
and save the customisation, but the org-babel-execute: functions
get created for the hard coded value of the variable not the customised
value.

The following patch should fix it:

---snip
*** ob-shell.el.old 2016-07-22 20:43:43.190100908 +0100
--- ob-shell.el 2016-07-22 22:55:28.730037538 +0100
***
*** 42,60 
  
  (defcustom org-babel-shell-names
'("sh" "bash" "csh" "ash" "dash" "ksh" "mksh" "posh")
!   "List of names of shell supported by babel shell code blocks."
:group 'org-babel
!   :type 'string
!   :initialize
(lambda (symbol value)
! (set-default symbol (second value))
  (mapc
   (lambda (name)
 (eval `(defun ,(intern (concat "org-babel-execute:" name)) (body 
params)
,(format "Execute a block of %s commands with Babel." name)
(let ((shell-file-name ,name))
  (org-babel-execute:shell body params)
!  (second value
  
  (defun org-babel-execute:shell (body params)
"Execute a block of Shell commands with Babel.
--- 42,61 
  
  (defcustom org-babel-shell-names
'("sh" "bash" "csh" "ash" "dash" "ksh" "mksh" "posh")
!   "List of names of shell supported by babel shell code blocks.
! Changing this variable outside the Customize interface has no effect."
:group 'org-babel
!   :type '(repeat string)
!   :set
(lambda (symbol value)
! (set-default symbol value)
  (mapc
   (lambda (name)
 (eval `(defun ,(intern (concat "org-babel-execute:" name)) (body 
params)
,(format "Execute a block of %s commands with Babel." name)
(let ((shell-file-name ,name))
  (org-babel-execute:shell body params)
!  value)))
  
  (defun org-babel-execute:shell (body params)
"Execute a block of Shell commands with Babel.
---snip--

I am using Org version 8.3.5 in Emacs  25.1.50.1.

Cheers,

Bernard

-- 

Your fortune cookie for today:

Marriage is low down, but you spend the rest of your life paying for it.
-- Baskins

** Fortune cookies are brought to you by GNU/Linux "fortunes" **