Mercurial > emacs
changeset 86949:5befb2f1ec98
(top-level): Don't require cl when compiling.
(url-history-setup-save-timer, url-history-save-history):
Use condition-case rather than ignore-errors.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sun, 02 Dec 2007 18:05:36 +0000 |
| parents | effd426f6dc7 |
| children | fed682f20285 |
| files | lisp/url/url-history.el |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/url/url-history.el Sun Dec 02 18:05:26 2007 +0000 +++ b/lisp/url/url-history.el Sun Dec 02 18:05:36 2007 +0000 @@ -28,7 +28,6 @@ ;; This can get a recursive require. ;;(require 'url) -(eval-when-compile (require 'cl)) (require 'url-parse) (autoload 'url-do-setup "url") @@ -83,8 +82,9 @@ (defun url-history-setup-save-timer () "Reset the history list timer." (interactive) - (ignore-errors - (cancel-timer url-history-timer)) + (condition-case nil + (cancel-timer url-history-timer) + (error nil)) (setq url-history-timer nil) (if (and (eq url-history-track t) url-history-save-interval) (setq url-history-timer (run-at-time url-history-save-interval @@ -120,7 +120,9 @@ (interactive) (or fname (setq fname (expand-file-name url-history-file))) (unless (file-directory-p (file-name-directory fname)) - (ignore-errors (make-directory (file-name-directory fname)))) + (condition-case nil + (make-directory (file-name-directory fname)) + (error nil))) (cond ((not url-history-changed-since-last-save) nil) ((not (file-writable-p fname))