aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2013-01-11 23:17:08 -0500
committerStefan Monnier2013-01-11 23:17:08 -0500
commit96c421bba786c56792fa842f222d046e52074505 (patch)
tree7f5ad08fbc002979469931c2fce30ea9849cb969
parenta07846093f1d91ab7d6c0e86a29aee357685292f (diff)
downloademacs-96c421bba786c56792fa842f222d046e52074505.tar.gz
emacs-96c421bba786c56792fa842f222d046e52074505.zip
* lisp/autorevert.el: Use cl-lib instead of cl.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/autorevert.el16
2 files changed, 10 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b90a5ecd11e..665620ff375 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12013-01-12 Stefan Monnier <monnier@iro.umontreal.ca> 12013-01-12 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * autorevert.el: Use cl-lib instead of cl.
4
3 * vc/vc-bzr.el (vc-bzr--sanitize-header): New function (bug#13307). 5 * vc/vc-bzr.el (vc-bzr--sanitize-header): New function (bug#13307).
4 (vc-bzr-checkin): Use it. 6 (vc-bzr-checkin): Use it.
5 * vc/log-edit.el (log-edit-extract-headers): Don't presume FUNCTION 7 * vc/log-edit.el (log-edit-extract-headers): Don't presume FUNCTION
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index e78cecf0cc2..fae2b88b3e2 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -97,7 +97,7 @@
97 97
98;; Dependencies: 98;; Dependencies:
99 99
100(eval-when-compile (require 'cl)) 100(eval-when-compile (require 'cl-lib))
101(require 'timer) 101(require 'timer)
102 102
103;; Custom Group: 103;; Custom Group:
@@ -527,14 +527,14 @@ will use an up-to-date value of `auto-revert-interval'"
527 (ignore-errors 527 (ignore-errors
528 ;; Check, that event is meant for us. 528 ;; Check, that event is meant for us.
529 ;; TODO: Filter events which stop watching, like `move' or `removed'. 529 ;; TODO: Filter events which stop watching, like `move' or `removed'.
530 (assert descriptor) 530 (cl-assert descriptor)
531 (when (featurep 'inotify) (assert (memq 'modify descriptor))) 531 (when (featurep 'inotify) (cl-assert (memq 'modify descriptor)))
532 (when (featurep 'w32notify) (assert (eq 'modified descriptor))) 532 (when (featurep 'w32notify) (cl-assert (eq 'modified descriptor)))
533 (assert (bufferp buffer)) 533 (cl-assert (bufferp buffer))
534 (when (stringp file) 534 (when (stringp file)
535 (assert (string-equal 535 (cl-assert (string-equal
536 (directory-file-name file) 536 (directory-file-name file)
537 (directory-file-name (buffer-file-name buffer))))) 537 (directory-file-name (buffer-file-name buffer)))))
538 538
539 ;; Mark buffer modified. 539 ;; Mark buffer modified.
540 (with-current-buffer buffer 540 (with-current-buffer buffer