emacs/sekka.el in sekka-1.6.0 vs emacs/sekka.el in sekka-1.6.1

@@ -1,13 +1,13 @@
 ;;; sekka.el --- A client for Sekka IME server
 ;;
 ;; Copyright (C) 2010-2014 Kiyoka Nishiyama
 ;;
 ;; Author: Kiyoka Nishiyama <[e-mail]>
-;; Version: 1.6.0          ;;SEKKA-VERSION
+;; Version: 1.6.1          ;;SEKKA-VERSION
 ;; Keywords: ime, skk, japanese
-;; Package-Requires: ((cl-lib "0.3") (concurrent "0.3.1") (popup "0.5.0"))
+;; Package-Requires: ((cl-lib "0.3") (concurrent "0.3.1") (popup "0.5.2"))
 ;; URL: https://github.com/kiyoka/sekka
 ;;
 ;; This file is part of Sekka
 ;; This program was derived from sumibi.el and yc.el-4.0.13(auther: knak)
 ;;
@@ -155,15 +155,20 @@
 (defvar sekka-muhenkan-key nil     "*Non-nil であれば、リアルタイムガイド表示中は指定したキーで無変換のままスペースを挿入する。アルファベット文字１文字を指定すること")
 (defvar sekka-sticky-shift nil     "*Non-nil であれば、Sticky-Shiftを有効にする")
 (defvar sekka-mode nil             "漢字変換トグル変数")
 (defun sekka-modeline-string ()
   ;; 接続先sekka-serverのホスト名を表示する。
-  (format " Sekka[%s%s]"
+  (format " Sekka[%s%s%s]"
 	  (if current-sekka-server-url
 	      (url-host
 	       (url-generic-parse-url current-sekka-server-url))
 	    "")
+          (if current-sekka-server-url
+              (format ":%d"
+                      (url-port
+                       (url-generic-parse-url current-sekka-server-url)))
+            "")
 	  (if sekka-uploading-flag
 	      "(UPLOADING)"
 	    "")))
 (defvar sekka-select-mode nil      "候補選択モード変数")
 (or (assq 'sekka-mode minor-mode-alist)
@@ -459,19 +464,24 @@
     (let* ((lines
 	    (let ((buf (url-retrieve-synchronously url)))
 	      (sekka-debug-print (buffer-name buf))
 	      (sekka-debug-print "\n")
 	      (if buf
-		  (with-current-buffer buf
-		    (decode-coding-string 
-		     (let ((str (buffer-substring-no-properties (point-min) (point-max))))
-		       (sekka-debug-print (format "http result code:%s\n" url-http-response-status))
-		       (sekka-debug-print (format "(%d-%d) eoh=%s\n" (point-min) (point-max) url-http-end-of-headers))
-		       (sekka-debug-print (format "<<<%s>>>\n" str))
-		       str)
-		     'utf-8))
-                (list "curl: (7)  Couldn't connect to host 'localhost'")))) ;; Emulate curl error.
+                  (with-current-buffer buf
+                    (decode-coding-string 
+                     (let ((str (buffer-substring-no-properties (point-min) (point-max))))
+                       (cond
+                        (url-http-response-status
+                         (sekka-debug-print (format "http result code:%s\n" url-http-response-status))
+                         (sekka-debug-print (format "(%d-%d) eoh=%s\n" (point-min) (point-max) url-http-end-of-headers))
+                         (sekka-debug-print (format "<<<%s>>>\n" str))
+                         str)
+                        (t
+                         "curl: (28) Time out\n" ;; Emulate curl Operation timed out.
+                         )))
+                     'utf-8))
+                "curl: (7)  Couldn't connect to host 'localhost'\n"))) ;; Emulate curl error.
            (line-list
             (split-string lines "\n")))
       
       (car (reverse line-list)))))
 
@@ -1744,10 +1754,10 @@
 ;; input-method として登録する。
 (set-language-info "Japanese" 'input-method "japanese-sekka")
 (setq default-input-method "japanese-sekka")
 
 (defconst sekka-version
-  "1.6.0" ;;SEKKA-VERSION
+  "1.6.1" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"
   (interactive "P")
   (message sekka-version))