Mercurial > emacs

view lispintro/ChangeLog @ 54402:8bf3846fc7dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2004-03-15 Masatake YAMATO <jet@gyve.org> Added context menu support in smerge mode. Most of the part is written by Stefan Monnier. * smerge-mode.el (smerge-context-menu-map, smerge-context-menu): New keyman and menu. (smerge-text-properties): New function. (smerge-remove-props): New function. (smerge-popup-context-menu): New function. (smerge-resolve): Call `smerge-remove-props'. (smerge-keep-base, smerge-keep-other, smerge-keep-mine): Ditto. (smerge-keep-current): Ditto. (smerge-kill-current): New function. (smerge-match-conflict): Detect the file as `a same-diff conflict' if the filename is "ANCESTOR". Put text properties.
author Masatake YAMATO <jet@gyve.org>
date Mon, 15 Mar 2004 11:27:47 +0000
parents b0293635c42b
children f849da3c5bb4
line wrap: on
line source

2004-02-29  Juanma Barranquero  <lektu@terra.es>

	* makefile.w32-in (mostlyclean, clean, maintainer-clean): Use
	$(DEL) instead of rm, and ignore exit code.

2003-11-16  Kevin Ryde  <user42@zip.com.au>

	* emacs-lisp-intro.texi: [CVS commitment by <bob@rattlesnake.com>]
	Corrections to cross references,
	(Interactive Options): elisp "interactive" -> "Using Interactive".
	(defvar and asterisk): Remove emacs "Edit Options" reference,
	edit-options is no longer described in the emacs manual.
	(Lists diagrammed): elisp "List Type" -> "Cons Cell Type".

2003-09-03  Peter Runestig  <peter@runestig.com>

	* makefile.w32-in: New file.

2001-11-29  Eli Zaretskii  <eliz@is.elta.co.il>

	* emacs-lisp-intro.texi (Index): @ignore extraneous text.
	Use @dircategory and @direntry to define the DIR entry.

2001-11-25  Robert J. Chassell  <bob@rattlesnake.com>

	* emacs-lisp-intro.texi: Move @contents to the beginning of the
	file.  Set the size to @smallbook.

2001-11-24  Eli Zaretskii  <eliz@is.elta.co.il>

	* Makefile.in: New file.

	* README: Update.

	* *.eps: Rename to avoid clashes in DOS 8+3 namespace.

;; Local Variables:
;; coding: iso-2022-7bit
;; End:

    Copyright (C) 2001
	Free Software Foundation, Inc.
  Copying and distribution of this file, with or without modification,
  are permitted provided the copyright notice and this notice are preserved.

;;; arch-tag: ee4f8e1f-e14c-4d2e-86de-4dd697e6f1c3