[Emacs-diffs] /srv/bzr/emacs/trunk r107231: Rename condition-case-no-debug to condition-case-unless-debug

[Leo Liu]

------------------------------------------------------------
revno: 107231
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Fri 2012-02-10 23:59:29 +0800
message:
  Rename condition-case-no-debug to condition-case-unless-debug
modified:
  doc/lispref/ChangeLog
  doc/lispref/control.texi
  etc/ChangeLog
  etc/NEWS
  lisp/ChangeLog
  lisp/desktop.el
  lisp/emacs-lisp/package.el
  lisp/font-lock.el
  lisp/nxml/rng-valid.el
  lisp/subr.el
  lisp/vc/diff-mode.el

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-02-10 15:50:11 +0000
+++ b/doc/lispref/ChangeLog     2012-02-10 15:59:29 +0000
@@ -1,3 +1,8 @@
+2012-02-10  Leo Liu  <address@hidden>
+
+       * control.texi (Handling Errors): Change condition-case-no-debug
+       to condition-case-unless-debug.
+
 2012-02-10  Chong Yidong  <address@hidden>
 
        * advice.texi (Defining Advice): Clarify ad-unadvise.

=== modified file 'doc/lispref/control.texi'
--- a/doc/lispref/control.texi  2012-02-06 00:48:02 +0000
+++ b/doc/lispref/control.texi  2012-02-10 15:59:29 +0000
@@ -948,8 +948,8 @@
 given error will invoke the debugger only if @code{debug-on-error} and
 the other usual filtering mechanisms say it should.  @xref{Error Debugging}.
 
address@hidden condition-case-no-debug var protected-form address@hidden
-The macro @code{condition-case-no-debug} provides another way to
address@hidden condition-case-unless-debug var protected-form address@hidden
+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
 address@hidden, in which case it does not handle any errors at all.
@@ -1131,9 +1131,9 @@
 @defmac with-demoted-errors address@hidden
 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
address@hidden rather than @code{condition-case}.
 @end defmac
 
 @node Error Symbols

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2012-02-09 07:48:22 +0000
+++ b/etc/ChangeLog     2012-02-10 15:59:29 +0000
@@ -1,3 +1,8 @@
+2012-02-10  Leo Liu  <address@hidden>
+
+       * NEWS: Change condition-case-no-debug to
+       condition-case-unless-debug and split the entry in two.
+
 2012-02-08  Alex Ott  <address@hidden>
 
        * tutorials/TUTORIAL.ru: Updated; synchronize with TUTORIAL.

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-02-10 08:51:37 +0000
+++ b/etc/NEWS  2012-02-10 15:59:29 +0000
@@ -1305,8 +1305,10 @@
 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

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-10 08:23:33 +0000
+++ b/lisp/ChangeLog    2012-02-10 15:59:29 +0000
@@ -1,3 +1,16 @@
+2012-02-10  Leo Liu  <address@hidden>
+
+       * 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  <address@hidden>
 
        * textmodes/bibtex.el:

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2012-01-19 07:21:25 +0000
+++ b/lisp/desktop.el   2012-02-10 15:59:29 +0000
@@ -1158,7 +1158,7 @@
       (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)

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2012-01-28 09:49:29 +0000
+++ b/lisp/emacs-lisp/package.el        2012-02-10 15:59:29 +0000
@@ -1103,7 +1103,7 @@
   (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 @@
                                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")))

=== modified file 'lisp/font-lock.el'
--- a/lisp/font-lock.el 2012-02-05 02:27:35 +0000
+++ b/lisp/font-lock.el 2012-02-10 15:59:29 +0000
@@ -2272,7 +2272,7 @@
                 "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"

=== modified file 'lisp/nxml/rng-valid.el'
--- a/lisp/nxml/rng-valid.el    2012-01-19 07:21:25 +0000
+++ b/lisp/nxml/rng-valid.el    2012-02-10 15:59:29 +0000
@@ -475,7 +475,7 @@
     (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

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2012-02-09 06:02:33 +0000
+++ b/lisp/subr.el      2012-02-10 15:59:29 +0000
@@ -3219,7 +3219,7 @@
           (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 @@
              (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 @@
 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))))
 

=== modified file 'lisp/vc/diff-mode.el'
--- a/lisp/vc/diff-mode.el      2012-01-19 07:21:25 +0000
+++ b/lisp/vc/diff-mode.el      2012-02-10 15:59:29 +0000
@@ -237,7 +237,7 @@
 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 @@
 (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)