Mercurial > emacs
view 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 |
line wrap: on
line source
(nxml-define-char-name-set 'control-pictures '(("SYMBOL FOR NULL" #x2400) ("SYMBOL FOR START OF HEADING" #x2401) ("SYMBOL FOR START OF TEXT" #x2402) ("SYMBOL FOR END OF TEXT" #x2403) ("SYMBOL FOR END OF TRANSMISSION" #x2404) ("SYMBOL FOR ENQUIRY" #x2405) ("SYMBOL FOR ACKNOWLEDGE" #x2406) ("SYMBOL FOR BELL" #x2407) ("SYMBOL FOR BACKSPACE" #x2408) ("SYMBOL FOR HORIZONTAL TABULATION" #x2409) ("SYMBOL FOR LINE FEED" #x240A) ("SYMBOL FOR VERTICAL TABULATION" #x240B) ("SYMBOL FOR FORM FEED" #x240C) ("SYMBOL FOR CARRIAGE RETURN" #x240D) ("SYMBOL FOR SHIFT OUT" #x240E) ("SYMBOL FOR SHIFT IN" #x240F) ("SYMBOL FOR DATA LINK ESCAPE" #x2410) ("SYMBOL FOR DEVICE CONTROL ONE" #x2411) ("SYMBOL FOR DEVICE CONTROL TWO" #x2412) ("SYMBOL FOR DEVICE CONTROL THREE" #x2413) ("SYMBOL FOR DEVICE CONTROL FOUR" #x2414) ("SYMBOL FOR NEGATIVE ACKNOWLEDGE" #x2415) ("SYMBOL FOR SYNCHRONOUS IDLE" #x2416) ("SYMBOL FOR END OF TRANSMISSION BLOCK" #x2417) ("SYMBOL FOR CANCEL" #x2418) ("SYMBOL FOR END OF MEDIUM" #x2419) ("SYMBOL FOR SUBSTITUTE" #x241A) ("SYMBOL FOR ESCAPE" #x241B) ("SYMBOL FOR FILE SEPARATOR" #x241C) ("SYMBOL FOR GROUP SEPARATOR" #x241D) ("SYMBOL FOR RECORD SEPARATOR" #x241E) ("SYMBOL FOR UNIT SEPARATOR" #x241F) ("SYMBOL FOR SPACE" #x2420) ("SYMBOL FOR DELETE" #x2421) ("BLANK SYMBOL" #x2422) ("OPEN BOX" #x2423) ("SYMBOL FOR NEWLINE" #x2424) ("SYMBOL FOR DELETE FORM TWO" #x2425) ("SYMBOL FOR SUBSTITUTE FORM TWO" #x2426) )) ;; arch-tag: efc349c9-065d-4033-b261-7cb961c54072