(file-cache-add-directory-using-find):

Only set up file-cache-find-command-posix-flag if we will use it.

diff --git a/etc/NEWS b/etc/NEWS
index 589ebc0ff2fb876cbd2ca10753c5d1e3b7704bf6..437bc1be9080f55c837734ea9941c4cba873bf91 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2371,6 +2371,11 @@ configuration files.
 \f
 * Lisp Changes in Emacs 21.4
 
+** (while-no-input BODY...) runs BODY, but only so lomg as no input
+arrives.  If the user types or clicks anything, BODY stops as if a
+quit had occurred.  while-no-input returns the value of BODY, if BODY
+finishes.  It returns nil if BODY was aborted.
+
 ---
 ** To manipulate the File menu using easy-menu, you must specify the
 proper name "file".  In previous Emacs versions, you had to specify
@@ -2620,8 +2625,10 @@ 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.
+** The first face specification element in a defface can specify
+`default' instead of frame classification.  Then its attributes act as
+defaults that apply to all the subsequent cases (and may be overridden
+by them).
 
 +++
 ** New face attribute `min-colors' can be used to tailor the face color

diff --git a/etc/TODO b/etc/TODO
index 5c674c5c06e67c735be3254721930696bc5c39fb..12d942e9402b0a129f0bcc770d9cced2b85cc281 100644 (file)
--- a/etc/TODO
+++ b/etc/TODO
@@ -15,6 +15,9 @@ to the FSF.
   ought to be possible to omit text which is invisible (due to a
   text-property, overlay, or selective display) from the kill-ring.
 
+** Redefine define-generic-mode as a macro, so the compiler
+  sees the definitions it generates.
+
 * Important features:
 
 ** Provide user-friendly ways to list all available font families,

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5cc31b93633e16a0073bc96842221222d75e5a1..003efcc400e175577860e3399f4e314a21036282 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,36 @@
+2004-12-13  Richard M. Stallman  <rms@gnu.org>
+
+       * filecache.el (file-cache-add-directory-using-find):
+       Only set up file-cache-find-command-posix-flag if we will use it.
+
+       * bindings.el (mode-line-buffer-identification-keymap): 
+       Don't cancel the mode-line's usual down-mouse-1 binding.
+
+       * cus-edit.el (custom-face-selected): Handle `default' specs.
+       (custom-face-edit): Increase extra-offset.
+       (custom-display): Handle `default' specs.
+
+       * xml.el (xml-name-re, xml-entity-value-re): Add defvars.
+
+       * emacs-lisp/elint.el (elint-standard-variables)
+       (elint-unknown-builtin-args): Move definitions up.
+
+       * net/browse-url.el (browse-url-url-at-point): Add autoload.
+
+       * info.el (info-xref-visited): Use `default' instead of t.
+       (Info-try-follow-nearest-node): Don't explicitly load browse-url.
+
+       * faces.el (header-line, mode-line-inactive, tool-bar):
+       Use `default' instead of t for setting the defaults.
+       (face-spec-choose): Separate `t' from `default'.
+
+       * subr.el (while-no-input): New macro.
+
+2004-12-13  Frederik Fouvry  <fouvry@CoLi.Uni-SB.DE>  (tiny change)
+
+       * filecache.el (file-cache-add-directory-using-find):
+       Only test file-cache-find-command-posix-flag on some systems.
+
 2004-12-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * vc-svn.el (vc-svn-repository-hostname): Adjust to new format.

diff --git a/lisp/filecache.el b/lisp/filecache.el
index df1f1b548d04ad73e25cdf676000ca8c619fefdd..90287ba5eef1a2bc1aa6b95294fc798bd779c206 100644 (file)
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -337,9 +337,10 @@ in each directory, not to the directory list itself."
 Find is run in DIRECTORY."
   (interactive "DAdd files under directory: ")
   (let ((dir (expand-file-name directory)))
-    (if (eq file-cache-find-command-posix-flag 'not-defined)
-        (setq file-cache-find-command-posix-flag
-             (executable-command-find-posix-p file-cache-find-command)))
+    (when (memq system-type '(windows-nt cygwin))
+      (if (eq file-cache-find-command-posix-flag 'not-defined)
+         (setq file-cache-find-command-posix-flag
+               (executable-command-find-posix-p file-cache-find-command))))
     (set-buffer (get-buffer-create file-cache-buffer))
     (erase-buffer)
     (call-process file-cache-find-command nil

diff --git a/src/ChangeLog b/src/ChangeLog
index 92f24f2af70494c2f25dd680f1b58a65f3bf4266..7e21c345192cf9e187cc9555752b3bd5b75aa56c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2004-12-13  Richard M. Stallman  <rms@gnu.org>
+
+       * eval.c (syms_of_eval) <quit-flag>: Doc fix.
+
+       * keyboard.c (Vthrow_on_input): New variable.
+       (syms_of_keyboard): Defvar and initialize it.
+       (kbd_buffer_store_event_hold): Handle Vthrow_on_input.
+
+       * lisp.h (QUIT): Check for Vthrow_on_input.
+       (Vthrow_on_input): Declare it.
+
 2004-12-13  Kim F. Storm  <storm@cua.dk>
 
        * xdisp.c (set_iterator_to_next): Reset stop_charpos after display