Mercurial > emacs
comparison lisp/org/org-jsinfo.el @ 112330:56d3e9c28eb0
Merge from mainline.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Mon, 17 Jan 2011 11:01:01 -0800 |
| parents | ef719132ddfa |
| children |
comparison
equal
deleted
inserted
replaced
| 112329:e36b2f5d36cd | 112330:56d3e9c28eb0 |
|---|---|
| 203 (cdr (assoc 'path org-infojs-options)))) | 203 (cdr (assoc 'path org-infojs-options)))) |
| 204 | 204 |
| 205 (provide 'org-infojs) | 205 (provide 'org-infojs) |
| 206 (provide 'org-jsinfo) | 206 (provide 'org-jsinfo) |
| 207 | 207 |
| 208 ;; arch-tag: c71d1d85-3337-4817-a066-725e74ac9eac | |
| 209 | 208 |
| 210 ;;; org-jsinfo.el ends here | 209 ;;; org-jsinfo.el ends here |