org-babel: allow regexp to be supplied in org-babel-trim, as per docstring.

This commit is contained in:
Dan Davison 2009-11-01 14:36:47 -05:00
parent c84903f1b3
commit 3cf02c1afa
1 changed files with 4 additions and 3 deletions

View File

@ -852,9 +852,10 @@ the table is trivial, then return it as a scalar."
"Remove any trailing space or carriage returns characters from "Remove any trailing space or carriage returns characters from
STRING. Default regexp used is \"[ \f\t\n\r\v]\" but can be STRING. Default regexp used is \"[ \f\t\n\r\v]\" but can be
overwritten by specifying a regexp as a second argument." overwritten by specifying a regexp as a second argument."
(while (and (> (length string) 0) (string-match "[ \f\t\n\r\v]" (substring string -1))) (let ((regexp (or regexp "[ \f\t\n\r\v]")))
(while (and (> (length string) 0) (string-match regexp (substring string -1)))
(setq string (substring string 0 -1))) (setq string (substring string 0 -1)))
string) string))
(defun org-babel-trim (string &optional regexp) (defun org-babel-trim (string &optional regexp)
"Like `org-babel-chomp' only it runs on both the front and back of the string" "Like `org-babel-chomp' only it runs on both the front and back of the string"