mwxlib 1.4.12__py3-none-any.whl → 1.4.20__py3-none-any.whl

mwx/nutshell.py

@@ -1,9 +1,9 @@
 #! python3
 """mwxlib Nautilus in the shell.
 """
+from contextlib import contextmanager
 from functools import wraps
 from importlib import import_module
-from contextlib import contextmanager
 from pathlib import Path
 from pprint import pformat
 from bdb import BdbQuit
@@ -61,6 +61,7 @@ class Stylus:
         stc.STC_STYLE_BRACELIGHT  : "fore:#000000,back:#ffffb8,bold",
         stc.STC_STYLE_BRACEBAD    : "fore:#000000,back:#ff0000,bold",
         stc.STC_STYLE_CONTROLCHAR : "size:6",
+        stc.STC_STYLE_INDENTGUIDE : "",
         stc.STC_STYLE_CARETLINE   : "fore:#000000,back:#ffff7f,size:2", # optional
         stc.STC_STYLE_ANNOTATION  : "fore:#7f0000,back:#ff7f7f", # optional
         stc.STC_P_DEFAULT         : "fore:#000000",
@@ -69,11 +70,11 @@ class Stylus:
         stc.STC_P_COMMENTLINE     : "fore:#007f7f,back:#ffcfcf",
         stc.STC_P_COMMENTBLOCK    : "fore:#007f7f,back:#ffcfcf,eol",
         stc.STC_P_NUMBER          : "fore:#7f0000",
-        stc.STC_P_STRINGEOL       : "fore:#000000,back:#ffcfcf",
         stc.STC_P_CHARACTER       : "fore:#7f7f7f",
         stc.STC_P_STRING          : "fore:#7f7f7f",
         stc.STC_P_TRIPLE          : "fore:#7f7f7f",
         stc.STC_P_TRIPLEDOUBLE    : "fore:#7f7f7f",
+        stc.STC_P_STRINGEOL       : "fore:#000000,back:#ffcfcf,eol",
         stc.STC_P_CLASSNAME       : "fore:#7f00ff,bold",
         stc.STC_P_DEFNAME         : "fore:#0000ff,bold",
         stc.STC_P_WORD            : "fore:#0000ff",
@@ -87,6 +88,7 @@ class Stylus:
         stc.STC_STYLE_BRACELIGHT  : "fore:#000000,back:#cccccc,bold",
         stc.STC_STYLE_BRACEBAD    : "fore:#000000,back:#ff0000,bold",
         stc.STC_STYLE_CONTROLCHAR : "size:6",
+        stc.STC_STYLE_INDENTGUIDE : "",
         stc.STC_STYLE_CARETLINE   : "fore:#000000,back:#f0f0ff,size:2", # optional
         stc.STC_STYLE_ANNOTATION  : "fore:#7f0000,back:#ff7f7f", # optional
         stc.STC_P_DEFAULT         : "fore:#000000",
@@ -95,11 +97,11 @@ class Stylus:
         stc.STC_P_COMMENTLINE     : "fore:#007f00,back:#f0fff0",
         stc.STC_P_COMMENTBLOCK    : "fore:#007f00,back:#f0fff0,eol",
         stc.STC_P_NUMBER          : "fore:#e02000",
-        stc.STC_P_STRINGEOL       : "fore:#7f7f7f,back:#ffc0c0,eol",
         stc.STC_P_CHARACTER       : "fore:#7f7f7f",
         stc.STC_P_STRING          : "fore:#7f7f7f",
         stc.STC_P_TRIPLE          : "fore:#7f7f7f",
         stc.STC_P_TRIPLEDOUBLE    : "fore:#7f7f7f",
+        stc.STC_P_STRINGEOL       : "fore:#7f7f7f,back:#ffc0c0,eol",
         stc.STC_P_CLASSNAME       : "fore:#7f00ff,bold",
         stc.STC_P_DEFNAME         : "fore:#0000ff,bold",
         stc.STC_P_WORD            : "fore:#0000ff",
@@ -113,6 +115,7 @@ class Stylus:
         stc.STC_STYLE_BRACELIGHT  : "fore:#ffffff,back:#202020,bold",
         stc.STC_STYLE_BRACEBAD    : "fore:#ffffff,back:#ff0000,bold",
         stc.STC_STYLE_CONTROLCHAR : "size:6",
+        stc.STC_STYLE_INDENTGUIDE : "",
         stc.STC_STYLE_CARETLINE   : "fore:#ffffff,back:#123460,size:2", # optional
         stc.STC_STYLE_ANNOTATION  : "fore:#7f0000,back:#ff7f7f", # optional
         stc.STC_P_DEFAULT         : "fore:#cccccc",
@@ -121,11 +124,11 @@ class Stylus:
         stc.STC_P_COMMENTLINE     : "fore:#42c18c,back:#004040",
         stc.STC_P_COMMENTBLOCK    : "fore:#42c18c,back:#004040,eol",
         stc.STC_P_NUMBER          : "fore:#ffc080",
-        stc.STC_P_STRINGEOL       : "fore:#cccccc,back:#004040,eol",
         stc.STC_P_CHARACTER       : "fore:#a0a0a0",
-        stc.STC_P_STRING          : "fore:#a0a0a0",
-        stc.STC_P_TRIPLE          : "fore:#a0a0a0,back:#004040",
-        stc.STC_P_TRIPLEDOUBLE    : "fore:#a0a0a0,back:#004040",
+        stc.STC_P_STRING          : "fore:#a0c0ff",
+        stc.STC_P_TRIPLE          : "fore:#a0a0a0",
+        stc.STC_P_TRIPLEDOUBLE    : "fore:#a0c0ff",
+        stc.STC_P_STRINGEOL       : "fore:#cccccc,back:#400000,eol",
         stc.STC_P_CLASSNAME       : "fore:#61d6d6,bold",
         stc.STC_P_DEFNAME         : "fore:#3a96ff,bold",
         stc.STC_P_WORD            : "fore:#80c0ff",
@@ -201,7 +204,10 @@ class AutoCompInterfaceMixin:
         super().CallTipShow(pos, tip)
     
     def autoCallTipShow(self, command, insertcalltip=True):
-        """Display argument spec and docstring in a popup window."""
+        """Display argument spec and docstring in a popup window.
+        
+        (override) Fix cursor position on calltip insertion.
+        """
         if self.CallTipActive():
             self.CallTipCancel()
         
@@ -288,9 +294,17 @@ class AutoCompInterfaceMixin:
     
     def _get_words_hint(self):
         cmdl = self.GetTextRange(self.bol, self.cpos)
-        text = next(split_words(cmdl, reverse=1), '')
+        if cmdl.endswith(' '): # 前の文字が空白の場合はスキップする
+            text = ''
+        else:
+            text = next(split_words(cmdl, reverse=1), '')
         return text.rpartition('.') # -> text, sep, hint
     
+    def clear_autocomp(self, evt):
+        if self.AutoCompActive():
+            self.AutoCompCancel()
+        self.message("")
+    
     def call_history_comp(self, evt):
         """Called when history-comp mode."""
         if not self.CanEdit():
@@ -345,8 +359,9 @@ class AutoCompInterfaceMixin:
                         return lh
         
         cmdl = self.GetTextRange(self.bol, self.cpos)
-        hint = re.search(r"[\w.]*$", cmdl).group(0) # extract the last word
+        hint = re.search(r"[\w.]*$", cmdl).group(0) # extract the last word including dots
         try:
+            ## from * import ...
             if (m := re.match(r"from\s+([\w.]+)\s+import\s+(.*)", cmdl)):
                 text, hints = m.groups()
                 if not _continue(hints) and not force:
@@ -366,13 +381,14 @@ class AutoCompInterfaceMixin:
                     q = f"{text}.{hint}".lower()
                     keys = [x[len(text)+1:] for x in self.modules if x.lower().startswith(q)]
                     modules.update(k for k in keys if '.' not in k)
-            
+            ## import ...
             elif (m := re.match(r"(import|from)\s+(.*)", cmdl)):
                 text, hints = m.groups()
                 if not _continue(hints) and not force:
                     self.message("[module]>>> waiting for key input...")
                     return
                 modules = self.modules
+            ## Module X.Y.Z
             else:
                 text, sep, hint = self._get_words_hint()
                 obj = self.eval(text)
@@ -401,11 +417,15 @@ class AutoCompInterfaceMixin:
         if not self.CanEdit():
             self.handler('quit', evt)
             return
+        
+        text, sep, hint = self._get_words_hint()
+        if not text:
+            self.handler('quit', evt)
+            self.message("- No autocompletion candidates or hints found.")
+            return
         try:
-            text, sep, hint = self._get_words_hint()
-            obj = self.eval(text)
             ## dir = introspect.getAttributeNames @TODO in wx ver 4.2.3
-            
+            obj = self.eval(text)
             P = re.compile(hint)
             p = re.compile(hint, re.I)
             words = sorted([x for x in dir(obj) if p.match(x)], key=lambda s:s.upper())
@@ -429,11 +449,15 @@ class AutoCompInterfaceMixin:
         if not self.CanEdit():
             self.handler('quit', evt)
             return
+        
+        text, sep, hint = self._get_words_hint()
+        if not text:
+            self.handler('quit', evt)
+            self.message("- No autocompletion candidates or hints found.")
+            return
         try:
-            text, sep, hint = self._get_words_hint()
-            obj = self.eval(text)
             ## dir = introspect.getAttributeNames @TODO in wx ver 4.2.3.
-            
+            obj = self.eval(text)
             P = re.compile(hint)
             p = re.compile(hint, re.I)
             words = sorted([x for x in dir(obj) if p.search(x)], key=lambda s:s.upper())
@@ -559,7 +583,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         self.SetKeyWords(1, ' '.join(builtins.__dict__)
                           + ' '.join(_dunders(type, int, float, str, bytes,
                                               tuple, list, range, operator,))
-                          + ' self this')
+                          + ' self this shell')
         
         ## AutoComp setting
         self.AutoCompSetAutoHide(False)
@@ -578,16 +602,16 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         ## Global style for all languages
         ## font = wx.Font(9, wx.MODERN, wx.NORMAL, wx.NORMAL, False, "MS Gothic")
         ## self.StyleSetFont(stc.STC_STYLE_DEFAULT, font)
-        
         ## self.StyleClearAll()
-        ## self.SetSelForeground(True, wx.SystemSettings.GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT))
-        ## self.SetSelBackground(True, wx.SystemSettings.GetColour(wx.SYS_COLOUR_HIGHLIGHT))
+        ## => STC_STYLE_DEFAULT に設定したスタイルを他のスタイルに全適用する
         
         ## The magin style for line numbers and symbols
         ## [0] for markers, 10 pixels wide, mask 0b11111
         ## [1] for numbers, 32 pixels wide, mask 0x01ffffff (~stc.STC_MASK_FOLDERS)
         ## [2] for borders,  1 pixels wide, mask 0xfe000000 ( stc.STC_MASK_FOLDERS)
-        
+        ## 
+        ## cf. `EditWindow.setDisplayLineNumbers`
+        ## 
         ## 32 bit margin mask
         ## [0] 1111,1111,1111,1111,1111,1111,1111,1111 = -1 for all markers
         ## [1] 0000,0001,1111,1111,1111,1111,1111,1111 = 0x01ffffff for markers
@@ -610,7 +634,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         
         self.SetMarginLeft(2) # +1 margin at the left
         
-        self.SetFoldFlags(0x10) # draw below if not expanded
+        self.SetFoldFlags(stc.STC_FOLDFLAG_LINEAFTER_CONTRACTED)
         
         self.SetProperty('fold', '1') # Enable folder property
         
@@ -724,7 +748,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     
     def add_marker(self, line, n):
         if self.MarkerAdd(line, n):
-            self.EnsureVisible(line) # expand if folded
+            self.EnsureVisible(line)  # expand if folded
             self.handler('{}_set'.format(self.marker_names[n]), line)
     
     def del_marker(self, n):
@@ -736,7 +760,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     def goto_marker(self, markerMask, selection=False):
         line = self.MarkerNext(0, markerMask)
         if line != -1:
-            self.EnsureVisible(line) # expand if folded
+            self.EnsureVisible(line)  # expand if folded
             self.goto_line(line, selection)
             self.recenter()
     
@@ -867,7 +891,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         return sty
     
     def get_char(self, pos):
-        """Returns the character at the given position."""
+        """Return the character at the given position."""
         return chr(self.GetCharAt(pos))
     
     def get_text(self, start, end):
@@ -1018,7 +1042,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     
     @classmethod
     def py_calc_indentation(self, text):
-        """Returns indent spaces for the command text."""
+        """Return indent spaces for the command text."""
         text = self.py_strip_comments(text)
         lstr, indent = self.py_strip_indents(text)
         text = text.rstrip()
@@ -1032,7 +1056,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     
     @classmethod
     def py_strip_indents(self, text):
-        """Returns left-stripped text and the number of indent spaces."""
+        """Return left-stripped text and the number of indent spaces."""
         text = self.py_strip_prompts(text) # cf. shell.lstripPrompt(text)
         lstr = text.lstrip(' \t')
         indent = len(text) - len(lstr)
@@ -1040,7 +1064,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     
     @classmethod
     def py_strip_prompts(self, text):
-        """Returns text without a leading prompt."""
+        """Return text without a leading prompt."""
         for ps in (sys.ps1, sys.ps2, sys.ps3):
             if text.startswith(ps):
                 text = text[len(ps):]
@@ -1049,7 +1073,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     
     @classmethod
     def py_strip_comments(self, text):
-        """Returns text without comments."""
+        """Return text without comments."""
         return ''.join(split_tokens(text, comment=False))
     
     ## --------------------------------
@@ -1181,6 +1205,9 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
             self.StyleSetSpec(stc.STC_STYLE_DEFAULT, default)
             self.StyleClearAll()
         
+        self.SetSelForeground(True, wx.SystemSettings.GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT))
+        self.SetSelBackground(True, wx.SystemSettings.GetColour(wx.SYS_COLOUR_HIGHLIGHT))
+        
         ## Add style to the folding margin
         item = _map(spec.get(stc.STC_STYLE_LINENUMBER, ''))
         if item:
@@ -1198,10 +1225,12 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
                 self.SetFoldMarginColour(True, item.get('fore'))
                 self.SetFoldMarginHiColour(True, item.get('fore'))
         
+        self.SetCaretLineVisible(0)
+        self.SetCaretForeground(_map(default).get('fore'))
+        
         ## Custom style for caret and line colour
         item = _map(spec.pop(stc.STC_STYLE_CARETLINE, ''))
         if item:
-            self.SetCaretLineVisible(0)
             if 'fore' in item:
                 self.SetCaretForeground(item['fore'])
             if 'back' in item:
@@ -1293,6 +1322,48 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         if not hl + offset < vl < hl + n - 1 - offset:
             self.ScrollToLine(vl - n//2)
     
+    def DoFindNext(self, findData, findDlg=None):
+        """Find the search text defined in `findData`.
+        
+        If found, selects the matched text and scrolls to its line.
+        Typically called from `wx.EVT_FIND` event handlers.
+        
+        (override) Enables the whole word search.
+                   Returns True if a match is found, False otherwise.
+        """
+        flags = 0
+        if findData.Flags & wx.FR_MATCHCASE: flags |= wx.stc.STC_FIND_MATCHCASE
+        if findData.Flags & wx.FR_WHOLEWORD: flags |= wx.stc.STC_FIND_WHOLEWORD
+        self.SetSearchFlags(flags)
+        
+        backward = not (findData.Flags & wx.FR_DOWN)
+        findstring = findData.FindString
+        if backward:
+            self.TargetStart = self.anchor  # backward anchor
+            self.TargetEnd = 0
+        else:
+            self.TargetStart = self.cpos  # forward anchor
+            self.TargetEnd = self.TextLength
+        loc = self.SearchInTarget(findstring)
+        
+        ## If it wasn't found then restart at beginning.
+        if loc == -1:
+            self.TargetStart = self.TextLength if backward else 0
+            loc = self.SearchInTarget(findstring)
+        
+        ## Was it still not found?
+        if loc == -1:
+            wx.MessageBox("Unable to find the search text.",
+                          "Not found!", wx.OK|wx.ICON_INFORMATION)
+            if findDlg:
+                wx.CallAfter(findDlg.SetFocus)
+            return False
+        
+        self.SetSelection(loc, loc + len(findstring))
+        self.EnsureVisible(self.cline)  # expand if folded
+        self.EnsureCaretVisible()
+        return True
+    
     ## --------------------------------
     ## Search functions
     ## --------------------------------
@@ -1407,17 +1478,22 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         if not text:
             self.message("No words")
             return
-        lw = len(text.encode()) # for multi-byte string
+        wholeword = (not self.SelectedText)  # Enable or disable whole word search.
+        lw = len(text.encode())
         lines = []
-        for p in self.search_text(text, mode=(not self.SelectedText)):
+        for p in self.search_text(text, wholeword):
             lines.append(self.LineFromPosition(p))
             for i in (10, 11,):
                 self.SetIndicatorCurrent(i)
                 self.IndicatorFillRange(p, lw)
-        self.__itextlines = sorted(set(lines)) # keep order, no duplication
+        self.__itextlines = sorted(set(lines))  # keep order, no duplication
         self.message("{}: {} found".format(text, len(lines)))
         try:
             self.TopLevelParent.findData.FindString = text
+            if wholeword:
+                self.TopLevelParent.findData.Flags |= wx.FR_WHOLEWORD
+            else:
+                self.TopLevelParent.findData.Flags &= ~wx.FR_WHOLEWORD
         except AttributeError:
             pass
     
@@ -1453,7 +1529,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
             evt.Skip()
             return
         line = self.__itextlines[i]
-        self.EnsureVisible(line) # expand if folded
+        self.EnsureVisible(line)  # expand if folded
         self.goto_line(line)
         self.recenter()
         self.on_itext_exit(evt)
@@ -1685,8 +1761,12 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     @editable
     def kill_line(self):
         if not self.SelectedText:
-            if self.cpos == self.eol:
-                self.WordRightEndExtend() # Select cr/lf
+            p = self.cpos
+            if p == self.eol:
+                ## self.WordRightEndExtend()  # Select cr/lf chunks
+                if self.get_char(p) == '\r': p += 1
+                if self.get_char(p) == '\n': p += 1
+                self.cpos = p
             else:
                 self.cpos = self.eol
         self.ReplaceSelection('')
@@ -1694,8 +1774,12 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     @editable
     def backward_kill_line(self):
         if not self.SelectedText:
-            if self.cpos == self.bol:
-                self.WordLeftExtend() # Select cr/lf
+            p = self.cpos
+            if p == self.bol:
+                ## self.WordLeftExtend()  # Select cr/lf chunks
+                if self.get_char(p-1) == '\n': p -= 1
+                if self.get_char(p-1) == '\r': p -= 1
+                self.cpos = p
             else:
                 self.cpos = self.bol
         self.ReplaceSelection('')
@@ -1783,14 +1867,14 @@ class Buffer(EditorInterface, EditWindow):
     
     @property
     def need_buffer_save(self):
-        """Returns whether the buffer should be saved.
+        """Return whether the buffer should be saved.
         The file has been modified internally.
         """
         return self.mtdelta is not None and self.IsModified()
     
     @property
     def need_buffer_load(self):
-        """Returns whether the buffer should be loaded.
+        """Return whether the buffer should be loaded.
         The file has been modified externally.
         """
         return self.mtdelta is not None and self.mtdelta > 0
@@ -1854,11 +1938,6 @@ class Buffer(EditorInterface, EditWindow):
                     self.ReplaceSelection('')
             self.message("")
         
-        def clear_autocomp(evt):
-            if self.AutoCompActive():
-                self.AutoCompCancel()
-            self.message("")
-        
         def fork(evt):
             self.handler.fork(self.handler.current_event, evt)
         
@@ -1898,8 +1977,8 @@ class Buffer(EditorInterface, EditWindow):
                   'M-/ pressed' : (3, self.call_apropos_autocomp),
             },
             2 : { # word auto completion AS-mode
-                         'quit' : (0, clear_autocomp),
-                    '* pressed' : (0, clear_autocomp, fork),
+                         'quit' : (0, self.clear_autocomp),
+                    '* pressed' : (0, self.clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
                'escape pressed' : (0, clear, skip),
@@ -1917,7 +1996,7 @@ class Buffer(EditorInterface, EditWindow):
               '*delete pressed' : (2, skip),
            '*backspace pressed' : (2, skip),
           '*backspace released' : (2, self.call_word_autocomp),
-         '*S-backspace pressed' : (0, clear_autocomp, fork),
+         '*S-backspace pressed' : (0, self.clear_autocomp, fork),
                  '*alt pressed' : (2, ),
                 '*ctrl pressed' : (2, ),
                '*shift pressed' : (2, ),
@@ -1925,8 +2004,8 @@ class Buffer(EditorInterface, EditWindow):
              '*f[0-9]* pressed' : (2, ),
             },
             3 : { # apropos auto completion AS-mode
-                         'quit' : (0, clear_autocomp),
-                    '* pressed' : (0, clear_autocomp, fork),
+                         'quit' : (0, self.clear_autocomp),
+                    '* pressed' : (0, self.clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
                'escape pressed' : (0, clear, skip),
@@ -1944,7 +2023,7 @@ class Buffer(EditorInterface, EditWindow):
               '*delete pressed' : (3, skip),
            '*backspace pressed' : (3, skip),
           '*backspace released' : (3, self.call_apropos_autocomp),
-         '*S-backspace pressed' : (0, clear_autocomp, fork),
+         '*S-backspace pressed' : (0, self.clear_autocomp, fork),
                  '*alt pressed' : (3, ),
                 '*ctrl pressed' : (3, ),
                '*shift pressed' : (3, ),
@@ -2017,6 +2096,9 @@ class Buffer(EditorInterface, EditWindow):
         evt.Skip()
     
     def OnEnterDot(self, evt):
+        if not self.CanEdit():
+            self.handler('quit', evt)
+            return
         p = self.cpos
         lst = self.get_style(p-1)
         rst = self.get_style(p)
@@ -2116,6 +2198,7 @@ class Buffer(EditorInterface, EditWindow):
                         sender=self, command=None, more=False)
     
     def eval_line(self):
+        """Evaluate the selected word or line and show calltips."""
         if self.CallTipActive():
             self.CallTipCancel()
         
@@ -2140,6 +2223,7 @@ class Buffer(EditorInterface, EditWindow):
             self.message("No words")
     
     def exec_region(self):
+        """Execute a region of code."""
         try:
             code = compile(self.Text, self.filename, "exec")
             exec(code, self.globals, self.locals)
@@ -2156,7 +2240,7 @@ class Buffer(EditorInterface, EditWindow):
                 lx = lines[-1] - 1
                 self.red_arrow = lx
                 self.goto_line(lx)
-                self.EnsureVisible(lx) # expand if folded
+                self.EnsureVisible(lx)  # expand if folded
                 self.EnsureCaretVisible()
                 self.AnnotationSetStyle(lx, stc.STC_STYLE_ANNOTATION)
                 self.AnnotationSetText(lx, msg)
@@ -2329,7 +2413,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
     
     @property
     def buffer(self):
-        """Returns the currently selected page or None."""
+        """Return the currently selected page or None."""
         return self.CurrentPage
     
     def find_buffer(self, fn):
@@ -2484,7 +2568,7 @@ class EditorBook(AuiNotebook, CtrlInterface):
                     return all([self.find_file(fn) for fn in dlg.Paths])
             return None
         retval = self.load_file(filename)
-        if retval == False: # noqa: not None
+        if retval == False:  # noqa # to check if not None
             buf = self.create_buffer(filename)
             self.swap_buffer(buf)
             self.post_message("New file.")
@@ -2807,11 +2891,6 @@ class Nautilus(EditorInterface, Shell):
                     self.ReplaceSelection('')
             self.message("")
         
-        def clear_autocomp(evt):
-            if self.AutoCompActive():
-                self.AutoCompCancel()
-            self.message("")
-        
         def fork(evt):
             self.handler.fork(self.handler.current_event, evt)
         
@@ -2867,10 +2946,10 @@ class Nautilus(EditorInterface, Shell):
                   'M-j pressed' : (0, _F(self.exec_region)),
                   'C-h pressed' : (0, self.call_helpTip),
                   'M-h pressed' : (0, self.call_helpDoc),
-                    '. pressed' : (2, self.OnEnterDot),
                   'tab pressed' : (1, self.call_history_comp),
                   'M-p pressed' : (1, self.call_history_comp),
                   'M-n pressed' : (1, self.call_history_comp),
+                    '. pressed' : (2, self.OnEnterDot),
                   'C-. pressed' : (2, self.call_word_autocomp),
                   'C-/ pressed' : (3, self.call_apropos_autocomp),
                   'C-, pressed' : (4, self.call_text_autocomp),
@@ -2906,8 +2985,8 @@ class Nautilus(EditorInterface, Shell):
              '*f[0-9]* pressed' : (1, ),
             },
             2 : { # word auto completion AS-mode
-                         'quit' : (0, clear_autocomp),
-                    '* pressed' : (0, clear_autocomp, fork),
+                         'quit' : (0, self.clear_autocomp),
+                    '* pressed' : (0, self.clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
                'escape pressed' : (0, clear, skip),
@@ -2925,7 +3004,7 @@ class Nautilus(EditorInterface, Shell):
               '*delete pressed' : (2, skip),
            '*backspace pressed' : (2, self.OnBackspace),
           '*backspace released' : (2, self.call_word_autocomp),
-         '*S-backspace pressed' : (0, clear_autocomp, fork),
+         '*S-backspace pressed' : (0, self.clear_autocomp, fork),
                   'C-j pressed' : (2, _F(self.eval_line)),
                  '*alt pressed' : (2, ),
                 '*ctrl pressed' : (2, ),
@@ -2934,8 +3013,8 @@ class Nautilus(EditorInterface, Shell):
              '*f[0-9]* pressed' : (2, ),
             },
             3 : { # apropos auto completion AS-mode
-                         'quit' : (0, clear_autocomp),
-                    '* pressed' : (0, clear_autocomp, fork),
+                         'quit' : (0, self.clear_autocomp),
+                    '* pressed' : (0, self.clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
                'escape pressed' : (0, clear, skip),
@@ -2953,7 +3032,7 @@ class Nautilus(EditorInterface, Shell):
               '*delete pressed' : (3, skip),
            '*backspace pressed' : (3, self.OnBackspace),
           '*backspace released' : (3, self.call_apropos_autocomp),
-         '*S-backspace pressed' : (0, clear_autocomp, fork),
+         '*S-backspace pressed' : (0, self.clear_autocomp, fork),
                   'C-j pressed' : (3, _F(self.eval_line)),
                  '*alt pressed' : (3, ),
                 '*ctrl pressed' : (3, ),
@@ -2962,8 +3041,8 @@ class Nautilus(EditorInterface, Shell):
              '*f[0-9]* pressed' : (3, ),
             },
             4 : { # text auto completion AS-mode
-                         'quit' : (0, clear_autocomp),
-                    '* pressed' : (0, clear_autocomp, fork),
+                         'quit' : (0, self.clear_autocomp),
+                    '* pressed' : (0, self.clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
                'escape pressed' : (0, clear, skip),
@@ -2981,7 +3060,7 @@ class Nautilus(EditorInterface, Shell):
               '*delete pressed' : (4, skip),
            '*backspace pressed' : (4, self.OnBackspace),
           '*backspace released' : (4, self.call_text_autocomp),
-         '*S-backspace pressed' : (0, clear_autocomp, fork),
+         '*S-backspace pressed' : (0, self.clear_autocomp, fork),
                   'C-j pressed' : (4, _F(self.eval_line)),
                  '*alt pressed' : (4, ),
                 '*ctrl pressed' : (4, ),
@@ -2990,8 +3069,8 @@ class Nautilus(EditorInterface, Shell):
              '*f[0-9]* pressed' : (4, ),
             },
             5 : { # module auto completion AS-mode
-                         'quit' : (0, clear_autocomp),
-                    '* pressed' : (0, clear_autocomp, fork),
+                         'quit' : (0, self.clear_autocomp),
+                    '* pressed' : (0, self.clear_autocomp, fork),
                   'tab pressed' : (0, clear, skip),
                 'enter pressed' : (0, clear, skip),
                'escape pressed' : (0, clear, skip),
@@ -3006,11 +3085,12 @@ class Nautilus(EditorInterface, Shell):
             'S-[a-z\\] pressed' : (5, skip),
            'S-[a-z\\] released' : (5, self.call_module_autocomp),
                   '\\ released' : (5, self.call_module_autocomp),
+                  'C-m pressed' : (5, _F(self.call_module_autocomp, force=1)),
                   'M-m pressed' : (5, _F(self.call_module_autocomp, force=1)),
               '*delete pressed' : (5, skip),
            '*backspace pressed' : (5, self.OnBackspace),
           '*backspace released' : (5, self.call_module_autocomp),
-         '*S-backspace pressed' : (0, clear_autocomp, fork),
+         '*S-backspace pressed' : (0, self.clear_autocomp, fork),
                  '*alt pressed' : (5, ),
                 '*ctrl pressed' : (5, ),
                '*shift pressed' : (5, ),
@@ -3077,39 +3157,41 @@ class Nautilus(EditorInterface, Shell):
         Backspace-guard from autocomp eating over a prompt whitespace.
         """
         if self.cpos == self.bolc:
-            self.handler('quit', evt) # don't eat backward prompt
+            self.handler('quit', evt) # Don't eat backward prompt
             return
         evt.Skip()
     
     @editable
-    def backward_kill_word(self): # (override)
+    def backward_kill_word(self):  # (override)
         if not self.SelectedText:
+            if self.cpos <= self.bolc:
+                return
             text, lp = self.CurLine
             if text[:lp] == sys.ps2:
-                self.cpos -= lp       # Select ps2:prompt
-                self.WordLeftExtend() # Select cr/lf
+                self.cpos -= lp        # Select ps2:prompt
+                self.WordLeftExtend()  # Select cr/lf chunks
             else:
-                q = max(self.bol, self.bolc) # for debugger mode: bol <= bolc
                 self.WordLeftExtend()
+                q = max(self.bol, self.bolc)  # for debugger mode: bol <= bolc
                 if self.cpos < q:
-                    self.cpos = q # Don't skip back prompt
+                    self.cpos = q  # Don't skip back ps2:prompt
         self.ReplaceSelection('')
     
     @editable
-    def backward_kill_line(self): # (override)
+    def backward_kill_line(self):  # (override)
         if not self.SelectedText:
+            if self.cpos <= self.bolc:
+                return
             text, lp = self.CurLine
             if text[:lp] == sys.ps2:
-                self.cpos -= lp       # Select ps2:prompt
-                self.WordLeftExtend() # Select cr/lf
+                self.cpos -= lp        # Select ps2:prompt
+                self.WordLeftExtend()  # Select cr/lf chunks
             else: 
                 q = max(self.bol, self.bolc) # for debugger mode: bol <= bolc
-                if self.cpos <= self.bolc:
-                    return
-                elif self.cpos > q:
+                if self.cpos > q:
                     self.cpos = q
                 else:
-                    self.WordLeftExtend() # Select cr/lf
+                    self.WordLeftExtend()  # Select cr/lf chunks
         self.ReplaceSelection('')
     
     def OnEnter(self, evt):
@@ -3626,7 +3708,7 @@ class Nautilus(EditorInterface, Shell):
     ## --------------------------------
     
     def eval_line(self):
-        """Evaluate the selected word or line."""
+        """Evaluate the selected word or line and show calltips."""
         if self.CallTipActive():
             self.CallTipCancel()
         
@@ -3654,7 +3736,7 @@ class Nautilus(EditorInterface, Shell):
             self.message("No words")
     
     def exec_region(self):
-        """Execute the the selected region."""
+        """Execute a region of code."""
         if self.CallTipActive():
             self.CallTipCancel()