comparison lisp/ChangeLog @ 63651:26ce1e6e98e5

Remove conflict markers.
author Lute Kamstra <lute@gnu.org>
date Wed, 22 Jun 2005 07:36:03 +0000
parents 906515736089
children cec122e2c385
comparison
equal deleted inserted replaced
63650:906515736089 63651:26ce1e6e98e5
578 578
579 * cus-start.el (all): Don't complain about missing GTK-related 579 * cus-start.el (all): Don't complain about missing GTK-related
580 variables, unless either `gtk' is boundp or this isn't a 580 variables, unless either `gtk' is boundp or this isn't a
581 `windows-nt' build. 581 `windows-nt' build.
582 582
583 >>>>>>> 1.7817
584 2005-06-13 Lute Kamstra <lute@gnu.org> 583 2005-06-13 Lute Kamstra <lute@gnu.org>
585 584
586 * abbrev.el (edit-abbrevs-mode): Use kill-all-local-variables and 585 * abbrev.el (edit-abbrevs-mode): Use kill-all-local-variables and
587 run-mode-hooks. 586 run-mode-hooks.
588 587
1486 * faces.el (list-faces-display): Signal error if passed a regexp 1485 * faces.el (list-faces-display): Signal error if passed a regexp
1487 that matches no face name. 1486 that matches no face name.
1488 1487
1489 * simple.el (filter-buffer-substring): Fix typo in docstring. 1488 * simple.el (filter-buffer-substring): Fix typo in docstring.
1490 1489
1491 >>>>>>> 1.7768
1492 2005-05-31 Richard M. Stallman <rms@gnu.org> 1490 2005-05-31 Richard M. Stallman <rms@gnu.org>
1493 1491
1494 * progmodes/vhdl-mode.el (vhdl-fill-region): Test ARG, not INTERACTIVE. 1492 * progmodes/vhdl-mode.el (vhdl-fill-region): Test ARG, not INTERACTIVE.
1495 (vhdl-emacs-21): Doc fix. 1493 (vhdl-emacs-21): Doc fix.
1496 (vhdl-mode): Unconditionally set comment-padding. 1494 (vhdl-mode): Unconditionally set comment-padding.
1523 2005-05-30 Stefan Monnier <monnier@iro.umontreal.ca> 1521 2005-05-30 Stefan Monnier <monnier@iro.umontreal.ca>
1524 1522
1525 * textmodes/tex-mode.el (tex-compile-commands, tex-compile) 1523 * textmodes/tex-mode.el (tex-compile-commands, tex-compile)
1526 (tex-start-tex): Undo all but the last part of the 2005-05-28 change. 1524 (tex-start-tex): Undo all but the last part of the 2005-05-28 change.
1527 1525
1528 >>>>>>> 1.7646
1529 2005-05-30 Glenn Morris <gmorris@ast.cam.ac.uk> 1526 2005-05-30 Glenn Morris <gmorris@ast.cam.ac.uk>
1530 1527
1531 * calendar/diary-lib.el (mark-included-diary-files): Only kill 1528 * calendar/diary-lib.el (mark-included-diary-files): Only kill
1532 included diary buffer if it was not already being visited. 1529 included diary buffer if it was not already being visited.
1533 Reported by Stephen Berman <Stephen.Berman@gmx.net>. 1530 Reported by Stephen Berman <Stephen.Berman@gmx.net>.