xserver: Branch 'master'

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Mar 31 20:40:05 UTC 2022 

 dix/enterleave.c               |    8 ++++----
 hw/kdrive/src/kdrive.c         |    2 +-
 hw/xfree86/ramdac/CURSOR.NOTES |    2 +-
 hw/xfree86/x86emu/ops.c        |    2 +-
 hw/xnest/man/Xnest.man         |    2 +-
 hw/xquartz/man/Xquartz.man     |    4 ++--
 hw/xwin/glx/indirect.c         |    2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 6f9fce03609351b5ffcf394797e975b6fd47ab0c
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Mar 28 17:40:17 2022 -0700

    Replace "the the" with a single "the" in docs & comments
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Martin Roukala <martin.roukala at mupuf.org>

diff --git a/dix/enterleave.c b/dix/enterleave.c
index 033ddc212..867ec7436 100644
--- a/dix/enterleave.c
+++ b/dix/enterleave.c
@@ -365,7 +365,7 @@ CoreEnterLeaveNonLinear(DeviceIntPtr dev, WindowPtr A, WindowPtr B, int mode)
        Case 3C: Otherwise:
        The pointer window moves from W to a window above W.
        The detail may need to be changed from Ancestor to Nonlinear or
-       vice versa depending on the the new P(W)
+       vice versa depending on the new P(W)
      */
 
     if (!HasPointer(dev, A)) {
@@ -447,7 +447,7 @@ CoreEnterLeaveToAncestor(DeviceIntPtr dev, WindowPtr A, WindowPtr B, int mode)
        Case 3C: Otherwise:
        The pointer window moves from W to a window above W.
        The detail may need to be changed from Ancestor to Nonlinear or
-       vice versa depending on the the new P(W)
+       vice versa depending on the new P(W)
      */
     if (!HasPointer(dev, A)) {
         WindowPtr child = FirstPointerChild(A);
@@ -1053,7 +1053,7 @@ CoreFocusNonLinear(DeviceIntPtr dev, WindowPtr A, WindowPtr B, int mode)
        Case 3C: Otherwise:
        The focus window moves from W to a window above W.
        The detail may need to be changed from Ancestor to Nonlinear or
-       vice versa depending on the the new F(W)
+       vice versa depending on the new F(W)
      */
 
     if (!HasFocus(A)) {
@@ -1141,7 +1141,7 @@ CoreFocusToAncestor(DeviceIntPtr dev, WindowPtr A, WindowPtr B, int mode)
        Case 3C: Otherwise:
        The focus window moves from W to a window above W.
        The detail may need to be changed from Ancestor to Nonlinear or
-       vice versa depending on the the new F(W)
+       vice versa depending on the new F(W)
      */
     if (!HasFocus(A)) {
         WindowPtr child = FirstFocusChild(A);
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index 8de01ccfa..0c80752a0 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -369,7 +369,7 @@ KdUseMsg(void)
     ErrorF("-softCursor      Force software cursor\n");
     ErrorF("-videoTest       Start the server, pause momentarily and exit\n");
     ErrorF
-        ("-origin X,Y      Locates the next screen in the the virtual screen (Xinerama)\n");
+        ("-origin X,Y      Locates the next screen in the virtual screen (Xinerama)\n");
     ErrorF("-switchCmd       Command to execute on vt switch\n");
     ErrorF
         ("vtxx             Use virtual terminal xx instead of the next available\n");
diff --git a/hw/xfree86/ramdac/CURSOR.NOTES b/hw/xfree86/ramdac/CURSOR.NOTES
index 3be79a1e2..eb77f70be 100644
--- a/hw/xfree86/ramdac/CURSOR.NOTES
+++ b/hw/xfree86/ramdac/CURSOR.NOTES
@@ -124,7 +124,7 @@ Flags
    Hardware cursor data consists of two pieces, a source and a mask.
    The mask is a bitmap indicating which parts of the cursor are
    transparent and which parts are drawn.  The source is a bitmap
-   indicating which parts of the non-transparent portion of the the
+   indicating which parts of the non-transparent portion of the
    cursor should be painted in the foreground color and which should
    be painted in the background color.
 
diff --git a/hw/xfree86/x86emu/ops.c b/hw/xfree86/x86emu/ops.c
index 8846db0ca..4983382bc 100644
--- a/hw/xfree86/x86emu/ops.c
+++ b/hw/xfree86/x86emu/ops.c
@@ -58,7 +58,7 @@
 * modularize it, was basically: 1) no unnecessary subroutine calls,
 * 2) no routines more than about 200 lines in size, and 3) modularize
 * any code that I might not get right the first time.  The fetch_*
-* subroutines fall into the latter category.  The The decode_* fall
+* subroutines fall into the latter category.  The decode_* fall
 * into the second category.  The coding of the "switch(mod){ .... }"
 * in many of the subroutines below falls into the first category.
 * Especially, the coding of {add,and,or,sub,...}_{byte,word}
diff --git a/hw/xnest/man/Xnest.man b/hw/xnest/man/Xnest.man
index 1057e2d72..6ad871d65 100644
--- a/hw/xnest/man/Xnest.man
+++ b/hw/xnest/man/Xnest.man
@@ -309,7 +309,7 @@ development of
 .PP
 Since
 .B Xnest
-need not use the same default visual as the the real server, the top-level
+need not use the same default visual as the real server, the top-level
 window of the
 .B Xnest
 client always has its own color map.
diff --git a/hw/xquartz/man/Xquartz.man b/hw/xquartz/man/Xquartz.man
index 643bea9df..9b01bbaf3 100644
--- a/hw/xquartz/man/Xquartz.man
+++ b/hw/xquartz/man/Xquartz.man
@@ -73,10 +73,10 @@ Enable syncing between the OSX pasteboard and clipboard/primary selection buffer
 Update the X11 CLIPBOARD when the OSX NSPasteboard is updated.
 .TP 8
 .B defaults write @bundle_id_prefix at .X11 sync_pasteboard_to_primary -boolean true
-Update the the X11 PRIMARY buffer when the OSX NSPasteboard is updated.
+Update the X11 PRIMARY buffer when the OSX NSPasteboard is updated.
 .TP 8
 .B defaults write @bundle_id_prefix at .X11 sync_clipboard_to_pasteboard -boolean true
-Update the the OSX NSPasteboard when the X11 CLIPBOARD is updated.  Note that enabling this option causes the clipboard synchronization to act as a clipboard manager in X11.  This makes it impossible to use xclipboard, klipper, or any other such clipboard managers.  If you want to use any of these programs, you must disable this option.
+Update the OSX NSPasteboard when the X11 CLIPBOARD is updated.  Note that enabling this option causes the clipboard synchronization to act as a clipboard manager in X11.  This makes it impossible to use xclipboard, klipper, or any other such clipboard managers.  If you want to use any of these programs, you must disable this option.
 .TP 8
 .B defaults write @bundle_id_prefix at .X11 sync_primary_on_select -boolean true
 This option defaults to false and is provided only "for experts."  It updates the NSPasteboard whenever a new X11 selection is made (rather than requiring you to hit cmd-c to copy the selection to the NSPasteboard).  Since the X11 protocol does not require applications to send notification when they change selection, this might not work in all cases (if you run into this problem, try selecting text in another application first, then selecting the text you want).
diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c
index ff015f763..e34437ace 100644
--- a/hw/xwin/glx/indirect.c
+++ b/hw/xwin/glx/indirect.c
@@ -1134,7 +1134,7 @@ glxWinSetPixelFormat(HDC hdc, int bppOverride, int drawableTypeOverride,
                     winConfig->pixelFormatIndex);
 
     /*
-       Normally, we can just use the the pixelFormatIndex corresponding
+       Normally, we can just use the pixelFormatIndex corresponding
        to the fbconfig which has been specified by the client
      */

More information about the xorg-commit mailing list