mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(ls-lisp-format): Support inodes that are 2- or 3-member cons cells.

Browse source
This commit is contained in:
Eli Zaretskii 2008-04-05 15:03:42 +00:00
parent 4324095897
commit c902c8a781
2 changed files with 16 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 @@
2008-04-05 Eli Zaretskii <eliz@gnu.org>
* ls-lisp.el (ls-lisp-format): Support inodes that are 2- or
3-member cons cells.
2008-04-05 Chong Yidong <cyd@stupidchicken.com>
* cus-face.el (custom-face-attributes): Handle roman slant.

12
lisp/ls-lisp.el
View file

@ -529,7 +529,17 @@ SWITCHES, TIME-INDEX and NOW give the full switch list and time data."
;; for symbolic link, or nil.
(drwxrwxrwx (nth 8 file-attr))) ; attribute string ("drwxrwxrwx")
(concat (if (memq ?i switches) ; inode number
(format " %6d" (nth 10 file-attr)))
(let ((inode (nth 10 file-attr)))
(if (consp inode)
(if (consp (cdr inode))
(format " %17.0f "
(+ (* (car inode) 1099511627776.0)
(* (cadr inode) 65536.0)
(cddr inode)))
(format " %17.0f "
(+ (* (car inode) 65536.0)
(cdr inode))))
(format " %17d " inode))))
;; nil is treated like "" in concat
(if (memq ?s switches) ; size in K
(format " %4.0f" (fceiling (/ file-size 1024.0))))