undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git.el: Define the propertize function if needed, for XEmacs compatibility.

Browse Source 
Also use `concat' instead of `format' in the pretty-printer since
format doesn't preserve properties under XEmacs.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Alexandre Julliard 2007-01-09 21:27:40 +01:00 committed by Junio C Hamano
parent 3fe71f3a6f
commit 03d311eda2
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/emacs/git.el
View File

@ -280,6 +280,15 @@ and returns the process output as a string."
(git-run-command nil nil "update-index" "--info-only" "--add" "--" (file-relative-name ignore-name))) (git-run-command nil nil "update-index" "--info-only" "--add" "--" (file-relative-name ignore-name)))
(git-add-status-file (if created 'added 'modified) (file-relative-name ignore-name)))) (git-add-status-file (if created 'added 'modified) (file-relative-name ignore-name))))
; propertize definition for XEmacs, stolen from erc-compat
(eval-when-compile
(unless (fboundp 'propertize)
(defun propertize (string &rest props)
(let ((string (copy-sequence string)))
(while props
(put-text-property 0 (length string) (nth 0 props) (nth 1 props) string)
(setq props (cddr props)))
string))))
;;;; Wrappers for basic git commands ;;;; Wrappers for basic git commands
;;;; ------------------------------------------------------------ ;;;; ------------------------------------------------------------
@ -448,11 +457,10 @@ and returns the process output as a string."
(defun git-fileinfo-prettyprint (info) (defun git-fileinfo-prettyprint (info)
"Pretty-printer for the git-fileinfo structure." "Pretty-printer for the git-fileinfo structure."
(insert (format " %s %s %s %s%s" (insert (concat " " (if (git-fileinfo->marked info) (propertize "*" 'face 'git-mark-face) " ")
(if (git-fileinfo->marked info) (propertize "*" 'face 'git-mark-face) " ") " " (git-status-code-as-string (git-fileinfo->state info))
(git-status-code-as-string (git-fileinfo->state info)) " " (git-permissions-as-string (git-fileinfo->old-perm info) (git-fileinfo->new-perm info))
(git-permissions-as-string (git-fileinfo->old-perm info) (git-fileinfo->new-perm info)) " " (git-escape-file-name (git-fileinfo->name info))
(git-escape-file-name (git-fileinfo->name info))
(git-rename-as-string info)))) (git-rename-as-string info))))
(defun git-parse-status (status) (defun git-parse-status (status)