Vassili Karpov <av1474@xxxxxxxx> writes: Please don't use "format=flowed"; your patch is whitespace damaged and does not apply. > The type-of ?\octal in XEmacs is character while in FSF Emacs it is > integer. Case expression using this syntax will not work correctly on > XEmacs. #ooctal syntax on the other hand produces integers everywhere. > > Signed-off-by: Vassili Karpov <av1474@xxxxxxxx> > --- > contrib/emacs/git.el | 30 +++++++++++++++--------------- > 1 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el > index 09e8bae..715580a 100644 > --- a/contrib/emacs/git.el > +++ b/contrib/emacs/git.el > @@ -562,29 +562,29 @@ the process output as a string, or nil if the > git command failed." > (let* ((old-type (lsh (or old-perm 0) -9)) > (new-type (lsh (or new-perm 0) -9)) > (str (case new-type > - (?\100 ;; file > + (#o100 ;; file > (case old-type > - (?\100 nil) > - (?\120 " (type change symlink -> file)") > - (?\160 " (type change subproject -> file)"))) > - (?\120 ;; symlink > + (#o100 nil) > + (#o120 " (type change symlink -> file)") > + (#o160 " (type change subproject -> file)"))) > + (#o120 ;; symlink > (case old-type > - (?\100 " (type change file -> symlink)") > - (?\160 " (type change subproject -> symlink)") > + (#o100 " (type change file -> symlink)") > + (#o160 " (type change subproject -> symlink)") > (t " (symlink)"))) > - (?\160 ;; subproject > + (#o160 ;; subproject > (case old-type > - (?\100 " (type change file -> subproject)") > - (?\120 " (type change symlink -> subproject)") > + (#o100 " (type change file -> subproject)") > + (#o120 " (type change symlink -> subproject)") > (t " (subproject)"))) > - (?\110 nil) ;; directory (internal, not a real git > state) > - (?\000 ;; deleted or unknown > + (#o110 nil) ;; directory (internal, not a real git > state) > + (#o000 ;; deleted or unknown > (case old-type > - (?\120 " (symlink)") > - (?\160 " (subproject)"))) > + (#o120 " (symlink)") > + (#o160 " (subproject)"))) > (t (format " (unknown type %o)" new-type))))) > (cond (str (propertize str 'face 'git-status-face)) > - ((eq new-type ?\110) "/") > + ((eq new-type #o110) "/") > (t "")))) > > (defun git-rename-as-string (info) > -- > 1.6.0.2.GIT > > > > -- > mailto:av1474@xxxxxxxx > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
