Mercurial > emacs
view src/s/README @ 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 | 8e1b437e5d04 |
children |
line wrap: on
line source
This directory contains C header files containing operating-system-specific definitions. Each file describes a particular operating system. The emacs configuration script edits ../config.h to include the appropriate one of these files, and then each emacs source file includes config.h. template.h is a generic template for system descriptions; it describes the parameters a system file can specify.