Changes committed gnus/lisp (ChangeLog lpath.el mm-util.el)

Modified: ChangeLog lpath.el mm-util.el

* mm-util.el (mm-charset-to-coding-system): Use coding-system-from-name
if it is available.  (bug#5647)

* lpath.el: Suppress compiler warning for coding-system-from-name for
Emacs 21 and XEmacs.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.2061 gnus/lisp/ChangeLog:7.2062
--- ChangeLog:7.2061	Mon Mar 15 00:31:30 2010
+++ ChangeLog	Mon Mar 15 03:37:02 2010
@@ -1,3 +1,11 @@
+2010-03-15  Katsumi Yamaoka  <[email protected]>
+
+	* mm-util.el (mm-charset-to-coding-system): Use coding-system-from-name
+	if it is available.  (bug#5647)
+
+	* lpath.el: Suppress compiler warning for coding-system-from-name for
+	Emacs 21 and XEmacs.
+
 2010-03-14  Juri Linkov  <[email protected]>
 
 	* hmac-def.el:
Index: lpath.el
diff -u gnus/lisp/lpath.el:7.57 gnus/lisp/lpath.el:7.58
--- lpath.el:7.57	Wed Dec  2 13:10:00 2009
+++ lpath.el	Mon Mar 15 03:37:02 2010
@@ -31,17 +31,17 @@
     (defun split-line (&optional arg))
     (maybe-fbind
      '(clear-string
-       coding-system-aliasee custom-autoload delete-annotation delete-extent
-       device-connection dfw-device events-to-keys find-face
-       font-lock-set-defaults get-char-table glyph-height glyph-width
-       help-buffer int-to-char ldap-search-entries mail-aliases-setup
-       make-annotation make-event make-glyph make-network-process map-extents
-       message-xmas-redefine put-char-table run-mode-hooks set-extent-property
-       set-itimer-function set-keymap-default-binding temp-directory
-       time-to-seconds ucs-to-char unicode-precedence-list unicode-to-char
-       url-generic-parse-url url-http-file-exists-p
-       valid-image-instantiator-format-p vcard-pretty-print
-       w3-coding-system-for-mime-charset window-pixel-height
+       coding-system-aliasee coding-system-from-name custom-autoload
+       delete-annotation delete-extent device-connection dfw-device
+       events-to-keys find-face font-lock-set-defaults get-char-table
+       glyph-height glyph-width help-buffer int-to-char ldap-search-entries
+       mail-aliases-setup make-annotation make-event make-glyph
+       make-network-process map-extents message-xmas-redefine put-char-table
+       run-mode-hooks set-extent-property set-itimer-function
+       set-keymap-default-binding temp-directory time-to-seconds ucs-to-char
+       unicode-precedence-list unicode-to-char url-generic-parse-url
+       url-http-file-exists-p valid-image-instantiator-format-p
+       vcard-pretty-print w3-coding-system-for-mime-charset window-pixel-height
        window-pixel-width))
     (maybe-bind
      '(eudc-protocol
@@ -56,9 +56,9 @@
     '(defun rmail-toggle-header (&optional arg)))
   (maybe-fbind
    '(clear-string
-     codepage-setup cp-supported-codepages create-image detect-coding-string
-     display-time-event-handler epg-check-configuration event-click-count
-     event-end event-start find-coding-systems-for-charsets
+     codepage-setup coding-system-from-name cp-supported-codepages create-image
+     detect-coding-string display-time-event-handler epg-check-configuration
+     event-click-count event-end event-start find-coding-systems-for-charsets
      find-coding-systems-region find-coding-systems-string find-image
      float-time help-buffer image-size image-type-available-p insert-image
      mail-abbrevs-setup make-mode-line-mouse-map make-network-process
Index: mm-util.el
diff -u gnus/lisp/mm-util.el:7.94 gnus/lisp/mm-util.el:7.95
--- mm-util.el:7.94	Wed Jan 13 11:59:44 2010
+++ mm-util.el	Mon Mar 15 03:37:02 2010
@@ -566,6 +566,9 @@
 ;;; 	 (eq charset (coding-system-get charset 'mime-charset))
 	 )
     charset)
+   ;; Use coding system Emacs knows.
+   ((and (fboundp 'coding-system-from-name)
+	 (coding-system-from-name charset)))
    ;; Eval expressions from `mm-charset-eval-alist'
    ((let* ((el (assq charset mm-charset-eval-alist))
 	   (cs (car el))