diff options
author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/tempo.el | |
parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
download | emacs-25-merge.tar.gz |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/tempo.el')
-rw-r--r-- | lisp/tempo.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/tempo.el b/lisp/tempo.el index 93df15a8934..2fe76ab82d8 100644 --- a/lisp/tempo.el +++ b/lisp/tempo.el @@ -147,7 +147,7 @@ disappears at the next keypress; otherwise, it remains forever." "List of functions to run when inserting a string. Each function is called with a single arg, STRING and should return another string. This could be used for making all strings upcase by -setting it to '(upcase), for example.") +setting it to (upcase), for example.") (defvar tempo-tags nil "An association list with tags and corresponding templates.") |