diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-09-23 00:17:08 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-09-23 00:17:08 -0700 |
| commit | 7b344dfef79b1fdd068b39036bb34ddeafa96b7d (patch) | |
| tree | b3f2f1036eba1c56faf76e0019ac7398b4975f51 /lisp/vc | |
| parent | d97034985aea86dbc2405db1cab5433c65339ac4 (diff) | |
| download | emacs-7b344dfef79b1fdd068b39036bb34ddeafa96b7d.tar.gz emacs-7b344dfef79b1fdd068b39036bb34ddeafa96b7d.tar.bz2 emacs-7b344dfef79b1fdd068b39036bb34ddeafa96b7d.zip | |
Cosmetic changes for add-log.el.
* lisp/vc/add-log.el: Don't require timezone when compiling.
(timezone-make-date-sortable): Autoload it.
(change-log-sortable-date-at): Don't require timezone.
Use `ignore-errors'.
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/add-log.el | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index 23f1e33f181..b63e482ff05 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el @@ -37,9 +37,6 @@ ;;; Code: -(eval-when-compile - (require 'timezone)) - (defgroup change-log nil "Change log maintenance." :group 'tools @@ -1252,19 +1249,18 @@ Has a preference of looking backwards." (change-log-get-method-definition-1 "")) (concat change-log-get-method-definition-md "]")))))) +(autoload 'timezone-make-date-sortable "timezone") + (defun change-log-sortable-date-at () "Return date of log entry in a consistent form for sorting. Point is assumed to be at the start of the entry." - (require 'timezone) (if (looking-at change-log-start-entry-re) (let ((date (match-string-no-properties 0))) (if date (if (string-match "\\(....\\)-\\(..\\)-\\(..\\)\\s-+" date) (concat (match-string 1 date) (match-string 2 date) (match-string 3 date)) - (condition-case nil - (timezone-make-date-sortable date) - (error nil))))) + (ignore-errors (timezone-make-date-sortable date))))) (error "Bad date"))) (defun change-log-resolve-conflict () |