headers
Richard Stanton | 1 Apr 2012 01:02
Picon

Re: Python code block hangs with :session if python-mode is loaded

> If I do not have (require 'python-mode) in my init.el, the following also
> works fine:
>
> #+begin_src python :results output :session print "%d + %d = %d" % (2, 3,
> 2+3)
> 2**5
> #+end_src
>
> #+RESULTS:
> : 2 + 3 = 5
> : 32
>
> However, if (require 'python-mode) is in my init.el file, pressing C-c C-c in
> the second code block causes Emacs to hang with the message "Executing
> python code block". I can get out  by pressing C-g, but it never returns
> otherwise.

A quick follow-up, in case it's useful:

1) This is with org-mode 7.8.07, but the same occurred with 7.8.06, in both cases running under Emacs 23.0.94, and I get the same behavior under both OS X and Windows.

2) If I toggle debug-on-quit, here's what I see when I press C-g:

Debugger entered--Lisp error: (quit)
  accept-process-output(#<process Python>)
  (while (progn (goto-char comint-last-input-end) (not (save-excursion (and (re-search-forward (regexp-quote org-babel-python-eoe-indicator) nil t) (re-search-forward comint-prompt-regexp nil t))))) (accept-process-output (get-buffer-process (current-buffer))))
  (progn (goto-char (process-mark (get-buffer-process (current-buffer)))) (let ((start (point)) (end (point-max))) (setq dangling-text (buffer-substring start end)) (delete-region start end)) (input-body body) (send-wait) (send-wait) (insert org-babel-python-eoe-indicator) (send-wait) (while (progn (goto-char comint-last-input-end) (not (save-excursion (and (re-search-forward (regexp-quote org-babel-python-eoe-indicator) nil t) (re-search-forward comint-prompt-regexp nil t))))) (accept-process-output (get-buffer-process (current-buffer)))) (goto-char (process-mark (get-buffer-process (current-buffer)))) (insert dangling-text))
  (unwind-protect (progn (goto-char (process-mark (get-buffer-process (current-buffer)))) (let ((start (point)) (end (point-max))) (setq dangling-text (buffer-substring start end)) (delete-region start end)) (input-body body) (send-wait) (send-wait) (insert org-babel-python-eoe-indicator) (send-wait) (while (progn (goto-char comint-last-input-end) (not (save-excursion (and (re-search-forward ... nil t) (re-search-forward comint-prompt-regexp nil t))))) (accept-process-output (get-buffer-process (current-buffer)))) (goto-char (process-mark (get-buffer-process (current-buffer)))) (insert dangling-text)) (remove-hook (quote comint-output-filter-functions) (quote my-filt)))
  (progn (fset (quote my-filt) (function* (lambda (text) (block my-filt (setq string-buffer (concat string-buffer text)))))) (add-hook (quote comint-output-filter-functions) (quote my-filt)) (unwind-protect (progn (goto-char (process-mark (get-buffer-process (current-buffer)))) (let ((start (point)) (end (point-max))) (setq dangling-text (buffer-substring start end)) (delete-region start end)) (input-body body) (send-wait) (send-wait) (insert org-babel-python-eoe-indicator) (send-wait) (while (progn (goto-char comint-last-input-end) (not (save-excursion (and ... ...)))) (accept-process-output (get-buffer-process (current-buffer)))) (goto-char (process-mark (get-buffer-process (current-buffer)))) (insert dangling-text)) (remove-hook (quote comint-output-filter-functions) (quote my-filt))))
  (unwind-protect (progn (fset (quote my-filt) (function* (lambda (text) (block my-filt (setq string-buffer (concat string-buffer text)))))) (add-hook (quote comint-output-filter-functions) (quote my-filt)) (unwind-protect (progn (goto-char (process-mark (get-buffer-process (current-buffer)))) (let ((start (point)) (end (point-max))) (setq dangling-text (buffer-substring start end)) (delete-region start end)) (input-body body) (send-wait) (send-wait) (insert org-babel-python-eoe-indicator) (send-wait) (while (progn (goto-char comint-last-input-end) (not (save-excursion ...))) (accept-process-output (get-buffer-process (current-buffer)))) (goto-char (process-mark (get-buffer-process (current-buffer)))) (insert dangling-text)) (remove-hook (quote comint-output-filter-functions) (quote my-filt)))) (if --cl-letf-bound-- (fset (quote my-filt) --cl-letf-save--) (fmakunbound (quote my-filt))))
(Continue reading)

Permalink | Reply | 0 comments |
headers
Nicolas Girard | 1 Apr 2012 01:58
Picon

Re: [PATCH] Allow org-collector to display heading indentation

2012/3/31 Sebastien Vauban <wxhgmqzgwmuf <at> spammotel.com>:
>
> You may want to follow the "indent" convention used for clockview: "\__"
> string.
>
> Have a look at (or reuse?) the function `org-clocktable-indent-string'...
>

Hi Sébastien,
fair enough ; not that I like underscores much better but it makes
sense for the indentation in both tables to be similar.
I've rewritten my code in this respect.

Cheers,
Nicolas
Permalink | Reply | 0 comments |
headers
Nicolas Girard | 1 Apr 2012 01:59
Picon

[PATCH 1/2] Simplify org-clocktable-indent-string.

---
 lisp/org-clock.el |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 591f59c..be66ce6 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
 <at>  <at>  -2342,11 +2342,7  <at>  <at>  from the dynamic block definition."
 (defun org-clocktable-indent-string (level)
   (if (= level 1)
       ""
-    (let ((str "\\__"))
-      (while (> level 2)
-	(setq level (1- level)
-	      str (concat str "___")))
-      (concat str " "))))
+    (concat "\\" (make-string (* 2 (1- level)) ?_ ) " ")))

 (defun org-clocktable-steps (params)
   "Step through the range to make a number of clock tables."
--

-- 
1.7.8.rc1
Permalink | Reply | 4 comments |
headers
Nicolas Girard | 1 Apr 2012 01:59
Picon

[PATCH 2/2] Allow org-collector to display heading indentation by passing ':indent t' to the propview block.

---
 contrib/lisp/org-collector.el |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/contrib/lisp/org-collector.el b/contrib/lisp/org-collector.el
index da612e9..2f5e598 100644
--- a/contrib/lisp/org-collector.el
+++ b/contrib/lisp/org-collector.el
 <at>  <at>  -91,6 +91,7  <at>  <at> 

 ;;; Code:
 (require 'org)
+(require 'org-clock)
 (require 'org-table)

 (defvar org-propview-default-value 0
 <at>  <at>  -98,6 +99,11  <at>  <at> 
 value is calculated either through lack of required variables for
 a column, or through the generation of an error.")

+(defvar org-propview-indent-function 'org-clocktable-indent-string
+  "A function called with the heading level. Should return a
+string which will be concatenated to the ITEM property when
+':indent t' is passed to the propview block.")
+
 (defun and-rest (list)
   (if (listp list)
       (if (> (length list) 1)
 <at>  <at>  -121,6 +127,7  <at>  <at>  preceeding the dblock, then update the contents of the dblock."
 	    (scope (plist-get params :scope))
(Continue reading)

Permalink | Reply | 2 comments |
headers
Achim Gratz | 1 Apr 2012 09:18
Picon

Re: URGENT Bug with exporting org source block

Eric Schulte writes:
[...]

With your latest changes I get this test regression (I have not checked
which commit is responsible):

Test ob-exp/noweb-on-export-with-exports-results backtrace:
  <(357 nil)
  apply(< (357 nil))
  (setq value-605 (apply fn-603 args-604))
  (unwind-protect (setq value-605 (apply fn-603 args-604)) (setq form-
  (if (unwind-protect (setq value-605 (apply fn-603 args-604)) (setq f
  (unless (unwind-protect (setq value-605 (apply fn-603 args-604)) (se
  (let (form-description-607) (unless (unwind-protect (setq value-605 
  (let ((value-605 (quote ert-form-evaluation-aborted-606))) (let (for
  (let ((fn-603 (function <)) (args-604 (list test-point (re-search-fo
  (should (< test-point (re-search-forward x nil t)))
  (lambda (x) (should (< test-point (re-search-forward x nil t))) (set
  mapcar((lambda (x) (should (< test-point (re-search-forward x nil t)
  (setq G93507 (mapcar (lambda (x) (should (< test-point (re-search-fo
  (let ((kill-buffer-query-functions nil) G93507) (with-temp-file "/tm
  (org-test-with-temp-text-in-file exported-html (mapcar (lambda (x) (
  (let ((exported-html (org-export-as-html nil nil nil (quote string) 
  (save-restriction (org-narrow-to-subtree) (let ((exported-html (org-
  (progn (org-id-goto "8701beb4-13d9-468c-997a-8e63e8b66f8d") (setq to
  (unwind-protect (progn (org-id-goto "8701beb4-13d9-468c-997a-8e63e8b
  (let ((save-match-data-internal (match-data))) (unwind-protect (prog
  (save-match-data (org-id-goto "8701beb4-13d9-468c-997a-8e63e8b66f8d"
  (progn (save-match-data (org-id-goto "8701beb4-13d9-468c-997a-8e63e8
  (unwind-protect (progn (save-match-data (org-id-goto "8701beb4-13d9-
(Continue reading)

Permalink | Reply | 5 comments |
headers
Andreas Leha | 1 Apr 2012 10:09
Picon

Re: [PATCH] link descriptions in :file results of src blocks

Eric Schulte <eric.schulte <at> gmx.com> writes:

> [...]
>>> I would like to apply this patch, however I have some questions about
>>> the use of the :file argument and the result itself to fill in the
>>> description if the :filelinkdescr header argument is left blank.  Also,
>>> I would suggest that :file-desc is a better name for this header
>>> argument.
>>
>> Hi Eric,
>>
>> thanks for considering this patch.  Feel free to change the term to
>> anything more appropriate.
>>
>>>
>>> In my opinion using the :file argument as a description changes (or at
>>> least adds to) the meaning of the :file header argument.  Is there a
>>> significant benefit to this behavior?  If not I'd prefer that an empty
>>> :file-desc header argument have no effect.
>>
>> My original use case was indeed making a code block to
>> produce [[file.pdf][file.pdf]] instead of [[file.pdf]] (see
>> http://permalink.gmane.org/gmane.emacs.orgmode/53941).  So, if you
>> remove the possibility to specify an empty :file-desc, for me that would
>> mean to give the file name twice, as in
>> : #+begin_src R :results graphics :file test2.png :file-desc test2.png
>> which would be avoidable with my proposed behaviour.
>>
>> I could live with that, though I'd still prefer not to have to type more
>> than necessary...
(Continue reading)

Permalink | Reply | 2 comments |
headers
Bastien | 1 Apr 2012 10:25
Picon
Gravatar

Re: [PATCH] Support hour in repeated task cookie

Hi Takafumi,

Takafumi Arakaki <aka.tkf <at> gmail.com> writes:

> No comments? No one wants to have "+3h" in SCHEDULED?

please be patient.  Developers are working on their free time.

Also, please refine the ChangeLog of your patch by adding an Emacs
changelog entry with `C-x 4 a'.  Because the patch is not trivial.
This is documented in 

  http://orgmode.org/worg/org-contribute.html

Thanks,

--

-- 
 Bastien
Permalink | Reply | 0 comments |
headers
Bastien | 1 Apr 2012 10:37
Picon
Gravatar

Re: Org release 7.8.07 (BUGFIX-only release)

Hi Achim,

Achim Gratz <Stromeko <at> nexgo.de> writes:

> Bastien writes:
>> This is the version that will be merged into Emacs' trunk
>> by tomorrow.
>
> Please tag the release on maint so that Git reports the correct
> version.

Done.  (I tagged locally but forgot to push the tag.)

>>  Please report critical bugs using "URGENT"
>> in the subject line.
>
> All tests (except for R which I can't run due to lack of ESS) are clean
> on openSUSE/Tumbleweed with both Emacs 23.4 and 24.0.94.

Yes.

>> Thanks all for your help!
>
> I'm still getting these complaints about unprefixed / global variables
> w/ latest Emacs24 from trunk and fresh pull from master:
>
> In toplevel form:
> org.el:4871:1:Warning: global/dynamic var `date' lacks a prefix
>
> In toplevel form:
(Continue reading)

Permalink | Reply | 2 comments |
headers
Bastien | 1 Apr 2012 10:40
Picon
Gravatar

Re: Org release 7.8.07 (BUGFIX-only release)

Hi Eric,

Eric Schulte <eric.schulte <at> gmx.com> writes:

>> I've pushed two bug fixes up to the hotfix-7.8.06 branch this morning.
>                ^
>              three
>> 
>> These should both be included in the code merged with Emacs.  I've
>> marked the emails related to these bugs as URGENT.

Noted, thanks.  I will merge Org>Emacs from the hotfix branch.  But
let's keep this branch very "hot" (only critical bugfixes.)

Thanks!

--

-- 
 Bastien
Permalink | Reply | 0 comments |
headers
Simon Thum | 1 Apr 2012 11:26
Picon
Picon
Gravatar

Re: [DEV] New git workflow

Hi Nick,

I did not mean to imply git is not capable of working that way. It's 
more a question of what is accepted practice and most importantly, what 
fits the problem you actually have.

The difference between both approaches, it seems to me, shows when there 
is a difference between the fix is it would have looked when done right 
from the first day on, and the fix as it looks when introduced later.

Daggy fixes' mental image is to incrementally fix your release branches 
(or how you call them) each the in way it needs to be fixed. 
Cherry-picking usually implies (but does not mandate!) fix on master, 
then go back. Git's support for the other way round could be better, 
e.g. by introducing a DAGGY_FIX_HEAD and repo mode so you don't need to 
alternate cherry-pick, tag, checkout, ...

To me the mental image behind is the main difference, and what is better 
depends on the fix and the project and what not.

Just my 2c.

Cheers,

Simon

On 03/24/2012 08:29 PM, Nick Dokos wrote:
> Simon Thum<simon.thum <at> gmx.de>  wrote:
>
>> Hi Daniel,
(Continue reading)

Permalink | Reply | 0 comments |

Gmane