diff options
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/mm-util.el | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 83da327041d..8b6e35a5a02 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2002-07-09 Dave Love <fx@gnu.org> | ||
| 2 | |||
| 3 | * mm-util.el (mm-find-mime-charset-region): Fix :mime-charset | ||
| 4 | part. | ||
| 5 | |||
| 1 | 2002-06-26 Dave Love <fx@gnu.org> | 6 | 2002-06-26 Dave Love <fx@gnu.org> |
| 2 | 7 | ||
| 3 | * rfc2047.el (rfc2047-encodable-p): Avoid mm-find-charset-region. | 8 | * rfc2047.el (rfc2047-encodable-p): Avoid mm-find-charset-region. |
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index 3ae754c2462..c7866e8ca6c 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el | |||
| @@ -504,9 +504,9 @@ charset, and a longer list means no appropriate charset." | |||
| 504 | (setq systems (delq 'compound-text systems)) | 504 | (setq systems (delq 'compound-text systems)) |
| 505 | (unless (equal systems '(undecided)) | 505 | (unless (equal systems '(undecided)) |
| 506 | (while systems | 506 | (while systems |
| 507 | (let ((cs (or (coding-system-get (pop systems) | 507 | (let* ((head (pop systems)) |
| 508 | :mime-charset) | 508 | (cs (or (coding-system-get head :mime-charset) |
| 509 | (coding-system-get systems 'mime-charset)))) | 509 | (coding-system-get head 'mime-charset)))) |
| 510 | (if cs | 510 | (if cs |
| 511 | (setq systems nil | 511 | (setq systems nil |
| 512 | charsets (list cs)))))) | 512 | charsets (list cs)))))) |
| @@ -537,7 +537,7 @@ Use unibyte mode for this." | |||
| 537 | (put 'mm-with-unibyte-buffer 'edebug-form-spec '(body)) | 537 | (put 'mm-with-unibyte-buffer 'edebug-form-spec '(body)) |
| 538 | 538 | ||
| 539 | (defmacro mm-with-unibyte-current-buffer (&rest forms) | 539 | (defmacro mm-with-unibyte-current-buffer (&rest forms) |
| 540 | "Evaluate FORMS with current current buffer temporarily made unibyte. | 540 | "Evaluate FORMS with current buffer temporarily made unibyte. |
| 541 | Also bind `default-enable-multibyte-characters' to nil. | 541 | Also bind `default-enable-multibyte-characters' to nil. |
| 542 | Equivalent to `progn' in XEmacs" | 542 | Equivalent to `progn' in XEmacs" |
| 543 | (let ((multibyte (make-symbol "multibyte")) | 543 | (let ((multibyte (make-symbol "multibyte")) |
| @@ -632,7 +632,7 @@ Equivalent to `progn' in XEmacs" | |||
| 632 | A buffer may be modified in several ways after reading into the buffer due | 632 | A buffer may be modified in several ways after reading into the buffer due |
| 633 | to advanced Emacs features, such as file-name-handlers, format decoding, | 633 | to advanced Emacs features, such as file-name-handlers, format decoding, |
| 634 | find-file-hooks, etc. | 634 | find-file-hooks, etc. |
| 635 | If INHIBIT is non-nil, inhibit mm-inhibit-file-name-handlers. | 635 | If INHIBIT is non-nil, inhibit `mm-inhibit-file-name-handlers'. |
| 636 | This function ensures that none of these modifications will take place." | 636 | This function ensures that none of these modifications will take place." |
| 637 | (let ((format-alist nil) | 637 | (let ((format-alist nil) |
| 638 | (auto-mode-alist (if inhibit nil (mm-auto-mode-alist))) | 638 | (auto-mode-alist (if inhibit nil (mm-auto-mode-alist))) |