[Emacs-diffs] Changes to emacs/lisp/ediff-init.el

[Juanma Barranquero]

Index: emacs/lisp/ediff-init.el
diff -c emacs/lisp/ediff-init.el:1.68 emacs/lisp/ediff-init.el:1.69
*** emacs/lisp/ediff-init.el:1.68       Fri Jun 17 05:55:26 2005
--- emacs/lisp/ediff-init.el    Mon Jul  4 02:00:10 2005
***************
*** 393,409 ****
             this-command)))
  
  (defgroup ediff-highlighting nil
!   "Hilighting of difference regions in Ediff"
    :prefix "ediff-"
    :group 'ediff)
  
  (defgroup ediff-merge nil
!   "Merging utilities"
    :prefix "ediff-"
    :group 'ediff)
  
  (defgroup ediff-hook nil
!   "Hooks run by Ediff"
    :prefix "ediff-"
    :group 'ediff)
  
--- 393,409 ----
             this-command)))
  
  (defgroup ediff-highlighting nil
!   "Hilighting of difference regions in Ediff."
    :prefix "ediff-"
    :group 'ediff)
  
  (defgroup ediff-merge nil
!   "Merging utilities."
    :prefix "ediff-"
    :group 'ediff)
  
  (defgroup ediff-hook nil
!   "Hooks run by Ediff."
    :prefix "ediff-"
    :group 'ediff)
  
***************
*** 1840,1846 ****
         "Merge dir versions via ancestors")
        (t
         (capitalize
!         (subst-char-in-string ?- ?\  (substring (symbol-name jobname) 6))))
        ))
  
  
--- 1840,1846 ----
         "Merge dir versions via ancestors")
        (t
         (capitalize
!         (subst-char-in-string ?- ?\s (substring (symbol-name jobname) 6))))
        ))