[Emacs-commit] CVSROOT: /cvsroot/emacs

[Miles Bader]

Module name:    emacs
Branch:         emacs-unicode-2
Changes by:     Miles Bader <address@hidden>    04/06/29 16:48:19

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         emacs-unicode-2
Changes by:     Miles Bader <address@hidden>    04/06/29 16:48:19

Modified files:
        src            : fns.c 

Log message:
        Revision: address@hidden/emacs--unicode--0--patch-18
        
        Fix merge screwups

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/src/fns.c.diff?only_with_tag=emacs-unicode-2&tr1=1.342.2.8&tr2=1.342.2.9&r1=text&r2=text