[gnus git] branch master updated: m0-11-219-g525742a =1= Catch the invalid-operation that idna.el will issue

       via  525742a924f00e006e6ed48e4b6341ba6f27d733 (commit)
      from  91a502818672a9fd471382f0e9077f7c7c0e4a6b (commit)


- Log -----------------------------------------------------------------
commit 525742a924f00e006e6ed48e4b6341ba6f27d733
Author: Katsumi Yamaoka <[email protected]>
Date:   Tue Apr 14 03:34:11 2015 +0000

    Catch the invalid-operation that idna.el will issue
    
    * gnus-art.el (gnus-use-idna):
    * gnus-sum.el (gnus-summary-idna-message):
    * message.el (message-use-idna):
    Catch the invalid-operation that idna.el will issue.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b720dc..e2724cc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2015-04-14  Katsumi Yamaoka  <[email protected]>
+
+	* gnus-art.el (gnus-use-idna):
+	* gnus-sum.el (gnus-summary-idna-message):
+	* message.el (message-use-idna):
+	Catch the invalid-operation that idna.el will issue.
+
 2015-04-14  Stefan Monnier  <[email protected]>
 
 	* gnus-group.el (gnus-group--setup-tool-bar-update):
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 1d9bcd1..44b026a 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1628,8 +1628,11 @@ It is a string, such as \"PGP\". If nil, ask user."
 
 (defvar idna-program)
 
-(defcustom gnus-use-idna (and (condition-case nil (require 'idna) (file-error))
-			      (mm-coding-system-p 'utf-8)
+(defcustom gnus-use-idna (and (mm-coding-system-p 'utf-8)
+			      (condition-case nil
+				  (require 'idna)
+				(file-error)
+				(invalid-operation))
 			      idna-program
 			      (executable-find idna-program))
   "Whether IDNA decoding of headers is used when viewing messages.
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 73a0d4b..1d8ad8e 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -9870,9 +9870,11 @@ invalid IDNA string (`xn--bar' is invalid).
 You must have GNU Libidn (URL `http://www.gnu.org/software/libidn/')
 installed for this command to work."
   (interactive "P")
-  (if (not (and (condition-case nil (require 'idna)
-		  (file-error))
-		(mm-coding-system-p 'utf-8)
+  (if (not (and (mm-coding-system-p 'utf-8)
+		(condition-case nil
+		    (require 'idna)
+		  (file-error)
+		  (invalid-operation))
 		(symbol-value 'idna-program)
 		(executable-find (symbol-value 'idna-program))))
       (gnus-message
diff --git a/lisp/message.el b/lisp/message.el
index 3d10eae..b8a69b0 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1807,7 +1807,10 @@ no, only reply back to the author."
 	       (let (mucs-ignore-version-incompatibilities)
 		 (require 'un-define))
 	     (error)))
-       (condition-case nil (require 'idna) (file-error))
+       (condition-case nil
+	   (require 'idna)
+	 (file-error)
+	 (invalid-operation))
        idna-program
        (executable-find idna-program)
        (string= (idna-to-ascii "räksmörgås") "xn--rksmrgs-5wao1o")

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog   |    7 +++++++
 lisp/gnus-art.el |    7 +++++--
 lisp/gnus-sum.el |    8 +++++---
 lisp/message.el  |    5 ++++-
 4 files changed, 21 insertions(+), 6 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project