* nnmail.el (nnmail-pathname-coding-system): Default to the `file-name'

  coding system in XEmacs; add a workaround for XEmacs.

* lpath.el: Fbind coding-system-aliasee.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 358854d..9ff72c7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * nnmail.el (nnmail-pathname-coding-system): Default to the `file-name'
+       coding system in XEmacs; add a workaround for XEmacs.
+
+       * lpath.el: Fbind coding-system-aliasee.
+

 2009-01-14  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-util.el (mm-coding-system-priorities): Protect against nil value
 2009-01-14  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-util.el (mm-coding-system-priorities): Protect against nil value

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 55ef8d6..434284f 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -30,16 +30,17 @@
     (defun split-line (&optional arg))
     (maybe-fbind
      '(clear-string
     (defun split-line (&optional arg))
     (maybe-fbind
      '(clear-string

-       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 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 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
+       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
        window-pixel-width))
     (maybe-bind
      '(eudc-protocol


@@ -102,9 +103,9 @@
 
   (unless (featurep 'file-coding)
     (maybe-fbind
 
   (unless (featurep 'file-coding)
     (maybe-fbind

-     '(coding-system-base
-       coding-system-change-eol-conversion coding-system-list coding-system-p
-       find-coding-system))
+     '(coding-system-aliasee
+       coding-system-base coding-system-change-eol-conversion coding-system-list
+       coding-system-p find-coding-system))

     (maybe-bind
      '(buffer-file-coding-system
        coding-system-for-read coding-system-for-write
     (maybe-bind
      '(buffer-file-coding-system
        coding-system-for-read coding-system-for-write

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 3bc9512..ddb8806 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -628,7 +628,14 @@ using different case (i.e. mailing-list@domain vs Mailing-List@Domain)."
   mm-text-coding-system
   "Coding system used in reading inbox")
 
   mm-text-coding-system
   "Coding system used in reading inbox")
 

-(defvar nnmail-pathname-coding-system nil
+(defvar nnmail-pathname-coding-system
+  ;; This causes Emacs 22.2 and 22.3 to issue a useless warning.
+  ;;(if (and (featurep 'xemacs) (featurep 'file-coding))
+  (if (featurep 'xemacs)
+      (if (featurep 'file-coding)
+         ;; Work around a bug in many XEmacs 21.5 betas.
+         ;; Cf. http://thread.gmane.org/gmane.emacs.gnus.general/68134
+         (setq file-name-coding-system (coding-system-aliasee 'file-name))))

   "*Coding system for file name.")
 
 (defun nnmail-find-file (file)
   "*Coding system for file name.")
 
 (defun nnmail-find-file (file)