Do not execute pending command when directory changes (#417)

* Do not execute pending command when directory changes

* nemo-terminal: do not restore old command after changing directory if input is empty

Co-authored-by: Vinícius <[email protected]>

Author: viniciusbm

nemo-terminal/src/nemo_terminal.py

@@ -252,7 +252,7 @@ def change_directory(self, uri):
 
             # Restore user input
             restorelinekeys = settings.get_string("terminal-restore-line")
-            self.feed_child(restorelinekeys.encode().decode("unicode_escape") + "\n")
+            self.feed_child(restorelinekeys.encode().decode("unicode_escape"))
             #self.feed_child(restorelinekeys + "\n")
 
     def get_widget(self):

nemo-terminal/src/org.nemo.extensions.nemo-terminal.gschema.xml

@@ -59,19 +59,19 @@
 	    </key>
 
 	    <key name="terminal-erase-line" type="s">
-           <default>"\\x05\\x15"</default>
+           <default>" \\x05\\x15"</default>
            <summary>Erase line key sequence</summary>
            <description>Key sequence to safely erase the current line in the terminal. Should be escaped according to Python rules. Use \xhh for non-printing characters, where hh is the hex value (including any leading zeroes) of the ASCII character. Default values are valid for Bash.</description>
         </key>
 
         <key name="terminal-restore-line" type="s">
-           <default>"\\x19"</default>
+           <default>"\\x19\\x08"</default>
            <summary>Restore line key sequence</summary>
            <description>Key sequence to restore the line erased by the erase line sequence. Use \xhh for non-printing characters, where hh is the hex value (including any leading zeroes) of the ASCII character. Default values are valid for Bash.</description>
         </key>
 
         <key name="terminal-change-directory-command" type="s">
-           <default>" cd %s &amp;&amp; tput cuu1 &amp;&amp; tput el"</default>
+           <default>" cd %s &amp;&amp; tput cuu1 &amp;&amp; tput el &amp;&amp; tput cuu1"</default>
            <summary>Change directory command</summary>
            <description>The command used by the terminal to change directory. %s is replaced by the shell-quoted directory name in the shell. This command will have a new line appended.</description>
         </key>