diff options
author | Bastien Guerry <bzg@altern.org> | 2014-01-15 09:22:59 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2014-01-15 09:22:59 +0100 |
commit | 8898c380ab97b31e812cf9cfb8dfc8efd3f0543a (patch) | |
tree | 347357ac22d99e77a417d218c5866a1f30e5c7fa | |
parent | 8694aa9352b1d9e778174a6111d8494c6713fb45 (diff) | |
parent | 0a8fe04a9d832c228c048c4775541b59efeef2ae (diff) | |
download | org-mode-8898c380ab97b31e812cf9cfb8dfc8efd3f0543a.tar.gz |
Merge branch 'maint'
Conflicts:
lisp/org.el
-rw-r--r-- | lisp/org.el | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lisp/org.el b/lisp/org.el index d1a8121..ecd84e9 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9689,8 +9689,9 @@ active region." (message "Stored: %s" (or desc link)) (when custom-id (setq link (concat "file:" (abbreviate-file-name - (buffer-file-name)) "::#" custom-id))) - (push (list link desc) org-stored-links)))))) + (buffer-file-name)) "::#" custom-id)) + (push (list link desc) org-stored-links)) + (car org-stored-links)))))) (defun org-store-link-props (&rest plist) "Store link properties, extract names and addresses." @@ -20482,14 +20483,11 @@ This command does many different things, depending on context: (defun org-mode-restart () "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) - ;; this will set the mode *and* set file local variables. - (normal-mode) - ;; but it may leave us in some unrelated mode - (unless (derived-mode-p "org-mode") - (org-mode)) - (message "Org-mode restarted")) + (funcall major-mode) + (hack-local-variables) + (message "%s restarted" major-mode)) (defun org-kill-note-or-show-branches () "If this is a Note buffer, abort storing the note. Else call `show-branches'." |