[logaling-commit] logaling/logalimacs [master] Use common functionn of popup.el instead of keyboard-quit

Zurück zum Archiv-Index

null+****@clear***** null+****@clear*****
Sun Jul 22 12:05:23 JST 2012


Yuta Yamada	2012-07-22 12:05:23 +0900 (Sun, 22 Jul 2012)

  New Revision: 59130846db0d56b90069ab0ad788a1aade9affeb
  https://github.com/logaling/logalimacs/commit/59130846db0d56b90069ab0ad788a1aade9affeb

  Log:
    Use common functionn of popup.el instead of keyboard-quit

  Modified files:
    logalimacs.el

  Modified: logalimacs.el (+7 -4)
===================================================================
--- logalimacs.el    2012-07-21 22:17:00 +0900 (ed3de84)
+++ logalimacs.el    2012-07-22 12:05:23 +0900 (8638ef4)
@@ -527,6 +527,10 @@ Otherwise passed character inside region."
   (loga-lookup :buffer))
 
 
+(defun loga-delete-popup ()
+  (if (popup-live-p menu)
+      (popup-delete menu)))
+
 (defun loga-to-singular-form (word)
   (if loga-use-singular-form
       (loop for (regexp replace) in '(("ies$" "y")
@@ -666,11 +670,11 @@ Otherwise passed character inside region."
       (setq count (1- count)))))
 
 (defun loga-quit ()
+  (loga-delete-popup)
   (switch-to-buffer "*logalimacs*")
   (when (eq loga-current-endpoint :buffer)
     (quit-window)
-    (switch-to-buffer loga-base-buffer))
-  (keyboard-quit))
+    (switch-to-buffer loga-base-buffer)))
 
 (defun loga-check-state ()
   (interactive)
@@ -702,8 +706,7 @@ Otherwise passed character inside region."
   (interactive)
   (when (functionp loga-fallback-function)
     (funcall loga-fallback-function (or search-word (caar loga-word-cache)))
-    ;; exit popup
-    (keyboard-quit)))
+    (loga-delete-popup)))
 
 (defun loga-one-word-p (search-word)
   (let ((english-only-p (not (string-match "[^a-zA-Z]" search-word)))
-------------- next part --------------
An HTML attachment was scrubbed...
Download 



More information about the logaling-commit mailing list
Zurück zum Archiv-Index