[PATCH GNUS] Set defcustom defaults to nil to avoid byte-compile problem
Mats Lidell <[email protected]> Tue, 19 Aug 2014 07:45:36 +0200
| Newsgroups | gmane.emacs.xemacs.patches |
|---|---|
| Organization | The XEmacs Project |
| Message-ID | <[email protected]> |
Hi Mike, The introduction of idna.el in net-utils triggered a problem with byte compiling two defcustom forms in gnus. This patch fixes this, at least until some better solution is found, by using nil as default and not calculating a value. (I could also argue that calculating a default on the machine where the file is compiled seems not to be a good idea. It should be calculated on the machine where it is loaded. I don't know if the :initialize property can be put to use here but the size of the problem might suggest that a simple default can be used and the user can customize a proper value himself!?) diff -r 075087fcf346 ChangeLog --- a/ChangeLog Sun Jun 22 09:03:58 2014 +0200 +++ b/ChangeLog Tue Aug 19 07:31:08 2014 +0200 @@ -1,3 +1,9 @@ +2014-08-17 Mats Lidell <[email protected]> + + * lisp/message.el (message-use-idna): Use nil as default since + calculated value will not byte-compile. + * lisp/gnus-art.el (gnus-use-idna): Ditto. + 2014-06-22 Norbert Koch <[email protected]> * Makefile (VERSION): XEmacs package 1.99 released. diff -r 075087fcf346 lisp/gnus-art.el --- a/lisp/gnus-art.el Sun Jun 22 09:03:58 2014 +0200 +++ b/lisp/gnus-art.el Tue Aug 19 07:31:08 2014 +0200 @@ -1517,9 +1517,10 @@ (defvar gnus-article-wash-function nil "Function used for converting HTML into text.") -(defcustom gnus-use-idna (and (condition-case nil (require 'idna) (file-error)) - (mm-coding-system-p 'utf-8) - (executable-find idna-program)) +; (defcustom gnus-use-idna (and (condition-case nil (require 'idna) (file-error)) +; (mm-coding-system-p 'utf-8) +; (executable-find idna-program)) +(defcustom gnus-use-idna nil "Whether IDNA decoding of headers is used when viewing messages. This requires GNU Libidn, and by default only enabled if it is found." :version "22.1" diff -r 075087fcf346 lisp/message.el --- a/lisp/message.el Sun Jun 22 09:03:58 2014 +0200 +++ b/lisp/message.el Tue Aug 19 07:31:08 2014 +0200 @@ -1475,13 +1475,14 @@ :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 (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 nil "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 Yours -- %% Mats