------------------------------------------------------------ revno: 410 revision-id: dgu...@yandex.ru-20130619072706-ylzdqgwoq1g567xp parent: t...@gnu.org-20130614185515-zmkafn051sqlc4fc committer: Dmitry Gutov <dgu...@yandex.ru> branch nick: elpa timestamp: Wed 2013-06-19 11:27:06 +0400 message: js2-mode: Merge from upstream Git commit 714dca50644c75884d9d90f10328c7a12e02cdcc modified: packages/js2-mode/js2-mode.el js2mode20090814.el-20101118182351-xme90jru269t6msr-7
=== modified file 'packages/js2-mode/js2-mode.el' --- a/packages/js2-mode/js2-mode.el 2013-06-08 19:07:07 +0000 +++ b/packages/js2-mode/js2-mode.el 2013-06-19 07:27:06 +0000 @@ -7,7 +7,7 @@ ;; Dmitry Gutov <dgu...@yandex.ru> ;; URL: https://github.com/mooz/js2-mode/ ;; http://code.google.com/p/js2-mode/ -;; Version: 20130608 +;; Version: 20130619 ;; Keywords: languages, javascript ;; Package-Requires: ((emacs "24.1")) @@ -10562,8 +10562,9 @@ (defun js2-echo-error (old-point new-point) "Called by point-motion hooks." (let ((msg (get-text-property new-point 'help-echo))) - (when (and (stringp msg) (or (not (current-message)) - (string= (current-message) "Quit"))) + (when (and (stringp msg) + (not (active-minibuffer-window)) + (not (current-message))) (message msg)))) (defalias #'js2-echo-help #'js2-echo-error) @@ -11138,6 +11139,8 @@ (if (zerop (decf count)) (setq continue nil))) (setq errs (cdr errs))) + ;; Clear for `js2-echo-error'. + (message nil) (if err (goto-char (second err)) ;; Wrap around to first error.
