Explorar o código

Bugfix: my regexp was not allowing whitespace inside function call.

Dan Davison %!s(int64=17) %!d(string=hai) anos
pai
achega
08eba0ceea
Modificáronse 1 ficheiros con 5 adicións e 5 borrados
  1. 5 5
      lisp/org-babel.el

+ 5 - 5
lisp/org-babel.el

@@ -500,11 +500,11 @@ takes into account some special considerations for certain
 parameters when merging lists."
 parameters when merging lists."
   (let (params results vars var ref)
   (let (params results vars var ref)
     (mapc (lambda (plist)
     (mapc (lambda (plist)
-            (mapc (lambda (pair)
-                    (case (car pair)
-                      (:var
-                       ;; we want only one specification per variable
-		       (when (string-match "\\([^= \f\t\n\r\v]+\\)=\\([^ \f\t\n\r\v]+\\)" (cdr pair))
+	    (mapc (lambda (pair)
+		    (case (car pair)
+		      (:var
+		       ;; we want only one specification per variable
+		       (when (string-match "^\\([^= \f\t\n\r\v]+\\)=\\([^\f\n\r\v]+\\)$" (cdr pair))
 			 ;; TODO: When is this not true? Can there be whitespace around the '='?
 			 ;; TODO: When is this not true? Can there be whitespace around the '='?
 			 (setq var (intern (match-string 1 (cdr pair)))
 			 (setq var (intern (match-string 1 (cdr pair)))
 			       ref (match-string 2 (cdr pair))
 			       ref (match-string 2 (cdr pair))