Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/emacs/patches/etags.patch
author Ali Bahrami <Ali.Bahrami@Oracle.COM>
Fri, 27 May 2011 09:19:45 -0600
changeset 270 ae736fcc412d
permissions -rw-r--r--
7047020 etags mangles paths starting with "./"
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
270
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     1
 
*** emacs-23.1/lib-src/etags.c.orig	Wed May 25 16:16:55 2011
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     2
 
--- emacs-23.1/lib-src/etags.c	Wed May 25 16:18:29 2011
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     3
 
***************
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     4
 
*** 6695,6707 ****
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     5
 
  	      else if (cp[0] != '/')
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     6
 
  		cp = slashp;
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     7
 
  #endif
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     8
 
! 	      strcpy (cp, slashp + 3);
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     9
 
  	      slashp = cp;
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    10
 
  	      continue;
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    11
 
  	    }
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    12
 
  	  else if (slashp[2] == '/' || slashp[2] == '\0')
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    13
 
  	    {
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    14
 
! 	      strcpy (slashp, slashp + 2);
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    15
 
  	      continue;
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    16
 
  	    }
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    17
 
  	}
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    18
 
--- 6695,6707 ----
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    19
 
  	      else if (cp[0] != '/')
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    20
 
  		cp = slashp;
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    21
 
  #endif
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    22
 
! 	      memmove (cp, slashp + 3, strlen(slashp + 3)  + 1);
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    23
 
  	      slashp = cp;
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    24
 
  	      continue;
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    25
 
  	    }
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    26
 
  	  else if (slashp[2] == '/' || slashp[2] == '\0')
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    27
 
  	    {
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    28
 
! 	      memmove (slashp, slashp + 2, strlen(slashp + 2) + 1);
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    29
 
  	      continue;
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    30
 
  	    }
ae736fcc412d 7047020 etags mangles paths starting with "./"
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    31
 
  	}
upstream/oracle/userland-gate