[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101556: Cosmetic changes for add-log
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101556: Cosmetic changes for add-log.el. |
Date: |
Thu, 23 Sep 2010 00:17:08 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101556
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-09-23 00:17:08 -0700
message:
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'.
modified:
lisp/ChangeLog
lisp/vc/add-log.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-09-23 07:09:24 +0000
+++ b/lisp/ChangeLog 2010-09-23 07:17:08 +0000
@@ -1,5 +1,10 @@
2010-09-23 Glenn Morris <address@hidden>
+ * 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.
=== modified file 'lisp/vc/add-log.el'
--- a/lisp/vc/add-log.el 2010-08-21 14:09:46 +0000
+++ b/lisp/vc/add-log.el 2010-09-23 07:17:08 +0000
@@ -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 ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101556: Cosmetic changes for add-log.el.,
Glenn Morris <=