Mercurial > emacs
comparison lisp/vc-rcs.el @ 105994:009383a57ce8
* x-dnd.el (x-dnd-maybe-call-test-function):
* window.el (split-window-vertically):
* whitespace.el (whitespace-help-on):
* vc-rcs.el (vc-rcs-consult-headers):
* userlock.el (ask-user-about-lock-help)
(ask-user-about-supersession-help):
* type-break.el (type-break-force-mode-line-update):
* time-stamp.el (time-stamp-conv-warn):
* terminal.el (te-set-output-log, te-more-break, te-filter)
(te-sentinel,terminal-emulator):
* term.el (make-term, term-exec, term-sentinel, term-read-input-ring)
(term-write-input-ring, term-check-source, term-start-output-log):
(term-display-buffer-line, term-dynamic-list-completions):
(term-ansi-make-term, serial-term):
* subr.el (selective-display):
* strokes.el (strokes-xpm-to-compressed-string, strokes-decode-buffer)
(strokes-encode-buffer, strokes-xpm-for-compressed-string):
* speedbar.el (speedbar-buffers-tail-notes, speedbar-buffers-item-info)
(speedbar-reconfigure-keymaps, speedbar-add-localized-speedbar-support)
(speedbar-remove-localized-speedbar-support)
(speedbar-set-mode-line-format, speedbar-create-tag-hierarchy)
(speedbar-update-special-contents, speedbar-buffer-buttons-engine)
(speedbar-buffers-line-directory):
* simple.el (shell-command-on-region, append-to-buffer)
(prepend-to-buffer):
* shadowfile.el (shadow-save-todo-file):
* scroll-bar.el (scroll-bar-set-window-start, scroll-bar-drag-1)
(scroll-bar-maybe-set-window-start):
* sb-image.el (speedbar-image-dump):
* saveplace.el (save-place-alist-to-file, save-places-to-alist)
(load-save-place-alist-from-file):
* ps-samp.el (ps-print-message-from-summary):
* ps-print.el (ps-flush-output, ps-insert-file, ps-get-boundingbox)
(ps-background-image, ps-begin-job, ps-do-despool):
* ps-bdf.el (bdf-find-file, bdf-read-font-info):
* printing.el (pr-interface, pr-ps-file-print, pr-find-buffer-visiting)
(pr-ps-message-from-summary, pr-lpr-message-from-summary):
(pr-call-process, pr-file-list, pr-interface-save):
* novice.el (disabled-command-function)
(enable-command, disable-command):
* mouse.el (mouse-buffer-menu-alist):
* mouse-copy.el (mouse-kill-preserving-secondary):
* macros.el (kbd-macro-query):
* ledit.el (ledit-go-to-lisp, ledit-go-to-liszt):
* informat.el (batch-info-validate):
* ido.el (ido-copy-current-word, ido-initiate-auto-merge):
* hippie-exp.el (try-expand-dabbrev-visible):
* help-mode.el (help-make-xrefs):
* help-fns.el (describe-variable):
* generic-x.el (bat-generic-mode-run-as-comint):
* finder.el (finder-mouse-select):
* find-dired.el (find-dired-sentinel):
* filesets.el (filesets-file-close):
* files.el (list-directory):
* faces.el (list-faces-display, describe-face):
* facemenu.el (list-colors-display):
* ezimage.el (ezimage-image-association-dump, ezimage-image-dump):
* epg.el (epg--process-filter, epg-cancel):
* epa.el (epa--marked-keys, epa--select-keys, epa-display-info)
(epa--read-signature-type):
* emerge.el (emerge-copy-as-kill-A, emerge-copy-as-kill-B)
(emerge-file-names):
* ehelp.el (electric-helpify):
* ediff.el (ediff-regions-wordwise, ediff-regions-linewise):
* ediff-vers.el (rcs-ediff-view-revision):
* ediff-util.el (ediff-setup):
* ediff-mult.el (ediff-append-custom-diff):
* ediff-diff.el (ediff-exec-process, ediff-process-sentinel)
(ediff-wordify):
* echistory.el (Electric-command-history-redo-expression):
* dos-w32.el (find-file-not-found-set-buffer-file-coding-system):
* disp-table.el (describe-display-table):
* dired.el (dired-find-buffer-nocreate):
* dired-aux.el (dired-rename-subdir, dired-dwim-target-directory):
* dabbrev.el (dabbrev--same-major-mode-p):
* chistory.el (list-command-history):
* apropos.el (apropos-documentation):
* allout.el (allout-obtain-passphrase):
(allout-copy-exposed-to-buffer):
(allout-verify-passphrase): Use with-current-buffer.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 13 Nov 2009 22:19:45 +0000 |
parents | a0f778f4a995 |
children | 2bed02fa3041 |
comparison
equal
deleted
inserted
replaced
105993:505670342624 | 105994:009383a57ce8 |
---|---|
1053 'rev if a workfile revision was found | 1053 'rev if a workfile revision was found |
1054 'rev-and-lock if revision and lock info was found" | 1054 'rev-and-lock if revision and lock info was found" |
1055 (cond | 1055 (cond |
1056 ((not (get-file-buffer file)) nil) | 1056 ((not (get-file-buffer file)) nil) |
1057 ((let (status version locking-user) | 1057 ((let (status version locking-user) |
1058 (save-excursion | 1058 (with-current-buffer (get-file-buffer file) |
1059 (set-buffer (get-file-buffer file)) | 1059 (goto-char (point-min)) |
1060 (goto-char (point-min)) | 1060 (cond |
1061 (cond | 1061 ;; search for $Id or $Header |
1062 ;; search for $Id or $Header | 1062 ;; ------------------------- |
1063 ;; ------------------------- | 1063 ;; The `\ 's below avoid an RCS 5.7 bug when checking in this file. |
1064 ;; The `\ 's below avoid an RCS 5.7 bug when checking in this file. | 1064 ((or (and (search-forward "$Id\ : " nil t) |
1065 ((or (and (search-forward "$Id\ : " nil t) | 1065 (looking-at "[^ ]+ \\([0-9.]+\\) ")) |
1066 (looking-at "[^ ]+ \\([0-9.]+\\) ")) | 1066 (and (progn (goto-char (point-min)) |
1067 (and (progn (goto-char (point-min)) | 1067 (search-forward "$Header\ : " nil t)) |
1068 (search-forward "$Header\ : " nil t)) | 1068 (looking-at "[^ ]+ \\([0-9.]+\\) "))) |
1069 (looking-at "[^ ]+ \\([0-9.]+\\) "))) | 1069 (goto-char (match-end 0)) |
1070 (goto-char (match-end 0)) | 1070 ;; if found, store the revision number ... |
1071 ;; if found, store the revision number ... | 1071 (setq version (match-string-no-properties 1)) |
1072 (setq version (match-string-no-properties 1)) | 1072 ;; ... and check for the locking state |
1073 ;; ... and check for the locking state | 1073 (cond |
1074 (cond | 1074 ((looking-at |
1075 ((looking-at | 1075 (concat "[0-9]+[/-][01][0-9][/-][0-3][0-9] " ; date |
1076 (concat "[0-9]+[/-][01][0-9][/-][0-3][0-9] " ; date | 1076 "[0-2][0-9]:[0-5][0-9]+:[0-6][0-9]+\\([+-][0-9:]+\\)? " ; time |
1077 "[0-2][0-9]:[0-5][0-9]+:[0-6][0-9]+\\([+-][0-9:]+\\)? " ; time | 1077 "[^ ]+ [^ ]+ ")) ; author & state |
1078 "[^ ]+ [^ ]+ ")) ; author & state | 1078 (goto-char (match-end 0)) ; [0-6] in regexp handles leap seconds |
1079 (goto-char (match-end 0)) ; [0-6] in regexp handles leap seconds | 1079 (cond |
1080 (cond | 1080 ;; unlocked revision |
1081 ;; unlocked revision | 1081 ((looking-at "\\$") |
1082 ((looking-at "\\$") | 1082 (setq locking-user 'none) |
1083 (setq locking-user 'none) | 1083 (setq status 'rev-and-lock)) |
1084 (setq status 'rev-and-lock)) | 1084 ;; revision is locked by some user |
1085 ;; revision is locked by some user | 1085 ((looking-at "\\([^ ]+\\) \\$") |
1086 ((looking-at "\\([^ ]+\\) \\$") | 1086 (setq locking-user (match-string-no-properties 1)) |
1087 (setq locking-user (match-string-no-properties 1)) | 1087 (setq status 'rev-and-lock)) |
1088 (setq status 'rev-and-lock)) | 1088 ;; everything else: false |
1089 ;; everything else: false | 1089 (nil))) |
1090 (nil))) | 1090 ;; unexpected information in |
1091 ;; unexpected information in | 1091 ;; keyword string --> quit |
1092 ;; keyword string --> quit | 1092 (nil))) |
1093 (nil))) | 1093 ;; search for $Revision |
1094 ;; search for $Revision | 1094 ;; -------------------- |
1095 ;; -------------------- | 1095 ((re-search-forward (concat "\\$" |
1096 ((re-search-forward (concat "\\$" | 1096 "Revision: \\([0-9.]+\\) \\$") |
1097 "Revision: \\([0-9.]+\\) \\$") | 1097 nil t) |
1098 nil t) | 1098 ;; if found, store the revision number ... |
1099 ;; if found, store the revision number ... | 1099 (setq version (match-string-no-properties 1)) |
1100 (setq version (match-string-no-properties 1)) | 1100 ;; and see if there's any lock information |
1101 ;; and see if there's any lock information | 1101 (goto-char (point-min)) |
1102 (goto-char (point-min)) | 1102 (if (re-search-forward (concat "\\$" "Locker:") nil t) |
1103 (if (re-search-forward (concat "\\$" "Locker:") nil t) | 1103 (cond ((looking-at " \\([^ ]+\\) \\$") |
1104 (cond ((looking-at " \\([^ ]+\\) \\$") | 1104 (setq locking-user (match-string-no-properties 1)) |
1105 (setq locking-user (match-string-no-properties 1)) | 1105 (setq status 'rev-and-lock)) |
1106 (setq status 'rev-and-lock)) | 1106 ((looking-at " *\\$") |
1107 ((looking-at " *\\$") | 1107 (setq locking-user 'none) |
1108 (setq locking-user 'none) | 1108 (setq status 'rev-and-lock)) |
1109 (setq status 'rev-and-lock)) | 1109 (t |
1110 (t | 1110 (setq locking-user 'none) |
1111 (setq locking-user 'none) | 1111 (setq status 'rev-and-lock))) |
1112 (setq status 'rev-and-lock))) | 1112 (setq status 'rev))) |
1113 (setq status 'rev))) | 1113 ;; else: nothing found |
1114 ;; else: nothing found | 1114 ;; ------------------- |
1115 ;; ------------------- | 1115 (t nil))) |
1116 (t nil))) | |
1117 (if status (vc-file-setprop file 'vc-working-revision version)) | 1116 (if status (vc-file-setprop file 'vc-working-revision version)) |
1118 (and (eq status 'rev-and-lock) | 1117 (and (eq status 'rev-and-lock) |
1119 (vc-file-setprop file 'vc-state | 1118 (vc-file-setprop file 'vc-state |
1120 (cond | 1119 (cond |
1121 ((eq locking-user 'none) 'up-to-date) | 1120 ((eq locking-user 'none) 'up-to-date) |