Merge from origin/emacs-25

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

diff --git a/lisp/org/org-mhe.el b/lisp/org/org-mhe.el
index c75bed37b8cd0582773468918a3a0b108e9ecdde..e8abef9f29d8dfe14f5e44c98635b98e630ade01 100644 (file)
--- a/lisp/org/org-mhe.el
+++ b/lisp/org/org-mhe.el
@@ -1,12 +1,10 @@
 ;;; org-mhe.el --- Support for links to MH-E messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2016 Free Software Foundation, Inc.
 
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.7
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -32,6 +30,7 @@
 
 ;;; Code:
 
+(require 'org-macs)
 (require 'org)
 
 ;; Customization variables
@@ -101,8 +100,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))))
 
@@ -181,17 +180,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.
@@ -226,6 +225,4 @@ folders."
 
 (provide 'org-mhe)
 
-;; arch-tag: dcb05484-8627-491d-a8c1-01dbd2bde4ae
-
 ;;; org-mhe.el ends here