From 652406e2bffa7e2223535c6512eb6de9943c33a3 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Thu, 31 Oct 2019 17:18:04 +0100 Subject: [PATCH] update langtool --- elpa/langtool-20180409.1016/langtool-pkg.el | 2 -- .../langtool-autoloads.el | 11 +++------ elpa/langtool-20190303.2227/langtool-pkg.el | 2 ++ .../langtool.el | 24 ++++++++++++------- 4 files changed, 20 insertions(+), 19 deletions(-) delete mode 100644 elpa/langtool-20180409.1016/langtool-pkg.el rename elpa/{langtool-20180409.1016 => langtool-20190303.2227}/langtool-autoloads.el (71%) create mode 100644 elpa/langtool-20190303.2227/langtool-pkg.el rename elpa/{langtool-20180409.1016 => langtool-20190303.2227}/langtool.el (98%) diff --git a/elpa/langtool-20180409.1016/langtool-pkg.el b/elpa/langtool-20180409.1016/langtool-pkg.el deleted file mode 100644 index d32b6804..00000000 --- a/elpa/langtool-20180409.1016/langtool-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "langtool" "20180409.1016" "Grammar check utility using LanguageTool" '((cl-lib "0.3")) :commit "d93286722cff3fecf8641a4a6c3b0691f30362fe" :keywords '("docs") :authors '(("Masahiro Hayashi" . "mhayashi1120@gmail.com")) :maintainer '("Masahiro Hayashi" . "mhayashi1120@gmail.com") :url "https://github.com/mhayashi1120/Emacs-langtool") diff --git a/elpa/langtool-20180409.1016/langtool-autoloads.el b/elpa/langtool-20190303.2227/langtool-autoloads.el similarity index 71% rename from elpa/langtool-20180409.1016/langtool-autoloads.el rename to elpa/langtool-20190303.2227/langtool-autoloads.el index 71a19c5c..5f8b51c2 100644 --- a/elpa/langtool-20180409.1016/langtool-autoloads.el +++ b/elpa/langtool-20190303.2227/langtool-autoloads.el @@ -1,12 +1,10 @@ ;;; langtool-autoloads.el --- automatically extracted autoloads ;; ;;; Code: - -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) - +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "langtool" "langtool.el" (0 0 0 0)) +;;;### (autoloads nil "langtool" "langtool.el" (23994 46459 774290 +;;;;;; 795000)) ;;; Generated autoloads from langtool.el (defalias 'langtool-check 'langtool-check-buffer) @@ -25,14 +23,11 @@ Switch `langtool-default-language' to LANG \(fn LANG)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "langtool" '("langtool-"))) - ;;;*** ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 ;; End: ;;; langtool-autoloads.el ends here diff --git a/elpa/langtool-20190303.2227/langtool-pkg.el b/elpa/langtool-20190303.2227/langtool-pkg.el new file mode 100644 index 00000000..6fbc1989 --- /dev/null +++ b/elpa/langtool-20190303.2227/langtool-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "langtool" "20190303.2227" "Grammar check utility using LanguageTool" '((cl-lib "0.3")) :commit "81f2b8a07b29bbdd558db4b68dd904f4c0eb10a4" :keywords '("docs") :authors '(("Masahiro Hayashi" . "mhayashi1120@gmail.com")) :maintainer '("Masahiro Hayashi" . "mhayashi1120@gmail.com") :url "https://github.com/mhayashi1120/Emacs-langtool") diff --git a/elpa/langtool-20180409.1016/langtool.el b/elpa/langtool-20190303.2227/langtool.el similarity index 98% rename from elpa/langtool-20180409.1016/langtool.el rename to elpa/langtool-20190303.2227/langtool.el index 834c4f53..7df87f6d 100644 --- a/elpa/langtool-20180409.1016/langtool.el +++ b/elpa/langtool-20190303.2227/langtool.el @@ -2,10 +2,10 @@ ;; Author: Masahiro Hayashi ;; Keywords: docs -;; Package-Version: 20180409.1016 +;; Package-Version: 20190303.2227 ;; URL: https://github.com/mhayashi1120/Emacs-langtool ;; Emacs: GNU Emacs 24 or later -;; Version: 2.0.0 +;; Version: 2.0.3 ;; Package-Requires: ((cl-lib "0.3")) ;; This program is free software; you can redistribute it and/or @@ -28,7 +28,7 @@ ;; ## Install: ;; Install LanguageTool version 3.0 or later (and java) -;; http://www.languagetool.org/ +;; https://languagetool.org/ ;; Put this file into load-path'ed directory, and byte compile it if ;; desired. And put the following expression into your ~/.emacs. @@ -745,7 +745,8 @@ Ordinary no need to change this." (langtool-language-tool-server-jar 'http) ((or langtool-language-tool-jar - langtool-java-classpath) + langtool-java-classpath + langtool-bin) 'commandline) (t (error "There is no valid setting.")))) @@ -898,6 +899,7 @@ Ordinary no need to change this." (langtool--apply-checks proc checks)))) (defun langtool-command--process-sentinel (proc event) + (langtool--debug "Sentinel" "event: %s" event) (unless (process-live-p proc) (let ((code (process-exit-status proc)) (pbuf (process-buffer proc)) @@ -991,6 +993,7 @@ Ordinary no need to change this." (defvar langtool-server--process-exit-hook nil) (defun langtool-server--process-sentinel (proc event) + (langtool--debug "Sentinel" "event: %s" event) (unless (process-live-p proc) (run-hooks 'langtool-server--process-exit-hook))) @@ -999,19 +1002,22 @@ Ordinary no need to change this." (unless (and (processp langtool-server--process) (eq (process-status langtool-server--process) 'run)) (setq langtool-server--process nil) - (let* ((args '())) + (let* ((bin langtool-java-bin) + (args '())) ;; jar Default setting is "HTTPSServer" . ;; This application no need to use SSL since local app. ;; http://wiki.languagetool.org/http-server + (setq args (append args (list + "-cp" (langtool--process-file-name + langtool-language-tool-server-jar)))) (setq args (append args (list "org.languagetool.server.HTTPServer"))) (setq args (append args langtool-server-user-arguments)) + (langtool--debug "HTTPServer" "%s: %s" bin args) (let* ((buffer (get-buffer-create " *LangtoolHttpServer* ")) (proc (apply 'start-process "LangtoolHttpServer" buffer - langtool-java-bin - "-cp" (langtool--process-file-name - langtool-language-tool-server-jar) + bin args))) (langtool-server--rendezvous proc buffer) (set-process-sentinel proc 'langtool-server--process-sentinel) @@ -1096,7 +1102,7 @@ Ordinary no need to change this." ("text" ,text) ,@(and langtool-mother-tongue `(("motherTongue" ,langtool-mother-tongue))) - ("disabled" ,disabled-rules) + ("disabledRules" ,disabled-rules) )) query-string) (when (and langtool-client-filter-query-function -- 2.47.3