aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2024-10-13 18:29:34 +0300
committerEli Zaretskii2024-10-13 18:29:34 +0300
commitae75ea62324598654b32ed28bf644ec2bc4c04b2 (patch)
tree6dd0b6568567871d3a5dc545119d9170d6e75586
parentb120397868502e8e4ffc09fdeea6ef4c65662cd1 (diff)
downloademacs-ae75ea62324598654b32ed28bf644ec2bc4c04b2.tar.gz
emacs-ae75ea62324598654b32ed28bf644ec2bc4c04b2.zip
; * src/fileio.c (Ffile_newer_than_file_p): Fix wording (bug#73709).
-rw-r--r--lisp/net/dictionary.el8
-rw-r--r--src/fileio.c4
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el
index f17dc160997..3343d29da0f 100644
--- a/lisp/net/dictionary.el
+++ b/lisp/net/dictionary.el
@@ -320,7 +320,11 @@ Otherwise, `dictionary-search' displays definitions in a *Dictionary* buffer."
320 :version "30.1") 320 :version "30.1")
321 321
322(defface dictionary-word-definition-face 322(defface dictionary-word-definition-face
323 '((((supports (:family "DejaVu Serif"))) 323 ;; w32 first, because 'supports' doesn't really tell whether the font
324 ;; family exists, and MS-Windows selects an ugly font as result.
325 '((((type w32))
326 (:font "Sans Serif"))
327 (((supports (:family "DejaVu Serif")))
324 (:family "DejaVu Serif")) 328 (:family "DejaVu Serif"))
325 (((type x)) 329 (((type x))
326 (:font "Sans Serif")) 330 (:font "Sans Serif"))
@@ -328,7 +332,7 @@ Otherwise, `dictionary-search' displays definitions in a *Dictionary* buffer."
328 (:font "default"))) 332 (:font "default")))
329"The face that is used for displaying the definition of the word." 333"The face that is used for displaying the definition of the word."
330:group 'dictionary 334:group 'dictionary
331:version "28.1") 335:version "31.1")
332 336
333(defface dictionary-word-entry-face 337(defface dictionary-word-entry-face
334 '((((type x)) 338 '((((type x))
diff --git a/src/fileio.c b/src/fileio.c
index 2db2760916b..1b1060d899f 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3787,8 +3787,8 @@ DEFUN ("unix-sync", Funix_sync, Sunix_sync, 0, 0, "",
3787 3787
3788DEFUN ("file-newer-than-file-p", Ffile_newer_than_file_p, Sfile_newer_than_file_p, 2, 2, 0, 3788DEFUN ("file-newer-than-file-p", Ffile_newer_than_file_p, Sfile_newer_than_file_p, 2, 2, 0,
3789 doc: /* Return t if file FILE1 is newer than file FILE2. 3789 doc: /* Return t if file FILE1 is newer than file FILE2.
3790If FILE1 does not exist, the answer is nil; 3790If FILE1 does not exist, the return value is nil;
3791otherwise, if FILE2 does not exist, the answer is t. 3791if FILE2 does not exist, the return value is t.
3792For existing files, this compares their last-modified times. */) 3792For existing files, this compares their last-modified times. */)
3793 (Lisp_Object file1, Lisp_Object file2) 3793 (Lisp_Object file1, Lisp_Object file2)
3794{ 3794{