Mercurial > emacs
comparison lisp/format.el @ 89943:4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-218
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-220
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-221
Restore deleted tagline in etc/TUTORIAL.ru
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-222
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-228
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-229
Remove TeX output files from the archive
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-230
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-247
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-248
src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-249
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-256
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-258
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-263
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-264
Update from CVS: lispref/display.texi: emacs -> Emacs.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-265
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-274
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-275
Update from CVS: man/makefile.w32-in: Revert last change
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-276
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-295
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-296
Allow restarting an existing debugger session that's exited
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-297
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-299
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-300
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-327
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-328
Update from CVS: src/.gdbinit (xsymbol): Fix last change.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-329
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-344
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-345
Tweak source regexps so that building in place won't cause problems
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-346
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-351
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-352
Update from CVS: lisp/flymake.el: New file.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-353
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-361
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-362
Support " [...]" style defaults in minibuffer-electric-default-mode
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363
(read-number): Use canonical format for default in prompt.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-364
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-367
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-368
Improve display-supports-face-attributes-p on non-ttys
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-369
Rewrite face-differs-from-default-p
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Move `display-supports-face-attributes-p' entirely into C code
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-371
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372
Simplify face-differs-from-default-p; don't consider :stipple.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-373
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
(tty_supports_face_attributes_p): Ensure attributes differ from default
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-375
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-376
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
(Fdisplay_supports_face_attributes_p): Work around bootstrapping problem
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-378
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-380
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Face merging cleanups
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-382
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-384
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385
src/xfaces.c (push_named_merge_point): Return 0 if a cycle is detected
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-386
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-395
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-396
Tweak arch tagging to make build/install-in-place less annoying
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-397
Work around vc-arch problems when building eshell
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-398
Tweak permissions
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-399
Tweak directory permissions
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-400
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-401
More build-in-place tweaking of arch tagging
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-402
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-403
Yet more build-in-place tweaking of arch tagging
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-404
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-409
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410
Make sure image types are initialized for lookup too
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-411
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-416
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 28 Jun 2004 07:56:49 +0000 |
parents | 68c22ea6027c b8d3cea56c44 |
children | cce1c0ee76ee |
comparison
equal
deleted
inserted
replaced
89942:9cb747ae49af | 89943:4c90ffeb71c5 |
---|---|
739 | 739 |
740 (if unknown-ans | 740 (if unknown-ans |
741 (message "Unknown annotations: %s" unknown-ans)))))) | 741 (message "Unknown annotations: %s" unknown-ans)))))) |
742 | 742 |
743 (defun format-subtract-regions (minu subtra) | 743 (defun format-subtract-regions (minu subtra) |
744 "Remove from the regions in MINUend the regions in SUBTRAhend. | 744 "Remove from the regions in MINUEND the regions in SUBTRAHEND. |
745 A region is a dotted pair (FROM . TO). Both parameters are lists of | 745 A region is a dotted pair (FROM . TO). Both parameters are lists of |
746 regions. Each list must contain nonoverlapping, noncontiguous | 746 regions. Each list must contain nonoverlapping, noncontiguous |
747 regions, in descending order. The result is also nonoverlapping, | 747 regions, in descending order. The result is also nonoverlapping, |
748 noncontiguous, and in descending order. The first element of MINUEND | 748 noncontiguous, and in descending order. The first element of MINUEND |
749 can have a cdr of nil, indicating that the end of that region is not | 749 can have a cdr of nil, indicating that the end of that region is not |
750 yet known." | 750 yet known. |
751 | |
752 \(fn MINUEND SUBTRAHEND)" | |
751 (let* ((minuend (copy-alist minu)) | 753 (let* ((minuend (copy-alist minu)) |
752 (subtrahend (copy-alist subtra)) | 754 (subtrahend (copy-alist subtra)) |
753 (m (car minuend)) | 755 (m (car minuend)) |
754 (s (car subtrahend)) | 756 (s (car subtrahend)) |
755 results) | 757 results) |
798 (defun format-insert-annotations (list &optional offset) | 800 (defun format-insert-annotations (list &optional offset) |
799 "Apply list of annotations to buffer as `write-region' would. | 801 "Apply list of annotations to buffer as `write-region' would. |
800 Inserts each element of the given LIST of buffer annotations at its | 802 Inserts each element of the given LIST of buffer annotations at its |
801 appropriate place. Use second arg OFFSET if the annotations' locations are | 803 appropriate place. Use second arg OFFSET if the annotations' locations are |
802 not relative to the beginning of the buffer: annotations will be inserted | 804 not relative to the beginning of the buffer: annotations will be inserted |
803 at their location-OFFSET+1 \(ie, the offset is treated as the character number | 805 at their location-OFFSET+1 \(ie, the offset is treated as the position of |
804 of the first character in the buffer)." | 806 the first character in the buffer)." |
805 (if (not offset) | 807 (if (not offset) |
806 (setq offset 0) | 808 (setq offset 0) |
807 (setq offset (1- offset))) | 809 (setq offset (1- offset))) |
808 (let ((l (reverse list))) | 810 (let ((l (reverse list))) |
809 (while l | 811 (while l |
909 | 911 |
910 ;;; Internal functions for format-annotate-region. | 912 ;;; Internal functions for format-annotate-region. |
911 | 913 |
912 (defun format-annotate-location (loc all ignore translations) | 914 (defun format-annotate-location (loc all ignore translations) |
913 "Return annotation(s) needed at location LOC. | 915 "Return annotation(s) needed at location LOC. |
914 This includes any properties that change between LOC-1 and LOC. | 916 This includes any properties that change between LOC - 1 and LOC. |
915 If ALL is true, don't look at previous location, but generate annotations for | 917 If ALL is true, don't look at previous location, but generate annotations for |
916 all non-nil properties. | 918 all non-nil properties. |
917 Third argument IGNORE is a list of text-properties not to consider. | 919 Third argument IGNORE is a list of text-properties not to consider. |
918 Use the TRANSLATIONS alist (see `format-annotate-region' for doc). | 920 Use the TRANSLATIONS alist (see `format-annotate-region' for doc). |
919 | 921 |