summaryrefslogtreecommitdiff
path: root/lisp/vc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/add-log.el2
-rw-r--r--lisp/vc/diff-mode.el4
-rw-r--r--lisp/vc/ediff-wind.el4
-rw-r--r--lisp/vc/pcvs-util.el2
-rw-r--r--lisp/vc/smerge-mode.el4
-rw-r--r--lisp/vc/vc.el2
6 files changed, 9 insertions, 9 deletions
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index d6b94a9179f..fb6f8d4d58b 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -229,7 +229,7 @@ Note: The search is conducted only within 10%, at the beginning of the file."
:version "21.1"
:group 'change-log)
(define-obsolete-face-alias 'change-log-acknowledgement
- 'change-log-acknowledgment "24.2")
+ 'change-log-acknowledgment "24.3")
(define-obsolete-face-alias 'change-log-acknowledgement-face
'change-log-acknowledgment "22.1")
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 3fa7788002e..c6a9371ea9a 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1902,7 +1902,7 @@ For use in `add-log-current-defun-function'."
:background "#aa2222"))
"Face used for removed characters shown by `diff-refine-hunk'."
:group 'diff-mode
- :version "24.2")
+ :version "24.3")
(defface diff-refine-added
'((default
@@ -1913,7 +1913,7 @@ For use in `add-log-current-defun-function'."
:background "#22aa22"))
"Face used for added characters shown by `diff-refine-hunk'."
:group 'diff-mode
- :version "24.2")
+ :version "24.3")
(defun diff-refine-preproc ()
(while (re-search-forward "^[+>]" nil t)
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index cc8ef4ad5c0..eee3f40fd96 100644
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -68,7 +68,7 @@
'ediff-setup-windows-plain))
(make-obsolete 'ediff-choose-window-setup-function-automatically
- 'ediff-setup-windows-default "24.2")
+ 'ediff-setup-windows-default "24.3")
(defcustom ediff-window-setup-function 'ediff-setup-windows-default
"Function called to set up windows.
@@ -102,7 +102,7 @@ provided functions are written."
(const :tag "Single Frame" ediff-setup-windows-plain)
(function :tag "Other function"))
:group 'ediff-window
- :version "24.2")
+ :version "24.3")
;; indicates if we are in a multiframe setup
(ediff-defvar-local ediff-multiframe nil "")
diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el
index 3d54bbd12a3..fdef490d4a2 100644
--- a/lisp/vc/pcvs-util.el
+++ b/lisp/vc/pcvs-util.el
@@ -182,7 +182,7 @@ arguments. If ARGS is not a list, no argument will be passed."
(if oneline (line-end-position) (point-max))))
(file-error nil)))
-(define-obsolete-function-alias 'cvs-string-prefix-p 'string-prefix-p "24.2")
+(define-obsolete-function-alias 'cvs-string-prefix-p 'string-prefix-p "24.3")
;;;;
;;;; file names
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index e6b63030fef..babcf6f1beb 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -138,7 +138,7 @@ Used in `smerge-diff-base-mine' and related functions."
(t :inverse-video t))
"Face used for removed characters shown by `smerge-refine'."
:group 'smerge
- :version "24.2")
+ :version "24.3")
(defface smerge-refined-added
'((default
@@ -150,7 +150,7 @@ Used in `smerge-diff-base-mine' and related functions."
(t :inverse-video t))
"Face used for added characters shown by `smerge-refine'."
:group 'smerge
- :version "24.2")
+ :version "24.3")
(easy-mmode-defmap smerge-basic-map
`(("n" . smerge-next)
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 2d95b14244f..87028194aa2 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2803,7 +2803,7 @@ to provide the `find-revision' operation instead."
;; These things should probably be generally available
-(define-obsolete-function-alias 'vc-string-prefix-p 'string-prefix-p "24.2")
+(define-obsolete-function-alias 'vc-string-prefix-p 'string-prefix-p "24.3")
(defun vc-file-tree-walk (dirname func &rest args)
"Walk recursively through DIRNAME.