mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-24 17:32:52 +00:00
Code Releases Activity

Transmit active region from Org buffer to code edit buffer

Browse source 
* org-src.el (org-edit-src-code): If mark was inside code
    block then code edit buffer inherits mark with active region.
This commit is contained in:
Dan Davison 2010-09-05 19:49:11 -04:00
parent 26b9263926
commit 92249cffb0
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lisp/org-src.el
View file

@ -209,6 +209,7 @@ buffer."
(setq org-edit-src-saved-temp-window-config (current-window-configuration))) (setq org-edit-src-saved-temp-window-config (current-window-configuration)))
(let ((line (org-current-line)) (let ((line (org-current-line))
(col (current-column)) (col (current-column))
(mark (and (use-region-p) (mark)))
(case-fold-search t) (case-fold-search t)
(info (org-edit-src-find-region-and-lang)) (info (org-edit-src-find-region-and-lang))
(babel-info (org-babel-get-src-block-info)) (babel-info (org-babel-get-src-block-info))
@ -217,7 +218,8 @@ buffer."
(end (make-marker)) (end (make-marker))
(preserve-indentation org-src-preserve-indentation) (preserve-indentation org-src-preserve-indentation)
(allow-write-back-p (null code)) (allow-write-back-p (null code))
block-nindent total-nindent ovl lang lang-f single lfmt begline buffer msg) block-nindent total-nindent ovl lang lang-f single lfmt buffer msg
begline markline markcol)
(if (not info) (if (not info)
nil nil
(setq beg (move-marker beg (nth 0 info)) (setq beg (move-marker beg (nth 0 info))
@ -235,6 +237,10 @@ buffer."
block-nindent (nth 5 info) block-nindent (nth 5 info)
lang-f (intern (concat lang "-mode")) lang-f (intern (concat lang "-mode"))
begline (save-excursion (goto-char beg) (org-current-line))) begline (save-excursion (goto-char beg) (org-current-line)))
(if (and mark (>= mark beg) (<= mark end))
(save-excursion (goto-char mark)
(setq markline (org-current-line)
markcol (current-column))))
(if (equal lang-f 'table.el-mode) (if (equal lang-f 'table.el-mode)
(setq lang-f (lambda () (setq lang-f (lambda ()
(text-mode) (text-mode)
@ -293,6 +299,12 @@ buffer."
(while (re-search-forward "^," nil t) (while (re-search-forward "^," nil t)
(if (eq (org-current-line) line) (setq total-nindent (1+ total-nindent))) (if (eq (org-current-line) line) (setq total-nindent (1+ total-nindent)))
(replace-match ""))) (replace-match "")))
(when markline
(org-goto-line (1+ (- markline begline)))
(org-move-to-column
(if preserve-indentation markcol (max 0 (- markcol total-nindent))))
(push-mark (point) 'no-message t)
(setq deactivate-mark nil))
(org-goto-line (1+ (- line begline))) (org-goto-line (1+ (- line begline)))
(org-move-to-column (org-move-to-column
(if preserve-indentation col (max 0 (- col total-nindent)))) (if preserve-indentation col (max 0 (- col total-nindent))))