Gnus: fix XEmacs compilation

This commit is contained in:
Katsumi Yamaoka 2014-11-27 01:33:09 +00:00
parent 666e90e5cc
commit b121ef10f5
4 changed files with 22 additions and 7 deletions

View file

@ -1,3 +1,12 @@
2014-11-27 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (gnus-use-idna):
* gnus-sum.el (gnus-summary-idna-message):
* message.el (message-use-idna):
Protect against nil value for idna-program.
* message.el (message-use-idna): Load Mule-UCS for XEmacs 21.4.
2014-11-25 Glenn Morris <rgm@gnu.org>
* gnus-start.el (gnus-save-newsrc-file-check-timestamp):

View file

@ -1628,6 +1628,7 @@ It is a string, such as \"PGP\". If nil, ask user."
(defcustom gnus-use-idna (and (condition-case nil (require 'idna) (file-error))
(mm-coding-system-p 'utf-8)
idna-program
(executable-find idna-program))
"Whether IDNA decoding of headers is used when viewing messages.
This requires GNU Libidn, and by default only enabled if it is found."

View file

@ -9870,6 +9870,7 @@ installed for this command to work."
(if (not (and (condition-case nil (require 'idna)
(file-error))
(mm-coding-system-p 'utf-8)
(symbol-value 'idna-program)
(executable-find (symbol-value 'idna-program))))
(gnus-message
5 "GNU Libidn not installed properly (`idn' or `idna.el' missing)")

View file

@ -1756,13 +1756,17 @@ no, only reply back to the author."
:type '(radio (const :format "%v " nil)
(string :format "FQDN: %v")))
(defcustom message-use-idna (and (condition-case nil (require 'idna)
(file-error))
(mm-coding-system-p 'utf-8)
(executable-find idna-program)
(string= (idna-to-ascii "räksmörgås")
"xn--rksmrgs-5wao1o")
t)
(defcustom message-use-idna
(and (or (mm-coding-system-p 'utf-8)
(condition-case nil
(let (mucs-ignore-version-incompatibilities)
(require 'un-define))
(error)))
(condition-case nil (require 'idna) (file-error))
idna-program
(executable-find idna-program)
(string= (idna-to-ascii "räksmörgås") "xn--rksmrgs-5wao1o")
t)
"Whether to encode non-ASCII in domain names into ASCII according to IDNA.
GNU Libidn, and in particular the elisp package \"idna.el\" and
the external program \"idn\", must be installed for this