procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(insert-directory): Don't treat FILE as a wildcard if FILE exists as

Browse source 
a directory.
This commit is contained in:
Eli Zaretskii 2007-06-23 09:52:06 +00:00
parent 247eedf8e9
commit 9b40e204ec
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2007-06-23 Eli Zaretskii <eliz@gnu.org>
* ls-lisp.el (insert-directory): Don't treat FILE as a wildcard if
FILE exists as a directory.
2007-06-21 Reto Zimmermann <reto@gnu.org> 2007-06-21 Reto Zimmermann <reto@gnu.org>
* vera-mode.el (vera-mode): Fix `commend-end-skip' setting. * vera-mode.el (vera-mode): Fix `commend-end-skip' setting.

5
lisp/ls-lisp.el
View file

@ -229,7 +229,10 @@ that work are: A a c i r S s t u U X g G B C R and F partly."
;; `ls' don't mind, we certainly do, because it makes us think ;; `ls' don't mind, we certainly do, because it makes us think
;; there is no wildcard, only a directory name. ;; there is no wildcard, only a directory name.
(if (and ls-lisp-support-shell-wildcards (if (and ls-lisp-support-shell-wildcards
(string-match "[[?*]" file)) (string-match "[[?*]" file)
;; Prefer an existing directory to wildcards, like
;; dired-noselect does.
(not (file-directory-p file)))
(progn (progn
(or (not (eq (aref file (1- (length file))) ?/)) (or (not (eq (aref file (1- (length file))) ?/))
(setq file (substring file 0 (1- (length file))))) (setq file (substring file 0 (1- (length file)))))