From: Didier Verna <verna@inf.enst.fr>
Subject: [COMMIT] Fix for the enable-multibyte-characters problem
Date: 29 Sep 1999 11:44:28 +0200 [thread overview]
Message-ID: <qyjemfi2gsj.fsf@metheny.enst.fr> (raw)
Dear Pterodactylees,
I have just committed the following patch in the CVS archive.
1999-09-29 Didier Verna <verna@inf.enst.fr>
* binhex.el (binhex-decode-region): don't consider the value of
`enable-multibyte-characters' in XEmacs.
* gnus-start.el (gnus-read-descriptions-file): ditto.
* mm-util.el (mm-multibyte-p): ditto.
(mm-with-unibyte-buffer): ditto.
(mm-find-charset-region): use `mm-multibyte-p'.
* mm-bodies.el (mm-decode-body): ditto.
(mm-decode-string): ditto.
* lpath.el ((string-match "XEmacs" emacs-version)): Don't define
`enable-multibyte-characters' in XEmacs.
Index: lisp/binhex.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/binhex.el,v
retrieving revision 5.6
diff -u -u -r5.6 binhex.el
--- lisp/binhex.el 1999/02/01 21:18:18 5.6
+++ lisp/binhex.el 1999/09/29 09:25:57
@@ -199,12 +199,12 @@
(save-excursion
(goto-char start)
(when (re-search-forward binhex-begin-line end t)
- (if (boundp 'enable-multibyte-characters)
+ (if (and (not (string-match "XEmacs\\|Lucid" emacs-version))
+ (boundp 'enable-multibyte-characters))
(let ((multibyte
(default-value 'enable-multibyte-characters)))
(setq-default enable-multibyte-characters nil)
- (setq work-buffer
- (generate-new-buffer " *binhex-work*"))
+ (setq work-buffer (generate-new-buffer " *binhex-work*"))
(setq-default enable-multibyte-characters multibyte))
(setq work-buffer (generate-new-buffer " *binhex-work*")))
(buffer-disable-undo work-buffer)
Index: lisp/gnus-start.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/gnus-start.el,v
retrieving revision 5.28
diff -u -u -r5.28 gnus-start.el
--- lisp/gnus-start.el 1999/08/27 13:18:10 5.28
+++ lisp/gnus-start.el 1999/09/29 09:25:58
@@ -2547,8 +2547,9 @@
(let ((str (buffer-substring
(point) (progn (end-of-line) (point))))
(coding
- (and (boundp 'enable-multibyte-characters)
- enable-multibyte-characters
+ (and (or gnus-xemacs
+ (and (boundp 'enable-multibyte-characters)
+ enable-multibyte-characters))
(fboundp 'gnus-mule-get-coding-system)
(gnus-mule-get-coding-system (symbol-name group)))))
(when coding
Index: lisp/lpath.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/lpath.el,v
retrieving revision 5.25
diff -u -u -r5.25 lpath.el
--- lisp/lpath.el 1999/09/27 15:19:01 5.25
+++ lisp/lpath.el 1999/09/29 09:25:59
@@ -48,7 +48,7 @@
font-lock-defaults user-full-name user-login-name
gnus-newsgroup-name gnus-article-x-face-too-ugly
gnus-newsgroup-charset gnus-newsgroup-emphasis-alist
- mail-mode-hook enable-multibyte-characters
+ mail-mode-hook
adaptive-fill-first-line-regexp adaptive-fill-regexp
url-current-mime-headers buffer-file-coding-system
w3-image-mappings url-current-mime-type
Index: lisp/mm-bodies.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/mm-bodies.el,v
retrieving revision 5.38
diff -u -u -r5.38 mm-bodies.el
--- lisp/mm-bodies.el 1999/08/27 13:18:16 5.38
+++ lisp/mm-bodies.el 1999/09/29 09:25:59
@@ -209,7 +209,7 @@
;; buffer-file-coding-system
;;Article buffer is nil coding system
;;in XEmacs
- enable-multibyte-characters
+ (mm-multibyte-p)
(or (not (eq mule-charset 'ascii))
(setq mule-charset mail-parse-charset)))
(mm-decode-coding-region (point-min) (point-max) mule-charset))))))
@@ -225,7 +225,7 @@
(let (mule-charset)
(when (and charset
(setq mule-charset (mm-charset-to-coding-system charset))
- enable-multibyte-characters
+ (mm-multibyte-p)
(or (not (eq mule-charset 'ascii))
(setq mule-charset mail-parse-charset)))
(mm-decode-coding-string string mule-charset))))
Index: lisp/mm-util.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/mm-util.el,v
retrieving revision 5.47
diff -u -u -r5.47 mm-util.el
--- lisp/mm-util.el 1999/09/27 15:19:03 5.47
+++ lisp/mm-util.el 1999/09/29 09:25:59
@@ -235,15 +235,17 @@
(defsubst mm-multibyte-p ()
"Say whether multibyte is enabled."
- (and (boundp 'enable-multibyte-characters)
- enable-multibyte-characters))
+ (or (string-match "XEmacs\\|Lucid" emacs-version)
+ (and (boundp 'enable-multibyte-characters)
+ enable-multibyte-characters)))
(defmacro mm-with-unibyte-buffer (&rest forms)
"Create a temporary buffer, and evaluate FORMS there like `progn'.
See also `with-temp-file' and `with-output-to-string'."
(let ((temp-buffer (make-symbol "temp-buffer"))
(multibyte (make-symbol "multibyte")))
- `(if (not (boundp 'enable-multibyte-characters))
+ `(if (or (string-match "XEmacs\\|Lucid" emacs-version)
+ (not (boundp 'enable-multibyte-characters)))
(with-temp-buffer ,@forms)
(let ((,multibyte (default-value 'enable-multibyte-characters))
,temp-buffer)
@@ -267,8 +269,7 @@
(defun mm-find-charset-region (b e)
"Return a list of charsets in the region."
(cond
- ((and (boundp 'enable-multibyte-characters)
- enable-multibyte-characters
+ ((and (mm-multibyte-p)
(fboundp 'find-charset-region))
(find-charset-region b e))
((not (boundp 'current-language-environment))
--
/ / _ _ Didier Verna http://www.inf.enst.fr/~verna/
- / / - / / /_/ / ENST, INFRES C201.1 mailto:verna@inf.enst.fr
/_/ / /_/ / /__ / 46 rue Barrault Tel. +33 (1) 45 81 73 46
75013 Paris, France Fax. +33 (1) 45 81 31 19
next reply other threads:[~1999-09-29 9:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
1999-09-29 9:44 Didier Verna [this message]
1999-09-29 17:38 ` Matt Pharr
1999-09-29 18:18 ` Lars Magne Ingebrigtsen
1999-09-29 19:12 ` Sudish Joseph
1999-09-29 19:16 ` David Aspinwall
1999-09-29 19:28 ` Lars Magne Ingebrigtsen
1999-09-29 19:33 ` David Aspinwall
1999-09-29 19:52 ` Lars Magne Ingebrigtsen
1999-09-29 19:59 ` Matt Pharr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=qyjemfi2gsj.fsf@metheny.enst.fr \
--to=verna@inf.enst.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).