Mercurial > emacs
diff lisp/ediff-init.el @ 90200:f9a65d7ebd29
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 459-473)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 86-87)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 07 Jul 2005 12:43:14 +0000 |
parents | b7da78284d4c 6fb026ad601f |
children | fbb2bea03df9 |
line wrap: on
line diff
--- a/lisp/ediff-init.el Thu Jun 30 00:31:46 2005 +0000 +++ b/lisp/ediff-init.el Thu Jul 07 12:43:14 2005 +0000 @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -393,17 +393,17 @@ this-command))) (defgroup ediff-highlighting nil - "Hilighting of difference regions in Ediff" + "Hilighting of difference regions in Ediff." :prefix "ediff-" :group 'ediff) (defgroup ediff-merge nil - "Merging utilities" + "Merging utilities." :prefix "ediff-" :group 'ediff) (defgroup ediff-hook nil - "Hooks run by Ediff" + "Hooks run by Ediff." :prefix "ediff-" :group 'ediff) @@ -1840,7 +1840,7 @@ "Merge dir versions via ancestors") (t (capitalize - (subst-char-in-string ?- ?\ (substring (symbol-name jobname) 6)))) + (subst-char-in-string ?- ?\s (substring (symbol-name jobname) 6)))) ))