[Emacs-diffs] emacs/lisp/gnus mml.el ChangeLog mm-util.el

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/12/19 02:40:26

Modified files:
        lisp/gnus      : mml.el ChangeLog mm-util.el 

Log message:
        Merge from gnus--devo--0
        
        Revision: address@hidden/emacs--devo--0--patch-1505

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/mml.el?cvsroot=emacs&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/ChangeLog?cvsroot=emacs&r1=1.781&r2=1.782
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/mm-util.el?cvsroot=emacs&r1=1.78&r2=1.79

Patches:
Index: mml.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/mml.el,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- mml.el      17 Dec 2008 00:34:16 -0000      1.58
+++ mml.el      19 Dec 2008 02:40:25 -0000      1.59
@@ -1289,7 +1289,9 @@
     (unless (message-in-body-p) (goto-char (point-max)))
     (mml-insert-empty-tag 'part
                          'type type
-                         'filename file
+                         ;; icicles redefines read-file-name and returns a
+                         ;; string w/ text properties :-/
+                         'filename (mm-substring-no-properties file)
                          'disposition (or disposition "attachment")
                          'description description)))
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/ChangeLog,v
retrieving revision 1.781
retrieving revision 1.782
diff -u -b -r1.781 -r1.782
--- ChangeLog   19 Dec 2008 01:50:50 -0000      1.781
+++ ChangeLog   19 Dec 2008 02:40:25 -0000      1.782
@@ -1,3 +1,16 @@
+2008-12-18  Katsumi Yamaoka  <address@hidden>
+
+       * mm-util.el (mm-substring-no-properties): New function.
+       (mm-read-charset, mm-subst-char-in-string, mm-replace-in-string)
+       (mm-special-display-p): Enable those lambda forms to be byte compiled.
+       (mm-string-to-multibyte): Doc fix.
+
+       * mml.el (mml-attach-file): Use mm-substring-no-properties.
+
+2008-12-18  Reiner Steib  <address@hidden>
+
+       * mml.el (mml-attach-file): Strip text properties from file name.
+
 2008-12-16  Glenn Morris  <address@hidden>
 
        * mm-util.el (mm-charset-override-alist): Declare for compiler.

Index: mm-util.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/mm-util.el,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- mm-util.el  17 Dec 2008 00:34:17 -0000      1.78
+++ mm-util.el  19 Dec 2008 02:40:25 -0000      1.79
@@ -47,13 +47,13 @@
        (if (fboundp (car elem))
           (defalias nfunc (car elem))
         (defalias nfunc (cdr elem)))))
-   '((coding-system-list . ignore)
+   `((coding-system-list . ignore)
      (char-int . identity)
      (coding-system-equal . equal)
      (annotationp . ignore)
      (set-buffer-file-coding-system . ignore)
      (read-charset
-      . (lambda (prompt)
+      . ,(lambda (prompt)
          "Return a charset."
          (intern
           (completing-read
@@ -62,7 +62,7 @@
                    mm-mime-mule-charset-alist)
            nil t))))
      (subst-char-in-string
-      . (lambda (from to string &optional inplace)
+      . ,(lambda (from to string &optional inplace)
          ;; stolen (and renamed) from nnheader.el
          "Replace characters in STRING from FROM to TO.
          Unless optional argument INPLACE is non-nil, return a new string."
@@ -76,7 +76,7 @@
              (setq idx (1+ idx)))
            string)))
      (replace-in-string
-      . (lambda (string regexp rep &optional literal)
+      . ,(lambda (string regexp rep &optional literal)
          "See `replace-regexp-in-string', only the order of args differs."
          (replace-regexp-in-string regexp rep string nil literal)))
      (string-as-unibyte . identity)
@@ -105,7 +105,7 @@
      (multibyte-char-to-unibyte . identity)
      (set-buffer-multibyte . ignore)
      (special-display-p
-      . (lambda (buffer-name)
+      . ,(lambda (buffer-name)
          "Returns non-nil if a buffer named BUFFER-NAME gets a special frame."
          (and special-display-function
               (or (and (member buffer-name special-display-buffer-names) t)
@@ -118,7 +118,19 @@
                       (and (consp elem)
                            (stringp (car elem))
                            (string-match (car elem) buffer-name)
-                           (throw 'return (cdr elem))))))))))))
+                            (throw 'return (cdr elem)))))))))
+     (substring-no-properties
+      . ,(lambda (string &optional from to)
+          "Return a substring of STRING, without text properties.
+It starts at index FROM and ending before TO.
+TO may be nil or omitted; then the substring runs to the end of STRING.
+If FROM is nil or omitted, the substring starts at the beginning of STRING.
+If FROM or TO is negative, it counts from the end.
+
+With one argument, just copy STRING without its properties."
+          (setq string (substring string (or from 0) to))
+          (set-text-properties 0 (length string) nil string)
+          string)))))
 
 (eval-and-compile
   (if (featurep 'xemacs)
@@ -156,7 +168,7 @@
     'string-to-multibyte)
    (t
     (lambda (string)
-      "Return a multibyte string with the same individual chars as string."
+      "Return a multibyte string with the same individual chars as STRING."
       (mapconcat
        (lambda (ch) (mm-string-as-multibyte (char-to-string ch)))
        string "")))))