[Emacs-diffs] Changes to emacs/lisp/tempo.el

[Pavel Janík]

Index: emacs/lisp/tempo.el
diff -c emacs/lisp/tempo.el:1.16 emacs/lisp/tempo.el:1.17
*** emacs/lisp/tempo.el:1.16    Sat Sep 16 21:04:35 2000
--- emacs/lisp/tempo.el Thu Dec 20 13:45:03 2001
***************
*** 125,146 ****
  
  (defcustom tempo-insert-region nil
    "*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 behaviour is reversed.
  
  In Transient Mark mode, this option is unused."
    :type 'boolean
    :group 'tempo)
  
  (defcustom tempo-show-completion-buffer t
!   "*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]
  disappears at the next keypress; otherwise, it remains forever."
    :type 'boolean
    :group 'tempo)
--- 125,146 ----
  
  (defcustom tempo-insert-region nil
    "*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 behaviour is reversed.
  
  In Transient Mark mode, this option is unused."
    :type 'boolean
    :group 'tempo)
  
  (defcustom tempo-show-completion-buffer t
!   "*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]
  disappears at the next keypress; otherwise, it remains forever."
    :type 'boolean
    :group 'tempo)
***************
*** 197,212 ****
    "Element handlers for user-defined elements.
  A list of symbols which are bound to functions that take one argument.
  This function should return something to be sent to `tempo-insert' if
! it recognizes the argument, and NIL otherwise")
  
  (defvar tempo-named-insertions nil
!   "Temporary storage for named insertions")
  
  (defvar tempo-region-start (make-marker)
!   "Region start when inserting around the region")
  
  (defvar tempo-region-stop (make-marker)
!   "Region stop when inserting around the region")
  
  ;; Make some variables local to every buffer
  
--- 197,212 ----
    "Element handlers for user-defined elements.
  A list of symbols which are bound to functions that take one argument.
  This function should return something to be sent to `tempo-insert' if
! it recognizes the argument, and nil otherwise.")
  
  (defvar tempo-named-insertions nil
!   "Temporary storage for named insertions.")
  
  (defvar tempo-region-start (make-marker)
!   "Region start when inserting around the region.")
  
  (defvar tempo-region-stop (make-marker)
!   "Region stop when inserting around the region.")
  
  ;; Make some variables local to every buffer
  
***************
*** 404,410 ****
    "Compatibility hack for tempo-insert-prompt.
  PROMPT can be either a prompt string, or a list of arguments to
  tempo-insert-prompt, or nil."
!   (if (consp prompt)                  ; not NIL either
        (apply 'tempo-insert-prompt prompt)
      (tempo-insert-prompt prompt)))
  
--- 404,410 ----
    "Compatibility hack for tempo-insert-prompt.
  PROMPT can be either a prompt string, or a list of arguments to
  tempo-insert-prompt, or nil."
!   (if (consp prompt)                  ; not nil either
        (apply 'tempo-insert-prompt prompt)
      (tempo-insert-prompt prompt)))
  
***************
*** 630,636 ****
  
  (defun tempo-build-collection ()
    "Build a collection of all the tags and return it.
! If `tempo-dirty-collection' is NIL, the old collection is reused."
    (prog1
        (or (and (not tempo-dirty-collection)
               tempo-collection)
--- 630,636 ----
  
  (defun tempo-build-collection ()
    "Build a collection of all the tags and return it.
! If `tempo-dirty-collection' is nil, the old collection is reused."
    (prog1
        (or (and (not tempo-dirty-collection)
               tempo-collection)
***************
*** 681,690 ****
  place of the matching string.
  
  If a partial completion or no match at all is found, and SILENT is
! non-NIL, the function will give a signal.
  
  If a partial completion is found and `tempo-show-completion-buffer' is
! non-NIL, a buffer containing possible completions is displayed."
  
    ;; This function may look like a hack, but this is how I want it to
    ;; work.
--- 681,690 ----
  place of the matching string.
  
  If a partial completion or no match at all is found, and SILENT is
! non-nil, the function will give a signal.
  
  If a partial completion is found and `tempo-show-completion-buffer' is
! non-nil, a buffer containing possible completions is displayed."
  
    ;; This function may look like a hack, but this is how I want it to
    ;; work.