diff options
| author | Stefan Monnier | 2002-10-01 18:48:35 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2002-10-01 18:48:35 +0000 |
| commit | 3dcdb054a0ed8e339c1059fc19bdb68396815597 (patch) | |
| tree | ffac83392976729958e50928a30b4f1c8accfcc1 | |
| parent | a6cadf53745dae89449bf7f700756575b23c27c0 (diff) | |
| download | emacs-3dcdb054a0ed8e339c1059fc19bdb68396815597.tar.gz emacs-3dcdb054a0ed8e339c1059fc19bdb68396815597.zip | |
(cvs-mode-find-file): Look up font-lock-face so it also
works when font-lock is turned off.
| -rw-r--r-- | lisp/pcvs.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/pcvs.el b/lisp/pcvs.el index 27e340e0343..4bfe1d8f6cd 100644 --- a/lisp/pcvs.el +++ b/lisp/pcvs.el | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | ;; (Jari Aalto+mail.emacs) jari.aalto@poboxes.com | 14 | ;; (Jari Aalto+mail.emacs) jari.aalto@poboxes.com |
| 15 | ;; Maintainer: (Stefan Monnier) monnier+lists/cvs/pcl@flint.cs.yale.edu | 15 | ;; Maintainer: (Stefan Monnier) monnier+lists/cvs/pcl@flint.cs.yale.edu |
| 16 | ;; Keywords: CVS, version control, release management | 16 | ;; Keywords: CVS, version control, release management |
| 17 | ;; Revision: $Id: pcvs.el,v 1.40 2002/09/13 18:25:26 monnier Exp $ | 17 | ;; Revision: $Id: pcvs.el,v 1.41 2002/09/13 19:09:45 monnier Exp $ |
| 18 | 18 | ||
| 19 | ;; This file is part of GNU Emacs. | 19 | ;; This file is part of GNU Emacs. |
| 20 | 20 | ||
| @@ -976,9 +976,11 @@ Optional argument NOSHOW if non-nil means not to display the buffer." | |||
| 976 | (defun cvs-update (directory flags) | 976 | (defun cvs-update (directory flags) |
| 977 | "Run a `cvs update' in the current working DIRECTORY. | 977 | "Run a `cvs update' in the current working DIRECTORY. |
| 978 | Feed the output to a *cvs* buffer and run `cvs-mode' on it. | 978 | Feed the output to a *cvs* buffer and run `cvs-mode' on it. |
| 979 | With a prefix argument, prompt for a directory and cvs FLAGS to use. | 979 | With a \\[universal-argument] prefix argument, prompt for a directory to use. |
| 980 | A prefix arg >8 (ex: \\[universal-argument] \\[universal-argument]), | 980 | A prefix arg >8 (ex: \\[universal-argument] \\[universal-argument]), |
| 981 | prevents reuse of an existing *cvs* buffer." | 981 | prevents reuse of an existing *cvs* buffer. |
| 982 | The prefix is also passed to `cvs-flags-query' to select the FLAGS | ||
| 983 | passed to cvs." | ||
| 982 | (interactive (list (cvs-query-directory "CVS Update (directory): ") | 984 | (interactive (list (cvs-query-directory "CVS Update (directory): ") |
| 983 | (cvs-flags-query 'cvs-update-flags "cvs update flags"))) | 985 | (cvs-flags-query 'cvs-update-flags "cvs update flags"))) |
| 984 | (when (eq flags t) | 986 | (when (eq flags t) |
| @@ -1888,7 +1890,7 @@ This command ignores files that are not flagged as `Unknown'." | |||
| 1888 | With a prefix, opens the buffer in an OTHER window." | 1890 | With a prefix, opens the buffer in an OTHER window." |
| 1889 | (interactive (list last-input-event current-prefix-arg)) | 1891 | (interactive (list last-input-event current-prefix-arg)) |
| 1890 | (when (ignore-errors (mouse-set-point e) t) ;for invocation via the mouse | 1892 | (when (ignore-errors (mouse-set-point e) t) ;for invocation via the mouse |
| 1891 | (unless (memq (get-text-property (1- (line-end-position)) 'face) | 1893 | (unless (memq (get-text-property (1- (line-end-position)) 'font-lock-face) |
| 1892 | '(cvs-header-face cvs-filename-face)) | 1894 | '(cvs-header-face cvs-filename-face)) |
| 1893 | (error "Not a file name"))) | 1895 | (error "Not a file name"))) |
| 1894 | (cvs-mode! | 1896 | (cvs-mode! |