Mercurial > emacs
changeset 110497:f7314f69b999
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'.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 23 Sep 2010 00:17:08 -0700 |
| parents | 2c341056a7ec |
| children | 7d1ae818a5d2 |
| files | lisp/ChangeLog lisp/vc/add-log.el |
| diffstat | 2 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Sep 23 00:09:24 2010 -0700 +++ b/lisp/ChangeLog Thu Sep 23 00:17:08 2010 -0700 @@ -1,5 +1,10 @@ 2010-09-23 Glenn Morris <rgm@gnu.org> + * 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'. + * comint.el (comint-use-prompt-regexp-instead-of-fields): Move alias before definition, so it does not need autoloading.
--- a/lisp/vc/add-log.el Thu Sep 23 00:09:24 2010 -0700 +++ b/lisp/vc/add-log.el Thu Sep 23 00:17:08 2010 -0700 @@ -37,9 +37,6 @@ ;;; Code: -(eval-when-compile - (require 'timezone)) - (defgroup change-log nil "Change log maintenance." :group 'tools @@ -1252,19 +1249,18 @@ (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 ()