mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-23 07:18:53 +00:00
Code

Change behavior of org-toggle-item when used with normal text.

Browse Source 
* lisp/org.el (org-toggle-item): Now accepts a prefix argument. When
  used without argument on normal text, it will make the whole region
  one item. With an argument, it defaults to old behavior: change each
  line in region into an item.
This commit is contained in:
Nicolas Goaziou 2011-01-23 18:23:22 +01:00
parent af6037a695
commit 304e8f1cd2
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lisp/org.el
View File

@ -17548,16 +17548,20 @@ Calls `org-table-insert-hline', `org-toggle-item', or
(t (t
(call-interactively 'org-toggle-item)))) (call-interactively 'org-toggle-item))))
(defun org-toggle-item () (defun org-toggle-item (arg)
"Convert headings or normal lines to items, items to normal lines. "Convert headings or normal lines to items, items to normal lines.
If there is no active region, only the current line is considered. If there is no active region, only the current line is considered.
If the first line in the region is a headline, convert all headlines to items. If the first line in the region is a headline, convert all
headlines to items.
If the first line in the region is an item, convert all items to normal lines. If the first line in the region is an item, convert all items to
normal lines.
If the first line is normal text, add an item bullet to each line." If the first line is normal text, change region into an
(interactive) item. With a prefix argument ARG, change each line in region into
an item."
(interactive "P")
(let (l2 l beg end) (let (l2 l beg end)
(if (org-region-active-p) (if (org-region-active-p)
(setq beg (region-beginning) end (region-end)) (setq beg (region-beginning) end (region-end))
@ -17568,6 +17572,9 @@ If the first line is normal text, add an item bullet to each line."
(setq l2 (org-current-line)) (setq l2 (org-current-line))
(goto-char beg) (goto-char beg)
(beginning-of-line 1) (beginning-of-line 1)
;; Ignore blank lines at beginning of region
(skip-chars-forward " \t\r\n")
(beginning-of-line 1)
(setq l (1- (org-current-line))) (setq l (1- (org-current-line)))
(if (org-at-item-p) (if (org-at-item-p)
;; We already have items, de-itemize ;; We already have items, de-itemize
@ -17582,13 +17589,26 @@ If the first line is normal text, add an item bullet to each line."
(if (looking-at org-outline-regexp) (if (looking-at org-outline-regexp)
(replace-match (org-list-bullet-string "-") t t)) (replace-match (org-list-bullet-string "-") t t))
(beginning-of-line 2)) (beginning-of-line 2))
;; normal lines, turn them into items ;; normal lines, with ARG, turn all of them into items
(while (< (setq l (1+ l)) l2) ;; unless they are already one.
(unless (org-at-item-p) (if arg
(if (looking-at "\\([ \t]*\\)\\(\\S-\\)") (while (< (setq l (1+ l)) l2)
(replace-match (unless (org-at-item-p)
(concat "\\1" (org-list-bullet-string "-") "\\2")))) (if (looking-at "\\([ \t]*\\)\\(\\S-\\)")
(beginning-of-line 2))))))) (replace-match
(concat "\\1" (org-list-bullet-string "-") "\\2"))))
(beginning-of-line 2))
;; Without ARG, make the first line of region an item, and
;; shift indentation of others lines to set them as item's
;; body.
(let* ((bul (org-list-bullet-string "-"))
(bul-len (length bul)))
(skip-chars-forward " \t")
(insert bul)
(beginning-of-line 2)
(while (and (< (setq l (1+ l)) l2) (< (point) end))
(org-indent-line-to (+ (org-get-indentation) bul-len))
(beginning-of-line 2)))))))))
(defun org-toggle-heading (&optional nstars) (defun org-toggle-heading (&optional nstars)
"Convert headings to normal text, or items or text to headings. "Convert headings to normal text, or items or text to headings.