X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=howm-vars.el;h=5a3a51f4ed5a7ae472d367e5dbfc2eecede9bf50;hb=HEAD;hp=6795d088fc7120cd227731aa7254a7fa9d51ff5c;hpb=9c44c0d76e641d7b4b167c1fb52c4d569ca7f3bb;p=howm%2Fhowm.git

diff --git a/howm-vars.el b/howm-vars.el
index 6795d08..51934a6 100644
--- a/howm-vars.el
+++ b/howm-vars.el
@@ -1,7 +1,6 @@
 ;;; howm-vars.el --- Wiki-like note-taking tool
-;;; Copyright (C) 2005-2018
+;;; Copyright (C) 2005-2022
 ;;;   HIRAOKA Kazuyuki <khi@users.osdn.me>
-;;; $Id: howm-vars.el,v 1.59 2011-12-31 15:07:29 hira Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -240,13 +239,21 @@ A file is excluded iff this regexp matches with all the relative paths."
   :group 'howm)
 
 (defcustom howm-menu-lang
-  (if (or (and (boundp 'current-language-environment)
-               (string= current-language-environment "Japanese"))
-          (string-match "^ja" (howm-get-locale)))
-      'ja
-    'en)
+  (let ((lang-table '((fr "French" "^fr")
+                      (ja "Japanese" "^ja"))))
+    (let ((lang (or (and (boundp 'current-language-environment)
+                        current-language-environment)
+                   ""))
+          (locale (howm-get-locale))
+          (ret 'en))
+      (mapc (lambda (rule)
+              (if (or (string= lang (cadr rule))
+                      (string-match (cl-caddr rule) locale))
+                  (setq ret (car rule))))
+            lang-table)
+      ret))
   "*Language of menu."
-  :type '(radio (const en) (const ja))
+  :type '(radio (const en) (const fr) (const ja))
   :group 'howm-menu)
 
 (howm-defcustom-risky howm-menu-file nil
@@ -825,6 +832,34 @@ so that highlighting works correctly."
     :type 'boolean
     :group 'howm-grep))
 
+(defgroup howm-iigrep nil
+  "Show search results on the fly before hitting RET."
+  :group 'howm-grep)
+
+(defcustom howm-iigrep-preview-items 20
+  "Show howm search results on the fly before hitting RET when the hit counts are within this number."
+  :type 'integer
+  :group 'howm-efficiency
+  :group 'howm-iigrep)
+
+(defcustom howm-iigrep-show-what nil
+  "Show search results on the fly before hitting RET."
+  :type '(radio (const :tag "Off" nil)
+                (const :tag "Counts" counts)
+                (const :tag "Contents" contents)
+                (const :tag "Full" full))
+  :group 'howm-efficiency
+  :group 'howm-iigrep)
+
+(defcustom howm-iigrep-migemo-show-what 'inherit
+  "Show migemo search results on the fly before hitting RET."
+  :type '(radio (const :tag "Inherit howm-iigrep-show-what" inherit)
+                (const :tag "Counts" counts)
+                (const :tag "Contents" contents)
+                (const :tag "Full" full))
+  :group 'howm-efficiency
+  :group 'howm-iigrep)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Misc