diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-03 13:39:52 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-03 13:39:52 -0700 |
| commit | b1c7207dbbc5b35aa2fa6e69a3041299e881dbb6 (patch) | |
| tree | 823364dde3da94970a5ae79f7d131f127eb547f4 /lisp/gnus/gmm-utils.el | |
| parent | f7c5f79ca565d3ef3feeb1e0af5ca261f1bcf58a (diff) | |
| parent | b787d5501bad8036016d835faa2f90bb0904c038 (diff) | |
| download | emacs-b1c7207dbbc5b35aa2fa6e69a3041299e881dbb6.tar.gz emacs-b1c7207dbbc5b35aa2fa6e69a3041299e881dbb6.tar.bz2 emacs-b1c7207dbbc5b35aa2fa6e69a3041299e881dbb6.zip | |
Merge from origin/emacs-25
b787d55 More format-time-string change fixups
13c8f29 make-xwidget unused arg cleanup
36e05f0 Remove unused arguments from make-xwidget
1042217 Document incompatible changes in 'format-time-string'
7228eb8 Improve documentation of byte-code objects
0020047 Adapt calls to 'format-time-string' to changes in Emacs 25
17b5152 Improve vc-diff with Git backend
c28f87a (js--continued-expression-p): Special-case unary plus and minus
2d02a5f ; * lisp/vc/vc-annotate.el (vc-annotate): Clarify commentary.
9151f16 Prevent C++ Mode wrongly fontifying some identifiers near tem...
b3b523c Avoid crashes due to insanely large columns in tabulated-list...
a3daa34 Teach M-x disassemble a default argument.
e30c3e9 Fix EOL decoding in vc-annotate with SVN back-end on MS-Windows
df441b3 Fix OS X specific settings in tramp-tests
2244331 Finish fixing a cacheing bug in CC Mode (see 2016-03-09)
# Conflicts:
# lisp/net/tramp-sh.el
# lisp/progmodes/cc-engine.el
Diffstat (limited to 'lisp/gnus/gmm-utils.el')
| -rw-r--r-- | lisp/gnus/gmm-utils.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el index 785a286c915..f6455cf9f1a 100644 --- a/lisp/gnus/gmm-utils.el +++ b/lisp/gnus/gmm-utils.el @@ -286,7 +286,7 @@ specifiers `%Z' and `%z' will be replaced with a numeric form. " (setq st nd)) (push (substring format-string st) rest) (format-time-string (apply 'concat (nreverse rest)) time)) - (format-time-string format-string time tz))) + (format-time-string format-string time t))) (provide 'gmm-utils) |