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:
Bastien Guerry 2014-01-15 09:22:59 +01:00
parent 8694aa9352 0a8fe04a9d
commit 8898c380ab
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lisp/org.el
View File

@ -9689,8 +9689,9 @@ active region."
(message "Stored: %s" (or desc link)) (message "Stored: %s" (or desc link))
(when custom-id (when custom-id
(setq link (concat "file:" (abbreviate-file-name (setq link (concat "file:" (abbreviate-file-name
(buffer-file-name)) "::#" custom-id))) (buffer-file-name)) "::#" custom-id))
(push (list link desc) org-stored-links)))))) (push (list link desc) org-stored-links))
(car org-stored-links))))))
(defun org-store-link-props (&rest plist) (defun org-store-link-props (&rest plist)
"Store link properties, extract names and addresses." "Store link properties, extract names and addresses."
@ -20482,14 +20483,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'."