* net/tramp.el (tramp-file-name-handler): Add 'debug to the error

[bpt/emacs.git] / lisp / completion.el

diff --git a/lisp/completion.el b/lisp/completion.el
index de18325..ad7e781 100644 (file)
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -1,7 +1,7 @@
 ;;; completion.el --- dynamic word-completion code
 
-;; Copyright (C) 1990, 1993, 1995, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1993, 1995, 1997, 2001-2011
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: abbrev convenience
@@ -695,7 +695,7 @@ Returns nil if there isn't one longer than `completion-min-length'."
 ;; Conditionalizing code on *record-cmpl-statistics-p*
 ;;-----------------------------------------------
 ;; All statistics code outside this block should use this
-(defmacro cmpl-statistics-block (&rest body))
+(defmacro cmpl-statistics-block (&rest _body))
 ;;  "Only executes body if we are recording statistics."
 ;;  (list 'cond
 ;;     (list* '*record-cmpl-statistics-p* body)
@@ -1311,7 +1311,7 @@ The completion is altered appropriately if NUM-USES and/or LAST-USE-TIME
 are specified."
   (interactive (interactive-completion-string-reader "Completion to add"))
   (check-completion-length string)
-  (let* ((current-completion-source (if (interactive-p)
+  (let* ((current-completion-source (if (called-interactively-p 'interactive)
                                        cmpl-source-interactive
                                        current-completion-source))
         (entry (add-completion-to-head string)))
@@ -1324,7 +1324,7 @@ are specified."
   "Add STRING if it isn't already listed, and mark it permanent."
   (interactive
     (interactive-completion-string-reader "Completion to add permanently"))
-  (let ((current-completion-source (if (interactive-p)
+  (let ((current-completion-source (if (called-interactively-p 'interactive)
                                       cmpl-source-interactive
                                       current-completion-source)))
     (add-completion string nil t)))
@@ -1751,7 +1751,7 @@ Prefix args ::
   (save-excursion
     (goto-char (point-min))
     (let (string)
-      (condition-case e
+      (condition-case nil
           (while t
             (search-forward "\177")
             (backward-char 3)
@@ -1788,7 +1788,7 @@ Prefix args ::
   (let (string)
     (save-excursion
       (goto-char (point-min))
-      (condition-case e
+      (condition-case nil
           (while t
             (re-search-forward *lisp-def-regexp*)
             (and (setq string (symbol-under-point))
@@ -2042,7 +2042,7 @@ If file name is not specified, use `save-completions-file-name'."
                                                    last-use-time)) "\n"))))
 
            ;; write the buffer
-           (condition-case e
+           (condition-case nil
                (let ((file-exists-p (file-exists-p filename)))
                  (if file-exists-p
                      (progn
@@ -2108,7 +2108,7 @@ If file is not specified, then use `save-completions-file-name'."
                    (aref completion-add-count-vector cmpl-source-file-parsing)))
                  (total-in-file 0) (total-perm 0))
              ;; insert the file into a buffer
-             (condition-case e
+             (condition-case nil
                  (progn (insert-file-contents filename t)
                         (setq insert-okay-p t))
 
@@ -2120,7 +2120,7 @@ If file is not specified, then use `save-completions-file-name'."
                  (progn
                    (goto-char (point-min))
 
-                   (condition-case e
+                   (condition-case nil
                        (while t
                          (setq entry (read buffer))
                          (setq total-in-file (1+ total-in-file))
@@ -2470,5 +2470,4 @@ TYPE is the type of the wrapper to be added.  Can be :before or :under."
 
 (provide 'completion)
 
-;; arch-tag: 6990dafe-4abd-4a1f-8c42-ffb25e120f5e
 ;;; completion.el ends here