=== modified file 'lisp/vc/vc.el'
*** lisp/vc/vc.el	2013-10-25 02:33:42 +0000
--- lisp/vc/vc.el	2013-10-28 17:04:10 +0000
***************
*** 1350,1373 ****
    (let ((vc-handled-backends (list backend)))
      (call-interactively 'vc-register)))
  
! (defun vc-ignore (file &optional directory)
!   "Ignore FILE under the VCS of DIRECTORY (default is `default-directory').
! FILE is a file wildcard.
! When called interactively and with a prefix argument, remove FILE
! from ignored files.
! When called from Lisp code, if DIRECTORY is non-nil, the
! repository to use will be deduced by DIRECTORY."
    (interactive
!    (list (read-file-name "The file to ignore: ")
  	 (completing-read
! 	  "The file to remove: "
  	  (vc-call-backend
! 	   (vc-backend default-directory)
! 	   'ignore-completion-table default-directory))))
    (let* ((directory (or directory default-directory))
! 	 (backend (vc-backend default-directory))
! 	 (remove current-prefix-arg))
!     (vc-call-backend backend 'ignore file directory remove)))
  
  (defun vc-default-ignore (backend file &optional directory remove)
    "Ignore FILE under the VCS of DIRECTORY (default is `default-directory').
--- 1350,1382 ----
    (let ((vc-handled-backends (list backend)))
      (call-interactively 'vc-register)))
  
! (defun vc-ignore (file &optional directory remove-p)
!   "Ignore or remove FILE under the VCS of DIRECTORY.
! 
! If REMOVE-P if nil, FILE is a file wild-card to be ignored.
! Otherwise, remove FILE from the list of ignored files.
! 
! DIRECTORY defaults to `default-directory' and is used to
! determine the responsible VCS back-end.
! 
! Interactively, FILE is ignored, unless a prefix argument is
! given, which queries for a FILE to remove from the list of
! ignored files."
    (interactive
!    (list
!     (if (not current-prefix-arg)
!         (read-file-name "File to ignore: ")
        (completing-read
!        "File to remove: "
         (vc-call-backend
!         (or (vc-responsible-backend default-directory)
!             (error "Unknown back end"))
!         'ignore-completion-table default-directory)))
!     nil current-prefix-arg))
    (let* ((directory (or directory default-directory))
! 	 (backend (or (vc-responsible-backend default-directory)
!                       (error "Unknown back end"))))
!     (vc-call-backend backend 'ignore file directory remove-p)))
  
  (defun vc-default-ignore (backend file &optional directory remove)
    "Ignore FILE under the VCS of DIRECTORY (default is `default-directory').