Anonymous avatar Anonymous committed 35ac98c

using starting as the default in ask_directory

The problem is `read-directory-name' returns default when the user
enters starting; that can be confusing.

Comments (0)

Files changed (1)

ropemacs/__init__.py

         return self.ask_values(prompt, values, starting=starting, exact=None)
 
     def ask_directory(self, prompt, default=None, starting=None):
-        if default is not None:
-            prompt = prompt + ('[%s] ' % default)
+        location = starting or default
+        if location is not None:
+            prompt = prompt + ('[%s] ' % location)
         if lisp.fboundp(lisp['read-directory-name']):
-            result = lisp.read_directory_name(prompt, starting, default)
+            # returns default when starting is entered
+            result = lisp.read_directory_name(prompt, location, location)
         else:
-            result = lisp.read_file_name(prompt, starting, default)
-        if result == '' and default is not None:
-            return default
+            result = lisp.read_file_name(prompt, location, location)
+        if result == '' and location is not None:
+            return location
         return result
 
     def message(self, message):
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.