Remove spurious * in docstrings.

(add-log-time-zone-rule): Rename from change-log-time-zone-rule.
(add-change-log-entry): Use it here, since it's not specific to iso8601.
(add-log-iso8601-time-string): Don't use it here any more.
(change-log-indent-text, change-log-indent): Rename from add-log-*.

2 files changed, 65 insertions, 49 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 487c79cfe0d..fcc049feb28 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2006-04-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * add-log.el: Remove spurious * in docstrings.
+        (add-log-time-zone-rule): Rename from change-log-time-zone-rule.
+        (add-change-log-entry): Use it here, since it's not specific
+        to iso8601.
+        (add-log-iso8601-time-string): Don't use it here any more.
+        (change-log-indent-text, change-log-indent): Rename from add-log-*.
+
+        * abbrev.el (abbrev-mode): Tighten up a bit the safety predicate.
+
 2006-04-25  Ryan Yeske  <rcyeske@gmail.com>
 
         * net/rcirc.el (rcirc-print): Revert last change with ignored nicks.
@@ -23,7 +34,7 @@
 
         * net/tramp.el (tramp-register-file-name-handlers): New defun.
         Added with autoload cookie.
-        (tramp-unload-file-name-handlers): Renamed from
+        (tramp-unload-file-name-handlers): Rename from
         `tramp-unload-file-name-handler-alist'.
 
 2006-04-23  Romain Francoise  <romain@orebokech.com>
@@ -50,8 +61,7 @@
 
 2006-04-21  Carsten Dominik  <dominik@science.uva.nl>
 
-        * textmodes/org.el (org-mode-map): Catch conflict with old
-        allout.el.
+        * textmodes/org.el (org-mode-map): Catch conflict with old allout.el.
         (org-open-at-point): Remove the "...done" message to keep output
         in the echo area visible.
         (org-export-as-xoxo): Fix call to `indent-region'.
@@ -79,7 +89,7 @@
 2006-04-20  Carsten Dominik  <dominik@science.uva.nl>
 
         * textmodes/org.el: (org-deadline-announce): Face removed.
-        (org-level-faces, org-n-levels): Converted to constant.
+        (org-level-faces, org-n-levels): Convert to constant.
         (org-compatible-face): New function.
         (org-hide, org-level-1, org-level-2, org-level-3, org-level-4)
         (org-level-5, org-level-6, org-level-7, org-level-8)
@@ -90,7 +100,7 @@
         (org-bold-re, org-italic-re, org-underline-re): New constants.
         (org-set-font-lock-defaults): Use the new constants.
         (org-agenda-highlight-todo): New function.
-        (org-agenda-todo): Fixed bug with point at end of line.
+        (org-agenda-todo): Fix bug with point at end of line.
         (org-agenda-change-all-lines, org-finalize-agenda-entries):
         Fontify TODO keywords.
         (org-insert-link): Preserve relative path in ../ links.
@@ -114,12 +124,11 @@
         when moving off either end of the input history ring.
         (comint-delete-input): New function, used by
         `comint-previous-input' and others.
-        (comint-previous-matching-input): Use
-        `coming-delete-input'. Save the partial input if leaving the
+        (comint-previous-matching-input):
+        Use `coming-delete-input'.  Save the partial input if leaving the
         edit line.  Goto point-max before deleting input to avoid
         partial input fragments hanging around.
-        (comint-restore-input): New function, used by
-        `comint-previous-input'.
+        (comint-restore-input): New function, used by `comint-previous-input'.
 
 2006-04-18  Luc Teirlinck  <teirllm@auburn.edu>
 
@@ -127,8 +136,7 @@
 
 2006-04-18  Dan Nicolaescu  <dann@ics.uci.edu>
 
-        * progmodes/python.el (python-mode): Add support for
-        hs-minor-mode.
+        * progmodes/python.el (python-mode): Add support for hs-minor-mode.
 
 2006-04-19  Reiner Steib  <Reiner.Steib@gmx.de>
 
@@ -206,7 +214,7 @@
         (gdb-frame-address): Re-use to identify frame for watch expression.
         (gdb-var-list, gdb-var-create-handler): Add frame address for root
         variables.
-        (gdb-init-1, gdb-source, gdb-post-prompt, )
+        (gdb-init-1, gdb-source, gdb-post-prompt)
         (gdb-assembler-custom, gdb-invalidate-assembler): Use gdb-pc-address.
         (gdb-frame-handler): Get gdb-frame-address.
 
diff --git a/lisp/add-log.el b/lisp/add-log.el
index 1afdc7dcb72..b47494194d4 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -72,7 +72,7 @@ This defaults to the value returned by the function `user-full-name'."
 
 ;;;###autoload
 (defcustom add-log-mailing-address nil
-  "*Email addresses of user, for inclusion in ChangeLog headers.
+  "Email addresses of user, for inclusion in ChangeLog headers.
 This defaults to the value of `user-mail-address'.  In addition to
 being a simple string, this value can also be a list.  All elements
 will be recognized as referring to the same user; when creating a new
@@ -83,7 +83,7 @@ ChangeLog entry, one element will be chosen at random."
   :group 'change-log)
 
 (defcustom add-log-time-format 'add-log-iso8601-time-string
-  "*Function that defines the time format.
+  "Function that defines the time format.
 For example, `add-log-iso8601-time-string', which gives the
 date in international ISO 8601 format,
 and `current-time-string' are two valid values."
@@ -95,7 +95,7 @@ and `current-time-string' are two valid values."
   :group 'change-log)
 
 (defcustom add-log-keep-changes-together nil
-  "*If non-nil, normally keep day's log entries for one file together.
+  "If non-nil, normally keep day's log entries for one file together.
 
 Log entries for a given file made with \\[add-change-log-entry] or
 \\[add-change-log-entry-other-window] will only be added to others \
@@ -127,20 +127,20 @@ this variable."
   :group 'change-log)
 
 (defcustom add-log-always-start-new-record nil
-  "*If non-nil, `add-change-log-entry' will always start a new record."
+  "If non-nil, `add-change-log-entry' will always start a new record."
   :version "22.1"
   :type 'boolean
   :group 'change-log)
 
 (defcustom add-log-buffer-file-name-function nil
-  "*If non-nil, function to call to identify the full filename of a buffer.
+  "If non-nil, function to call to identify the full filename of a buffer.
 This function is called with no argument.  If this is nil, the default is to
 use `buffer-file-name'."
   :type '(choice (const nil) function)
   :group 'change-log)
 
 (defcustom add-log-file-name-function nil
-  "*If non-nil, function to call to identify the filename for a ChangeLog entry.
+  "If non-nil, function to call to identify the filename for a ChangeLog entry.
 This function is called with one argument, the value of variable
 `buffer-file-name' in that buffer.  If this is nil, the default is to
 use the file's name relative to the directory of the change log file."
@@ -286,10 +286,14 @@ Note: The search is conducted only within 10%, at the beginning of the file."
     map)
   "Keymap for Change Log major mode.")
 
-(defvar change-log-time-zone-rule nil
+;; It used to be called change-log-time-zone-rule but really should be
+;; called add-log-time-zone-rule since it's only used from add-log-* code.
+(defvaralias 'change-log-time-zone-rule 'add-log-time-zone-rule)
+(defvar add-log-time-zone-rule nil
   "Time zone used for calculating change log time stamps.
 It takes the same format as the TZ argument of `set-time-zone-rule'.
-If nil, use local time.")
+If nil, use local time.
+If t, use universal time.")
 
 (defun add-log-iso8601-time-zone (time)
   (let* ((utc-offset (or (car (current-time-zone time)) 0))
@@ -304,18 +308,13 @@ If nil, use local time.")
                   (t "%c%02d"))
             sign hh mm ss)))
 
+(defvar add-log-iso8601-with-time-zone nil)
+
 (defun add-log-iso8601-time-string ()
-  (if change-log-time-zone-rule
-      (let ((tz (getenv "TZ"))
-            (now (current-time)))
-        (unwind-protect
-            (progn
-              (set-time-zone-rule change-log-time-zone-rule)
-              (concat
-               (format-time-string "%Y-%m-%d " now)
-               (add-log-iso8601-time-zone now)))
-          (set-time-zone-rule tz)))
-    (format-time-string "%Y-%m-%d")))
+  (let ((time (format-time-string "%Y-%m-%d" (eq t add-log-time-zone-rule))))
+    (if add-log-iso8601-with-time-zone
+        (concat time " " (add-log-iso8601-time-zone))
+      time)))
 
 (defun change-log-name ()
   "Return (system-dependent) default name for a change log file."
@@ -494,7 +493,7 @@ The change log file can start with a copyright notice and a copying
 permission notice.  The first blank line indicates the end of these
 notices.
 
-Today's date is calculated according to `change-log-time-zone-rule' if
+Today's date is calculated according to `add-log-time-zone-rule' if
 non-nil, otherwise in local time."
   (interactive (list current-prefix-arg
                      (prompt-for-change-log-name)))
@@ -538,13 +537,22 @@ non-nil, otherwise in local time."
       (skip-chars-forward "\n"))
 
     ;; Advance into first entry if it is usable; else make new one.
-    (let ((new-entries (mapcar (lambda (addr)
-                                 (concat (funcall add-log-time-format)
-                                         "  " full-name
-                                         "  <" addr ">"))
-                               (if (consp mailing-address)
-                                   mailing-address
-                                 (list mailing-address)))))
+    (let ((new-entries
+           (mapcar (lambda (addr)
+                     (concat
+                      (if (stringp add-log-time-zone-rule)
+                          (let ((tz (getenv "TZ")))
+                            (unwind-protect
+                                (progn
+                                  (set-time-zone-rule add-log-time-zone-rule)
+                                  (funcall add-log-time-format))
+                              (set-time-zone-rule tz)))
+                        (funcall add-log-time-format))
+                      "  " full-name
+                      "  <" addr ">"))
+                   (if (consp mailing-address)
+                       mailing-address
+                     (list mailing-address)))))
       (if (and (not add-log-always-start-new-record)
                (let ((hit nil))
                  (dolist (entry new-entries hit)
@@ -652,21 +660,21 @@ the change log file in another window."
   (add-change-log-entry whoami file-name t))
 ;;;###autoload (define-key ctl-x-4-map "a" 'add-change-log-entry-other-window)
 
-(defvar add-log-indent-text 0)
+(defvar change-log-indent-text 0)
 
-(defun add-log-indent ()
+(defun change-log-indent ()
   (let* ((indent
           (save-excursion
             (beginning-of-line)
             (skip-chars-forward " \t")
             (cond
-             ((and (looking-at "\\(.*\\)  [^ \n].*[^ \n]  <.*>$")
+             ((and (looking-at "\\(.*\\)  [^ \n].*[^ \n]  <.*>\\(?: +(.*)\\)? *$")
                    ;; Matching the output of add-log-time-format is difficult,
                    ;; but I'll get it has at least two adjacent digits.
                    (string-match "[[:digit:]][[:digit:]]" (match-string 1)))
               0)
              ((looking-at "[^*(]")
-              (+ (current-left-margin) add-log-indent-text))
+              (+ (current-left-margin) change-log-indent-text))
              (t (current-left-margin)))))
          (pos (save-excursion (indent-line-to indent) (point))))
     (if (> pos (point)) (goto-char pos))))
@@ -688,7 +696,7 @@ Runs `change-log-mode-hook'.
         tab-width 8)
   (set (make-local-variable 'fill-paragraph-function)
        'change-log-fill-paragraph)
-  (set (make-local-variable 'indent-line-function) 'add-log-indent)
+  (set (make-local-variable 'indent-line-function) 'change-log-indent)
   (set (make-local-variable 'tab-always-indent) nil)
   ;; We really do want "^" in paragraph-start below: it is only the
   ;; lines that begin at column 0 (despite the left-margin of 8) that
@@ -722,23 +730,23 @@ Prefix arg means justify as well."
 
 (defcustom add-log-current-defun-header-regexp
   "^\\([[:upper:]][[:upper:]_ ]*[[:upper:]_]\\|[-_[:alpha:]]+\\)[ \t]*[:=]"
-  "*Heuristic regexp used by `add-log-current-defun' for unknown major modes."
+  "Heuristic regexp used by `add-log-current-defun' for unknown major modes."
   :type 'regexp
   :group 'change-log)
 
 ;;;###autoload
 (defvar add-log-lisp-like-modes
-    '(emacs-lisp-mode lisp-mode scheme-mode dsssl-mode lisp-interaction-mode)
+  '(emacs-lisp-mode lisp-mode scheme-mode dsssl-mode lisp-interaction-mode)
   "*Modes that look like Lisp to `add-log-current-defun'.")
 
 ;;;###autoload
 (defvar add-log-c-like-modes
-    '(c-mode c++-mode c++-c-mode objc-mode)
+  '(c-mode c++-mode c++-c-mode objc-mode)
   "*Modes that look like C to `add-log-current-defun'.")
 
 ;;;###autoload
 (defvar add-log-tex-like-modes
-    '(TeX-mode plain-TeX-mode LaTeX-mode plain-tex-mode latex-mode)
+  '(TeX-mode plain-TeX-mode LaTeX-mode plain-tex-mode latex-mode)
   "*Modes that look like TeX to `add-log-current-defun'.")
 
 ;;;###autoload
@@ -1103,5 +1111,5 @@ old-style time formats for entries are supported."
 
 (provide 'add-log)
 
-;;; arch-tag: 81eee6fc-088f-4372-a37f-80ad9620e762
+;; arch-tag: 81eee6fc-088f-4372-a37f-80ad9620e762
 ;;; add-log.el ends here