From: Lele Gaifax Date: Fri, 1 Jul 2022 16:03:57 +0000 (+0200) Subject: Fix repeated "the" X-Git-Tag: emacs-29.0.90~1447^2~1284 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9dc0fdfdc14beb5d19b705b25bf01020df27541b;p=emacs.git Fix repeated "the" * configure.ac (EMACS_CONFIG_FEATURES): * etc/NEWS: * lisp/dnd.el (dnd-begin-text-drag): * src/pgtkfns.c (Fx_display_mm_height, Fx_display_mm_width): (Fx_display_backing_store, Fx_display_visual_class): * src/xterm.c: Fix repeated "the". (Bug#56341) Copyright-paperwork-exempt: yes --- diff --git a/configure.ac b/configure.ac index 17f86627a7d..ad3df5d7312 100644 --- a/configure.ac +++ b/configure.ac @@ -6492,7 +6492,7 @@ AS_ECHO([" Does Emacs use -lXaw3d? ${HAVE_XAW3D Does Emacs support legacy unexec dumping? ${with_unexec} Which dumping strategy does Emacs use? ${with_dumping} Does Emacs have native lisp compiler? ${HAVE_NATIVE_COMP} - Does Emacs use version 2 of the the X Input Extension? ${HAVE_XINPUT2} + Does Emacs use version 2 of the X Input Extension? ${HAVE_XINPUT2} Does Emacs generate a smaller-size Japanese dictionary? ${with_small_ja_dic} "]) diff --git a/etc/NEWS b/etc/NEWS index 3127e734261..30404cc13c2 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1012,7 +1012,7 @@ so automatically. ** Elisp *** New command 'elisp-eval-buffer' (bound to 'C-c C-e'). -This command evals the forms in the the current buffer. +This command evals the forms in the current buffer. *** New commands 'elisp-byte-compile-file' and 'elisp-byte-compile-buffer'. These commands (bound to 'C-c C-f' and 'C-c C-b', respectively) diff --git a/lisp/dnd.el b/lisp/dnd.el index 29f4ca98ec8..ade61917e96 100644 --- a/lisp/dnd.el +++ b/lisp/dnd.el @@ -348,7 +348,7 @@ program where the drop happened. FRAME is the frame where the mouse is currently held down, or nil, which stands for the current frame. ACTION is one of the symbols `copy' or `move', where `copy' means that the text should be inserted by the drop -target, and `move' means the the same as `copy', but in addition +target, and `move' means the same as `copy', but in addition the caller might have to delete TEXT from its source after this function returns. If ALLOW-SAME-FRAME is nil, ignore any drops on FRAME itself. diff --git a/src/pgtkfns.c b/src/pgtkfns.c index 4f15ec6ff66..5c43e5f3607 100644 --- a/src/pgtkfns.c +++ b/src/pgtkfns.c @@ -2043,7 +2043,7 @@ use `(length \(display-monitor-attributes-list TERMINAL))' instead. */) DEFUN ("x-display-mm-height", Fx_display_mm_height, Sx_display_mm_height, 0, 1, 0, - doc: /* Return the height in millimeters of the the display TERMINAL. + doc: /* Return the height in millimeters of the display TERMINAL. The optional argument TERMINAL specifies which display to ask about. TERMINAL should be a terminal object, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. @@ -2084,7 +2084,7 @@ for each physical monitor, use `display-monitor-attributes-list'. */) DEFUN ("x-display-mm-width", Fx_display_mm_width, Sx_display_mm_width, 0, 1, 0, - doc: /* Return the width in millimeters of the the display TERMINAL. + doc: /* Return the width in millimeters of the display TERMINAL. The optional argument TERMINAL specifies which display to ask about. TERMINAL should be a terminal object, a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. @@ -2125,7 +2125,7 @@ for each physical monitor, use `display-monitor-attributes-list'. */) DEFUN ("x-display-backing-store", Fx_display_backing_store, Sx_display_backing_store, 0, 1, 0, - doc: /* Return an indication of whether the the display TERMINAL does backing store. + doc: /* Return an indication of whether the display TERMINAL does backing store. The value may be `buffered', `retained', or `non-retained'. The optional argument TERMINAL specifies which display to ask about. TERMINAL should be a terminal object, a frame or a display name (a string). @@ -2138,7 +2138,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-display-visual-class", Fx_display_visual_class, Sx_display_visual_class, 0, 1, 0, - doc: /* Return the visual class of the the display TERMINAL. + doc: /* Return the visual class of the display TERMINAL. The value is one of the symbols `static-gray', `gray-scale', `static-color', `pseudo-color', `true-color', or `direct-color'. diff --git a/src/xterm.c b/src/xterm.c index 061bca0684b..245ffedb800 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -497,7 +497,7 @@ along with GNU Emacs. If not, see . */ data.l[1] = timestamp data.l[2] = low 32 bits of a provided frame counter value data.l[3] = high 32 bits of a provided frame counter value - data.l[4] = 1 if the the extended frame counter should be updated, + data.l[4] = 1 if the extended frame counter should be updated, otherwise 0 Upon receiving such an event, Emacs constructs and saves a counter