procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(top-level): Require mule-utils when compiling.

Browse source 
(rmail-decode-babyl-format): Use detect-coding-with-priority
instead of detect-coding-region, to favor detection of emacs-mule
encoded Babyl files written by rmailout.el etc.  Suggested by
Kenichi Handa <handa@etl.go.jp>.
This commit is contained in:
Eli Zaretskii 2001-09-16 07:56:36 +00:00
parent 966533c9c7
commit 1bbdda4d51
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/ChangeLog
View file

@ -1,3 +1,11 @@
2001-09-16 Eli Zaretskii <eliz@is.elta.co.il>
* mail/rmail.el (top-level): Require mule-utils when compiling.
(rmail-decode-babyl-format): Use detect-coding-with-priority
instead of detect-coding-region, to favor detection of emacs-mule
encoded Babyl files written by rmailout.el etc. Suggested by
Kenichi Handa <handa@etl.go.jp>.
2001-09-14 Eli Zaretskii <eliz@is.elta.co.il> 2001-09-14 Eli Zaretskii <eliz@is.elta.co.il>
* eshell/em-unix.el (eshell-shuffle-files, eshell-shuffle-files): * eshell/em-unix.el (eshell-shuffle-files, eshell-shuffle-files):

14
lisp/mail/rmail.el
View file

@ -40,6 +40,7 @@
;; ;;
(require 'mail-utils) (require 'mail-utils)
(eval-when-compile (require 'mule-util)) ; for detect-coding-with-priority
; These variables now declared in paths.el. ; These variables now declared in paths.el.
;(defvar rmail-spool-directory "/usr/spool/mail/" ;(defvar rmail-spool-directory "/usr/spool/mail/"
@ -621,7 +622,7 @@ If `rmail-display-summary' is non-nil, make a summary for this RMAIL file."
(rmail-require-mime-maybe) (rmail-require-mime-maybe)
(let* ((file-name (expand-file-name (or file-name-arg rmail-file-name))) (let* ((file-name (expand-file-name (or file-name-arg rmail-file-name)))
(existed (get-file-buffer file-name)) (existed (get-file-buffer file-name))
;; This binding is necessary because we much decide if we ;; This binding is necessary because we must decide if we
;; need code conversion while the buffer is unibyte ;; need code conversion while the buffer is unibyte
;; (i.e. enable-multibyte-characters is nil). ;; (i.e. enable-multibyte-characters is nil).
(rmail-enable-multibyte (rmail-enable-multibyte
@ -772,7 +773,16 @@ Note: it means the file has no messages in it.\n\^_")))
(setq to (point)) (setq to (point))
(unless (and coding-system (unless (and coding-system
(coding-system-p coding-system)) (coding-system-p coding-system))
(setq coding-system (detect-coding-region from to t))) (setq coding-system
;; Emacs 21.1 and later writes RMAIL files in emacs-mule, but
;; earlier versions did that with the current buffer's encoding.
;; So we want to favor detection of emacs-mule (whose normal
;; priority is quite low), but still allow detection of other
;; encodings if emacs-mule won't fit. The call to
;; detect-coding-with-priority below achieves that.
(car (detect-coding-with-priority
from to
'((coding-category-emacs-mule . emacs-mule))))))
(unless (memq coding-system (unless (memq coding-system
'(undecided undecided-unix)) '(undecided undecided-unix))
(set-buffer-modified-p t) ; avoid locking when decoding (set-buffer-modified-p t) ; avoid locking when decoding