From: Leo <sdl.web@gmail.com>
To: emacs-devel@gnu.org
Subject: Re: /srv/bzr/emacs/trunk r107126: Document yet more things that were never added to NEWS
Date: Thu, 09 Feb 2012 15:47:28 +0800 [thread overview]
Message-ID: <m1k43wv46n.fsf@gmail.com> (raw)
In-Reply-To: q0d39oh4yy.fsf@fencepost.gnu.org
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
On 2012-02-09 14:54 +0800, Glenn Morris wrote:
> Suggest:
>
> ** 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.
Thanks. Newly generated patch attached.
Leo
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: ccud2.diff --]
[-- Type: text/x-diff, Size: 6340 bytes --]
=== modified file 'doc/lispref/control.texi'
--- doc/lispref/control.texi 2012-02-06 00:48:02 +0000
+++ doc/lispref/control.texi 2012-02-09 03:25:47 +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}.
-@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 @@
@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
=== modified file 'etc/NEWS'
--- etc/NEWS 2012-02-09 07:28:32 +0000
+++ etc/NEWS 2012-02-09 07:43:49 +0000
@@ -1297,8 +1297,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/desktop.el'
--- lisp/desktop.el 2012-01-19 07:21:25 +0000
+++ lisp/desktop.el 2012-02-09 03:26:20 +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'
--- lisp/emacs-lisp/package.el 2012-01-28 09:49:29 +0000
+++ lisp/emacs-lisp/package.el 2012-02-09 03:26:33 +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'
--- lisp/font-lock.el 2012-02-05 02:27:35 +0000
+++ lisp/font-lock.el 2012-02-09 03:26:41 +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'
--- lisp/nxml/rng-valid.el 2012-01-19 07:21:25 +0000
+++ lisp/nxml/rng-valid.el 2012-02-09 03:26:48 +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'
--- lisp/subr.el 2012-02-09 06:02:33 +0000
+++ lisp/subr.el 2012-02-09 06:49: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'
--- lisp/vc/diff-mode.el 2012-01-19 07:21:25 +0000
+++ lisp/vc/diff-mode.el 2012-02-09 03:29:04 +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)
next prev parent reply other threads:[~2012-02-09 7:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1RuDCk-0000uU-8t@vcs.savannah.gnu.org>
2012-02-06 4:10 ` /srv/bzr/emacs/trunk r107126: Document yet more things that were never added to NEWS Leo
2012-02-06 14:45 ` Stefan Monnier
2012-02-07 19:02 ` Wolfgang Jenkner
2012-02-07 23:58 ` Stefan Monnier
2012-02-08 2:01 ` Leo
2012-02-08 19:09 ` Stefan Monnier
2012-02-09 3:43 ` Leo
2012-02-09 6:06 ` Glenn Morris
2012-02-09 6:43 ` Leo
2012-02-09 6:54 ` Glenn Morris
2012-02-09 7:47 ` Leo [this message]
2012-02-09 21:57 ` Stefan Monnier
2012-02-10 12:52 ` Leo
2012-02-10 15:27 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m1k43wv46n.fsf@gmail.com \
--to=sdl.web@gmail.com \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.