Mercurial > emacs
comparison lisp/time.el @ 111572:b3f9490f0b7f
merge trunk
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 08 Nov 2010 14:19:24 +0900 |
| parents | 4e901a2d3669 |
| children | 40af77a50adc |
comparison
equal
deleted
inserted
replaced
| 111571:91de9477a77a | 111572:b3f9490f0b7f |
|---|---|
| 452 ;; what variables are available. | 452 ;; what variables are available. |
| 453 (run-hooks 'display-time-hook)) | 453 (run-hooks 'display-time-hook)) |
| 454 (force-mode-line-update)) | 454 (force-mode-line-update)) |
| 455 | 455 |
| 456 (defun display-time-file-nonempty-p (file) | 456 (defun display-time-file-nonempty-p (file) |
| 457 (and (file-exists-p file) | 457 (let ((remote-file-name-inhibit-cache (- display-time-interval 5))) |
| 458 (< 0 (nth 7 (file-attributes (file-chase-links file)))))) | 458 (and (file-exists-p file) |
| 459 (< 0 (nth 7 (file-attributes (file-chase-links file))))))) | |
| 459 | 460 |
| 460 ;;;###autoload | 461 ;;;###autoload |
| 461 (define-minor-mode display-time-mode | 462 (define-minor-mode display-time-mode |
| 462 "Toggle display of time, load level, and mail flag in mode lines. | 463 "Toggle display of time, load level, and mail flag in mode lines. |
| 463 With a numeric arg, enable this display if arg is positive. | 464 With a numeric arg, enable this display if arg is positive. |