(vc-git-mode-line-string): Don't use `replace-regexp-in-string'

* lisp/vc/vc-git.el (vc-git-mode-line-string): Use `substring'
instead of `replace-regexp-in-string', because REV can be nil
(e.g. when FILE is a directory, bug#23344), and we actually know
we only need the first 4 characters.
This commit is contained in:
Dmitry Gutov 2016-04-23 22:16:27 +03:00
parent 5c587fdff1
commit 87ee542fbc

View file

@ -284,7 +284,7 @@ Should be consistent with the Git config value i18n.logOutputEncoding."
(def-ml (vc-default-mode-line-string 'Git file)) (def-ml (vc-default-mode-line-string 'Git file))
(help-echo (get-text-property 0 'help-echo def-ml)) (help-echo (get-text-property 0 'help-echo def-ml))
(face (get-text-property 0 'face def-ml))) (face (get-text-property 0 'face def-ml)))
(propertize (replace-regexp-in-string (concat rev "\\'") disp-rev def-ml t t) (propertize (concat (substring def-ml 0 4) disp-rev)
'face face 'face face
'help-echo (concat help-echo "\nCurrent revision: " rev)))) 'help-echo (concat help-echo "\nCurrent revision: " rev))))