HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk; up to 2014-02-23T23:41:17Z!lekktu@gmail.com.
[bpt/emacs.git]
/
lisp
/
tempo.el
diff --git
a/lisp/tempo.el
b/lisp/tempo.el
index
dc47193
..
9ff7a49
100644
(file)
--- a/
lisp/tempo.el
+++ b/
lisp/tempo.el
@@
-1,7
+1,6
@@
;;; tempo.el --- Flexible template insertion
;;; tempo.el --- Flexible template insertion
-;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 2001-2014 Free Software Foundation, Inc.
;; Author: David K}gedal <davidk@lysator.liu.se>
;; Created: 16 Feb 1994
;; Author: David K}gedal <davidk@lysator.liu.se>
;; Created: 16 Feb 1994
@@
-114,14
+113,14
@@
:group 'tools)
(defcustom tempo-interactive nil
:group 'tools)
(defcustom tempo-interactive nil
- "
*
Prompt user for strings in templates.
+ "Prompt user for strings in templates.
If this variable is non-nil, `tempo-insert' prompts the
user for text to insert in the templates."
:type 'boolean
:group 'tempo)
(defcustom tempo-insert-region nil
If this variable is non-nil, `tempo-insert' prompts the
user for text to insert in the templates."
:type 'boolean
:group 'tempo)
(defcustom tempo-insert-region nil
- "
*
Automatically insert current region when there is a `r' in the template
+ "Automatically insert current region when there is a `r' in the template
If this variable is nil, `r' elements will be treated just like `p'
elements, unless the template function is given a prefix (or a non-nil
argument). If this variable is non-nil, the behavior is reversed.
If this variable is nil, `r' elements will be treated just like `p'
elements, unless the template function is given a prefix (or a non-nil
argument). If this variable is non-nil, the behavior is reversed.
@@
-131,13
+130,13
@@
In Transient Mark mode, this option is unused."
:group 'tempo)
(defcustom tempo-show-completion-buffer t
:group 'tempo)
(defcustom tempo-show-completion-buffer t
- "
*
If non-nil, show a buffer with possible completions, when only
+ "If non-nil, show a buffer with possible completions, when only
a partial completion can be found."
:type 'boolean
:group 'tempo)
(defcustom tempo-leave-completion-buffer nil
a partial completion can be found."
:type 'boolean
:group 'tempo)
(defcustom tempo-leave-completion-buffer nil
- "
*
If nil, a completion buffer generated by \\[tempo-complete-tag]
+ "If nil, a completion buffer generated by \\[tempo-complete-tag]
disappears at the next keypress; otherwise, it remains forever."
:type 'boolean
:group 'tempo)
disappears at the next keypress; otherwise, it remains forever."
:type 'boolean
:group 'tempo)
@@
-763,5
+762,4
@@
space bar, and looks something like this:
(provide 'tempo)
(provide 'tempo)
-;; arch-tag: b3c0ee36-db3b-47bc-875f-091b4e27a063
;;; tempo.el ends here
;;; tempo.el ends here