[O] Problem with pretty entities and subscript

[Thomas Holst]

Hello,

super- and subscript display does not work as expected anymore. (At
least for me :-) )

I have `org-pretty-entities' set to t. And in most of my files I have an
options line which contains:

#+OPTIONS: ^:{}

So super- and subscripts should only be displayed when there are curly
braces oround the text.

But text is always displayed subscripted after a `_' even if there are
no curly braces around the text after `_'.

Git bisecting showed that it works prior to:

61a241f0dc07aef5a3a5c2bd037a197236bde2e6 is the first bad commit
commit 61a241f0dc07aef5a3a5c2bd037a197236bde2e6
Author: Nicolas Goaziou <address@hidden>
Date:   Tue Oct 14 10:53:29 2014 +0200

    Rewrite setup keywords initialization
    
    * lisp/org-table.el (org-table-set-constants): Remove function.
    * lisp/org.el (org-set-regexps-and-options): Rewrite function.  Merge
      it with `org-set-regexps-and-options-for-tags'.
    (org-set-regexps-and-options-for-tags): Remove function
    (org--setup-collect-keywords, org--setup-process-tags): New functions.
    (org-mode): Remove `org-set-regexps-and-options-for-tags' call.
    (org-agenda-prepare-buffers): Use optimized setup for tags in all
    cases.  Improve docstring.
    (org-make-options-regexp): Make returned regexp more efficient.

as expected.

^:t   subscript is always displayed
^:{}  subscript is only displayd when surounded by curly braces.
^:nil text is never displayed subscripted

I have tested this with a minimal setup:

: emacs -Q 

and:

#+begin_src elisp
  ;; set path to git repo
  (add-to-list 'load-path "~/git-emacs/site-lisp")
  (add-to-list 'load-path "~/git-emacs/org-mode/lisp")

  (require 'org)
  (setq org-pretty-entities t)

  (find-file "~/emacs/tst-pretty-entities/entities-tst.org")
#+end_src

#+begin_src org
  #+OPTIONS: ':nil *:t -:t ::t <:t H:3 \n:nil ^:{} arch:headline author:t c:nil
  #+OPTIONS: creator:comment d:(not "LOGBOOK") date:t e:t email:nil f:t 
inline:t num:t
  #+OPTIONS: p:nil pri:nil prop:nil stat:t tags:t tasks:t tex:t timestamp:t 
toc:t
  #+OPTIONS: todo:t |:t
  #+TITLE: entities-tst
  #+DATE: <2014-12-02 Di>
  #+AUTHOR: Thomas Holst
  #+EMAIL: address@hidden
  #+DESCRIPTION:
  #+KEYWORDS:
  #+LANGUAGE: en
  #+SELECT_TAGS: export
  #+EXCLUDE_TAGS: noexport
  #+CREATOR: Emacs 24.3.1 (Org mode 8.3beta)


  \Delta
  tst_ding_ding
  =tst_ding=
#+end_src

Org-mode version 8.3beta
  (release_8.3beta-595-g5945be @
  c:/daten/users/DE_hts2fe/git-emacs/org-mode/lisp/)
  
GNU Emacs 24.3.1 (i386-mingw-nt6.1.7601) of 2013-03-17 on MARVIN
Win7

Thanks for looking into this
-- 
Mit freundlichen Grüßen / Best regards 

Thomas Holst 
DGS-EC/ESE4

Tel.   +49 (711) 811-40681
PC-Fax +49 (711) 811-5182208