Next: , Previous: Directories, Up: Files   [Contents][Index]


12.9 ¥Õ¥¡¥¤¥ë¤ÎÈæ³Ó

¥³¥Þ¥ó¥ÉM-x diff¤Ï¡¢2¤Ä¤Î¥Õ¥¡¥¤¥ë¤òÈæ³Ó¤·¡¢ ‘*Diff*’¤È¤¤¤¦Ì¾Á°¤ÎEmacs¥Ð¥Ã¥Õ¥¡¤Ë¤½¤Î°ã¤¤¤òɽ¼¨¤·¤Þ¤¹¡£ ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢Ãͤ¬Ê¸»úÎó¤Ç¤¢¤ëÊÑ¿ôdiff-switches¤Ç»ØÄꤵ¤ì¤¿ ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Ædiff¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤·¤Þ¤¹¡£

¥Ð¥Ã¥Õ¥¡‘*Diff*’¤Î¥á¥¸¥ã¡¼¥â¡¼¥É¤Ï¥³¥ó¥Ñ¥¤¥ë¡Êcompilation¡Ë¥â¡¼¥É¤Ç¤¹¡£ ¤Ç¤¹¤«¤é¡¢C-x `¤ò»È¤Ã¤Æ¡¢ 2¤Ä¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÇÊѹ¹¤µ¤ì¤Æ¤¤¤ë²Õ½ê¤ò¼¡¡¹¤Ëˬ¤ì¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ ÆÃÄê¤ÎÊѹ¹²Õ½ê¤Ë¥Ý¥¤¥ó¥È¤ò°Üư¤·¤Æ¤«¤é¡¢ RET¤äC-c C-c¤òÂǤĤ«¡¢¤½¤³¤ÇMouse-2¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢ ¤½¤³¤ËÂбþ¤¹¤ë¥½¡¼¥¹¤Î¾ì½ê¤Ø°Üư¤Ç¤­¤Þ¤¹¡£ ¥³¥ó¥Ñ¥¤¥ë¡Êcompilation¡Ë¥â¡¼¥É¤Î¾¤ÎÆÃÊ̤ʥ³¥Þ¥ó¥É¤ò»È¤¦¤³¤È¤â¤Ç¤­¤Þ¤¹¡£ SPC¤ÈDEL¤Ç¥¹¥¯¥í¡¼¥ë¡¢ M-p¤ÈM-n¤Ç¥«¡¼¥½¥ë°Üư¤Ç¤­¤Þ¤¹¡£ See Compilation¡£

¥³¥Þ¥ó¥ÉM-x diff-backup¤Ï¡¢ »ØÄꤵ¤ì¤¿¥Õ¥¡¥¤¥ë¤È¤½¤ÎºÇ¿·¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤È¤òÈæ³Ó¤·¤Þ¤¹¡£ ¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤Î̾Á°¤ò»ØÄꤹ¤ë¤È¡¢ diff-backup¤Ï¤½¤Î¤â¤È¤Î¥Õ¥¡¥¤¥ë¤È¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤È¤òÈæ³Ó¤·¤Þ¤¹¡£

¥³¥Þ¥ó¥ÉM-x compare-windows¤Ï¡¢ ¥«¥ì¥ó¥È¥¦¥£¥ó¥É¥¦¤ÎÃæ¤Î¥Æ¥­¥¹¥È¤È¡¢ ¤Ä¤®¤Î¥¦¥£¥ó¥É¥¦¤ÎÃæ¤Î¥Æ¥­¥¹¥È¤òÈæ³Ó¤·¤Þ¤¹¡£ ¤½¤ì¤¾¤ì¤Î¥¦¥£¥ó¥É¥¦¤Î¥Ý¥¤¥ó¥È°ÌÃÖ¤«¤éÈæ³Ó¤ò»Ï¤á¤Þ¤¹¡£ ¤½¤ì¤¾¤ì¤Î³«»Ï°ÌÃ֤ϡ¢³Æ¥Ð¥Ã¥Õ¥¡¤Î¥Þ¡¼¥¯¥ê¥ó¥°¤ËÀѤޤì¤Þ¤¹¡£ ¤½¤·¤Æ¡¢³Æ¥¦¥£¥ó¥É¥¦¤Ç¤½¤ì¤¾¤ì¤Î¥Ý¥¤¥ó¥È¤ò1ʸ»ú¤º¤Ä¿Ê¤á¤ë¤³¤È¤ò¡¢ ξ¼Ô¤Î¥¦¥£¥ó¥É¥¦¤Ç°ìÃפ·¤Ê¤¤¤â¤Î¤Ë½Ð²ñ¤¦¤Þ¤Ç¹Ô¤¤¤Þ¤¹¡£ ¤½¤·¤Æ¡¢¥³¥Þ¥ó¥É¤Ï½ªÎ»¤·¤Þ¤¹¡£ Emacs¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ä¤¤¤Æ¤è¤ê¾Ü¤·¤¯¤Ï¡¢See Windows¡£

¿ô°ú¿ô¤ò»ØÄꤹ¤ë¤È¡¢compare-windows¤Ï Çòʸ»ú¤Î°ã¤¤¤ò̵»ë¤·¤Þ¤¹¡£ ÊÑ¿ôcompare-ignore-case¤¬nil°Ê³°¤Ê¤é¤Ð¡¢ Âçʸ»ú¾®Ê¸»ú¤Î°ã¤¤¤âƱÍͤË̵»ë¤·¤Þ¤¹¡£

2¤Ä¤Î»÷¤¿¥Õ¥¡¥¤¥ë¤ÎÊ»¹ç¤ËÊØÍø¤Êµ¡Ç½¤Ë´Ø¤·¤Æ¤Ï¡¢See Emerge¡£