diff options
| author | Paul Eggert | 2015-09-17 16:08:20 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-09-17 16:09:39 -0700 |
| commit | 284c470ef752967fcd8bae6a450dc138462b1e49 (patch) | |
| tree | 83e8bcfe4c756e741ee9d4ecdf80f6b8d0e73c91 /lisp/org/ob-sql.el | |
| parent | d149ff5233805c0a09b6067e0cf27549291cc83a (diff) | |
| download | emacs-284c470ef752967fcd8bae6a450dc138462b1e49.tar.gz emacs-284c470ef752967fcd8bae6a450dc138462b1e49.zip | |
Backslash cleanup in Elisp source files
This patch should not change behavior. It typically omits backslashes
where they are redundant (e.g., in the string literal "^\$").
In a few places, insert backslashes where they make regular
expressions clearer: e.g., replace "^\*" (equivalent to "^*") with
"^\\*", which has the same effect as a regular expression.
Also, use ‘\ %’ instead of ‘\%’ when avoiding confusion with SCCS IDs,
and similarly use ‘\ $’ instead of ‘\$’ when avoiding confusion with
RCS IDs, as that makes it clearer that the backslash is intended.
Diffstat (limited to 'lisp/org/ob-sql.el')
| -rw-r--r-- | lisp/org/ob-sql.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el index 7ed61b153e7..6dff9adca86 100644 --- a/lisp/org/ob-sql.el +++ b/lisp/org/ob-sql.el | |||
| @@ -106,7 +106,7 @@ This function is called by `org-babel-execute-src-block'." | |||
| 106 | ('dbi (format "dbish --batch %s < %s | sed '%s' > %s" | 106 | ('dbi (format "dbish --batch %s < %s | sed '%s' > %s" |
| 107 | (or cmdline "") | 107 | (or cmdline "") |
| 108 | (org-babel-process-file-name in-file) | 108 | (org-babel-process-file-name in-file) |
| 109 | "/^+/d;s/^\|//;s/(NULL)/ /g;$d" | 109 | "/^+/d;s/^|//;s/(NULL)/ /g;$d" |
| 110 | (org-babel-process-file-name out-file))) | 110 | (org-babel-process-file-name out-file))) |
| 111 | ('monetdb (format "mclient -f tab %s < %s > %s" | 111 | ('monetdb (format "mclient -f tab %s < %s > %s" |
| 112 | (or cmdline "") | 112 | (or cmdline "") |
| @@ -186,7 +186,7 @@ This function is called by `org-babel-execute-src-block'." | |||
| 186 | (lambda (pair) | 186 | (lambda (pair) |
| 187 | (setq body | 187 | (setq body |
| 188 | (replace-regexp-in-string | 188 | (replace-regexp-in-string |
| 189 | (format "\$%s" (car pair)) ;FIXME: "\$" == "$"! | 189 | (format "$%s" (car pair)) |
| 190 | (let ((val (cdr pair))) | 190 | (let ((val (cdr pair))) |
| 191 | (if (listp val) | 191 | (if (listp val) |
| 192 | (let ((data-file (org-babel-temp-file "sql-data-"))) | 192 | (let ((data-file (org-babel-temp-file "sql-data-"))) |