[Orgmode] [PATCH] Fix minor glitches on XEmacs

[Michael Sperber]

I had to apply this patch to make things work on XEmacs.

First hunk: `calc-trail' does not appear to be used in `ob-calc'

Second hunk: This seems to be a genuine bug (I don't see a '+' syntax
class on GNU Emacs, either), and this is just my guess as to the fix.

-- 
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla

diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el
index 287bad3..5263c83 100644
--- a/lisp/ob-calc.el
+++ b/lisp/ob-calc.el
@@ -29,7 +29,6 @@
 ;;; Code:
 (require 'ob)
 (require 'calc)
-(require 'calc-trail)
 (eval-when-compile (require 'ob-comint))
 
 (defvar org-babel-default-header-args:calc nil
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 9dca4f5..6b92a7a 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -1860,7 +1860,7 @@ Also, store forcedalignment information found in such 
lines."
     (goto-char (point-min))
     (while (re-search-forward re-plain-link nil t)
       (unless (org-string-match-p
-              "\\[\\[\\S+:\\S-*?\\<"
+              "\\[\\[\\Sw+:\\S-*?\\<"
               (buffer-substring (point-at-bol) (match-beginning 0)))
        (goto-char (1- (match-end 0)))
        (org-if-unprotected-at (1+ (match-beginning 0))