*** empty log message ***

4 files changed, 46 insertions, 12 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 73e6d50df14..ca0e16bdec9 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -36,6 +36,32 @@ invalid pointer from string_free_list.
 
 * BUGS
 
+** Ange-ftp should ignore irrelevant IPv6 errors:
+
+Message-Id: <4121-Tue23Mar2004165249+0100-piet@cs.uu.nl>
+From: "Piet van Oostrum" <piet@cs.uu.nl>
+To: emacs-pretest-bug@gnu.org
+Subject: Ange-ftp can't deal with IPV6/IPV4 fallback
+
+Symptoms:
+
+C-x C-f /ftp.nluug.nl:/
+
+The problem is that the DNS first gives an IPV6 address. However our
+router doesn't do IPV6. Ftp then falls back to IPV4:
+
+ftp> open ftp.nluug.nl
+Trying 2001:610:1:80aa:192:87:102:36...
+ftp: connect to address 2001:610:1:80aa:192:87:102:36: No route to host
+Trying 192.87.102.36...
+Connected to ftp.nluug.nl.
+
+Ange-ftp chokes on the `No route to host' message and doesn't look any
+further. 
+
+I think in the near future we will see more of this problem, so it might be
+time to make anfe-ftp more intelligent.
+
 ** Mailabbrev should quote addresses to correspond to RFC 822.
 See http://article.gmane.org/gmane.emacs.devel/27585
 
diff --git a/etc/NEWS b/etc/NEWS
index aedd81d5fa7..1faa6b74fc4 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2581,6 +2581,9 @@ strings by giving that character a non-nil `cursor' text property.
 around potentially blocking or long-running code in timers
 and post-command-hooks.
 
+** An unconditional face specification in defface (one where the DISPLAY part
+is just t) applies to all cases and does not override subsequent entries.
+
 +++
 ** New face attribute `min-colors' can be used to tailor the face color
 to the number of colors supported by a display, and define the
diff --git a/etc/TODO b/etc/TODO
index e9bfbb01009..544e42694fc 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -9,7 +9,7 @@ to the FSF.
 
 * Small but important fixes needed in existing features:
 
-** Fix the kill/yank treatment of invisible text. At the moment,
+** Fix the kill/yank treatment of invisible text.  At the moment,
   invisible text is placed in the kill-ring, so that the contents of
   the ring may not correspond to the text as displayed to the user. It
   ought to be possible to omit text which is invisible (due to a
@@ -32,7 +32,8 @@ to the FSF.
   properly with variable-pitch faces.
 
 ** Implement a smoother vertical scroll facility, one that allows
-  C-v to scroll through a tall image.
+  C-v to scroll through a tall image.  The primitive operations
+  posn-at-point and posn-at-x-y should now make it doable in elisp.
 
 ** Implement intelligent search/replace, going beyond query-replace
   (see http://graphics.csail.mit.edu/~rcm/chi04.pdf).
@@ -67,7 +68,6 @@ to the FSF.
 
 ** ange-ftp
 *** understand sftp
-*** ignore some irrelevant errors (like IPv6 and kerberos thingies).
 *** Use MLS for ange-ftp-insert-directory if a list of files is specified.
 
 ** Ability to map a key, including all modified-combinations.
@@ -122,9 +122,6 @@ to the FSF.
 ** Save undo information in special temporary files, and reload it
   when needed for undoing.  This could extend undo capacity.
 
-** Merge the Emacs regex.c with the Glibc regex.c.
-  They split off a few years ago through negligence.
-
 ** Change the Windows NT menu code
   so that it handles the deep_p argument and avoids
   regenerating the whole menu bar menu tree except
@@ -318,6 +315,8 @@ to the FSF.
 
 * Internal changes
 
+** Replace Emacs's regex.c with the new DFA-based glibc regex code.
+
 ** Replace gmalloc.c with the modified Doug Lea code from the current
   GNU libc so that the special mmapping of buffers can be removed --
   that apparently loses under Solaris, at least.  [fx has mostly done
@@ -327,7 +326,8 @@ to the FSF.
 
 ** Add an inferior-comint-minor-mode to capture the common set of operations
    offered by major modes that offer an associated inferior
-   comint-derived mode.  I.e. basically make cmuscheme.el generic.
-   For use by sml-mode, python-mode, tex-mode, scheme-mode, ...
+   comint-derived mode.  I.e. basically make cmuscheme.el/inf-lisp.el generic.
+   For use by sml-mode, python-mode, tex-mode, scheme-mode, lisp-mode,
+   haskell-mode, tuareg-mode, ...
 
 ;;; arch-tag: b0a3e40b-726a-457d-9999-ba848321b036
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4188c0c4cb5..2e57be13739 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,13 +1,18 @@
+2004-12-06  Stefan  <monnier@iro.umontreal.ca>
+
+        * font-lock.el (font-lock-unfontify-region): Save buffer state.
+        (font-lock-default-unfontify-region): Dont' save buffer state any more.
+
 2004-12-07  Jay Belanger  <belanger@truman.edu>
 
-        * calc/calc-help.el (calc-describe-key): 
+        * calc/calc-help.el (calc-describe-key):
         Set calc-summary-indentation even when Calc Summary buffer exists.
 
 2004-12-07  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
         * calendar/holidays.el (holiday-easter-etc): Make arguments
-        optional for backwards compatability.  Doc fix.  Remove
-        un-necessary local vars mandatory, output-list.
+        optional for backwards compatability.  Doc fix.
+        Remove un-necessary local vars mandatory, output-list.
         (holiday-advent):  Make arguments optional for backwards
         compatability.  Doc fix.
 
@@ -41,7 +46,7 @@
 2004-12-05  Sam Steingold  <sds@gnu.org>
 
         * net/tramp.el (tramp-handle-file-accessible-directory-p):
-        Fix `tramp-time-diff' comparison logic
+        Fix `tramp-time-diff' comparison logic.
 
 2004-12-05  Paul Pogonyshev  <pogonyshev@gmx.net>