diff options
| author | Carsten Dominik <carsten.dominik@gmail.com> | 2010-12-11 17:42:53 +0100 |
|---|---|---|
| committer | Carsten Dominik <carsten.dominik@gmail.com> | 2010-12-11 17:42:53 +0100 |
| commit | acedf35ce08b9df4a0dcbcd1413e7d85f1182034 (patch) | |
| tree | 240e26f10d2feb66e8c0cd0634082fcb7bd577e5 /lisp/org/org-beamer.el | |
| parent | 39321b94bfa4e50401e30caedfd09a06629f5bd2 (diff) | |
| download | emacs-acedf35ce08b9df4a0dcbcd1413e7d85f1182034.tar.gz emacs-acedf35ce08b9df4a0dcbcd1413e7d85f1182034.tar.bz2 emacs-acedf35ce08b9df4a0dcbcd1413e7d85f1182034.zip | |
Update to Org mode 7.4
Diffstat (limited to 'lisp/org/org-beamer.el')
| -rw-r--r-- | lisp/org/org-beamer.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el index d3f0f47e45c..c88df859f79 100644 --- a/lisp/org/org-beamer.el +++ b/lisp/org/org-beamer.el @@ -2,7 +2,7 @@ ;; ;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; -;; Version: 7.3 +;; Version: 7.4 ;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com> ;; Maintainer: Carsten Dominik <carsten.dominik AT gmail DOT com> ;; Keywords: org, wp, tex @@ -246,14 +246,14 @@ in org-export-latex-classes." (if (and (string-match "\\`[0-9.]+\\'" tmp) (or (= (string-to-number tmp) 1.0) (= (string-to-number tmp) 0.0))) - ;; column width 1 means cloase columns, go back to full width + ;; column width 1 means close columns, go back to full width (org-beamer-close-columns-maybe) (when (setq ass (assoc "BEAMER_envargs" props)) (let (case-fold-search) - (when (string-match "C\\(\\[[^][]*\\]\\)" (cdr ass)) + (while (string-match "C\\(\\[[^][]*\\]\\|<[^<>]*>\\)" (cdr ass)) (setq columns-option (match-string 1 (cdr ass))) (setcdr ass (replace-match "" t t (cdr ass)))) - (when (string-match "c\\(\\[[^][]*\\]\\)" (cdr ass)) + (while (string-match "c\\(\\[[^][]*\\]\\|<[^<>]*>\\)" (cdr ass)) (setq column-option (match-string 1 (cdr ass))) (setcdr ass (replace-match "" t t (cdr ass)))))) (org-beamer-open-columns-maybe columns-option) |