Mercurial > emacs
view etc/nxml/0FE30-0FE4F.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 | 205c4340ce76 |
children | ef719132ddfa |
line wrap: on
line source
(nxml-define-char-name-set 'cjk-compatibility-forms '(("PRESENTATION FORM FOR VERTICAL TWO DOT LEADER" #xFE30) ("PRESENTATION FORM FOR VERTICAL EM DASH" #xFE31) ("PRESENTATION FORM FOR VERTICAL EN DASH" #xFE32) ("PRESENTATION FORM FOR VERTICAL LOW LINE" #xFE33) ("PRESENTATION FORM FOR VERTICAL WAVY LOW LINE" #xFE34) ("PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS" #xFE35) ("PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS" #xFE36) ("PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET" #xFE37) ("PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET" #xFE38) ("PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET" #xFE39) ("PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET" #xFE3A) ("PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET" #xFE3B) ("PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET" #xFE3C) ("PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET" #xFE3D) ("PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET" #xFE3E) ("PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET" #xFE3F) ("PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET" #xFE40) ("PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET" #xFE41) ("PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET" #xFE42) ("PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET" #xFE43) ("PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET" #xFE44) ("SESAME DOT" #xFE45) ("WHITE SESAME DOT" #xFE46) ("DASHED OVERLINE" #xFE49) ("CENTRELINE OVERLINE" #xFE4A) ("WAVY OVERLINE" #xFE4B) ("DOUBLE WAVY OVERLINE" #xFE4C) ("DASHED LOW LINE" #xFE4D) ("CENTRELINE LOW LINE" #xFE4E) ("WAVY LOW LINE" #xFE4F) )) ;; arch-tag: 6d8f4c10-304f-4d0b-b830-1e37a8386015