diff options
| author | Dan Davison <davison@stats.ox.ac.uk> | 2010-09-30 10:34:49 +0100 |
|---|---|---|
| committer | Dan Davison <davison@stats.ox.ac.uk> | 2010-09-30 11:43:55 +0100 |
| commit | 940ab32aa8c5cd07539580525b196372097ebf59 (patch) | |
| tree | e3ab352a6f88d92199e65df1cd5e387a7c8617a2 | |
| parent | ae6d203a4be3006cf9a48e3ed166fa85144fb53f (diff) | |
| download | org-mode-940ab32aa8c5cd07539580525b196372097ebf59.tar.gz | |
Adjustment of location of point when generating org-src edit buffer
* org-src.el (org-edit-src-code): Deal with point being in #+end_src line
| -rw-r--r-- | lisp/org-src.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/org-src.el b/lisp/org-src.el index 6c4c464..05580d9 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -211,9 +211,7 @@ buffer." (interactive) (unless (eq context 'save) (setq org-edit-src-saved-temp-window-config (current-window-configuration))) - (let ((line (org-current-line)) - (col (current-column)) - (mark (and (use-region-p) (mark))) + (let ((mark (and (use-region-p) (mark))) (case-fold-search t) (info (org-edit-src-find-region-and-lang)) (babel-info (org-babel-get-src-block-info)) @@ -223,7 +221,7 @@ buffer." (preserve-indentation org-src-preserve-indentation) (allow-write-back-p (null code)) block-nindent total-nindent ovl lang lang-f single lfmt buffer msg - begline markline markcol) + begline markline markcol line col) (if (not info) nil (setq beg (move-marker beg (nth 0 info)) @@ -254,6 +252,9 @@ buffer." (org-set-local 'org-edit-src-content-indentation 0)))) (unless (functionp lang-f) (error "No such language mode: %s" lang-f)) + (if (> (point) end) (goto-char end)) + (setq line (org-current-line) + col (current-column)) (org-goto-line line) (if (and (setq buffer (org-edit-src-find-buffer beg end)) (if org-src-ask-before-returning-to-edit-buffer |