X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/ac3232837188f7e1c4ffe34b76edede0ccb54f5e..58b28e3ae5f8b50762b5d2f236931d11820985d8:/lisp/tempo.el diff --git a/lisp/tempo.el b/lisp/tempo.el index dc47193d50..9b6cd75b31 100644 --- a/lisp/tempo.el +++ b/lisp/tempo.el @@ -1,11 +1,10 @@ ;;; 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 +;; Author: David KÃ¥gedal ;; Created: 16 Feb 1994 -;; K}gedal's last version number: 1.2.4 +;; KÃ¥gedal's last version number: 1.2.4 ;; Keywords: extensions, languages, tools ;; This file is part of GNU Emacs. @@ -114,14 +113,14 @@ :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 - "*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. @@ -131,13 +130,13 @@ In Transient Mark mode, this option is unused." :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 - "*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) @@ -724,13 +723,13 @@ non-nil, a buffer containing possible completions is displayed." (if tempo-leave-completion-buffer (with-output-to-temp-buffer "*Completions*" (display-completion-list - (all-completions string tag-list) - string)) + (completion-hilit-commonality (all-completions string tag-list) + (length string)))) (save-window-excursion (with-output-to-temp-buffer "*Completions*" (display-completion-list - (all-completions string tag-list) - string)) + (completion-hilit-commonality (all-completions string tag-list) + (length string)))) (sit-for 32767)))) ;;; @@ -763,5 +762,8 @@ space bar, and looks something like this: (provide 'tempo) -;; arch-tag: b3c0ee36-db3b-47bc-875f-091b4e27a063 ;;; tempo.el ends here + +;; Local Variables: +;; coding: utf-8 +;; End: