patch 8.1.2324: with of scrollbar in popup menu not taken into account

Problem:    With of scrollbar in popup menu not taken into account.
Solution:   Add the width of the scrollbar.
diff --git a/src/popupmenu.c b/src/popupmenu.c
index 55845cf..10d367a 100644
--- a/src/popupmenu.c
+++ b/src/popupmenu.c
@@ -628,7 +628,7 @@
     void
 pum_position_info_popup(win_T *wp)
 {
-    int col = pum_col + pum_width + 1;
+    int col = pum_col + pum_width + pum_scrollbar + 1;
     int row = pum_row;
     int botpos = POPPOS_BOTLEFT;
 
@@ -745,7 +745,7 @@
 #if defined(FEAT_QUICKFIX)
 	/*
 	 * Show extra info in the preview window if there is something and
-	 * 'completeopt' contains "preview" or "popup".
+	 * 'completeopt' contains "preview" or "popup" or "popuphidden".
 	 * Skip this when tried twice already.
 	 * Skip this also when there is not much room.
 	 * NOTE: Be very careful not to sync undo!