[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ehelp.el [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ehelp.el [emacs-unicode-2] |
Date: |
Mon, 28 Jun 2004 04:55:17 -0400 |
Index: emacs/lisp/ehelp.el
diff -c emacs/lisp/ehelp.el:1.33.2.1 emacs/lisp/ehelp.el:1.33.2.2
*** emacs/lisp/ehelp.el:1.33.2.1 Fri Apr 16 12:49:49 2004
--- emacs/lisp/ehelp.el Mon Jun 28 07:28:39 2004
***************
*** 1,6 ****
;;; ehelp.el --- bindings for electric-help mode
! ;; Copyright (C) 1986, 1995, 2000, 2001 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: help, extensions
--- 1,6 ----
;;; ehelp.el --- bindings for electric-help mode
! ;; Copyright (C) 1986, 1995, 2000, 2001, 2004 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: help, extensions
***************
*** 200,212 ****
(progn (setq unread-command-events nil)
(throw 'exit t)))))
(let (up down both neither
! (standard (and (eq (key-binding " ")
'scroll-up)
! (eq (key-binding "\^?")
'scroll-down)
! (eq (key-binding "q")
'electric-help-exit)
! (eq (key-binding "r")
'electric-help-retain))))
(Electric-command-loop
'exit
--- 200,212 ----
(progn (setq unread-command-events nil)
(throw 'exit t)))))
(let (up down both neither
! (standard (and (eq (key-binding " " nil t)
'scroll-up)
! (eq (key-binding "\^?" nil t)
'scroll-down)
! (eq (key-binding "q" nil t)
'electric-help-exit)
! (eq (key-binding "r" nil t)
'electric-help-retain))))
(Electric-command-loop
'exit
***************
*** 215,221 ****
;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))))
(cond (isearch-mode 'noprompt)
((and min max)
(cond (standard "Press q to exit, r to retain ")
--- 215,221 ----
;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 (1- (point-max)))))
(cond (isearch-mode 'noprompt)
((and min max)
(cond (standard "Press q to exit, r to retain ")
***************
*** 272,278 ****
(interactive)
(error "%s is undefined -- Press %s to exit"
(mapconcat 'single-key-description (this-command-keys) " ")
! (if (eq (key-binding "q") 'electric-help-exit)
"q"
(substitute-command-keys "\\[electric-help-exit]"))))
--- 272,278 ----
(interactive)
(error "%s is undefined -- Press %s to exit"
(mapconcat 'single-key-description (this-command-keys) " ")
! (if (eq (key-binding "q" nil t) 'electric-help-exit)
"q"
(substitute-command-keys "\\[electric-help-exit]"))))
***************
*** 280,289 ****
;>>> this needs to be hairified (recursive help, anybody?)
(defun electric-help-help ()
(interactive)
! (if (and (eq (key-binding "q") 'electric-help-exit)
! (eq (key-binding " ") 'scroll-up)
! (eq (key-binding "\^?") 'scroll-down)
! (eq (key-binding "r") 'electric-help-retain))
(message "SPC scrolls up, DEL scrolls down, q exits burying help
buffer, r exits")
(message "%s" (substitute-command-keys "\\[scroll-up] scrolls up,
\\[scroll-down] scrolls down, \\[electric-help-exit] exits burying help buffer,
\\[electric-help-retain] exits")))
(sit-for 2))
--- 280,289 ----
;>>> this needs to be hairified (recursive help, anybody?)
(defun electric-help-help ()
(interactive)
! (if (and (eq (key-binding "q" nil t) 'electric-help-exit)
! (eq (key-binding " " nil t) 'scroll-up)
! (eq (key-binding "\^?" nil t) 'scroll-down)
! (eq (key-binding "r" nil t) 'electric-help-retain))
(message "SPC scrolls up, DEL scrolls down, q exits burying help
buffer, r exits")
(message "%s" (substitute-command-keys "\\[scroll-up] scrolls up,
\\[scroll-down] scrolls down, \\[electric-help-exit] exits burying help buffer,
\\[electric-help-retain] exits")))
(sit-for 2))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/ehelp.el [emacs-unicode-2],
Miles Bader <=