Mercurial > emacs
annotate src/s/openbsd.h @ 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 | 17d73312ed65 |
children | ef719132ddfa |
rev | line source |
---|---|
108279
af063227abbf
Missing part of previous commit.
Glenn Morris <rgm@gnu.org>
parents:
108229
diff
changeset
|
1 /* System file for openbsd. */ |
25844 | 2 |
108310
17d73312ed65
Move TERMINFO, LIBS_TERMCAP from cpp to configure.
Glenn Morris <rgm@gnu.org>
parents:
108279
diff
changeset
|
3 /* The same as NetBSD. Note there are differences in configure. */ |
25844 | 4 #include "netbsd.h" |
28264 | 5 |
52401 | 6 /* arch-tag: 7e3f65ca-3f48-4237-933f-2b208b21e8e2 |
7 (do not change this comment) */ |