Mercurial > emacs
view etc/nxml/01680-0169F.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.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 14 Jan 2011 13:10:15 -0500 |
parents | 1945c39baaa7 |
children | ef719132ddfa |
line wrap: on
line source
(nxml-define-char-name-set 'ogham '(("OGHAM SPACE MARK" #x1680) ("OGHAM LETTER BEITH" #x1681) ("OGHAM LETTER LUIS" #x1682) ("OGHAM LETTER FEARN" #x1683) ("OGHAM LETTER SAIL" #x1684) ("OGHAM LETTER NION" #x1685) ("OGHAM LETTER UATH" #x1686) ("OGHAM LETTER DAIR" #x1687) ("OGHAM LETTER TINNE" #x1688) ("OGHAM LETTER COLL" #x1689) ("OGHAM LETTER CEIRT" #x168A) ("OGHAM LETTER MUIN" #x168B) ("OGHAM LETTER GORT" #x168C) ("OGHAM LETTER NGEADAL" #x168D) ("OGHAM LETTER STRAIF" #x168E) ("OGHAM LETTER RUIS" #x168F) ("OGHAM LETTER AILM" #x1690) ("OGHAM LETTER ONN" #x1691) ("OGHAM LETTER UR" #x1692) ("OGHAM LETTER EADHADH" #x1693) ("OGHAM LETTER IODHADH" #x1694) ("OGHAM LETTER EABHADH" #x1695) ("OGHAM LETTER OR" #x1696) ("OGHAM LETTER UILLEANN" #x1697) ("OGHAM LETTER IFIN" #x1698) ("OGHAM LETTER EAMHANCHOLL" #x1699) ("OGHAM LETTER PEITH" #x169A) ("OGHAM FEATHER MARK" #x169B) ("OGHAM REVERSED FEATHER MARK" #x169C) )) ;; arch-tag: db8ea8fc-61b4-4f83-97f5-d2a952b9d8b6