Merge branch 'main' of github.com:lem-project/lem

lem-project · Nov 28, 2023 · 4522650 · 4522650
2 parents eb5d8b1 + 7bef7a8
commit 4522650
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/docs/default-keybindings.md b/docs/default-keybindings.md
@@ -90,15 +90,15 @@
 | Command                                                                                           | Key bindings | Documentation                                                                                                 |
 |---------------------------------------------------------------------------------------------------|--------------|---------------------------------------------------------------------------------------------------------------|
 | [find-file](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L65)              | C-x C-f      | Open the file.                                                                                                |
-| [find-file-recursively](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L207) |              | Open a file, from the list of all files present under the buffer's directory, recursively.                    |
-| [read-file](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L223)             | C-x C-r      | Open the file as a read-only.                                                                                 |
-| [save-current-buffer](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L261)   | C-x C-s      | Saves the current buffer text to a file                                                                       |
-| [write-file](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L267)            | C-x C-w      | Saves the text in the current buffer to the specified file                                                    |
-| [write-region-file](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L288)     |              | Saves the region of text to the specified file                                                                |
-| [insert-file](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L296)           | C-x Tab      | Inserts the contents of the file into the current buffer.                                                     |
-| [save-some-buffers](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L302)     | C-x s        | Save some files in the open buffer.                                                                           |
-| [revert-buffer](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L334)         |              | Restores the buffer. Normally this command will cause the contents of the file to be reflected in the buffer. |
-| [change-directory](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L367)      |              |                                                                                                               |
+| [find-file-recursively](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L208) |              | Open a file, from the list of all files present under the buffer's directory, recursively.                    |
+| [read-file](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L224)             | C-x C-r      | Open the file as a read-only.                                                                                 |
+| [save-current-buffer](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L262)   | C-x C-s      | Saves the current buffer text to a file                                                                       |
+| [write-file](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L268)            | C-x C-w      | Saves the text in the current buffer to the specified file                                                    |
+| [write-region-file](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L289)     |              | Saves the region of text to the specified file                                                                |
+| [insert-file](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L297)           | C-x Tab      | Inserts the contents of the file into the current buffer.                                                     |
+| [save-some-buffers](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L303)     | C-x s        | Save some files in the open buffer.                                                                           |
+| [revert-buffer](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L335)         |              | Restores the buffer. Normally this command will cause the contents of the file to be reflected in the buffer. |
+| [change-directory](https://github.com/lem-project/lem/blob/main/src/commands/file.lisp#L368)      |              |                                                                                                               |
 
 ## Project
 | Command                                                                                               | Key bindings | Documentation                                                                                                                                                                                                            |

diff --git a/src/commands/file.lisp b/src/commands/file.lisp
@@ -82,7 +82,8 @@
                     :directory (buffer-directory)
                     :default nil
                     :existing nil))
-                  ((pathnamep arg)
+                  ((or (pathnamep arg)
+                       (uiop:absolute-pathname-p arg))
                    (namestring arg)))))
       (let (buffer)
         (dolist (pathname (expand-files* filename))

diff --git a/src/prompt.lisp b/src/prompt.lisp
@@ -120,7 +120,7 @@
                               directory :directory-only t)))
                  :test-function (and existing #'virtual-probe-file)
                  :history-symbol 'prompt-for-directory
-                 (alexandria:remove-from-plist args :directory default existing))))
+                 (alexandria:remove-from-plist args :directory :default :existing))))
     (if (string= result "")
         default
         result)))