Mercurial > emacs
changeset 60547:23b4e52963d6
(tooltip-mode): Don't complain that you can't turn the
feature ON when the user requests to turn it OFF.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 10 Mar 2005 14:45:31 +0000 |
| parents | a670e7851135 |
| children | 0cb5cc0ad33c |
| files | lisp/ChangeLog lisp/tooltip.el |
| diffstat | 2 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Mar 10 09:43:01 2005 +0000 +++ b/lisp/ChangeLog Thu Mar 10 14:45:31 2005 +0000 @@ -1,15 +1,18 @@ +2005-03-10 Stefan Monnier <monnier@iro.umontreal.ca> + + * tooltip.el (tooltip-mode): Don't complain that you can't turn the + feature ON when the user requests to turn it OFF. + 2005-03-10 Lute Kamstra <lute@gnu.org> * emacs-lisp/debug.el (debug-entry-code): Delete it. - (implement-debug-on-entry): New function to replace - debug-entry-code. + (implement-debug-on-entry): New function to replace debug-entry-code. (debug-on-entry-1): Use implement-debug-on-entry. Delete the second argument as the 2005-03-07 change makes it obsolete. (debug-on-entry, cancel-debug-on-entry): Update call to debug-on-entry-1. (debug, debugger-setup-buffer): Comment update. - (debugger-frame-number): Update to work with - implement-debug-on-entry. + (debugger-frame-number): Update to work with implement-debug-on-entry. 2005-03-10 Jay Belanger <belanger@truman.edu> @@ -54,7 +57,7 @@ * textmodes/ispell.el (ispell-insert-word): New function. (ispell-word): Use ispell-insert-word to insert a new word. - (ispell-process-line): Likewise + (ispell-process-line): Likewise. (ispell-complete-word): Likewise. 2005-03-09 Glenn Morris <gmorris@ast.cam.ac.uk>
--- a/lisp/tooltip.el Thu Mar 10 09:43:01 2005 +0000 +++ b/lisp/tooltip.el Thu Mar 10 14:45:31 2005 +0000 @@ -188,7 +188,7 @@ With ARG, turn tooltip mode on if and only if ARG is positive." :global t :group 'tooltip - (unless (fboundp 'x-show-tip) + (unless (or (null tooltip-mode) (fboundp 'x-show-tip)) (error "Sorry, tooltips are not yet available on this system")) (let ((hook-fn (if tooltip-mode 'add-hook 'remove-hook))) (funcall hook-fn 'change-major-mode-hook 'tooltip-change-major-mode)