view etc/nxml/02070-0209F.el @ 112231:f4a73cf7587b

* lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively. (smerge-resolve--normalize-re): New var. (smerge-resolve--extract-comment, smerge-resolve--normalize): New funs. (smerge-resolve): Use them. * lisp/newcomment.el (comment-only-p): New function. (comment-or-uncomment-region): Use it.

(nxml-define-char-name-set 'superscripts-and-subscripts
  '(("SUPERSCRIPT ZERO" #x2070)
    ("SUPERSCRIPT LATIN SMALL LETTER I" #x2071)
    ("SUPERSCRIPT FOUR" #x2074)
    ("SUPERSCRIPT FIVE" #x2075)
    ("SUPERSCRIPT SIX" #x2076)
    ("SUPERSCRIPT SEVEN" #x2077)
    ("SUPERSCRIPT EIGHT" #x2078)
    ("SUPERSCRIPT NINE" #x2079)
    ("SUPERSCRIPT PLUS SIGN" #x207A)
    ("SUPERSCRIPT MINUS" #x207B)
    ("SUPERSCRIPT EQUALS SIGN" #x207C)
    ("SUPERSCRIPT LEFT PARENTHESIS" #x207D)
    ("SUPERSCRIPT RIGHT PARENTHESIS" #x207E)
    ("SUPERSCRIPT LATIN SMALL LETTER N" #x207F)
    ("SUBSCRIPT ZERO" #x2080)
    ("SUBSCRIPT ONE" #x2081)
    ("SUBSCRIPT TWO" #x2082)
    ("SUBSCRIPT THREE" #x2083)
    ("SUBSCRIPT FOUR" #x2084)
    ("SUBSCRIPT FIVE" #x2085)
    ("SUBSCRIPT SIX" #x2086)
    ("SUBSCRIPT SEVEN" #x2087)
    ("SUBSCRIPT EIGHT" #x2088)
    ("SUBSCRIPT NINE" #x2089)
    ("SUBSCRIPT PLUS SIGN" #x208A)
    ("SUBSCRIPT MINUS" #x208B)
    ("SUBSCRIPT EQUALS SIGN" #x208C)
    ("SUBSCRIPT LEFT PARENTHESIS" #x208D)
    ("SUBSCRIPT RIGHT PARENTHESIS" #x208E)
    ))

;; arch-tag: 59e357e5-c021-440d-a923-921b485dcbb8