Mercurial > emacs
annotate lisp/vc-hooks.el @ 1717:aa7d6d57504b
* frame.h (struct frame): New fields `can_have_scrollbars' and
`has_vertical_scrollbars'.
(FRAME_CAN_HAVE_SCROLLBARS, FRAME_HAS_VERTICAL_SCROLLBARS): New
accessors, for both the MULTI_FRAME and non-MULTI_FRAME.
(VERTICAL_SCROLLBAR_WIDTH, WINDOW_VERTICAL_SCROLLBAR,
WINDOW_VERTICAL_SCROLLBAR_COLUMN,
WINDOW_VERTICAL_SCROLLBAR_HEIGHT): New macros.
* window.h (struct window): New field `vertical_scrollbar'.
* xterm.h (struct x_display): vertical_scrollbars,
judge_timestamp, vertical_scrollbar_extra: New fields.
(struct scrollbar): New struct.
(VERTICAL_SCROLLBAR_PIXEL_WIDTH, VERTICAL_SCROLLBAR_PIXEL_HEIGHT,
VERTICAL_SCROLLBAR_LEFT_BORDER, VERTICAL_SCROLLBAR_RIGHT_BORDER,
VERTICAL_SCROLLBAR_TOP_BORDER, VERTICAL_SCROLLBAR_BOTTOM_BORDER,
CHAR_TO_PIXEL_WIDTH, CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_WIDTH,
PIXEL_TO_CHAR_HEIGHT): New accessors and macros.
* frame.c (make_frame): Initialize the `can_have_scrollbars' and
`has_vertical_scrollbars' fields of the frame.
* term.c (term_init): Note that TERMCAP terminals don't support
scrollbars.
(mouse_position_hook): Document new args.
(set_vertical_scrollbar_hook, condemn_scrollbars_hook,
redeem_scrollbar_hook, judge_scrollbars_hook): New hooks.
* termhooks.h: Declare and document them.
(enum scrollbar_part): New type.
(struct input_event): Describe the new form of the scrollbar_click
event type. Change `part' from a Lisp_Object to an enum
scrollbar_part. Add a new field `scrollbar'.
* keyboard.c (kbd_buffer_get_event): Pass appropriate new
parameters to *mouse_position_hook, and make_lispy_movement.
* xfns.c (x_set_vertical_scrollbar): New function.
(x_figure_window_size): Use new macros to calculate frame size.
(Fx_create_frame): Note that X Windows frames do support scroll
bars. Default to "yes".
* xterm.c: #include <X11/cursorfont.h> and "window.h".
(x_vertical_scrollbar_cursor): New variable.
(x_term_init): Initialize it.
(last_mouse_bar, last_mouse_bar_frame, last_mouse_part,
last_mouse_scroll_range_start, last_mouse_scroll_range_end): New
variables.
(XTmouse_position): Use them to return scrollbar movement events.
Take new arguments, for that purpose.
(x_window_to_scrollbar, x_scrollbar_create,
x_scrollbar_set_handle, x_scrollbar_remove, x_scrollbar_move,
XTset_scrollbar, XTcondemn_scrollbars, XTredeem_scrollbar,
XTjudge_scrollbars, x_scrollbar_expose,
x_scrollbar_background_expose, x_scrollbar_handle_click,
x_scrollbar_handle_motion): New functions to implement scrollbars.
(x_term_init): Set the termhooks.h hooks to point to them.
(x_set_window_size): Use new macros to calculate frame size. Set
vertical_scrollbar_extra field.
(x_make_frame_visible): Use the frame accessor
FRAME_HAS_VERTICAL_SCROLLBARS to decide if we need to map the
frame's subwindows as well.
(XTread_socket): Use new size-calculation macros from xterm.h when
processing ConfigureNotify events.
(x_wm_set_size_hint): Use PIXEL_TO_CHAR_WIDTH and
PIXEL_TO_CHAR_HEIGHT macros.
* ymakefile (xdisp.o): This now depends on termhooks.h.
(xterm.o): This now depends on window.h.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Thu, 24 Dec 1992 06:17:18 +0000 |
| parents | 341c17b20f2a |
| children | ef257d7ca34a |
| rev | line source |
|---|---|
| 904 | 1 ;;; vc-hooks.el -- resident support for version-control |
| 2 | |
| 3 ;; Copyright (C) 1992 Free Software Foundation, Inc. | |
| 4 | |
| 5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> | |
| 6 ;; Version: 4.0 | |
| 7 | |
|
1474
341c17b20f2a
(vc-prefix-map): Put vc-diff on = and vc-directory on d.
Richard M. Stallman <rms@gnu.org>
parents:
1457
diff
changeset
|
8 ;; $Id: vc-hooks.el,v 1.5 1992/10/20 18:43:33 rms Exp rms $ |
| 904 | 9 |
| 10 ;; This file is part of GNU Emacs. | |
| 11 | |
| 12 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
| 13 ;; it under the terms of the GNU General Public License as published by | |
| 14 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 15 ;; any later version. | |
| 16 | |
| 17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
| 18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 20 ;; GNU General Public License for more details. | |
| 21 | |
| 22 ;; You should have received a copy of the GNU General Public License | |
| 23 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
| 24 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
| 25 | |
| 26 ;;; Commentary: | |
| 27 | |
| 28 ;; See the commentary of vc.el. | |
| 29 | |
| 30 ;;; Code: | |
| 31 | |
| 32 (defvar vc-master-templates | |
| 33 '(("%sRCS/%s,v" . RCS) ("%s%s,v" . RCS) ("%sRCS/%s" . RCS) | |
| 34 ("%sSCCS/s.%s" . SCCS) ("%ss.%s". SCCS)) | |
| 35 "*Where to look for version-control master files. | |
| 36 The first pair corresponding to a given back end is used as a template | |
| 37 when creating new masters.") | |
| 38 | |
| 39 (defvar vc-make-backup-files nil | |
| 40 "*If non-nil, backups of registered files are made according to | |
| 41 the make-backup-files variable. Otherwise, prevents backups being made.") | |
| 42 | |
| 43 ;; Tell Emacs about this new kind of minor mode | |
| 44 (if (not (assoc 'vc-mode-string minor-mode-alist)) | |
| 45 (setq minor-mode-alist (cons '(vc-mode-string vc-mode-string) | |
| 46 minor-mode-alist))) | |
| 47 | |
| 48 (make-variable-buffer-local 'vc-mode-string) | |
| 49 | |
| 50 ;; We need a notion of per-file properties because the version | |
| 51 ;; control state of a file is expensive to derive --- we don't | |
| 52 ;; want to recompute it even on every find. | |
| 53 | |
| 54 (defvar vc-file-prop-obarray [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0] | |
| 55 "Obarray for per-file properties.") | |
| 56 | |
| 57 (defun vc-file-setprop (file property value) | |
| 58 ;; set per-file property | |
| 59 (put (intern file vc-file-prop-obarray) property value)) | |
| 60 | |
| 61 (defun vc-file-getprop (file property) | |
| 62 ;; get per-file property | |
| 63 (get (intern file vc-file-prop-obarray) property)) | |
| 64 | |
| 65 ;;; actual version-control code starts here | |
| 66 | |
| 67 (defun vc-registered (file) | |
|
1457
7f3e86c53165
(vc-registered): Look for handler only if file-name-handler-alist is bound.
Richard M. Stallman <rms@gnu.org>
parents:
1455
diff
changeset
|
68 (let (handler handlers) |
|
7f3e86c53165
(vc-registered): Look for handler only if file-name-handler-alist is bound.
Richard M. Stallman <rms@gnu.org>
parents:
1455
diff
changeset
|
69 (if (boundp 'file-name-handler-alist) |
|
7f3e86c53165
(vc-registered): Look for handler only if file-name-handler-alist is bound.
Richard M. Stallman <rms@gnu.org>
parents:
1455
diff
changeset
|
70 (save-match-data |
|
7f3e86c53165
(vc-registered): Look for handler only if file-name-handler-alist is bound.
Richard M. Stallman <rms@gnu.org>
parents:
1455
diff
changeset
|
71 (setq handlers file-name-handler-alist) |
|
7f3e86c53165
(vc-registered): Look for handler only if file-name-handler-alist is bound.
Richard M. Stallman <rms@gnu.org>
parents:
1455
diff
changeset
|
72 (while (and (consp handlers) (null handler)) |
|
7f3e86c53165
(vc-registered): Look for handler only if file-name-handler-alist is bound.
Richard M. Stallman <rms@gnu.org>
parents:
1455
diff
changeset
|
73 (if (and (consp (car handlers)) |
|
7f3e86c53165
(vc-registered): Look for handler only if file-name-handler-alist is bound.
Richard M. Stallman <rms@gnu.org>
parents:
1455
diff
changeset
|
74 (stringp (car (car handlers))) |
|
7f3e86c53165
(vc-registered): Look for handler only if file-name-handler-alist is bound.
Richard M. Stallman <rms@gnu.org>
parents:
1455
diff
changeset
|
75 (string-match (car (car handlers)) file)) |
|
7f3e86c53165
(vc-registered): Look for handler only if file-name-handler-alist is bound.
Richard M. Stallman <rms@gnu.org>
parents:
1455
diff
changeset
|
76 (setq handler (cdr (car handlers)))) |
|
7f3e86c53165
(vc-registered): Look for handler only if file-name-handler-alist is bound.
Richard M. Stallman <rms@gnu.org>
parents:
1455
diff
changeset
|
77 (setq handlers (cdr handlers))))) |
|
1455
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
78 (if handler |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
79 (funcall handler 'vc-registered file) |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
80 ;; Search for a master corresponding to the given file |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
81 (let ((dirname (or (file-name-directory file) "")) |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
82 (basename (file-name-nondirectory file))) |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
83 (catch 'found |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
84 (mapcar |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
85 (function (lambda (s) |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
86 (let ((trial (format (car s) dirname basename))) |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
87 (if (and (file-exists-p trial) |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
88 ;; Make sure the file we found with name |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
89 ;; TRIAL is not the source file itself. |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
90 ;; That can happen with RCS-style names |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
91 ;; if the file name is truncated |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
92 ;; (e.g. to 14 chars). See if either |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
93 ;; directory or attributes differ. |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
94 (or (not (string= dirname |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
95 (file-name-directory trial))) |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
96 (not (equal |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
97 (file-attributes file) |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
98 (file-attributes trial))))) |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
99 (throw 'found (cons trial (cdr s))))))) |
|
b5a0e08b0dbe
(vc-registered): Look for a vc-registered handler.
Richard M. Stallman <rms@gnu.org>
parents:
1224
diff
changeset
|
100 vc-master-templates) |
|
1457
7f3e86c53165
(vc-registered): Look for handler only if file-name-handler-alist is bound.
Richard M. Stallman <rms@gnu.org>
parents:
1455
diff
changeset
|
101 nil))))) |
| 904 | 102 |
| 103 (defun vc-backend-deduce (file) | |
| 104 "Return the version-control type of a file, nil if it is not registered" | |
| 105 (and file | |
| 106 (or (vc-file-getprop file 'vc-backend) | |
| 107 (vc-file-setprop file 'vc-backend (cdr (vc-registered file)))))) | |
| 108 | |
| 109 (defun vc-toggle-read-only () | |
|
1224
981b00f8fe77
(vc-toggle-read-only): Doc fix.
Roland McGrath <roland@gnu.org>
parents:
926
diff
changeset
|
110 "If the file in the current buffer is under version control, perform the |
| 904 | 111 logical next version-control action; otherwise, just toggle the buffer's |
| 112 read-only flag." | |
| 113 (interactive) | |
| 114 (if (vc-backend-deduce (buffer-file-name)) | |
| 115 (vc-next-action nil) | |
| 116 (toggle-read-only))) | |
| 117 | |
| 118 (defun vc-mode-line (file &optional label) | |
| 119 "Set `vc-mode-string' to display type of version control for FILE. | |
| 120 The value is set in the current buffer, which should be the buffer | |
| 121 visiting FILE." | |
|
1224
981b00f8fe77
(vc-toggle-read-only): Doc fix.
Roland McGrath <roland@gnu.org>
parents:
926
diff
changeset
|
122 (interactive (list buffer-file-name nil)) |
| 904 | 123 (let ((vc-type (vc-backend-deduce file))) |
| 124 (if vc-type | |
| 125 (progn | |
| 126 (if (null (current-local-map)) | |
| 127 (use-local-map (make-sparse-keymap))) | |
| 128 (define-key (current-local-map) "\C-x\C-q" 'vc-toggle-read-only) | |
| 129 (setq vc-mode-string | |
| 130 (concat " " (or label (symbol-name vc-type)))))) | |
| 131 ;; force update of mode line | |
| 132 (set-buffer-modified-p (buffer-modified-p)) | |
| 133 vc-type)) | |
| 134 | |
| 135 ;;; install a call to the above as a find-file hook | |
| 136 (defun vc-find-file-hook () | |
| 137 (if (and (vc-mode-line buffer-file-name) (not vc-make-backup-files)) | |
| 138 (progn | |
| 139 (make-local-variable 'make-backup-files) | |
| 140 (setq make-backup-files nil)))) | |
| 141 | |
| 142 (or (memq 'vc-find-file-hook find-file-hooks) | |
| 143 (setq find-file-hooks | |
| 144 (cons 'vc-find-file-hook find-file-hooks))) | |
| 145 | |
| 146 ;;; more hooks, this time for file-not-found | |
| 147 (defun vc-file-not-found-hook () | |
| 148 "When file is not found, try to check it out from RCS or SCCS. | |
| 149 Returns t if checkout was successful, nil otherwise." | |
| 150 (if (vc-backend-deduce buffer-file-name) | |
| 151 (progn | |
| 152 (require 'vc) | |
| 153 (not (vc-error-occurred (vc-checkout buffer-file-name)))))) | |
| 154 | |
| 155 (or (memq 'vc-file-not-found-hook find-file-not-found-hooks) | |
| 156 (setq find-file-not-found-hooks | |
| 157 (cons 'vc-file-not-found-hook find-file-not-found-hooks))) | |
| 158 | |
| 159 ;;; Now arrange for bindings and autoloading of the main package. | |
| 160 ;;; Bindings for this have to go in the global map, as it may have | |
| 161 ;;; to coexist with a lot of different major modes. | |
| 162 | |
| 163 (setq vc-prefix-map (lookup-key global-map "\C-xv")) | |
| 164 (if (not (keymapp vc-prefix-map)) | |
| 165 (progn | |
| 166 (setq vc-prefix-map (make-sparse-keymap)) | |
| 167 (define-key global-map "\C-xv" vc-prefix-map) | |
| 168 (define-key vc-prefix-map "a" 'vc-update-change-log) | |
| 169 (define-key vc-prefix-map "c" 'vc-cancel-version) | |
|
1474
341c17b20f2a
(vc-prefix-map): Put vc-diff on = and vc-directory on d.
Richard M. Stallman <rms@gnu.org>
parents:
1457
diff
changeset
|
170 (define-key vc-prefix-map "d" 'vc-directory) |
| 904 | 171 (define-key vc-prefix-map "h" 'vc-insert-headers) |
| 172 (define-key vc-prefix-map "i" 'vc-register) | |
| 173 (define-key vc-prefix-map "l" 'vc-print-log) | |
| 174 (define-key vc-prefix-map "r" 'vc-retrieve-snapshot) | |
| 175 (define-key vc-prefix-map "s" 'vc-create-snapshot) | |
| 176 (define-key vc-prefix-map "u" 'vc-revert-buffer) | |
| 177 (define-key vc-prefix-map "v" 'vc-next-action) | |
|
1474
341c17b20f2a
(vc-prefix-map): Put vc-diff on = and vc-directory on d.
Richard M. Stallman <rms@gnu.org>
parents:
1457
diff
changeset
|
178 (define-key vc-prefix-map "=" 'vc-diff) |
| 904 | 179 )) |
| 180 | |
| 181 (provide 'vc-hooks) | |
| 182 | |
| 183 ;;; vc-hooks.el ends here |
