emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r117585: Cleanup error signals.


From: Fabián Ezequiel Gallina
Subject: [Emacs-diffs] trunk r117585: Cleanup error signals.
Date: Sun, 27 Jul 2014 07:05:43 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 117585
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18067
committer: Fabián Ezequiel Gallina <address@hidden>
branch nick: trunk
timestamp: Sun 2014-07-27 04:05:13 -0300
message:
  Cleanup error signals. 
  
  * lisp/progmodes/python.el
  (python-indent-shift-left): Use user-error instead.
  (python-shell-prompt-detect): Use lwarn with python group.
  (python-completion-complete-at-point)
  (python-eldoc--get-doc-at-point): Don't signal error.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/python.el       python.el-20091113204419-o5vbwnq5f7feedwu-3008
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-07-27 06:39:17 +0000
+++ b/lisp/ChangeLog    2014-07-27 07:05:13 +0000
@@ -1,5 +1,14 @@
 2014-07-27  Fabián Ezequiel Gallina  <address@hidden>
 
+       Cleanup error signals.  (Bug#18067)
+       * progmodes/python.el
+       (python-indent-shift-left): Use user-error instead.
+       (python-shell-prompt-detect): Use lwarn with python group.
+       (python-completion-complete-at-point)
+       (python-eldoc--get-doc-at-point): Don't signal error.
+
+2014-07-27  Fabián Ezequiel Gallina  <address@hidden>
+
        Support for packages in Python shell.  (Bug#13570)
        * progmodes/python.el (python-shell--package-depth): New var.
        (python-shell-package-enable): New command.

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2014-07-27 06:39:17 +0000
+++ b/lisp/progmodes/python.el  2014-07-27 07:05:13 +0000
@@ -1111,12 +1111,10 @@
         (while (< (point) end)
           (if (and (< (current-indentation) count)
                    (not (looking-at "[ \t]*$")))
-              (error "Can't shift all lines enough"))
+              (user-error "Can't shift all lines enough"))
           (forward-line))
         (indent-rigidly start end (- count))))))
 
-(add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
-
 (defun python-indent-shift-right (start end &optional count)
   "Shift lines contained in region START END by COUNT columns to the right.
 COUNT defaults to `python-indent-offset'.  If region isn't
@@ -1935,7 +1933,9 @@
               nil)))
       (when (and (not prompts)
                  python-shell-prompt-detect-failure-warning)
-        (warn
+        (lwarn
+         '(python python-shell-prompt-regexp)
+         :warning
          (concat
           "Python shell prompts cannot be detected.\n"
           "If your emacs session hangs when starting python shells\n"
@@ -3029,13 +3029,9 @@
 `python-shell-send-buffer' from time to time so context in
 inferior Python process is updated properly."
   (let ((process (python-shell-get-process)))
-    (if (not process)
-        (error "Completion needs an inferior Python process running")
+    (when process
       (python-shell-completion-complete-at-point process))))
 
-(add-to-list 'debug-ignored-errors
-             "^Completion needs an inferior Python process running.")
-
 
 ;;; Fill paragraph
 
@@ -3552,8 +3548,7 @@
 returns will be used.  If not FORCE-PROCESS is passed what
 `python-shell-get-process' returns is used."
   (let ((process (or force-process (python-shell-get-process))))
-    (if (not process)
-        (error "Eldoc needs an inferior Python process running")
+    (when process
       (let ((input (or force-input
                        (python-info-current-symbol t))))
         (and input
@@ -3580,9 +3575,6 @@
                         nil nil symbol))))
   (message (python-eldoc--get-doc-at-point symbol)))
 
-(add-to-list 'debug-ignored-errors
-             "^Eldoc needs an inferior Python process running.")
-
 
 ;;; Imenu
 


reply via email to

[Prev in Thread] Current Thread [Next in Thread]