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

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-01-16 01:19:49 +01:00
parent 05dfe2aa9d d4b653656e
commit c7408a2bd7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/org.el
View File

@ -20475,11 +20475,12 @@ This command does many different things, depending on context:
"C-c C-c can do nothing useful at this location"))))))))) "C-c C-c can do nothing useful at this location")))))))))
(defun org-mode-restart () (defun org-mode-restart ()
"Restart Org-mode, to scan again for special lines.
Also updates the keyword regular expressions and file variables."
(interactive) (interactive)
(let ((indent-status (org-bound-and-true-p org-indent-mode)))
(funcall major-mode) (funcall major-mode)
(hack-local-variables) (hack-local-variables)
(when (and indent-status (not (org-bound-and-true-p org-indent-mode)))
(org-indent-mode -1)))
(message "%s restarted" major-mode)) (message "%s restarted" major-mode))
(defun org-kill-note-or-show-branches () (defun org-kill-note-or-show-branches ()