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

Merge branch 'maint' 

Conflicts:
	lisp/org.el
This commit is contained in:
Carsten Dominik 2014-01-14 20:47:27 +01:00
parent 8694aa9352 723306d6e7
commit da6e2289cc
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/org.el
View File

@ -20482,14 +20482,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)
;; this will set the mode *and* set file local variables. (funcall major-mode)
(normal-mode) (hack-local-variables)
;; but it may leave us in some unrelated mode (message "%s restarted" major-mode))
(unless (derived-mode-p "org-mode")
(org-mode))
(message "Org-mode restarted"))
(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'."