aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/vc-hooks.el15
1 files changed, 7 insertions, 8 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 76fe6053f19..0d63abc9b9e 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -287,8 +287,8 @@ It is usually called via the `vc-call' macro."
287(defmacro vc-call (fun file &rest args) 287(defmacro vc-call (fun file &rest args)
288 "A convenience macro for calling VC backend functions. 288 "A convenience macro for calling VC backend functions.
289Functions called by this macro must accept FILE as the first argument. 289Functions called by this macro must accept FILE as the first argument.
290ARGS specifies any additional arguments. FUN should be unquoted. 290ARGS specifies any additional arguments. FUN should be unquoted.
291BEWARE!! `file' is evaluated twice!!" 291BEWARE!! FILE is evaluated twice!!"
292 `(vc-call-backend (vc-backend ,file) ',fun ,file ,@args)) 292 `(vc-call-backend (vc-backend ,file) ',fun ,file ,@args))
293 293
294(defsubst vc-parse-buffer (pattern i) 294(defsubst vc-parse-buffer (pattern i)
@@ -365,7 +365,7 @@ the root is the last directory for which WITNESS *is* found."
365;; Access functions to file properties 365;; Access functions to file properties
366;; (Properties should be _set_ using vc-file-setprop, but 366;; (Properties should be _set_ using vc-file-setprop, but
367;; _retrieved_ only through these functions, which decide 367;; _retrieved_ only through these functions, which decide
368;; if the property is already known or not. A property should 368;; if the property is already known or not. A property should
369;; only be retrieved by vc-file-getprop if there is no 369;; only be retrieved by vc-file-getprop if there is no
370;; access function.) 370;; access function.)
371 371
@@ -531,8 +531,7 @@ For registered files, the value returned is one of:
531 'unregistered The file is not under version control. 531 'unregistered The file is not under version control.
532 532
533A return of nil from this function means we have no information on the 533A return of nil from this function means we have no information on the
534status of this file. 534status of this file."
535"
536 ;; Note: in Emacs 22 and older, return of nil meant the file was unregistered. 535 ;; Note: in Emacs 22 and older, return of nil meant the file was unregistered.
537 ;; This is potentially a source of backward-compatibility bugs. 536 ;; This is potentially a source of backward-compatibility bugs.
538 537
@@ -556,7 +555,7 @@ rather than the heuristic."
556 (eq (vc-state file) 'up-to-date)) 555 (eq (vc-state file) 'up-to-date))
557 556
558(defun vc-default-state-heuristic (backend file) 557(defun vc-default-state-heuristic (backend file)
559 "Default implementation of vc-state-heuristic. 558 "Default implementation of vc-BACKEND-state-heuristic.
560It simply calls the real state computation function `vc-BACKEND-state' 559It simply calls the real state computation function `vc-BACKEND-state'
561and does not employ any heuristic at all." 560and does not employ any heuristic at all."
562 (vc-call-backend backend 'state file)) 561 (vc-call-backend backend 'state file))
@@ -679,8 +678,8 @@ this function."
679 "Change read-only status of current buffer, perhaps via version control. 678 "Change read-only status of current buffer, perhaps via version control.
680 679
681If the buffer is visiting a file registered with version control, 680If the buffer is visiting a file registered with version control,
682throw an error, because this is not a safe or really meaningful operation 681throw an error, because this is not a safe or really meaningful operation
683on any version-control system newer than RCS. 682on any version-control system newer than RCS.
684 683
685Otherwise, just change the read-only flag of the buffer. 684Otherwise, just change the read-only flag of the buffer.
686 685