Rename condition-case-no-debug to condition-case-unless-debug

11 files changed, 44 insertions, 16 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 1e93d5dd737..d8e322790e7 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-10  Leo Liu  <sdl.web@gmail.com>
+
+        * control.texi (Handling Errors): Change condition-case-no-debug
+        to condition-case-unless-debug.
+
 2012-02-10  Chong Yidong  <cyd@gnu.org>
 
         * advice.texi (Defining Advice): Clarify ad-unadvise.
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 3673f753a0a..c23c93300a6 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -948,8 +948,8 @@ The effect of @code{debug} here is only to prevent
 given error will invoke the debugger only if @code{debug-on-error} and
 the other usual filtering mechanisms say it should.  @xref{Error Debugging}.
 
-@defmac condition-case-no-debug var protected-form handlers@dots{}
-The macro @code{condition-case-no-debug} provides another way to
+@defmac condition-case-unless-debug var protected-form handlers@dots{}
+The macro @code{condition-case-unless-debug} provides another way to
 handle debugging of such forms.  It behaves exactly like
 @code{condition-case}, unless the variable @code{debug-on-error} is
 non-@code{nil}, in which case it does not handle any errors at all.
@@ -1131,9 +1131,9 @@ Here's the example at the beginning of this subsection rewritten using
 @defmac with-demoted-errors body@dots{}
 This macro is like a milder version of @code{ignore-errors}.  Rather
 than suppressing errors altogether, it converts them into messages.
-Use this form around code that is not expected to signal errors,
-but should be robust if one does occur.  Note that this macro
-uses @code{condition-case-no-debug} rather than @code{condition-case}.
+Use this form around code that is not expected to signal errors, but
+should be robust if one does occur.  Note that this macro uses
+@code{condition-case-unless-debug} rather than @code{condition-case}.
 @end defmac
 
 @node Error Symbols
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 93258d8c06c..1f1190b19d9 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-10  Leo Liu  <sdl.web@gmail.com>
+
+        * NEWS: Change condition-case-no-debug to
+        condition-case-unless-debug and split the entry in two.
+
 2012-02-08  Alex Ott  <alexott@gmail.com>
 
         * tutorials/TUTORIAL.ru: Updated; synchronize with TUTORIAL.
diff --git a/etc/NEWS b/etc/NEWS
index df35fee46b9..944dd9b7a70 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1305,8 +1305,10 @@ set of "wrapping" filters, similar to around advice.
 advertised at the time.)
 
 +++
-** The macros `condition-case-no-debug' and `with-demoted-errors' were
-added in Emacs 23.1, but not advertised.
+** New macro `condition-case-unless-debug' (this was actually added in
+Emacs 23.1 as condition-case-no-debug, but not advertised)
+
+** The macro `with-demoted-errors' was added in Emacs 23.1, but not advertised.
 
 +++
 ** The new function `server-eval-at' allows evaluation of Lisp forms on
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 69d32b4725a..52b9eb38374 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2012-02-10  Leo Liu  <sdl.web@gmail.com>
+
+        * subr.el (condition-case-unless-debug): Rename from
+        condition-case-no-debug.  All callers changed.
+        (with-demoted-errors): Fix caller.
+
+        * vc/diff-mode.el (diff-auto-refine-mode, diff-hunk):
+        * nxml/rng-valid.el (rng-do-some-validation):
+        * emacs-lisp/package.el (package-refresh-contents)
+        (package-menu-execute):
+        * desktop.el (desktop-create-buffer):
+        * font-lock.el (lisp-font-lock-keywords-2): caller changed.
+
 2012-02-10  Glenn Morris  <rgm@gnu.org>
 
         * textmodes/bibtex.el:
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 2f79cc05e79..674ce72dba3 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1158,7 +1158,7 @@ directory DIRNAME."
       (desktop-load-file desktop-buffer-major-mode)
       (let ((buffer-list (buffer-list))
             (result
-             (condition-case-no-debug err
+             (condition-case-unless-debug err
                  (funcall (or (cdr (assq desktop-buffer-major-mode
                                          desktop-buffer-mode-handlers))
                               'desktop-restore-file-buffer)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 317fa1fd23d..d80454ba269 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1103,7 +1103,7 @@ makes them available for download."
   (unless (file-exists-p package-user-dir)
     (make-directory package-user-dir t))
   (dolist (archive package-archives)
-    (condition-case-no-debug nil
+    (condition-case-unless-debug nil
         (package--download-one-archive archive "archive-contents")
       (error (message "Failed to download `%s' archive."
                       (car archive)))))
@@ -1608,7 +1608,7 @@ packages marked for deletion are removed."
                                 delete-list
                                 ", "))))
           (dolist (elt delete-list)
-            (condition-case-no-debug err
+            (condition-case-unless-debug err
                 (package-delete (car elt) (cdr elt))
               (error (message (cadr err)))))
         (error "Aborted")))
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index befed33abba..9f9445bdea9 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2272,7 +2272,7 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
                  "save-selected-window" "save-window-excursion"
                  "save-match-data" "save-current-buffer"
                  "combine-after-change-calls" "unwind-protect"
-                 "condition-case" "condition-case-no-debug"
+                 "condition-case" "condition-case-unless-debug"
                  "track-mouse" "eval-after-load" "eval-and-compile"
                  "eval-when-compile" "eval-when" "eval-next-after-load"
                  "with-case-table" "with-category-table"
diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el
index 6fc696361e8..61b583b56c2 100644
--- a/lisp/nxml/rng-valid.el
+++ b/lisp/nxml/rng-valid.el
@@ -475,7 +475,7 @@ The schema is set like `rng-auto-set-schema'."
     (save-restriction
       (widen)
       (nxml-with-invisible-motion
-        (condition-case-no-debug err
+        (condition-case-unless-debug err
             (and (rng-validate-prepare)
                  (let ((rng-dt-namespace-context-getter '(nxml-ns-get-context)))
                    (nxml-with-unmodifying-text-property-changes
diff --git a/lisp/subr.el b/lisp/subr.el
index 6c79b3f88e2..00a030c744c 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3219,7 +3219,7 @@ If BODY finishes, `while-no-input' returns whatever value BODY produced."
            (or (input-pending-p)
                (progn ,@body)))))))
 
-(defmacro condition-case-no-debug (var bodyform &rest handlers)
+(defmacro condition-case-unless-debug (var bodyform &rest handlers)
   "Like `condition-case' except that it does not catch anything when debugging.
 More specifically if `debug-on-error' is set, then it does not catch any signal."
   (declare (debug condition-case) (indent 2))
@@ -3231,6 +3231,9 @@ More specifically if `debug-on-error' is set, then it does not catch any signal.
              (funcall ,bodysym)
            ,@handlers)))))
 
+(define-obsolete-function-alias 'condition-case-no-debug
+  'condition-case-unless-debug "24.1")
+
 (defmacro with-demoted-errors (&rest body)
   "Run BODY and demote any errors to simple messages.
 If `debug-on-error' is non-nil, run BODY without catching its errors.
@@ -3238,7 +3241,7 @@ This is to be used around code which is not expected to signal an error
 but which should be robust in the unexpected case that an error is signaled."
   (declare (debug t) (indent 0))
   (let ((err (make-symbol "err")))
-    `(condition-case-no-debug ,err
+    `(condition-case-unless-debug ,err
          (progn ,@body)
        (error (message "Error: %S" ,err) nil))))
 
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 7de9d17e3f7..ba4a2766526 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -237,7 +237,7 @@ from disabled to enabled, it tries to refine the current hunk, as
 well."
   :group 'diff-mode :init-value t :lighter nil ;; " Auto-Refine"
   (when diff-auto-refine-mode
-    (condition-case-no-debug nil (diff-refine-hunk) (error nil))))
+    (condition-case-unless-debug nil (diff-refine-hunk) (error nil))))
 
 ;;;;
 ;;;; font-lock support
@@ -542,7 +542,7 @@ but in the file header instead, in which case move forward to the first hunk."
 (easy-mmode-define-navigation
  diff-hunk diff-hunk-header-re "hunk" diff-end-of-hunk diff-restrict-view
  (if diff-auto-refine-mode
-     (condition-case-no-debug nil (diff-refine-hunk) (error nil))))
+     (condition-case-unless-debug nil (diff-refine-hunk) (error nil))))
 
 (easy-mmode-define-navigation
  diff-file diff-file-header-re "file" diff-end-of-hunk)