summaryrefslogtreecommitdiff
path: root/lisp/autorevert.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2013-06-05 15:57:10 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2013-06-05 15:57:10 -0400
commitfccdc796cfccb428a3535943faa08f4323cacc4b (patch)
treef381e2a3171c37aa78aec63a39b29b6df82f339c /lisp/autorevert.el
parent398b4366647e54babb1c743728fddbc909678904 (diff)
downloademacs-fccdc796cfccb428a3535943faa08f4323cacc4b.tar.gz
emacs-fccdc796cfccb428a3535943faa08f4323cacc4b.tar.bz2
emacs-fccdc796cfccb428a3535943faa08f4323cacc4b.zip
* lisp/autorevert.el (auto-revert-notify-handler): Use memq.
Hide assertion failure. * lisp/skeleton.el: Use cl-lib. (skeleton-further-elements): Use defvar-local. (skeleton-insert): Use cl-progv.
Diffstat (limited to 'lisp/autorevert.el')
-rw-r--r--lisp/autorevert.el12
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 90dda93a166..4a6d4cb4cc0 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -578,7 +578,7 @@ will use an up-to-date value of `auto-revert-interval'"
((featurep 'w32notify) (nth 2 event)))))
(defun auto-revert-notify-handler (event)
- "Handle an event returned from file notification."
+ "Handle an EVENT returned from file notification."
(when (auto-revert-notify-event-p event)
(let* ((descriptor (auto-revert-notify-event-descriptor event))
(action (auto-revert-notify-event-action event))
@@ -591,10 +591,12 @@ will use an up-to-date value of `auto-revert-interval'"
(cl-assert descriptor)
(cond
((featurep 'gfilenotify)
- (cl-assert (or (eq 'attribute-changed action)
- (eq 'changed action)
- (eq 'created action)
- (eq 'deleted action))))
+ (cl-assert (memq action '(attribute-changed changed created deleted
+ ;; FIXME: I keep getting this action, so I
+ ;; added it here, but I have no idea what
+ ;; I'm doing. --Stef
+ changes-done-hint))
+ t))
((featurep 'inotify)
(cl-assert (or (memq 'attrib action)
(memq 'create action)