--- lbbs/src/editor.c	2025/11/09 11:18:07	1.57
+++ lbbs/src/editor.c	2025/11/11 00:28:05	1.60
@@ -6,6 +6,10 @@
  * Copyright (C) 2004-2025  Leaflet <leaflet@leafok.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "bbs.h"
 #include "common.h"
 #include "editor.h"
@@ -679,6 +683,7 @@ int editor_display(EDITOR_DATA *p_editor
 	int i, j;
 	char *p_str;
 	int del_line;
+	int tab_width = 0;
 
 	clrline(output_current_row, SCREEN_ROWS);
 
@@ -717,6 +722,7 @@ int editor_display(EDITOR_DATA *p_editor
 			moveto((int)row_pos, (int)col_pos);
 			iflush();
 
+			tab_width = 0;
 			str_len = 0;
 			ch = igetch_t(BBS_max_user_idle_time);
 			while (!SYS_server_exit)
@@ -732,6 +738,12 @@ int editor_display(EDITOR_DATA *p_editor
 					goto cleanup;
 				}
 
+				if (ch == '\t')
+				{
+					ch = ' ';
+					tab_width = TAB_SIZE - ((int)(col_pos - 1) % TAB_SIZE) - 1;
+				}
+
 				if (ch < 256 && (ch & 0x80)) // head of multi-byte character
 				{
 					str_len = 0;
@@ -850,10 +862,17 @@ int editor_display(EDITOR_DATA *p_editor
 						break;
 					}
 
-					ch = igetch(0);
-					if (ch == KEY_NULL || ch == KEY_TIMEOUT) // Output if no futher input
+					if (ch == ' ' && tab_width > 0)
 					{
-						break;
+						tab_width--;
+					}
+					else
+					{
+						ch = igetch(0);
+						if (ch == KEY_NULL || ch == KEY_TIMEOUT) // Output if no futher input
+						{
+							break;
+						}
 					}
 
 					str_len = 0;