diff options
| author | Juri Linkov | 2012-09-30 19:54:43 +0300 |
|---|---|---|
| committer | Juri Linkov | 2012-09-30 19:54:43 +0300 |
| commit | 4c478e6b45d9e868efaf5f402fad2e54f4324a93 (patch) | |
| tree | 2f42cec4a5c65e2e26d9976ce4da1b01f4346249 | |
| parent | d80d54b289a971d7a98dc5fafebaa957082c8222 (diff) | |
| download | emacs-4c478e6b45d9e868efaf5f402fad2e54f4324a93.tar.gz emacs-4c478e6b45d9e868efaf5f402fad2e54f4324a93.zip | |
* lisp/arc-mode.el (archive-summarize): Let-bind `buffer-file-truename'
to nil around the call to `add-text-properties' to prevent
directory time modification by lock_file.
* lisp/tar-mode.el (tar-summarize-buffer): Idem.
Fixes: debbugs:2295
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/arc-mode.el | 3 | ||||
| -rw-r--r-- | lisp/tar-mode.el | 9 |
3 files changed, 17 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4ac0f1d451e..bdc8afd208d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,12 @@ | |||
| 1 | 2012-09-30 Juri Linkov <juri@jurta.org> | 1 | 2012-09-30 Juri Linkov <juri@jurta.org> |
| 2 | 2 | ||
| 3 | * arc-mode.el (archive-summarize): Let-bind `buffer-file-truename' | ||
| 4 | to nil around the call to `add-text-properties' to prevent | ||
| 5 | directory time modification by lock_file. (Bug#2295) | ||
| 6 | * tar-mode.el (tar-summarize-buffer): Idem. | ||
| 7 | |||
| 8 | 2012-09-30 Juri Linkov <juri@jurta.org> | ||
| 9 | |||
| 3 | * facemenu.el (list-colors-sort): Add option "Luminance". | 10 | * facemenu.el (list-colors-sort): Add option "Luminance". |
| 4 | (list-colors-sort-key): Implement it. | 11 | (list-colors-sort-key): Implement it. |
| 5 | 12 | ||
| @@ -2686,8 +2693,9 @@ | |||
| 2686 | 2693 | ||
| 2687 | * register.el (copy-to-register, copy-rectangle-to-register): | 2694 | * register.el (copy-to-register, copy-rectangle-to-register): |
| 2688 | Deactivate the mark, and use indicate-copied-region (Bug#10056). | 2695 | Deactivate the mark, and use indicate-copied-region (Bug#10056). |
| 2689 | (append-to-register, prepend-to-register): | 2696 | (append-to-register, prepend-to-register): Call indicate-copied-region. |
| 2690 | Call 2012-07-29 Juri Linkov <juri@jurta.org> | 2697 | |
| 2698 | 2012-07-29 Juri Linkov <juri@jurta.org> | ||
| 2691 | 2699 | ||
| 2692 | * simple.el (async-shell-command-buffer): New defcustom. | 2700 | * simple.el (async-shell-command-buffer): New defcustom. |
| 2693 | (shell-command): Use it. (Bug#4719) | 2701 | (shell-command): Use it. (Bug#4719) |
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index a97a052dc08..c04cd8dcf9d 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el | |||
| @@ -787,7 +787,8 @@ is visible (and the real data of the buffer is hidden). | |||
| 787 | Optional argument SHUT-UP, if non-nil, means don't print messages | 787 | Optional argument SHUT-UP, if non-nil, means don't print messages |
| 788 | when parsing the archive." | 788 | when parsing the archive." |
| 789 | (widen) | 789 | (widen) |
| 790 | (let ((inhibit-read-only t)) | 790 | (let ((buffer-file-truename nil) ; avoid changing dir mtime by lock_file |
| 791 | (inhibit-read-only t)) | ||
| 791 | (setq archive-proper-file-start (copy-marker (point-min) t)) | 792 | (setq archive-proper-file-start (copy-marker (point-min) t)) |
| 792 | (set (make-local-variable 'change-major-mode-hook) 'archive-desummarize) | 793 | (set (make-local-variable 'change-major-mode-hook) 'archive-desummarize) |
| 793 | (or shut-up | 794 | (or shut-up |
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index 9cd69d84250..2622a8215b8 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el | |||
| @@ -518,12 +518,13 @@ MODE should be an integer which is a file mode value." | |||
| 518 | (progress-reporter-done progress-reporter) | 518 | (progress-reporter-done progress-reporter) |
| 519 | (message "Warning: premature EOF parsing tar file")) | 519 | (message "Warning: premature EOF parsing tar file")) |
| 520 | (goto-char (point-min)) | 520 | (goto-char (point-min)) |
| 521 | (let ((inhibit-read-only t) | 521 | (let ((buffer-file-truename nil) ; avoid changing dir mtime by lock_file |
| 522 | (inhibit-read-only t) | ||
| 522 | (total-summaries | 523 | (total-summaries |
| 523 | (mapconcat 'tar-header-block-summarize tar-parse-info "\n"))) | 524 | (mapconcat 'tar-header-block-summarize tar-parse-info "\n"))) |
| 524 | (insert total-summaries "\n")) | 525 | (insert total-summaries "\n") |
| 525 | (goto-char (point-min)) | 526 | (goto-char (point-min)) |
| 526 | (restore-buffer-modified-p modified))) | 527 | (restore-buffer-modified-p modified)))) |
| 527 | 528 | ||
| 528 | (defvar tar-mode-map | 529 | (defvar tar-mode-map |
| 529 | (let ((map (make-keymap))) | 530 | (let ((map (make-keymap))) |