diff options
| author | Richard M. Stallman | 2008-12-23 03:56:30 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2008-12-23 03:56:30 +0000 |
| commit | 759f544f5a4c2f2e447eb2bb59a46cf8717ff5eb (patch) | |
| tree | 80028ed3c5abd5e9ff188569defe6372d77f3b0f | |
| parent | 125d2ddf70994fb619770d30cbc4feae40866cab (diff) | |
| download | emacs-759f544f5a4c2f2e447eb2bb59a46cf8717ff5eb.tar.gz emacs-759f544f5a4c2f2e447eb2bb59a46cf8717ff5eb.zip | |
(pmail-edit-saved-coding-system): Var deleted.
(pmail-edit-current-message, pmail-cease-edit):
Don't set it, or save-buffer-coding-system.
| -rw-r--r-- | lisp/mail/pmailedit.el | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/lisp/mail/pmailedit.el b/lisp/mail/pmailedit.el index 9ee13fb2e4a..c4585bc0f86 100644 --- a/lisp/mail/pmailedit.el +++ b/lisp/mail/pmailedit.el | |||
| @@ -77,9 +77,6 @@ This functions runs the normal hook `pmail-edit-mode-hook'. | |||
| 77 | (defvar pmail-old-pruned nil) | 77 | (defvar pmail-old-pruned nil) |
| 78 | (put 'pmail-old-pruned 'permanent-local t) | 78 | (put 'pmail-old-pruned 'permanent-local t) |
| 79 | 79 | ||
| 80 | (defvar pmail-edit-saved-coding-system nil) | ||
| 81 | (put 'pmail-edit-saved-coding-system 'permanent-local t) | ||
| 82 | |||
| 83 | ;;;###autoload | 80 | ;;;###autoload |
| 84 | (defun pmail-edit-current-message () | 81 | (defun pmail-edit-current-message () |
| 85 | "Edit the contents of this message." | 82 | "Edit the contents of this message." |
| @@ -88,13 +85,7 @@ This functions runs the normal hook `pmail-edit-mode-hook'. | |||
| 88 | (error "No messages in this file")) | 85 | (error "No messages in this file")) |
| 89 | (make-local-variable 'pmail-old-pruned) | 86 | (make-local-variable 'pmail-old-pruned) |
| 90 | (setq pmail-old-pruned (eq pmail-header-style 'normal)) | 87 | (setq pmail-old-pruned (eq pmail-header-style 'normal)) |
| 91 | (make-local-variable 'pmail-edit-saved-coding-system) | ||
| 92 | (setq pmail-edit-saved-coding-system save-buffer-coding-system) | ||
| 93 | (pmail-edit-mode) | 88 | (pmail-edit-mode) |
| 94 | ;; As the local value of save-buffer-coding-system is deleted by | ||
| 95 | ;; pmail-edit-mode, we restore the original value. | ||
| 96 | (make-local-variable 'save-buffer-coding-system) | ||
| 97 | (setq save-buffer-coding-system pmail-edit-saved-coding-system) | ||
| 98 | (make-local-variable 'pmail-old-text) | 89 | (make-local-variable 'pmail-old-text) |
| 99 | (setq pmail-old-text (buffer-substring (point-min) (point-max))) | 90 | (setq pmail-old-text (buffer-substring (point-min) (point-max))) |
| 100 | (setq buffer-read-only nil) | 91 | (setq buffer-read-only nil) |
| @@ -129,9 +120,6 @@ This functions runs the normal hook `pmail-edit-mode-hook'. | |||
| 129 | (if (boundp 'tool-bar-map) | 120 | (if (boundp 'tool-bar-map) |
| 130 | (set (make-local-variable 'tool-bar-map) pmail-tool-bar-map)) | 121 | (set (make-local-variable 'tool-bar-map) pmail-tool-bar-map)) |
| 131 | (pmail-variables) | 122 | (pmail-variables) |
| 132 | ;; As the local value of save-buffer-coding-system is changed by | ||
| 133 | ;; pmail-variables, we restore the original value. | ||
| 134 | (setq save-buffer-coding-system pmail-edit-saved-coding-system) | ||
| 135 | (unless (and (= (length old) (- (point-max) (point-min))) | 123 | (unless (and (= (length old) (- (point-max) (point-min))) |
| 136 | (string= old (buffer-substring (point-min) (point-max)))) | 124 | (string= old (buffer-substring (point-min) (point-max)))) |
| 137 | (setq old nil) | 125 | (setq old nil) |