mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-27 10:54:40 +00:00
(dired-permission-flags-regexp): New variable.
(dired-move-to-end-of-filename): Use it instead of a constant.
This commit is contained in:
parent
6aea3b07e8
commit
23e217f6d2
@ -1278,7 +1278,7 @@ Optional arg GLOBAL means to replace all matches."
|
||||
(concat (or dir default-directory) file))
|
||||
|
||||
(defun dired-make-relative (file &optional dir no-error)
|
||||
;;"Convert FILE (an absolute pathname) to a pathname relative to DIR.
|
||||
;;"Convert FILE (an absolute file name) to a name relative to DIR.
|
||||
;; Else error (unless NO-ERROR is non-nil, then FILE is returned unchanged)
|
||||
;;DIR defaults to default-directory."
|
||||
;; DIR must be file-name-as-directory, as with all directory args in
|
||||
@ -1301,6 +1301,10 @@ Optional arg GLOBAL means to replace all matches."
|
||||
[ 0-9][0-9][:0-9][0-9][ 0-9] "
|
||||
"Regular expression to match a month abbreviation followed date/time.")
|
||||
|
||||
(defvar dired-permission-flags-regexp
|
||||
"\\([^ ]\\)[-r][-w]\\([^ ]\\)[-r][-w]\\([^ ]\\)[-r][-w]\\([^ ]\\)"
|
||||
"Regular expression to match the permission flags in `ls -l'.")
|
||||
|
||||
;; Move to first char of filename on this line.
|
||||
;; Returns position (point) or nil if no filename on this line."
|
||||
(defun dired-move-to-filename (&optional raise-error eol)
|
||||
@ -1334,8 +1338,7 @@ Optional arg GLOBAL means to replace all matches."
|
||||
;; "l---------" (some systems make symlinks that way)
|
||||
;; "----------" (plain file with zero perms)
|
||||
(if (re-search-backward
|
||||
"\\([^ ]\\)[-r][-w]\\([^ ]\\)[-r][-w]\\([^ ]\\)[-r][-w]\\([^ ]\\)"
|
||||
nil t)
|
||||
dired-permission-flags-regexp nil t)
|
||||
(setq file-type (char-after (match-beginning 1))
|
||||
symlink (eq file-type ?l)
|
||||
;; Only with -F we need to know whether it's an executable
|
||||
|
Loading…
Reference in New Issue
Block a user