view etc/ORDERS @ 94626:5eb3ee73ed4e

(smerge-start-session): Don't call smerge-next if looking at conflict marker.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 05 May 2008 06:16:20 +0000
parents 0ebcdaee8a4e
children ea7513e99331
line wrap: on
line source

Printed copies of the GNU Emacs Manual, the Emacs Lisp Reference
Manual, "Programming in Emacs Lisp: An Introduction", and other
materials can be ordered directly from the Free Software Foundation.

For more information, see the order form on the web at
<http://www.gnu.org/order/order.html>.

Your purchases will help support further development of Emacs and
other free software programs.

You can also make tax-deductible donations to the Free Software
Foundation, a not-for-profit organization (assuming you pay US taxes)
- see <http://www.gnu.org/help/donate.html>.