Sync Org 7.9.2 from the commit tagged "release_7.9.2" in Org's Git repo.

[gnu-emacs] / lisp / org / org-mhe.el

diff --git a/lisp/org/org-mhe.el b/lisp/org/org-mhe.el
index 0c59d50073535724fb5113fdae11911be52fe598..7c8b0b2390581315b8ddf3862a54d373a6a145fc 100644 (file)
--- a/lisp/org/org-mhe.el
+++ b/lisp/org/org-mhe.el
@@ -99,8 +99,8 @@ supported by MH-E."
          (org-add-link-props :date date :date-timestamp date-ts
                              :date-timestamp-inactive date-ts-ia))
        (setq desc (org-email-link-description))
-       (setq link (org-make-link "mhe:" (org-mhe-get-message-real-folder) "#"
-                                 (org-remove-angle-brackets message-id)))
+       (setq link (concat "mhe:" (org-mhe-get-message-real-folder) "#"
+                          (org-remove-angle-brackets message-id)))
        (org-add-link-props :link link :description desc)
        link))))
 
@@ -179,17 +179,17 @@ you have a better idea of how to do this then please let us know."
         (num (org-mhe-get-message-num))
         (buffer (get-buffer-create (concat "show-" folder)))
         (header-field))
-  (with-current-buffer buffer
-    (mh-display-msg num folder)
-    (if (equal major-mode 'mh-folder-mode)
-       (mh-header-display)
-      (mh-show-header-display))
-    (set-buffer buffer)
-    (setq header-field (mh-get-header-field header))
-    (if (equal major-mode 'mh-folder-mode)
-       (mh-show)
-      (mh-show-show))
-    (org-trim header-field))))
+    (with-current-buffer buffer
+      (mh-display-msg num folder)
+      (if (equal major-mode 'mh-folder-mode)
+         (mh-header-display)
+       (mh-show-header-display))
+      (set-buffer buffer)
+      (setq header-field (mh-get-header-field header))
+      (if (equal major-mode 'mh-folder-mode)
+         (mh-show)
+       (mh-show-show))
+      (org-trim header-field))))
 
 (defun org-mhe-follow-link (folder article)
   "Follow an MH-E link to FOLDER and ARTICLE.