[Emacs-diffs] master 49a9e73: Only cancel timer when it is non-nil

[Dmitry Gutov]

branch: master
commit 49a9e73f0a7d52a3c452d466097b2d14b1b8e126
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Only cancel timer when it is non-nil
    
    * lisp/cedet/pulse.el (pulse-momentary-unhighlight): Only cancel
    timer when it is non-nil
    (http://lists.gnu.org/archive/html/emacs-devel/2015-05/msg00223.html).
---
 lisp/cedet/pulse.el |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el
index 67ad31a..39ba13c 100644
--- a/lisp/cedet/pulse.el
+++ b/lisp/cedet/pulse.el
@@ -215,9 +215,10 @@ Optional argument FACE specifies the face to do the 
highlighting."
     (setq pulse-momentary-overlay nil)
 
     ;; Reset the pulsing face.
-    (pulse-reset-face)
+    (pulse-reset-face))
 
-    ;; Cancel the timer.
+  ;; Cancel the timer.
+  (when pulse-momentary-timer
     (cancel-timer pulse-momentary-timer))
 
   ;; Remove this hook.