emacs/sekka.el in sekka-1.5.5 vs emacs/sekka.el in sekka-1.5.6

@@ -1,32 +1,51 @@
-;; -*- coding: utf-8 -*-
+;;; sekka.el --- A client for Sekka IME server
 ;;
-;; "sekka.el" is a client for Sekka server
+;; Copyright (C) 2010-2014 Kiyoka Nishiyama
 ;;
-;;   Copyright (C) 2010-2014 Kiyoka Nishiyama
-;;   This program was derived from sumibi.el and yc.el-4.0.13(auther: knak)
+;; Author: Kiyoka Nishiyama <[e-mail]>
+;; Version: 1.5.6          ;;SEKKA-VERSION
+;; Keywords: ime, skk, japanese
+;; Package-Requires: ((cl-lib "0.3") (concurrent "0.3.1") (popup "0.5.0"))
+;; 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)
 ;;
 ;; Sekka is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
-;; 
+;;
 ;; Sekka is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
-;; 
+;;
 ;; You should have received a copy of the GNU General Public License
 ;; along with Sekka; see the file COPYING.
 ;;
 
+;;; Commentary:
+
+;; Sekka is yet another Japanese Input Method inspired by SKK.
+;; sekka.el is a client for Sekka IME server.
+;; [https://github.com/kiyoka/sekka]
+;;
+;; you might want to enable IME:
+;;
+;;  (require 'sekka)
+;;  (global-sekka-mode 1)
+;;
+;; To enable sticky-shift with ";" key:
+;;
+;;  (setq sekka-sticky-shift t)
+;;
+;;
+
 ;;; Code:
 (require 'cl)
-(require 'http-get)
 (require 'popup)
 (require 'url-parse)
 (require 'concurrent)
 
 ;;; 
@@ -294,11 +313,11 @@
    (mapcar
     (lambda (x)
       (list "--data" (format "%s=%s"
 			     (car x)
 			     (if (stringp (cdr x))
-				 (http-url-encode (cdr x) 'utf-8)
+				 (url-hexify-string (cdr x))
 			       (cdr x)))))
     arg-alist)))
 
 ;; test-code
 (when nil
@@ -832,11 +851,10 @@
     (define-key map "\C-s"      'popup-isearch)
     (define-key map "\C-g"      'popup-close)
     (define-key map "\C-r"      'popup-select)
     map))
 
-
 ;; 選択操作回数のインクリメント
 (defun sekka-select-operation-inc ()
   (incf sekka-select-operation-times)
   (when (< 3 sekka-select-operation-times)
     (sekka-select-operation-reset)
@@ -852,11 +870,11 @@
 	   (result 
 	    (popup-menu* lst
 			 :scroll-bar t
 			 :margin t
 			 :keymap sekka-popup-menu-keymap
-			 :initial-offset sekka-cand-cur)))
+			 :initial-index sekka-cand-cur)))
       (let ((selected-word (car (split-string result " "))))
 	(setq sekka-cand-cur (sekka-find-by-tango selected-word))))))
 
 
 ;; 選択操作回数のリセット
@@ -1646,13 +1664,19 @@
 ;; input-method として登録する。
 (set-language-info "Japanese" 'input-method "japanese-sekka")
 (setq default-input-method "japanese-sekka")
 
 (defconst sekka-version
-  "1.5.5" ;;SEKKA-VERSION
+  "1.5.6" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"
   (interactive "P")
   (message sekka-version))
 
 (provide 'sekka)
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
+
+;;; sekka.el ends here