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

[Stefan Monnier]

Index: emacs/lisp/wid-edit.el
diff -c emacs/lisp/wid-edit.el:1.117 emacs/lisp/wid-edit.el:1.118
*** emacs/lisp/wid-edit.el:1.117        Fri Feb 14 04:57:45 2003
--- emacs/lisp/wid-edit.el      Sat May 17 16:29:40 2003
***************
*** 1,6 ****
  ;;; wid-edit.el --- Functions for creating and using widgets 
-*-byte-compile-dynamic: t;-*-
  ;;
! ;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002 Free Software Foundation, 
Inc.
  ;;
  ;; Author: Per Abrahamsen <address@hidden>
  ;; Maintainer: FSF
--- 1,6 ----
  ;;; wid-edit.el --- Functions for creating and using widgets 
-*-byte-compile-dynamic: t;-*-
  ;;
! ;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003 Free Software 
Foundation, Inc.
  ;;
  ;; Author: Per Abrahamsen <address@hidden>
  ;; Maintainer: FSF
***************
*** 63,71 ****
    "Character position of the end of event if that exists, or nil."
    (posn-point (event-end event)))
  
- (autoload 'pp-to-string "pp")
- (autoload 'Info-goto-node "info")
- 
  (defun widget-button-release-event-p (event)
    "Non-nil if EVENT is a mouse-button-release event object."
    (and (eventp event)
--- 63,68 ----
***************
*** 236,243 ****
           ;; Define SPC as a prefix char to get to this menu.
           (define-key overriding-terminal-local-map " "
             (setq map (make-sparse-keymap title)))
!          (save-excursion
!            (set-buffer (get-buffer-create " widget-choose"))
             (erase-buffer)
             (insert "Available choices:\n\n")
             (while items
--- 233,239 ----
           ;; Define SPC as a prefix char to get to this menu.
           (define-key overriding-terminal-local-map " "
             (setq map (make-sparse-keymap title)))
!          (with-current-buffer (get-buffer-create " widget-choose")
             (erase-buffer)
             (insert "Available choices:\n\n")
             (while items
***************
*** 304,310 ****
  ;;
  ;; These functions are for specifying text properties.
  
! (defvar widget-field-add-space t
    "Non-nil means add extra space at the end of editable text fields.
  If you don't add the space, it will become impossible to edit a zero
  size field.")
--- 300,307 ----
  ;;
  ;; These functions are for specifying text properties.
  
! ;; We can set it to nil now that get_local_map uses get_pos_property.
! (defconst widget-field-add-space nil
    "Non-nil means add extra space at the end of editable text fields.
  If you don't add the space, it will become impossible to edit a zero
  size field.")
***************
*** 570,576 ****
        (widget nil)
        (parent nil)
        (overlays (if buffer
!                     (save-excursion (set-buffer buffer) (overlay-lists))
                    (overlay-lists))))
      (setq overlays (append (car overlays) (cdr overlays)))
      (while (setq cur (pop overlays))
--- 567,573 ----
        (widget nil)
        (parent nil)
        (overlays (if buffer
!                     (with-current-buffer buffer (overlay-lists))
                    (overlay-lists))))
      (setq overlays (append (car overlays) (cdr overlays)))
      (while (setq cur (pop overlays))
***************
*** 1104,1115 ****
  
  ;;; Setting up the buffer.
  
! (defvar widget-field-new nil)
! ;; List of all newly created editable fields in the buffer.
  (make-variable-buffer-local 'widget-field-new)
  
! (defvar widget-field-list nil)
! ;; List of all editable fields in the buffer.
  (make-variable-buffer-local 'widget-field-list)
  
  (defun widget-at (&optional pos)
--- 1101,1112 ----
  
  ;;; Setting up the buffer.
  
! (defvar widget-field-new nil
!   "List of all newly created editable fields in the buffer.")
  (make-variable-buffer-local 'widget-field-new)
  
! (defvar widget-field-list nil
!   "List of all editable fields in the buffer.")
  (make-variable-buffer-local 'widget-field-list)
  
  (defun widget-at (&optional pos)
***************
*** 1675,1681 ****
  
  (defun widget-info-link-action (widget &optional event)
    "Open the info node specified by WIDGET."
!   (Info-goto-node (widget-value widget)))
  
  ;;; The `url-link' Widget.
  
--- 1672,1678 ----
  
  (defun widget-info-link-action (widget &optional event)
    "Open the info node specified by WIDGET."
!   (info (widget-value widget)))
  
  ;;; The `url-link' Widget.