Merge from emacs-23; up to 2010-06-16T23:27:20Z!jay.p.belanger@gmail.com.

[gnu-emacs] / lisp / org / ob-table.el

diff --git a/lisp/org/ob-table.el b/lisp/org/ob-table.el
index cdc7a6250fe64b2f81a2b2634521455736c030af..e44bb86ca04a9b4ae7774057404707e439a10d95 100644 (file)
--- a/lisp/org/ob-table.el
+++ b/lisp/org/ob-table.el
@@ -1,11 +1,11 @@
 ;;; ob-table.el --- support for calling org-babel functions from tables
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.3
+;; Version: 7.4
 
 ;; This file is part of GNU Emacs.
 
@@ -57,9 +57,9 @@
   "Replace newline character with ellipses.
 If STRING ends in a newline character, then remove the newline
 character and replace it with ellipses."
-  (if (and (stringp string) (string-match "[\n\r]" string))
-      (concat (substring string 0 (match-beginning 0)) "...")
-    string))
+  (if (and (stringp string) (string-match "[\n\r]\\(.\\)?" string))
+      (concat (substring string 0 (match-beginning 0))
+             (if (match-string 1 string) "...")) string))
 
 (defmacro sbe (source-block &rest variables)
   "Return the results of calling SOURCE-BLOCK with VARIABLES.
@@ -120,6 +120,5 @@ example above."
 
 (provide 'ob-table)
 
-;; arch-tag: 4234cc7c-4fc8-4e92-abb0-2892de1a493b
 
 ;;; ob-table.el ends here