From 723306d6e7797279448fd9b1cabc4beba8cc897b Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Tue, 14 Jan 2014 20:45:54 +0100 Subject: [PATCH 1/3] Fix mode reset --- lisp/org.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index ee7965a20..337cab961 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -20373,10 +20373,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) - (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'." From d9797ca17ec2ac9dd852016814214a0b38786f7f Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 15 Jan 2014 09:19:30 +0100 Subject: [PATCH 2/3] Revert "org.el (org-store-link): When a link has been stored, always returns it" This reverts commit 035087777d0b4d91373466ed1a56f357c63f5465. --- lisp/org.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index ee7965a20..b763c629b 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9608,8 +9608,8 @@ 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))))))) (defun org-store-link-props (&rest plist) "Store link properties, extract names and addresses." From 947c3f5c2ad10c262904802aad81ae4d622ccfe5 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 15 Jan 2014 09:21:44 +0100 Subject: [PATCH 3/3] Fix 035087777 --- lisp/org.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/org.el b/lisp/org.el index b763c629b..d0207e85d 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9609,7 +9609,8 @@ active region." (when custom-id (setq link (concat "file:" (abbreviate-file-name (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) "Store link properties, extract names and addresses."