diff options
| author | Miles Bader <miles@gnu.org> | 2007-12-06 09:51:45 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-12-06 09:51:45 +0000 |
| commit | 0bd508417142ff377f34aec8dcec9438d9175c2c (patch) | |
| tree | 4d60fe09e5cebf7d79766b11e9cda8cc1c9dbb9b /lisp/url/url-history.el | |
| parent | 98fe991da804a42f53f6a5e84cd5eab18a82e181 (diff) | |
| parent | 9fb1ba8090da3528de56158a79bd3527d31c7f2f (diff) | |
| download | emacs-0bd508417142ff377f34aec8dcec9438d9175c2c.tar.gz | |
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
Diffstat (limited to 'lisp/url/url-history.el')
| -rw-r--r-- | lisp/url/url-history.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el index 1ed3c71174e..605ffa0145f 100644 --- a/lisp/url/url-history.el +++ b/lisp/url/url-history.el @@ -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 @@ to run the `url-history-setup-save-timer' function manually." (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 @@ user for what type to save as." (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)) |