Mercurial > emacs

view admin/notes/changelogs @ 112231:f4a73cf7587b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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 4b9bb9aba3c8
children
line wrap: on
line source

http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00793.html
  There is no need to make change log entries for files such as NEWS,
  MAINTAINERS, and FOR-RELEASE.

http://lists.gnu.org/archive/html/emacs-devel/2006-12/msg01135.html
  There is no need to indicate regeneration of files such as configure
  in ChangeLog.


http://lists.gnu.org/archive/html/emacs-devel/2008-11/msg00940.html
Preferred form for several entries with the same content:

   * help.el (view-lossage):
   * kmacro.el (kmacro-edit-lossage):
   * edmacro.el (edit-kbd-macro): Fix docstring, lossage is now 300 keys.

(Rather than anything involving "ditto" and suchlike.)