[COMMIT] Fix for the enable-multibyte-characters problem

[COMMIT] Fix for the enable-multibyte-characters problem

[Didier Verna]

	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

Re: [COMMIT] Fix for the enable-multibyte-characters problem

[Matt Pharr]

Hmm.  What's up with the cvs repository?  I successfully checked out a tree 
yesterday and can successfully do stuff like 'cvs log ChangeLog', so I'm
definitely successfully talking to the cvs server on quimby, etc.  However, 
no changes have appeared in cvs-land--I can do stuff like the following to
my heart's content with no results:

% cd lib/emacs/gnus/lisp
% cvs diff ChangeLog
% cvs diff
% cvs -t diff
cvs diff: notice: main loop with
CVSROOT=:pserver:gnus@quimby.gnus.org:/usr/local/cvsroot
? Makefile
cvs server: Diffing .
S-> rename(CVS/Entries.Backup,CVS/Entries)
S-> unlink(CVS/Entries.Log)
%

Am I clueless, or is something fishy here?

-matt
-- 
Matt Pharr                                   mmp@graphics.stanford.edu
<URL:http://graphics.stanford.edu/~mmp>

Re: [COMMIT] Fix for the enable-multibyte-characters problem

[Lars Magne Ingebrigtsen]

Matt Pharr <mmp@graphics.stanford.edu> writes:

> However, no changes have appeared in cvs-land--I can do stuff like
> the following to my heart's content with no results:

Huh, yes --

[larsi@quimbies ~/pgnus/lisp]$ cvs diff
? Makefile
cvs server: Diffing .
[larsi@quimbies ~/pgnus/lisp]$ 

Which means that cvs thinks that there are no differences between my
version and the one in the repository, right?

And I know that people have been checking stuff in.  I'll have a peek
at the CVS files...

bash-2.03# ls -lt | head
total 19950
-r--r--r--  1 cvs  cvs  1081582 Sep 29 11:44 ChangeLog,v
-r--r--r--  1 cvs  cvs    31096 Sep 29 11:44 mm-util.el,v
-r--r--r--  1 cvs  cvs    21434 Sep 29 11:44 mm-bodies.el,v
-r--r--r--  1 cvs  cvs    15556 Sep 29 11:44 lpath.el,v
-r--r--r--  1 cvs  cvs   155841 Sep 29 11:44 gnus-start.el,v
-r--r--r--  1 cvs  cvs    17082 Sep 29 11:44 binhex.el,v
-r--r--r--  1 cvs  cvs     8655 Sep 28 02:59 rfc1843.el,v
-r--r--r--  1 cvs  cvs    17034 Sep 28 02:59 mm-uu.el,v
-r--r--r--  1 cvs  cvs   339007 Sep 28 02:59 gnus-art.el,v

These have newer timestamps than the files in my gnus/lisp directory.
So what's going on?

`C-x v =' says

No changes to /usr/home/larsi/pgnus/lisp/rfc2231.el since latest version

-- 
(domestic pets only, the antidote for overdose, milk.)
   larsi@gnus.org * Lars Magne Ingebrigtsen

Re: [COMMIT] Fix for the enable-multibyte-characters problem

[Sudish Joseph]

Lars Magne Ingebrigtsen writes:
> Which means that cvs thinks that there are no differences between my
> version and the one in the repository, right?

> And I know that people have been checking stuff in.  I'll have a peek
> at the CVS files...

"cvs status <files>" will show you the revisions of the checked-out
copy and the head of the repository.  Comparison those revisions
should tell the whole story.

-- 
Sudish Joseph                                          MindSpring Enterprises

Re: [COMMIT] Fix for the enable-multibyte-characters problem

[David Aspinwall]

>>"larsi" == Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

> [larsi@quimbies ~/pgnus/lisp]$ cvs diff
> ? Makefile
> cvs server: Diffing .
> [larsi@quimbies ~/pgnus/lisp]$ 

> Which means that cvs thinks that there are no differences between my
> version and the one in the repository, right?

>From the CVS docs:

The diff command is used to compare different revisions of files.  The
default action is to compare your working files *with the revisions
they were based on*, and report any differences that are found. 

Re: [COMMIT] Fix for the enable-multibyte-characters problem

[Lars Magne Ingebrigtsen]

David Aspinwall <aspinwall@TimesTen.com> writes:

> The diff command is used to compare different revisions of files.  The
> default action is to compare your working files *with the revisions
> they were based on*, and report any differences that are found. 

Oh; and not the other way around?  How do I get a to see the
differences between my version and the checked-in version, then, if
the checked-in version is newer?

-- 
(domestic pets only, the antidote for overdose, milk.)
   larsi@gnus.org * Lars Magne Ingebrigtsen

Re: [COMMIT] Fix for the enable-multibyte-characters problem

[David Aspinwall]

>>"larsi" == Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

> Oh; and not the other way around?  How do I get a to see the
> differences between my version and the checked-in version, then, if
> the checked-in version is newer?

This should do it:
  cvs diff -r HEAD file

Re: [COMMIT] Fix for the enable-multibyte-characters problem

[Lars Magne Ingebrigtsen]

David Aspinwall <aspinwall@TimesTen.com> writes:

> This should do it:
>   cvs diff -r HEAD file

Ah; thanks.

-- 
(domestic pets only, the antidote for overdose, milk.)
   larsi@gnus.org * Lars Magne Ingebrigtsen

Re: [COMMIT] Fix for the enable-multibyte-characters problem

[Matt Pharr]

> >From the CVS docs:
> 
> The diff command is used to compare different revisions of files.  The
> default action is to compare your working files *with the revisions
> they were based on*, and report any differences that are found. 

Hmm.  I swear that I tried doing a cvs update after Didier's checkin and
that I didn't get anything (cvs diff seemed like a better example to send
to the list as a test case), but now an update did give me something, so
all seems well.  

Hmm.

-matt
-- 
Matt Pharr                                   mmp@graphics.stanford.edu
<URL:http://graphics.stanford.edu/~mmp>