Mercurial > emacs
view doc/lispintro/makefile.w32-in @ 93956:bfc762f0b49c
* vc-hooks.el (vc-state): Add new state `conflict'.
(vc-after-save): Use when not if.
(vc-default-mode-line-string): Deal with the conflict state.
(vc-prefix-map):
(vc-menu-map): Bind vc-status instead of vc-directory.
* vc.el (vc-editable-p):
(vc-default-status-printer):
(vc-next-action): Deal with the conflict state.
(vc-mark-resolved): New function.
(vc-status-mode): Fix mode name.
(vc-default-comment-history): Use when not if.
(Todo): Add new entries, remove old ones.
* vc-cvs.el (vc-cvs-merge, vc-cvs-merge-news): Set conflict state.
(vc-cvs-parse-status):
(vc-cvs-after-dir-status):
* vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status):
Detect the conflict state.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Thu, 10 Apr 2008 07:32:25 +0000 |
parents | 9bbb6ab858c8 |
children | 38ec81da0a8b |
line wrap: on
line source
#### -*- Makefile -*- for the Emacs Lisp Introduction manual. # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is part of GNU Emacs. # GNU Emacs is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. # GNU Emacs is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with GNU Emacs; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. srcdir = . infodir = $(srcdir)/../../info INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi # The file name eintr must fit within 5 characters, to allow for # -NN extensions to fit into DOS 8+3 limits without clashing INFO_TARGETS = $(infodir)/eintr DVI_TARGETS = emacs-lisp-intro.dvi MAKEINFO = makeinfo INSTALL_INFO = install-info TEXI2DVI = texi2dvi DVIPS = dvips ENVADD = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" \ "MAKEINFO=$(MAKEINFO) -I$(srcdir)" /C .SUFFIXES: .dvi .ps .texi info: $(INFO_TARGETS) $(infodir)/dir: $(INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS) dvi: $(DVI_TARGETS) $(infodir)/eintr: $(INFO_SOURCES) $(MAKEINFO) -o $@ $(srcdir)/emacs-lisp-intro.texi emacs-lisp-intro.dvi: $(INFO_SOURCES) $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-lisp-intro.texi emacs-lisp-intro.html: $(INFO_SOURCES) $(MAKEINFO) --html -o $@ $(srcdir)/emacs-lisp-intro.texi .dvi.ps: $(DVIPS) $< -o $@ mostlyclean: - $(DEL) *.log *.cp *.fn *.ky *.pg *.vr *.tp clean: mostlyclean - $(DEL) *.dvi $(infodir)/eintr* distclean: clean maintainer-clean: distclean - $(DEL) *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: