Close bug#3992.

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

diff --git a/lisp/org/org-vm.el b/lisp/org/org-vm.el
index aec28c5f6635ad4410edcacede1ce9c0c293c4f1..fc7fcd8947ebf596ff29f7911608152c4a7c3d22 100644 (file)
--- a/lisp/org/org-vm.el
+++ b/lisp/org/org-vm.el
@@ -1,12 +1,12 @@
 ;;; org-vm.el --- Support for links to VM messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.21b
+;; Version: 6.33x
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -71,8 +71,9 @@
                              :message-id message-id)
        (setq message-id (org-remove-angle-brackets message-id))
        (setq folder (abbreviate-file-name folder))
-       (if (string-match (concat "^" (regexp-quote vm-folder-directory))
-                         folder)
+       (if (and vm-folder-directory
+                (string-match (concat "^" (regexp-quote vm-folder-directory))
+                              folder))
            (setq folder (replace-match "" t t folder)))
        (setq desc (org-email-link-description))
        (setq link (org-make-link "vm:" folder "#" message-id))