diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-03-10 14:45:31 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-03-10 14:45:31 +0000 |
| commit | ef75a6477366c638e58c8660eb9e0ccfbde85c49 (patch) | |
| tree | 037a9ecae2376b68c032a7ba24e504bdbcdf486e /lisp | |
| parent | 449808f757acf51ff61875c5c32dfa3000a72f24 (diff) | |
| download | emacs-ef75a6477366c638e58c8660eb9e0ccfbde85c49.tar.gz | |
(tooltip-mode): Don't complain that you can't turn the
feature ON when the user requests to turn it OFF.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/tooltip.el | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b9952c55973..daf15811bdc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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> diff --git a/lisp/tooltip.el b/lisp/tooltip.el index 6d81ee39d7f..e4cab1beba1 100644 --- a/lisp/tooltip.el +++ b/lisp/tooltip.el @@ -188,7 +188,7 @@ This might return nil if the event did not occur over a buffer." 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) |