; * src/fileio.c (Ffile_newer_than_file_p): Fix wording (bug#73709).

diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el
index f17dc160997e948bce4e894e9ae844467c548612..3343d29da0f7334b311e709f585560379cbd5262 100644 (file)
--- a/lisp/net/dictionary.el
+++ b/lisp/net/dictionary.el
@@ -320,7 +320,11 @@ Otherwise, `dictionary-search' displays definitions in a *Dictionary* buffer."
   :version "30.1")
 
 (defface dictionary-word-definition-face
-  '((((supports (:family "DejaVu Serif")))
+  ;; w32 first, because 'supports' doesn't really tell whether the font
+  ;; family exists, and MS-Windows selects an ugly font as result.
+  '((((type w32))
+     (:font "Sans Serif"))
+    (((supports (:family "DejaVu Serif")))
      (:family "DejaVu Serif"))
     (((type x))
      (:font "Sans Serif"))
@@ -328,7 +332,7 @@ Otherwise, `dictionary-search' displays definitions in a *Dictionary* buffer."
      (:font "default")))
 "The face that is used for displaying the definition of the word."
 :group 'dictionary
-:version "28.1")
+:version "31.1")
 
 (defface dictionary-word-entry-face
   '((((type x))

diff --git a/src/fileio.c b/src/fileio.c
index 2db2760916b4e234910e4b3e5815b7dbc0afde0b..1b1060d899fc3792a6fc4ee23916dfef7cb926b5 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3787,8 +3787,8 @@ DEFUN ("unix-sync", Funix_sync, Sunix_sync, 0, 0, "",
 
 DEFUN ("file-newer-than-file-p", Ffile_newer_than_file_p, Sfile_newer_than_file_p, 2, 2, 0,
        doc: /* Return t if file FILE1 is newer than file FILE2.
-If FILE1 does not exist, the answer is nil;
-otherwise, if FILE2 does not exist, the answer is t.
+If FILE1 does not exist, the return value is nil;
+if FILE2 does not exist, the return value is t.
 For existing files, this compares their last-modified times.  */)
   (Lisp_Object file1, Lisp_Object file2)
 {