--- a/src/eric7/ViewManager/ViewManager.py Mon Dec 04 10:33:58 2023 +0100 +++ b/src/eric7/ViewManager/ViewManager.py Mon Dec 04 15:21:07 2023 +0100 @@ -6503,7 +6503,7 @@ """ Private method to handle the toggle comment action. """ - self.activeWindow().toggleCommentBlock() + self.activeWindow().toggleComment() def __editComment(self): """ @@ -7476,13 +7476,21 @@ lex = editor.getLexer() if lex is not None: - self.commentAct.setEnabled(lex.canBlockComment()) - self.uncommentAct.setEnabled(lex.canBlockComment()) + self.commentAct.setEnabled( + lex.canBlockComment() or lex.canStreamComment() + ) + self.uncommentAct.setEnabled( + lex.canBlockComment() or lex.canStreamComment() + ) + self.toggleCommentAct.setEnabled( + lex.canBlockComment() or lex.canStreamComment() + ) self.streamCommentAct.setEnabled(lex.canStreamComment()) self.boxCommentAct.setEnabled(lex.canBoxComment()) else: self.commentAct.setEnabled(False) self.uncommentAct.setEnabled(False) + self.toggleCommentAct.setEnabled(False) self.streamCommentAct.setEnabled(False) self.boxCommentAct.setEnabled(False)