diff options
| author | Stefan Monnier | 2008-02-12 21:20:05 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-02-12 21:20:05 +0000 |
| commit | 53ad7bee3f4fe36f65121a69857b016a02aca7f7 (patch) | |
| tree | aec4aee7b633346c066c6205d03672bf73bbe7e3 | |
| parent | 355652a2a38cd9e5eb4501b0caad060c29c987ca (diff) | |
| download | emacs-53ad7bee3f4fe36f65121a69857b016a02aca7f7.tar.gz emacs-53ad7bee3f4fe36f65121a69857b016a02aca7f7.zip | |
Fix broken indentation.
(tar-mouse-extract, tar-extract, tar-subfile-save-buffer):
Use with-current-buffer.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/tar-mode.el | 54 |
2 files changed, 30 insertions, 30 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7b1391a5f57..aef928f431d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2008-02-12 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * tar-mode.el: Fix broken indentation. | ||
| 4 | (tar-mouse-extract, tar-extract, tar-subfile-save-buffer): | ||
| 5 | Use with-current-buffer. | ||
| 6 | |||
| 1 | 2008-02-12 Juanma Barranquero <lekktu@gmail.com> | 7 | 2008-02-12 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 8 | ||
| 3 | * hexl.el (hexl-mode): Don't make `font-lock-defaults' buffer-local; | 9 | * hexl.el (hexl-mode): Don't make `font-lock-defaults' buffer-local; |
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index ed974160382..8df1231d96c 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el | |||
| @@ -498,50 +498,50 @@ is visible (and the real data of the buffer is hidden)." | |||
| 498 | (define-key map "M" 'tar-chmod-entry) | 498 | (define-key map "M" 'tar-chmod-entry) |
| 499 | (define-key map "G" 'tar-chgrp-entry) | 499 | (define-key map "G" 'tar-chgrp-entry) |
| 500 | (define-key map "O" 'tar-chown-entry) | 500 | (define-key map "O" 'tar-chown-entry) |
| 501 | 501 | ||
| 502 | ;; Make menu bar items. | 502 | ;; Make menu bar items. |
| 503 | 503 | ||
| 504 | ;; Get rid of the Edit menu bar item to save space. | 504 | ;; Get rid of the Edit menu bar item to save space. |
| 505 | (define-key map [menu-bar edit] 'undefined) | 505 | (define-key map [menu-bar edit] 'undefined) |
| 506 | 506 | ||
| 507 | (define-key map [menu-bar immediate] | 507 | (define-key map [menu-bar immediate] |
| 508 | (cons "Immediate" (make-sparse-keymap "Immediate"))) | 508 | (cons "Immediate" (make-sparse-keymap "Immediate"))) |
| 509 | 509 | ||
| 510 | (define-key map [menu-bar immediate view] | 510 | (define-key map [menu-bar immediate view] |
| 511 | '("View This File" . tar-view)) | 511 | '("View This File" . tar-view)) |
| 512 | (define-key map [menu-bar immediate display] | 512 | (define-key map [menu-bar immediate display] |
| 513 | '("Display in Other Window" . tar-display-other-window)) | 513 | '("Display in Other Window" . tar-display-other-window)) |
| 514 | (define-key map [menu-bar immediate find-file-other-window] | 514 | (define-key map [menu-bar immediate find-file-other-window] |
| 515 | '("Find in Other Window" . tar-extract-other-window)) | 515 | '("Find in Other Window" . tar-extract-other-window)) |
| 516 | (define-key map [menu-bar immediate find-file] | 516 | (define-key map [menu-bar immediate find-file] |
| 517 | '("Find This File" . tar-extract)) | 517 | '("Find This File" . tar-extract)) |
| 518 | 518 | ||
| 519 | (define-key map [menu-bar mark] | 519 | (define-key map [menu-bar mark] |
| 520 | (cons "Mark" (make-sparse-keymap "Mark"))) | 520 | (cons "Mark" (make-sparse-keymap "Mark"))) |
| 521 | 521 | ||
| 522 | (define-key map [menu-bar mark unmark-all] | 522 | (define-key map [menu-bar mark unmark-all] |
| 523 | '("Unmark All" . tar-clear-modification-flags)) | 523 | '("Unmark All" . tar-clear-modification-flags)) |
| 524 | (define-key map [menu-bar mark deletion] | 524 | (define-key map [menu-bar mark deletion] |
| 525 | '("Flag" . tar-flag-deleted)) | 525 | '("Flag" . tar-flag-deleted)) |
| 526 | (define-key map [menu-bar mark unmark] | 526 | (define-key map [menu-bar mark unmark] |
| 527 | '("Unflag" . tar-unflag)) | 527 | '("Unflag" . tar-unflag)) |
| 528 | 528 | ||
| 529 | (define-key map [menu-bar operate] | 529 | (define-key map [menu-bar operate] |
| 530 | (cons "Operate" (make-sparse-keymap "Operate"))) | 530 | (cons "Operate" (make-sparse-keymap "Operate"))) |
| 531 | 531 | ||
| 532 | (define-key map [menu-bar operate chown] | 532 | (define-key map [menu-bar operate chown] |
| 533 | '("Change Owner..." . tar-chown-entry)) | 533 | '("Change Owner..." . tar-chown-entry)) |
| 534 | (define-key map [menu-bar operate chgrp] | 534 | (define-key map [menu-bar operate chgrp] |
| 535 | '("Change Group..." . tar-chgrp-entry)) | 535 | '("Change Group..." . tar-chgrp-entry)) |
| 536 | (define-key map [menu-bar operate chmod] | 536 | (define-key map [menu-bar operate chmod] |
| 537 | '("Change Mode..." . tar-chmod-entry)) | 537 | '("Change Mode..." . tar-chmod-entry)) |
| 538 | (define-key map [menu-bar operate rename] | 538 | (define-key map [menu-bar operate rename] |
| 539 | '("Rename to..." . tar-rename-entry)) | 539 | '("Rename to..." . tar-rename-entry)) |
| 540 | (define-key map [menu-bar operate copy] | 540 | (define-key map [menu-bar operate copy] |
| 541 | '("Copy to..." . tar-copy)) | 541 | '("Copy to..." . tar-copy)) |
| 542 | (define-key map [menu-bar operate expunge] | 542 | (define-key map [menu-bar operate expunge] |
| 543 | '("Expunge Marked Files" . tar-expunge)) | 543 | '("Expunge Marked Files" . tar-expunge)) |
| 544 | 544 | ||
| 545 | map) | 545 | map) |
| 546 | "Local keymap for Tar mode listings.") | 546 | "Local keymap for Tar mode listings.") |
| 547 | 547 | ||
| @@ -678,8 +678,7 @@ appear on disk when you save the tar-file's buffer." | |||
| 678 | (defun tar-mouse-extract (event) | 678 | (defun tar-mouse-extract (event) |
| 679 | "Extract a file whose tar directory line you click on." | 679 | "Extract a file whose tar directory line you click on." |
| 680 | (interactive "e") | 680 | (interactive "e") |
| 681 | (save-excursion | 681 | (with-current-buffer (window-buffer (posn-window (event-end event))) |
| 682 | (set-buffer (window-buffer (posn-window (event-end event)))) | ||
| 683 | (save-excursion | 682 | (save-excursion |
| 684 | (goto-char (posn-point (event-end event))) | 683 | (goto-char (posn-point (event-end event))) |
| 685 | ;; Just make sure this doesn't get an error. | 684 | ;; Just make sure this doesn't get an error. |
| @@ -721,8 +720,7 @@ appear on disk when you save the tar-file's buffer." | |||
| 721 | undo-list) | 720 | undo-list) |
| 722 | (unless buffer | 721 | (unless buffer |
| 723 | (setq buffer (generate-new-buffer bufname)) | 722 | (setq buffer (generate-new-buffer bufname)) |
| 724 | (save-excursion | 723 | (with-current-buffer buffer |
| 725 | (set-buffer buffer) | ||
| 726 | (setq undo-list buffer-undo-list | 724 | (setq undo-list buffer-undo-list |
| 727 | buffer-undo-list t)) | 725 | buffer-undo-list t)) |
| 728 | (setq bufname (buffer-name buffer)) | 726 | (setq bufname (buffer-name buffer)) |
| @@ -751,13 +749,11 @@ appear on disk when you save the tar-file's buffer." | |||
| 751 | (setq coding (detect-coding-region start end t))) | 749 | (setq coding (detect-coding-region start end t))) |
| 752 | (if (and default-enable-multibyte-characters | 750 | (if (and default-enable-multibyte-characters |
| 753 | (coding-system-get coding :for-unibyte)) | 751 | (coding-system-get coding :for-unibyte)) |
| 754 | (save-excursion | 752 | (with-current-buffer buffer |
| 755 | (set-buffer buffer) | ||
| 756 | (set-buffer-multibyte nil))) | 753 | (set-buffer-multibyte nil))) |
| 757 | (widen) | 754 | (widen) |
| 758 | (decode-coding-region start end coding buffer) | 755 | (decode-coding-region start end coding buffer) |
| 759 | (save-excursion | 756 | (with-current-buffer buffer |
| 760 | (set-buffer buffer) | ||
| 761 | (goto-char (point-min)) | 757 | (goto-char (point-min)) |
| 762 | (setq buffer-file-name new-buffer-file-name) | 758 | (setq buffer-file-name new-buffer-file-name) |
| 763 | (setq buffer-file-truename | 759 | (setq buffer-file-truename |
| @@ -768,8 +764,7 @@ appear on disk when you save the tar-file's buffer." | |||
| 768 | ;; Set the default-directory to the dir of the | 764 | ;; Set the default-directory to the dir of the |
| 769 | ;; superior buffer. | 765 | ;; superior buffer. |
| 770 | (setq default-directory | 766 | (setq default-directory |
| 771 | (save-excursion | 767 | (with-current-buffer tar-buffer |
| 772 | (set-buffer tar-buffer) | ||
| 773 | default-directory)) | 768 | default-directory)) |
| 774 | (normal-mode) ; pick a mode. | 769 | (normal-mode) ; pick a mode. |
| 775 | (rename-buffer bufname) | 770 | (rename-buffer bufname) |
| @@ -1138,8 +1133,7 @@ to make your changes permanent." | |||
| 1138 | (delete-region (point-min) (point-max)) | 1133 | (delete-region (point-min) (point-max)) |
| 1139 | ;; insert the new data... | 1134 | ;; insert the new data... |
| 1140 | (goto-char data-start) | 1135 | (goto-char data-start) |
| 1141 | (save-excursion | 1136 | (with-current-buffer subfile |
| 1142 | (set-buffer subfile) | ||
| 1143 | (save-restriction | 1137 | (save-restriction |
| 1144 | (widen) | 1138 | (widen) |
| 1145 | (encode-coding-region 1 (point-max) coding tar-superior-buffer))) | 1139 | (encode-coding-region 1 (point-max) coding tar-superior-buffer))) |