annotate lisp/talk.el @ 31383:860d7ac182e3

(vc-rcs-show-log-entry): New function. (vc-rcs-checkin, vc-rcs-checkout): Don't set all properties. (vc-rcs-register): If there is no RCS subdir, ask the user whether to create one. (vc-rcs-state-heuristic): Use file-ownership-preserved-p. (vc-rcs-checkout): Remove the error-handling for missing-rcs. (vc-rcs-state-heuristic): Don't use file-writable-p. (vc-rcs-print-log): Insert in the current buffer. (vc-rcs-diff): Insert in the current buffer and remove unused arg CMP. (vc-rcs-workfile-unchanged-p): Use vc-do-command instead of vc-simple-command. (vc-rcs-fetch-master-state): Removed check for unlocked-changes to avoid doing a diff when opening a file. (vc-rcs-state): Added check for unlocked-changes. (vc-rcs-header): Escape Id. (vc-rcs-workfile-unchanged-p): Remove optional arg VERSION. (vc-rcs-state): Call vc-workfile-unchanged-p, not the RCS-specific version. (vc-rcs-state-heuristic): Use file-writable-p instead of comparing userids. (vc-rcs-fetch-master-state): Handle the case where rcs is missing. Simplify the logic by eliminating unreachable code. (vc-rcs-diff): Only pass `2' to vc-do-command if necessary and just do a recursive call if we need to retry. (vc-rcs-checkout): Handle the case where rcs is missing by making the buffer read-write if requested and re-signalling the error. (vc-rcs-find-most-recent-rev): New function. The code derives from the old vc-parse-buffer but uses the revision number rather than the date (much easier to compare robustly). (vc-rcs-fetch-master-state): Use `with-temp-buffer'. Adapt to the new vc-parse-buffer (and vc-rcs-find-most-recent-rev). Find the locking-user more directly. Check strict locking and set checkout-model appropriately. (vc-rcs-parse-locks): Remove. (vc-rcs-latest-on-branch-p): Use with-temp-buffer and adapt to the new vc-parse-buffer (and vc-rcs-find-most-recent-rev). (vc-rcs-system-release): Use with-current-buffer and vc-parse-buffer. (vc-rcs-register, vc-rcs-checkout): Use with-current-buffer. Merge in code from vc-rcs-hooks.el. Don't require 'vc anymore. (vc-rcs-responsible-p): Use expand-file-name instead of concat and file-directory-p instead of file-exists-p. (vc-rcs-exists): Remove. (vc-rcs-header): New var. Update Copyright. (vc-rcs-rename-file): New function. (vc-rcs-diff): Remove unused `backend' variable. (vc-rcs-clear-headers): New function; code moved here from vc-clear-headers in vc.el. (tail): Provide vc-rcs and remove vc-rcs-logentry-check. (vc-rcs-register): Parse command output to find master file name and workfile version. (vc-rcs-checkout): Removed call to vc-file-clear-masterprops. Require vc and vc-rcs-hooks. (vc-rcs-trunk-p, vc-rcs-branch-part): Move to vc-rcs-hooks. (vc-rcs-backend-release-p): Remove (use vc-rcs-release-p). (vc-release-greater-or-equal-p): Move from vc. (vc-rcs-trunk-p, vc-rcs-branch-p, vc-rcs-branch-part, vc-rcs-minor-part, vc-rcs-previous-version): Remove duplicates. (vc-rcs-checkout): Add a missing `new-version' argument in the call to vc-rcs-latest-on-branch-p. Hopefully that was the right one. (vc-rcs-steal-lock): Renamed from `vc-rcs-steal'. Updated everything to use `vc-checkout-model'. (vc-rcs-backend-release-p): function added. other stuff updated to reference this function instead of the old `vc-backend-release-p'. (vc-rcs-logentry-check): Function added. (vc-rcs-checkin, vc-rcs-previous-version) (vc-rcs-checkout): Name space cleaned up. No more revision number crunching function names that are not prefixed with vc-rcs. (vc-rcs-checkout-model): Function added. References to `vc-checkout-model' replaced. (vc-rcs-admin): Added the query-only option as required by the vc.el file. (vc-rcs-exists): Function added. (vc-*-checkout): Use with-temp-file instead of /bin/sh. Merged from mainline (vc-rcs-latest-on-branch-p): Moved to vc-rcs-hooks.el. (vc-rcs-latest-on-branch-p, vc-rcs-trunk-p) (vc-rcs-branch-p, vc-rcs-branch-part, vc-rcs-minor-part) (vc-rcs-previous-version): Functions added. (vc-rcs-diff): Function added. (vc-rcs-checkout) Bug (typo) found and fixed. (vc-rcs-register-switches) Variable `vc-rcs-register-switches' added. Require vc when compiling. (vc-rcs-print-log, vc-rcs-assign-name, vc-rcs-merge) (vc-rcs-check-headers, vc-rcs-steal, vc-rcs-uncheck, vc-rcs-revert) (vc-rcs-checkin): New functions (code from vc.el). (vc-rcs-previous-version, vc-rcs-system-release, vc-rcs-checkout): Doc fix. (vc-rcs-release): Deleted. (Duplicated vc-rcs-system-release). (vc-rcs-trunk-p, vc-rcs-branch-p, vc-rcs-branch-part) (vc-rcs-minor-part, vc-rcs-previous-version, vc-rcs-release) (vc-rcs-release-p, vc-rcs-admin, vc-rcs-checkout): New functions from vc.el. (vc-rcs-system-release): Renamed from vc-rcs-backend-release.
author Gerd Moellmann <gerd@gnu.org>
date Mon, 04 Sep 2000 19:47:43 +0000
parents 11218164bc54
children 67b464da13ec
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11684
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1 ;;; talk.el --- Allow several users to talk to each other through Emacs.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3 ;; Copyright (C) 1995 Free Software Foundation, Inc.
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 12461
diff changeset
4
11684
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5 ;; Keywords: comm, frames
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
7 ;; This file is part of GNU Emacs.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
8
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
9 ;; GNU Emacs is free software; you can redistribute it and/or modify
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
10 ;; it under the terms of the GNU General Public License as published by
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
11 ;; the Free Software Foundation; either version 2, or (at your option)
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
12 ;; any later version.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
13
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
14 ;; GNU Emacs is distributed in the hope that it will be useful,
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17 ;; GNU General Public License for more details.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
18
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
19 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 12461
diff changeset
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 12461
diff changeset
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 12461
diff changeset
22 ;; Boston, MA 02111-1307, USA.
11684
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
23
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
24 ;;; Commentary:
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
25
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 12461
diff changeset
26 ;; This is a multi-user talk package that runs in Emacs.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 12461
diff changeset
27 ;; Use talk-connect to bring a new person into the conversation.
11684
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
28
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
29 ;;; Code:
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
30
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
31 (defvar talk-display-alist nil
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
32 "Alist of displays on which Emacs talk is now running.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
33 Each element has the form (DISPLAY FRAME BUFFER).")
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
34
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
35 ;;;###autoload
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
36 (defun talk-connect (display)
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
37 "Connect to display DISPLAY for the Emacs talk group."
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
38 (interactive "sTalk to display: ")
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
39 ;; Make sure we have an entry for the current display.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
40 (let ((mydisp (cdr (assq 'display (frame-parameters (selected-frame))))))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
41 (talk-add-display mydisp))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
42 ;; Make sure we have an entry for the specified display.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
43 (talk-add-display display)
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
44 ;; Add the new buffers to all talk frames.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
45 (talk-update-buffers))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
46
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
47 (defun talk-add-display (display)
12461
578abe49e2d3 (talk-disconnect): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 11684
diff changeset
48 (let* ((elt (assoc display talk-display-alist))
578abe49e2d3 (talk-disconnect): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 11684
diff changeset
49 (name (concat "*talk-" display "*"))
578abe49e2d3 (talk-disconnect): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 11684
diff changeset
50 buffer frame)
578abe49e2d3 (talk-disconnect): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 11684
diff changeset
51 (if (not (and elt (frame-live-p (setq frame (nth 1 elt)))))
578abe49e2d3 (talk-disconnect): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 11684
diff changeset
52 (setq frame (make-frame-on-display display (list (cons 'name name)))))
578abe49e2d3 (talk-disconnect): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 11684
diff changeset
53 (if (not (and elt (buffer-name (get-buffer (setq buffer (nth 2 elt))))))
578abe49e2d3 (talk-disconnect): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 11684
diff changeset
54 (setq buffer (get-buffer-create name)))
578abe49e2d3 (talk-disconnect): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 11684
diff changeset
55 (setq talk-display-alist
578abe49e2d3 (talk-disconnect): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 11684
diff changeset
56 (cons (list display frame buffer) (delq elt talk-display-alist)))))
11684
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
57
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
58 (defun talk-disconnect ()
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
59 "Disconnect this display from the Emacs talk group."
12461
578abe49e2d3 (talk-disconnect): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 11684
diff changeset
60 (interactive)
11684
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
61 (let* ((mydisp (cdr (assq 'display (frame-parameters (selected-frame)))))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
62 (elt (assoc mydisp talk-display-alist)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
63 (delete-frame (nth 1 elt))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
64 (kill-buffer (nth 2 elt))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
65 (setq talk-display-alist (delq elt talk-display-alist))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
66 (talk-update-buffers)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
67
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
68 (defun talk-update-buffers ()
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
69 "Update all the talk frames so that each shows all the talk buffers."
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
70 (let ((tail talk-display-alist))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
71 (while tail
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
72 (let ((frame (nth 1 (car tail)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
73 (this-buffer (nth 2 (car tail)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
74 (buffers
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
75 (mapcar (function (lambda (elt) (nth 2 elt)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
76 talk-display-alist)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
77 ;; Put this display's own talk buffer
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
78 ;; at the front of the list.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
79 (setq buffers (cons this-buffer (delq this-buffer buffers)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
80 (talk-split-up-frame frame buffers))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
81 (setq tail (cdr tail)))))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
82
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
83 (defun talk-split-up-frame (frame buffers)
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
84 "Split FRAME into equal-sized windows displaying the buffers in BUFFERS.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
85 Select the first of these windows, displaying the first of the buffers."
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
86 (let ((lines-per-buffer (/ (frame-height frame) (length buffers)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
87 (old-frame (selected-frame)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
88 (unwind-protect
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
89 (progn
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
90 (select-frame frame)
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
91 (select-window (frame-first-window frame))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
92 (delete-other-windows)
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
93 (while (progn
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
94 (switch-to-buffer (car buffers))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
95 (setq buffers (cdr buffers)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
96 (split-window-vertically lines-per-buffer)
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
97 (other-window 1))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
98 (select-window (frame-first-window frame)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
99 (select-frame old-frame))))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
100
18383
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
101 (provide 'talk)
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
102
11684
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
103 ;;; talk.el ends here