From: Kelly Dean <kellydeanch@yahoo.com>
To: 14480@debbugs.gnu.org
Subject: bug#14480: [PATCH2] Re: bug#14480: A few error to user-error replacements
Date: Mon, 3 Jun 2013 17:35:31 -0700 (PDT) [thread overview]
Message-ID: <1370306131.29278.YahooMailClassic@web141102.mail.bf1.yahoo.com> (raw)
In-Reply-To: <1369617965.32345.YahooMailClassic@web141101.mail.bf1.yahoo.com>
[-- Attachment #1: Type: text/plain, Size: 47 bytes --]
Here are some more. Additional patch attached.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: user-error2.patch --]
[-- Type: text/x-diff; name="user-error2.patch", Size: 5564 bytes --]
--- emacs-24.3/lisp/winner.el
+++ emacs-24.3/lisp/winner.el
@@ -436,7 +436,7 @@
(ring-ref winner-pending-undo-ring 0)))
(unless (eq (selected-window) (minibuffer-window))
(message "Winner undid undo")))
- (t (error "Previous command was not a `winner-undo'"))))
+ (t (user-error "Previous command was not a `winner-undo'"))))
(provide 'winner)
;;; winner.el ends here
--- emacs-24.3/lisp/windmove.el
+++ emacs-24.3/lisp/windmove.el
@@ -486,10 +486,10 @@
If no window is at direction DIR, an error is signaled."
(let ((other-window (windmove-find-other-window dir arg window)))
(cond ((null other-window)
- (error "No window %s from selected window" dir))
+ (user-error "No window %s from selected window" dir))
((and (window-minibuffer-p other-window)
(not (minibuffer-window-active-p other-window)))
- (error "Minibuffer is inactive"))
+ (user-error "Minibuffer is inactive"))
(t
(select-window other-window)))))
--- emacs-24.3/lisp/register.el
+++ emacs-24.3/lisp/register.el
@@ -163,7 +163,7 @@
(goto-char (cadr val)))
((markerp val)
(or (marker-buffer val)
- (error "That register's buffer no longer exists"))
+ (user-error "That register's buffer no longer exists"))
(switch-to-buffer (marker-buffer val))
(goto-char val))
((and (consp val) (eq (car val) 'file))
@@ -171,7 +171,7 @@
((and (consp val) (eq (car val) 'file-query))
(or (find-buffer-visiting (nth 1 val))
(y-or-n-p (format "Visit file %s again? " (nth 1 val)))
- (error "Register access aborted"))
+ (user-error "Register access aborted"))
(find-file (nth 1 val))
(goto-char (nth 2 val)))
((and (fboundp 'semantic-foreign-tag-p)
@@ -180,7 +180,7 @@
(switch-to-buffer (semantic-tag-buffer val))
(goto-char (semantic-tag-start val)))
(t
- (error "Register doesn't contain a buffer position or configuration")))))
+ (user-error "Register doesn't contain a buffer position or configuration")))))
(defun register-swap-out ()
"Turn markers into file-query references when a buffer is killed."
@@ -226,7 +226,7 @@
(set-register register (+ number register-val))))
((or (not register-val) (stringp register-val))
(append-to-register register (region-beginning) (region-end) prefix))
- (t (error "Register does not contain a number or text")))))
+ (t (user-error "Register does not contain a number or text")))))
(defun view-register (register)
"Display what is contained in register named REGISTER.
@@ -354,7 +354,7 @@
(semantic-foreign-tag-p val))
(semantic-insert-foreign-tag val))
(t
- (error "Register does not contain text"))))
+ (user-error "Register does not contain text"))))
(if (not arg) (exchange-point-and-mark)))
(defun copy-to-register (register start end &optional delete-flag)
@@ -382,7 +382,7 @@
(set-register
register (cond ((not reg) text)
((stringp reg) (concat reg separator text))
- (t (error "Register does not contain text")))))
+ (t (user-error "Register does not contain text")))))
(setq deactivate-mark t)
(cond (delete-flag
(delete-region start end))
@@ -401,7 +401,7 @@
(set-register
register (cond ((not reg) text)
((stringp reg) (concat text separator reg))
- (t (error "Register does not contain text")))))
+ (t (user-error "Register does not contain text")))))
(setq deactivate-mark t)
(cond (delete-flag
(delete-region start end))
--- emacs-24.3/lisp/files.el
+++ emacs-24.3/lisp/files.el
@@ -1539,10 +1539,10 @@
(confirm-nonexistent-file-or-buffer) file-name)
t)))
(unless (run-hook-with-args-until-failure 'kill-buffer-query-functions)
- (error "Aborted"))
+ (user-error "Aborted"))
(and (buffer-modified-p) buffer-file-name
(not (yes-or-no-p "Kill and replace the buffer without saving it? "))
- (error "Aborted"))
+ (user-error "Aborted"))
(let ((obuf (current-buffer))
(ofile buffer-file-name)
(onum buffer-file-number)
@@ -1741,7 +1741,7 @@
(not (y-or-n-p (format "File %s is large (%s), really %s? "
(file-name-nondirectory filename)
(file-size-human-readable size) op-type))))
- (error "Aborted")))
+ (user-error "Aborted")))
(defun find-file-noselect (filename &optional nowarn rawfile wildcards)
"Read file FILENAME into a buffer and return the buffer.
@@ -3732,7 +3732,7 @@
(not no-query)
(not (y-or-n-p (format "A buffer is visiting %s; proceed? "
filename)))
- (error "Aborted")))
+ (user-error "Aborted")))
(or (equal filename buffer-file-name)
(progn
(and filename (lock-buffer filename))
@@ -3852,7 +3852,7 @@
(and confirm
(file-exists-p filename)
(or (y-or-n-p (format "File `%s' exists; overwrite? " filename))
- (error "Canceled")))
+ (user-error "Canceled")))
(set-visited-file-name filename (not confirm))))
(set-buffer-modified-p t)
;; Make buffer writable if file is writable.
@@ -4502,7 +4502,7 @@
(error "%s is a directory" filename)
(unless (y-or-n-p (format "File `%s' exists; overwrite? "
filename))
- (error "Canceled")))
+ (user-error "Canceled")))
;; Signal an error if the specified name refers to a
;; non-existing directory.
(let ((dir (file-name-directory filename)))
next prev parent reply other threads:[~2013-06-04 0:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-27 1:26 bug#14480: [PATCH] A few error to user-error replacements Kelly Dean
2013-06-04 0:35 ` Kelly Dean [this message]
2013-06-12 0:52 ` bug#14480: [PATCH3] Re: bug#14480: " Kelly Dean
2013-06-12 13:49 ` Kelly Dean
2014-02-28 2:34 ` bug#14480: [PATCH] " Glenn Morris
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=1370306131.29278.YahooMailClassic@web141102.mail.bf1.yahoo.com \
--to=kellydeanch@yahoo.com \
--cc=14480@debbugs.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.