[Emacs-diffs] Changes to emacs/lisp/gnus/mm-util.el

[Miles Bader]

Index: emacs/lisp/gnus/mm-util.el
diff -c emacs/lisp/gnus/mm-util.el:1.36 emacs/lisp/gnus/mm-util.el:1.37
*** emacs/lisp/gnus/mm-util.el:1.36     Sun Feb 13 08:47:44 2005
--- emacs/lisp/gnus/mm-util.el  Wed Mar 30 08:14:32 2005
***************
*** 86,91 ****
--- 86,117 ----
       (multibyte-char-to-unibyte . identity))))
  
  (eval-and-compile
+   (cond
+    ((fboundp 'replace-in-string)
+     (defalias 'mm-replace-in-string 'replace-in-string))
+    ((fboundp 'replace-regexp-in-string)
+     (defun mm-replace-in-string (string regexp newtext &optional literal)
+       "Replace all matches for REGEXP with NEWTEXT in STRING.
+ If LITERAL is non-nil, insert NEWTEXT literally.  Return a new
+ string containing the replacements.
+ 
+ This is a compatibility function for different Emacsen."
+       (replace-regexp-in-string regexp newtext string nil literal)))
+    (t
+     (defun mm-replace-in-string (string regexp newtext &optional literal)
+       "Replace all matches for REGEXP with NEWTEXT in STRING.
+ If LITERAL is non-nil, insert NEWTEXT literally.  Return a new
+ string containing the replacements.
+ 
+ This is a compatibility function for different Emacsen."
+       (let ((start 0) tail)
+       (while (string-match regexp string start)
+         (setq tail (- (length string) (match-end 0)))
+         (setq string (replace-match newtext nil literal string))
+         (setq start (- (length string) tail))))
+       string))))
+ 
+ (eval-and-compile
    (defalias 'mm-char-or-char-int-p
      (cond
       ((fboundp 'char-or-char-int-p) 'char-or-char-int-p)
***************
*** 606,612 ****
  
      ;; Load the Latin Unity library, if available.
      (when (and (not (featurep 'latin-unity)) (locate-library "latin-unity"))
!       (require 'latin-unity))
  
      ;; Now, can we use it?
      (if (featurep 'latin-unity)
--- 632,638 ----
  
      ;; Load the Latin Unity library, if available.
      (when (and (not (featurep 'latin-unity)) (locate-library "latin-unity"))
!       (ignore-errors (require 'latin-unity)))
  
      ;; Now, can we use it?
      (if (featurep 'latin-unity)
***************
*** 651,657 ****
  
  (defmacro mm-xemacs-find-mime-charset (begin end)
    (when (featurep 'xemacs)
!     `(mm-xemacs-find-mime-charset-1 ,begin ,end)))
  
  (defun mm-find-mime-charset-region (b e &optional hack-charsets)
    "Return the MIME charsets needed to encode the region between B and E.
--- 677,683 ----
  
  (defmacro mm-xemacs-find-mime-charset (begin end)
    (when (featurep 'xemacs)
!     `(and (featurep 'mule) (mm-xemacs-find-mime-charset-1 ,begin ,end))))
  
  (defun mm-find-mime-charset-region (b e &optional hack-charsets)
    "Return the MIME charsets needed to encode the region between B and E.