Mercurial > emacs
view msdos/sedlisp.inp @ 111676:7b1a21c5033e
Cleanup diff-buffer-with-file.
* lisp/vc/diff.el (diff-old-temp-file, diff-new-temp-file): Remove.
(diff-sentinel): Get them as arguments instead.
(diff-old-file, diff-new-file, diff-extra-args): Remove.
(diff-file-local-copy, diff-better-file-name): New funs.
(diff-no-select): Rename from diff-into-buffer.
Support buffers additionally to files. Move `buf' arg. Don't display buf.
Prefer closures to buffer-local variables.
(diff): Adjust accordingly.
(diff-buffer-with-file): Move from files.el.
* lisp/files.el (diff-buffer-with-file): Move to vc/diff.el.
(diff-buffer-internal): Remove.
(diff-buffer-buffer): Remove.
(save-some-buffers-action-alist): Use diff-no-select so as not to guess
the buffer name used, and so as not to mess up windows and frames.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 22 Nov 2010 14:22:03 -0500 |
parents | f1433702b7ea |
children | 417b1e4d63cd |
line wrap: on
line source
# -sedlisp.inp----------------------------------------------------------- # Configuration script for lisp/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # # This file is free software; as a special exception, the author gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. # # This program 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. # # ---------------------------------------------------------------------- /^SHELL *=/i\ export FNCASE=y /^lisp *=/s|\$(srcdir)|$(CURDIR)| /^srcdir *=/s|@srcdir@|.| /^top_srcdir *=/s|@top_srcdir@|./..| /^abs_top_builddir *=/s|@abs_top_builddir@|$(CURDIR)/..| # arch-tag: da7a3cff-4839-4ad7-bbe3-e2b61c84c38e