ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow C-c C-c on blank lines within src blocks 

* lisp/org.el (org-ctrl-c-ctrl-c): Act on blank lines if they are
  located within a src block.

Reported-by: John Hendy <jw.hendy@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/111720>
This commit is contained in:
Nicolas Goaziou 2017-01-27 23:56:30 +01:00
parent d715cc42fa
commit ebb9da0d03
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lisp/org.el
View File

@ -21117,11 +21117,6 @@ This command does many different things, depending on context:
(funcall org-finish-function)) (funcall org-finish-function))
((org-babel-hash-at-point)) ((org-babel-hash-at-point))
((run-hook-with-args-until-success 'org-ctrl-c-ctrl-c-hook)) ((run-hook-with-args-until-success 'org-ctrl-c-ctrl-c-hook))
((save-excursion (beginning-of-line) (looking-at-p "[ \t]*$"))
(or (run-hook-with-args-until-success 'org-ctrl-c-ctrl-c-final-hook)
(user-error
(substitute-command-keys
"`\\[org-ctrl-c-ctrl-c]' can do nothing useful here"))))
(t (t
(let* ((context (let* ((context
(org-element-lineage (org-element-lineage
@ -21145,7 +21140,21 @@ This command does many different things, depending on context:
(setq context parent) (setq context parent)
(setq type 'item)))) (setq type 'item))))
;; Act according to type of element or object at point. ;; Act according to type of element or object at point.
;;
;; Do nothing on a blank line, except if it is contained in
;; a src block. Hence, we first check if point is in such
;; a block and then if it is at a blank line.
(pcase type (pcase type
((or `inline-src-block `src-block)
(unless org-babel-no-eval-on-ctrl-c-ctrl-c
(org-babel-eval-wipe-error-buffer)
(org-babel-execute-src-block
current-prefix-arg (org-babel-get-src-block-info nil context))))
((guard (org-match-line "[ \t]*$"))
(or (run-hook-with-args-until-success 'org-ctrl-c-ctrl-c-final-hook)
(user-error
(substitute-command-keys
"`\\[org-ctrl-c-ctrl-c]' can do nothing useful here"))))
((or `babel-call `inline-babel-call) ((or `babel-call `inline-babel-call)
(let ((info (org-babel-lob-get-info context))) (let ((info (org-babel-lob-get-info context)))
(when info (org-babel-execute-src-block nil info)))) (when info (org-babel-execute-src-block nil info))))
@ -21161,11 +21170,6 @@ This command does many different things, depending on context:
((or `headline `inlinetask) ((or `headline `inlinetask)
(save-excursion (goto-char (org-element-property :begin context)) (save-excursion (goto-char (org-element-property :begin context))
(call-interactively #'org-set-tags))) (call-interactively #'org-set-tags)))
((or `inline-src-block `src-block)
(unless org-babel-no-eval-on-ctrl-c-ctrl-c
(org-babel-eval-wipe-error-buffer)
(org-babel-execute-src-block
current-prefix-arg (org-babel-get-src-block-info nil context))))
(`item (`item
;; At an item: `C-u C-u' sets checkbox to "[-]" ;; At an item: `C-u C-u' sets checkbox to "[-]"
;; unconditionally, whereas `C-u' will toggle its presence. ;; unconditionally, whereas `C-u' will toggle its presence.