Merge remote-tracking branch 'origin/master' into index-polymode

This commit is contained in:
John Miller 2015-05-04 10:55:38 -05:00
commit 91a9404748

View file

@ -1038,12 +1038,14 @@ prettified text thus be used instead of HTML type."
(ein:log 'debug "SAVE-NOTEBOOK: Skipping unnecessary :text data."))
((and (equal otype "execute_result")
(equal prop :text))
(or (equal prop :text)
(equal prop :html)))
(ein:log 'debug "Fixing execute_result (%s?)." otype)
(let ((new-prop (cdr (ein:output-property-p prop))))
(push (list new-prop (list value)) new-output)
(push :data new-output)))
((and (equal otype "execute_result")
(equal prop :prompt_number))
(ein:log 'debug "SAVE-NOTEBOOK: Fixing prompt_number property.")
@ -1061,6 +1063,7 @@ prettified text thus be used instead of HTML type."
(outputs . ,(apply #'vector (or renamed-outputs outputs)))
(metadata . ,metadata))))
(defmethod ein:cell-to-json ((cell ein:textcell) &optional discard-output)
`((cell_type . ,(oref cell :cell-type))
(source . ,(ein:cell-get-text cell))))