comparison lisp/ChangeLog @ 43168:3d510ec26d69

fix conflict
author Per Abrahamsen <abraham@dina.kvl.dk>
date Thu, 07 Feb 2002 17:33:40 +0000
parents 6dab4dad0093
children 168298133c9d
comparison
equal deleted inserted replaced
43167:6dab4dad0093 43168:3d510ec26d69
1 2002-02-05 Per Abrahamsen <abraham@dina.kvl.dk>
2
3 * cus-edit.el (customize-mark-to-save): New function.
4 * menu-bar.el (menu-bar-options-save): Rewrote.
5
6 2002-02-06 Kim F. Storm <storm@cua.dk> 1 2002-02-06 Kim F. Storm <storm@cua.dk>
7 2
8 * help.el (where-is): Report remapped commands. 3 * help.el (where-is): Report remapped commands.
9 4
10 * help-fns.el (describe-function-1): Ditto. 5 * help-fns.el (describe-function-1): Ditto.
87 2002-02-05 Eli Zaretskii <eliz@is.elta.co.il> 82 2002-02-05 Eli Zaretskii <eliz@is.elta.co.il>
88 83
89 * gud.el (gud-refresh): Call recenter only after we are sure we 84 * gud.el (gud-refresh): Call recenter only after we are sure we
90 are in the right window. 85 are in the right window.
91 86
92 >>>>>>> 1.3415 87 2002-02-05 Per Abrahamsen <abraham@dina.kvl.dk>
88
89 * cus-edit.el (customize-mark-to-save): New function.
90 * menu-bar.el (menu-bar-options-save): Rewrote.
91
93 2002-02-05 Pavel Jan,Bm(Bk <Pavel@Janik.cz> 92 2002-02-05 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
94 93
95 * cus-start.el (x-use-underline-position-properties): 94 * cus-start.el (x-use-underline-position-properties):
96 Allow customization. 95 Allow customization.
97 96