[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/pcvs.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/pcvs.el |
Date: |
Wed, 30 Apr 2003 20:46:41 -0400 |
Index: emacs/lisp/pcvs.el
diff -c emacs/lisp/pcvs.el:1.51 emacs/lisp/pcvs.el:1.52
*** emacs/lisp/pcvs.el:1.51 Sun Apr 20 18:03:00 2003
--- emacs/lisp/pcvs.el Wed Apr 30 20:46:41 2003
***************
*** 14,20 ****
;; (Jari Aalto+mail.emacs) address@hidden
;; Maintainer: (Stefan Monnier) monnier+lists/cvs/address@hidden
;; Keywords: CVS, version control, release management
! ;; Revision: $Id: pcvs.el,v 1.51 2003/04/20 22:03:00 sds Exp $
;; This file is part of GNU Emacs.
--- 14,20 ----
;; (Jari Aalto+mail.emacs) address@hidden
;; Maintainer: (Stefan Monnier) monnier+lists/cvs/address@hidden
;; Keywords: CVS, version control, release management
! ;; Revision: $Id: pcvs.el,v 1.52 2003/05/01 00:46:41 monnier Exp $
;; This file is part of GNU Emacs.
***************
*** 1899,1908 ****
"Select a buffer containing the file.
With a prefix, opens the buffer in an OTHER window."
(interactive (list last-input-event current-prefix-arg))
! (when (ignore-errors (mouse-set-point e) t) ;for invocation via the mouse
! (unless (memq (get-text-property (1- (line-end-position)) 'font-lock-face)
! '(cvs-header-face cvs-filename-face))
! (error "Not a file name")))
(cvs-mode!
(lambda (&optional rev)
(interactive (list (cvs-prefix-get 'cvs-branch-prefix)))
--- 1899,1909 ----
"Select a buffer containing the file.
With a prefix, opens the buffer in an OTHER window."
(interactive (list last-input-event current-prefix-arg))
! ;; If the event moves point, check that it moves it to a valid location.
! (when (and (/= (point) (progn (ignore-errors (mouse-set-point e)) (point)))
! (memq (get-text-property (1- (line-end-position)) 'font-lock-face)
! '(cvs-header-face cvs-filename-face)))
! (error "Not a file name"))
(cvs-mode!
(lambda (&optional rev)
(interactive (list (cvs-prefix-get 'cvs-branch-prefix)))
***************
*** 2229,2235 ****
(string-match "\\`-" (car flags)))
(pop flags))
;; don't parse output we don't understand.
! (member (car flags) cvs-parse-known-commands)))
(save-current-buffer
(let ((buffer (current-buffer))
(dir default-directory)
--- 2230,2241 ----
(string-match "\\`-" (car flags)))
(pop flags))
;; don't parse output we don't understand.
! (member (car flags) cvs-parse-known-commands))
! ;; Don't parse "update -p" output.
! (not (and (member (car flags) '("update" "checkout"))
! (let ((found-p nil))
! (dolist (flag flags found-p)
! (if (equal flag "-p") (setq found-p t)))))))
(save-current-buffer
(let ((buffer (current-buffer))
(dir default-directory)