Anonymous avatar Anonymous committed 23af4a9

lisputils: using fboundp test for read-directory-name

Comments (0)

Files changed (1)

ropemacs/lisputils.py

         values = [[value, value] for value in values]
     if exact and default is not None:
         prompt = prompt + ('[%s] ' % default)
-    result = lisp["ropemacs-completing-read-function"].value()(prompt, values,
-                                                               None, exact, starting)
+    reader = lisp['ropemacs-completing-read-function'].value()
+    result = reader(prompt, values, None, exact, starting)
     if result == '' and exact:
         return default
     return result
 def ask_directory(prompt, default=None, starting=None):
     if default is not None:
         prompt = prompt + ('[%s] ' % default)
-    if _emacs_version() < 22:
+    if lisp.fboundp(lisp['read-directory-name']):
+        result = lisp.read_directory_name(prompt, starting, default)
+    else:
         result = lisp.read_file_name(prompt, starting, default)
-    else:
-        result = lisp.read_directory_name(prompt, starting, default)
     if result == '' and default is not None:
         return default
     return result
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.