Mercurial > hg > xemacs-beta

diff lisp/mule/mule-cmds.el @ 203:850242ba4a81 r20-3b28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b28
author cvs
date Mon, 13 Aug 2007 10:02:21 +0200
parents acd284d43ca1
children e45d5e7c476e
line wrap: on
line diff
--- a/lisp/mule/mule-cmds.el	Mon Aug 13 10:01:24 2007 +0200
+++ b/lisp/mule/mule-cmds.el	Mon Aug 13 10:02:21 2007 +0200
@@ -311,8 +311,11 @@
 		       ))
     (if (> (length input-method) 0)
 	input-method
-      (if inhibit-null
-	  (error "No valid input method is specified")))))
+      ;; If we have a default, use it, otherwise check inhibit-null
+      (if default
+	  default
+	(if inhibit-null
+	    (error "No valid input method is specified"))))))
 
 (defun activate-input-method (input-method)
   "Turn INPUT-METHOD on.