From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernard Hurley Subject: [PATCH] Better handling labels in source code blocks + A suggestion Date: Mon, 01 Aug 2016 14:43:37 +0100 Message-ID: <87h9b4a9km.fsf@marcade.biz> Mime-Version: 1.0 Content-Type: text/plain; charset=gb2312 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUDVo-000052-Nq for emacs-orgmode@gnu.org; Mon, 01 Aug 2016 09:44:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUDVk-0002v0-1f for emacs-orgmode@gnu.org; Mon, 01 Aug 2016 09:44:08 -0400 Received: from [86.53.51.141] (port=45146 helo=snares-penguin.marcade.biz) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUDVj-0002ty-N5 for emacs-orgmode@gnu.org; Mon, 01 Aug 2016 09:44:03 -0400 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: emacs-orgmode 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=A1=AFt break anything else: (N.B. I=A1=AFm using org-plus-contrib-20160725 and Emacs 25.1.50.1) =3D=3D=3D=3D=3D=3D=3D=3D=3D snip=3D=3D=3D=3D=3D *** 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)))) =3D=3D=3D=3D=3D=3D=3D=3D snip =3D=3D=3D=3D=3D=3D=3D 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: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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=A1=AFm not sure what the best way to implement this would be. --=20 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" **