diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
| commit | 4dd1f56f29fc598a8339a345c2f8945250600602 (patch) | |
| tree | af341efedffe027e533b1bcc0dbf270532e48285 /lisp/ls-lisp.el | |
| parent | 4c49ec7f865bdad1629d2f125f71f4e506b258f2 (diff) | |
| parent | 810fa21d26453f898de9747ece7205dfe6de9d08 (diff) | |
| download | emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.gz emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.bz2 emacs-4dd1f56f29fc598a8339a345c2f8945250600602.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/ls-lisp.el')
| -rw-r--r-- | lisp/ls-lisp.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 9041b9ac0f9..82153ff0adb 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -283,6 +283,7 @@ are also supported; unsupported long options are silently ignored." (funcall orig-fun file switches wildcard full-directory-p) ;; We need the directory in order to find the right handler. + (setq switches (or switches "")) (let ((handler (find-file-name-handler (expand-file-name file) 'insert-directory)) (orig-file file) @@ -599,7 +600,7 @@ to a non-nil value." "Return t if versioned string S1 should sort before versioned string S2. Case is significant if `ls-lisp-ignore-case' is nil. -This is the same as string-lessp (with the exception of case +This is the same as `string-lessp' (with the exception of case insensitivity), but sequences of digits are compared numerically, as a whole, in the same manner as the `strverscmp' function available in some standard C libraries does." |