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

[Juanma Barranquero]

Index: emacs/lisp/ehelp.el
diff -c emacs/lisp/ehelp.el:1.31 emacs/lisp/ehelp.el:1.32
*** emacs/lisp/ehelp.el:1.31    Tue Mar 20 08:37:17 2001
--- emacs/lisp/ehelp.el Tue Feb  4 06:15:34 2003
***************
*** 181,187 ****
        (condition-case ()
            (funcall (or default-major-mode 'fundamental-mode))
          (error nil))
!       
        (set-window-configuration config)
        (when bury
        ;;>> Perhaps this shouldn't be done,
--- 181,187 ----
        (condition-case ()
            (funcall (or default-major-mode 'fundamental-mode))
          (error nil))
! 
        (set-window-configuration config)
        (when bury
        ;;>> Perhaps this shouldn't be done,
***************
*** 211,218 ****
        (Electric-command-loop
          'exit
        (function (lambda ()
!         (sit-for 0) ;necessary if last command was end-of-buffer or 
!                     ;beginning-of-buffer - otherwise pos-visible-in-window-p 
                      ;will yield a wrong result.
          (let ((min (pos-visible-in-window-p (point-min)))
                (max (pos-visible-in-window-p (point-max))))
--- 211,218 ----
        (Electric-command-loop
          'exit
        (function (lambda ()
!         (sit-for 0) ;necessary if last command was end-of-buffer or
!                     ;beginning-of-buffer - otherwise pos-visible-in-window-p
                      ;will yield a wrong result.
          (let ((min (pos-visible-in-window-p (point-min)))
                (max (pos-visible-in-window-p (point-max))))
***************
*** 343,349 ****
  
  
  
! ;; This is to be bound to M-x in ehelp mode. Retains ehelp buffer and then 
  ;; continues with execute-extended-command.
  (defun electric-help-execute-extended (prefixarg)
    (interactive "p")
--- 343,349 ----
  
  
  
! ;; This is to be bound to M-x in ehelp mode. Retains ehelp buffer and then
  ;; continues with execute-extended-command.
  (defun electric-help-execute-extended (prefixarg)
    (interactive "p")
***************
*** 407,413 ****
  (defvar ehelp-map ())
  (if ehelp-map
      nil
!   (let ((map (copy-keymap help-map))) 
      (substitute-key-definition 'apropos 'electric-apropos map)
      (substitute-key-definition 'command-apropos 'electric-command-apropos map)
      (substitute-key-definition 'describe-key 'electric-describe-key map)
--- 407,413 ----
  (defvar ehelp-map ())
  (if ehelp-map
      nil
!   (let ((map (copy-keymap help-map)))
      (substitute-key-definition 'apropos 'electric-apropos map)
      (substitute-key-definition 'command-apropos 'electric-command-apropos map)
      (substitute-key-definition 'describe-key 'electric-describe-key map)
***************
*** 421,426 ****
      (setq ehelp-map map)
      (fset 'ehelp-command map)))
  
! (provide 'ehelp) 
  
  ;;; ehelp.el ends here
--- 421,426 ----
      (setq ehelp-map map)
      (fset 'ehelp-command map)))
  
! (provide 'ehelp)
  
  ;;; ehelp.el ends here