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

Merge branch 'maint' of orgmode.org:org-mode into maint

This commit is contained in:
Bastien Guerry 2014-01-15 09:21:59 +01:00
parent 947c3f5c2a 723306d6e7
commit 0a8fe04a9d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/org.el
View File

@ -20374,10 +20374,11 @@ This command does many different things, depending on context:
(defun org-mode-restart () (defun org-mode-restart ()
"Restart Org-mode, to scan again for special lines. "Restart Org-mode, to scan again for special lines.
Also updates the keyword regular expressions." Also updates the keyword regular expressions and file variables."
(interactive) (interactive)
(org-mode) (funcall major-mode)
(message "Org-mode restarted")) (hack-local-variables)
(message "%s restarted" major-mode))
(defun org-kill-note-or-show-branches () (defun org-kill-note-or-show-branches ()
"If this is a Note buffer, abort storing the note. Else call `show-branches'." "If this is a Note buffer, abort storing the note. Else call `show-branches'."