summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorKaroly Lorentey <lorentey@elte.hu>2004-10-14 14:42:03 +0000
committerKaroly Lorentey <lorentey@elte.hu>2004-10-14 14:42:03 +0000
commitf4ed7d82485fa824499ddef3feccebeca527db96 (patch)
treef0fa762b3bf26479a7cdfe6d7fc0dbdd9f39eb29 /etc
parent5a0105aa4d9ef9ae08c5bb528c44e137565648d7 (diff)
parent971d44b77ac5fff89255c6cc4041127f4464b234 (diff)
downloademacs-f4ed7d82485fa824499ddef3feccebeca527db96.tar.gz
Merged in changes from CVS trunk.
Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-611 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-612 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-613 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-614 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-615 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-46 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-47 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-48 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-49 Add {arch}/=commit-merge-make-log * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-50 {arch}/=commit-merge-make-log: Don't die if there are no ChangeLog changes git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-259
Diffstat (limited to 'etc')
-rw-r--r--etc/CENSORSHIP2
-rw-r--r--etc/NEWS5
-rw-r--r--etc/TODO3
3 files changed, 9 insertions, 1 deletions
diff --git a/etc/CENSORSHIP b/etc/CENSORSHIP
index 24bca114790..ca949aa6b6e 100644
--- a/etc/CENSORSHIP
+++ b/etc/CENSORSHIP
@@ -54,7 +54,7 @@ rules.
Of course, I'm making an assumption about just what "indecent" means.
I have to do this, because nobody knows for sure. The most obvious
-possibile meaning is the meaning it has for television, so I'm using
+possible meaning is the meaning it has for television, so I'm using
that as a tentative assumption. However, there is a good chance that
our courts will reject that interpretation of the law as
unconstitutional.
diff --git a/etc/NEWS b/etc/NEWS
index 63c4ec3e3a1..9381dfdbb35 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -99,6 +99,11 @@ types any more. Add -DUSE_LISP_UNION_TYPE if you want union types.
* Changes in Emacs 21.4
+++
+** New function `looking-back' checks whether a regular expression matches
+the text before point. Specifying the LIMIT argument bounds how far
+back the match can start; this is a way to keep it from taking too long.
+
++++
** New functions `make-progress-reporter', `progress-reporter-update',
`progress-reporter-force-update' and `progress-reporter-done' provide
a simple and efficient way of printing progress messages to the user.
diff --git a/etc/TODO b/etc/TODO
index fdefd670f7c..69a26362652 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -34,6 +34,9 @@ to the FSF.
** Implement a smoother vertical scroll facility, one that allows
C-v to scroll through a tall image.
+** Implement intelligent search/replace, going beyond query-replace
+ (see http://graphics.csail.mit.edu/~rcm/chi04.pdf).
+
** Implement other text formatting properties.
*** Footnotes that can appear either in place or at the end of the page.
*** text property that says "don't break line in middle of this".