diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-12 08:50:47 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-12 08:50:47 -0700 |
| commit | 7c2c2196fd4be0b656bdf0e0b68f3d7c4a5eca08 (patch) | |
| tree | c038edb545cc82ee825390d1e7691a247fd7fc5f /lisp/vc | |
| parent | 435da5d2955ce35be4785b7d46566ed9b42ea9fb (diff) | |
| parent | ca509810014726cf6bee9f7e8f69bdeaf62dc146 (diff) | |
| download | emacs-7c2c2196fd4be0b656bdf0e0b68f3d7c4a5eca08.tar.gz | |
Merge from origin/emacs-25
ca50981 Improve time zone documentation
c23c965 Prevent bootstrap autoload backup files
9344612 Disable multicolor fonts on OS X since they are not supported...
c41ce1c Capitalize “Universal Time” in documentation
10597c9 Don't use 'find-program'
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/add-log.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index d6c1fc203db..58a4e77a602 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el @@ -583,10 +583,9 @@ Compatibility function for \\[next-error] invocations." ;; 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 t, use universal time.") + "Time zone rule used for calculating change log time stamps. +If nil, use local time. If t, use Universal Time. +If a string, interpret as the ZONE argument of `format-time-string'.") (put 'add-log-time-zone-rule 'safe-local-variable (lambda (x) (or (booleanp x) (stringp x)))) |