From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Sperber Subject: [PATCH] Fix minor glitches on XEmacs Date: Wed, 22 Dec 2010 10:54:12 +0100 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from [140.186.70.92] (port=40598 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PVLOu-0001yM-95 for emacs-orgmode@gnu.org; Wed, 22 Dec 2010 04:54:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PVLOs-0005gy-4M for emacs-orgmode@gnu.org; Wed, 22 Dec 2010 04:54:28 -0500 Received: from lo.gmane.org ([80.91.229.12]:43201) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PVLOr-0005gU-SU for emacs-orgmode@gnu.org; Wed, 22 Dec 2010 04:54:26 -0500 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1PVLOp-0004sq-Jj for emacs-orgmode@gnu.org; Wed, 22 Dec 2010 10:54:23 +0100 Received: from p5b207759.dip.t-dialin.net ([91.32.119.89]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 22 Dec 2010 10:54:23 +0100 Received: from sperber by p5b207759.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 22 Dec 2010 10:54:23 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Cc: carsten.dominik@gmail.com --=-=-= Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit 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 --=-=-= Content-Disposition: inline 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)) --=-=-= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode --=-=-=--