Mercurial > emacs
annotate etc/nxml/02400-0243F.el @ 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 | 7d96f9094dcf |
children | ef719132ddfa |
rev | line source |
---|---|
86623
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
1 (nxml-define-char-name-set 'control-pictures |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
2 '(("SYMBOL FOR NULL" #x2400) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
3 ("SYMBOL FOR START OF HEADING" #x2401) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
4 ("SYMBOL FOR START OF TEXT" #x2402) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
5 ("SYMBOL FOR END OF TEXT" #x2403) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
6 ("SYMBOL FOR END OF TRANSMISSION" #x2404) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
7 ("SYMBOL FOR ENQUIRY" #x2405) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
8 ("SYMBOL FOR ACKNOWLEDGE" #x2406) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
9 ("SYMBOL FOR BELL" #x2407) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
10 ("SYMBOL FOR BACKSPACE" #x2408) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
11 ("SYMBOL FOR HORIZONTAL TABULATION" #x2409) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
12 ("SYMBOL FOR LINE FEED" #x240A) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
13 ("SYMBOL FOR VERTICAL TABULATION" #x240B) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
14 ("SYMBOL FOR FORM FEED" #x240C) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
15 ("SYMBOL FOR CARRIAGE RETURN" #x240D) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
16 ("SYMBOL FOR SHIFT OUT" #x240E) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
17 ("SYMBOL FOR SHIFT IN" #x240F) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
18 ("SYMBOL FOR DATA LINK ESCAPE" #x2410) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
19 ("SYMBOL FOR DEVICE CONTROL ONE" #x2411) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
20 ("SYMBOL FOR DEVICE CONTROL TWO" #x2412) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
21 ("SYMBOL FOR DEVICE CONTROL THREE" #x2413) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
22 ("SYMBOL FOR DEVICE CONTROL FOUR" #x2414) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
23 ("SYMBOL FOR NEGATIVE ACKNOWLEDGE" #x2415) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
24 ("SYMBOL FOR SYNCHRONOUS IDLE" #x2416) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
25 ("SYMBOL FOR END OF TRANSMISSION BLOCK" #x2417) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
26 ("SYMBOL FOR CANCEL" #x2418) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
27 ("SYMBOL FOR END OF MEDIUM" #x2419) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
28 ("SYMBOL FOR SUBSTITUTE" #x241A) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
29 ("SYMBOL FOR ESCAPE" #x241B) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
30 ("SYMBOL FOR FILE SEPARATOR" #x241C) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
31 ("SYMBOL FOR GROUP SEPARATOR" #x241D) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
32 ("SYMBOL FOR RECORD SEPARATOR" #x241E) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
33 ("SYMBOL FOR UNIT SEPARATOR" #x241F) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
34 ("SYMBOL FOR SPACE" #x2420) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
35 ("SYMBOL FOR DELETE" #x2421) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
36 ("BLANK SYMBOL" #x2422) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
37 ("OPEN BOX" #x2423) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
38 ("SYMBOL FOR NEWLINE" #x2424) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
39 ("SYMBOL FOR DELETE FORM TWO" #x2425) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
40 ("SYMBOL FOR SUBSTITUTE FORM TWO" #x2426) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
41 )) |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
42 |
7d96f9094dcf
Move here from lisp/nxml/char-name/unicode
Glenn Morris <rgm@gnu.org>
parents:
diff
changeset
|
43 ;; arch-tag: efc349c9-065d-4033-b261-7cb961c54072 |