From dd72a03ac28d34e970c073949f4819999fef1360 Mon Sep 17 00:00:00 2001 From: Lute Kamstra Date: Mon, 13 Jun 2005 08:14:06 +0000 Subject: [PATCH] (cancel-debug-on-entry): Make the empty string argument obsolete. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/debug.el | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ee10a5f787e..0dd7b735ee6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-06-13 Lute Kamstra + + * emacs-lisp/debug.el (cancel-debug-on-entry): Make the empty + string argument obsolete. + 2005-06-13 Carsten Dominik * textmodes/org.el: (org-CUA-compatible): New option. diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el index 83e07f6d199..795c6418e5a 100644 --- a/lisp/emacs-lisp/debug.el +++ b/lisp/emacs-lisp/debug.el @@ -693,16 +693,19 @@ Redefining FUNCTION also cancels it." ;;;###autoload (defun cancel-debug-on-entry (&optional function) "Undo effect of \\[debug-on-entry] on FUNCTION. -If argument is nil or an empty string, cancel for all functions. +If FUNCTION is nil, cancel debug-on-entry for all functions. When called interactively, prompt for FUNCTION in the minibuffer. To specify a nil argument interactively, exit with an empty minibuffer." (interactive (list (let ((name (completing-read "Cancel debug on entry (to function): " (mapcar 'symbol-name debug-function-list) - nil t nil))) - (if name (intern name))))) - (if (and function (not (string= function ""))) + nil t))) + (when name + (unless (string= name "") + (intern name)))))) + (if (and function + (not (string= function ""))) ; Pre 22.1 compatibility test. (progn (let ((defn (debug-on-entry-1 function nil))) (condition-case nil -- 2.39.5