Trailing whitespace deleted.
[bpt/emacs.git] / mac / ChangeLog
... / ...
CommitLineData
12003-01-14 Steven Tamm <steventamm@mac.com>
2
3 * make-package: Fixed problem where the building without
4 specifying build directory fails.
5
62003-01-07 Steven Tamm <steventamm@mac.com>
7
8 * INSTALL: Added documentation about --enable-carbon-app and
9 changed documentation concerning Emacs.app location
10 Removed some of the documentation about make-package that isn't
11 needed
12 Changed comment about requiring root permission to install to
13 saying that it might be necessary depending on where you install
14 Refered to /usr caveat in more places
15 * make-package (make_options): Use new carbon_appdir option to
16 specify directory to install Application and lets the makefile
17 install
18
192003-01-01 Steven Tamm <steventamm@mac.com>
20
21 * make-package: Now copies License and ReadMe files into the
22 Resources directory. Reduces overhead size when creating
23 installer disk image.
24
252002-12-29 Steven Tamm <steventamm@mac.com>
26
27 * make-package: Defaults to building the source tree in a
28 separate directory. Use the new option --build-in-place to
29 have old behavior. Added new option --build-dir to specify the
30 build directory.
31
322002-12-27 Steven Tamm <steventamm@mac.com>
33
34 * make-package: Fix typo where tmpparent was used instead of
35 tempparent for calculating installedSize and compressedSize.
36
372002-12-10 Andreas Schwab <schwab@suse.de>
38
39 * make-package: Fix syntax for find.
40
412002-12-08 Steven Tamm <steventamm@mac.com>
42
43 * INSTALL: Added description about make-package.
44
45 * make-package: Fixed --self-contained option to place the
46 directories in the correct locations for
47 init_mac_osx_environment and use hardlink by default for the
48 application. Script fails with invalid option.
49
502002-12-02 Andrew Choi <akochoi@shaw.ca>
51
52 * make-bin-dist, osx-install: Remove.
53
54 * INSTALL: Remove description of make-bin-dist and osx-install.
55
562002-12-02 Steven Tamm <steventamm@mac.com>
57
58 * make-package (installprefix): Switched copying of .el files
59 to be on by default. Removed symlink for emacs -> emacs-version.
60
612002-11-30 Steven Tamm <steventamm@mac.com>
62
63 * make-package: Now compresses .pax file instead of entire disk
64 image to reduce installer size on disk. Also added code to
65 create compressed disk image in the future.
66
67 No longer copies .el files that have been compiled by default.
68 Use --full-dist option to include them.
69
70 Option --symlink added to reduce disk size by making
71 /usr/bin/emacs and the Emacs binary inside the Emacs.app to become
72 symlinks to the emacs-[version] binary.
73
74 Option --self-contained added to place files shared files
75 inside the Emacs.app executable (for portability between systems)
76
77 Added hidden debugging option --keep-dir to keep temporary install
78 directory (emacs-[version]) around after running script
79
80 * README: Removed comment about mouse-2 & -3 not working (it does).
81
822002-10-14 Andreas Schwab <schwab@suse.de>
83
84 * make-package: Fix syntax for find.
85
862002-10-08 Steven Tamm <steventamm@mac.com>
87
88 * make-package: Added ability to pass command line options
89 through to make and configure (-m, & -c,).
90 Added option to not copy Application into installer, the default
91 for X11 builds. Does not copy CVS directories into installer.
92 Clarified some of the usage notes.
93
942002-10-07 Steven Tamm <steventamm@mac.com>
95
96 * make-package: Now calls make bootstrap if .elc files are missing.
97
982002-08-27 Andrew Choi <akochoi@shaw.ca>
99
100 * INSTALL: Add information on starting Emacs as a GUI application
101 from the terminal.
102
1032002-08-15 Andrew Choi <akochoi@shaw.ca>
104
105 * INSTALL: Add instructions for building Carbon version on Macs
106 with X Window installed.
107
1082002-07-31 Andrew Choi <akochoi@shaw.ca>
109
110 * Emacs.app/Contents/PkgInfo, Emacs.app/Contents/Info.plist:
111 change creator code from ???? to EMAx.
112
113 * INSTALL: Add instructions for building X Window version.
114
1152002-07-11 Andrew Choi <akochoi@shaw.ca>
116
117 * make-package: Change -a option to -R for cp command.
118
1192002-07-05 Andrew Choi <akochoi@shaw.ca>
120
121 * make-package: Add ability to handle options --help, --prefix,
122 --no-conf, and --with-x.
123
1242002-07-04 Andrew Choi <akochoi@shaw.ca>
125
126 * make-package: New file.
127
1282002-07-01 Andrew Choi <akochoi@shaw.ca>
129
130 * Emacs.app/Contents/Resources/Emacs.icns: New file.
131
132 * Emacs.app/Contents/Info.plist: Add CFBundleDocumentTypes and
133 CFBundleIconFile entries.
134
1352002-04-13 Andrew Choi <akochoi@shaw.ca>
136
137 * Emacs.app/Contents/Info.plist: New file.
138
139 * Emacs.app/Contents/PkgInfo: New file.
140
141 * Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings:
142 New file.
143
144 * cw5-mcp.xml: Remove file.
145
146 * inc/defs-cw5.h: Remove file.
147
148 * cw6-mcp.xml: Update with new version.
149
150 * mac/inc/defs-cw6.h: New constant MAC_OS8. Remove definition
151 of constant CODEWARRIOR_VERSION_6.
152
153 * mac/src/mac.c:
154 * mac/src/macmenu.c:
155 * mac/src/macterm.c:
156 Test constant __MSL__ instead of CODEWARRIOR_VERSION_6.
157
158 * src/Carbon.r: New File.
159
160 * makefile.MPW: Define MAC_OS and MAC_OS8. Update with change of
161 locations for mac.c, macfns.c, macgui.h, macmenu.c, macterm.c, and
162 macterm.h. Generate DOC from .el instead of .elc versions of
163 files listed in DONTCOMPILE in lisp/Makefile.in.
164
165 * INSTALL: Add installation instructions for Mac OS X.
166
167 * README: Add information for Mac OS X.
168
169 * src/mac.c, inc/macgui.h, src/macfns.c, src/macmenu.c,
170 src/macterm.c, inc/macterm.h: Remove from here and move to src.
171
1722002-04-12 Andrew Choi <akochoi@shaw.ca>
173
174 * src/mac.c (select): Under Carbon, always return true so
175 XTread_socket is called to poll input.
176 (run_mac_command): Not implemented under Carbon.
177 (get_wd): Call PBHGetVolSync and path_from_vol_dir_name to
178 establish pathname.
179 (do_applescript): Use Carbon routines AEGetDescDatASize and
180 AEGetDescData.
181 (Fmac_paste_function): Use Carbon routines GetCurrentScrap,
182 GetScrapFlavorFlags, GetScrapFlavorSize, and GetScrapFlavorData.
183 (Fmac_cut_function): Use Carbon routines ClearCurrentScrap,
184 GetCurrentScrap, and PutScrapFlavor.
185 (Fx_selection_exists_p): Use Carbon routines GetCurrentScrap and
186 GetScrapFlavorFlags.
187
188 * src/macfns.c: Synchronize with changes in w32fns.c.
189 [MAC_OSX]: Include Carbon headers.
190 (x_real_positions): Use Carbon routine GetWindowPortBounds.
191 (x_set_scroll_bar_width): Set width of scroll bar to 16.
192 (x_make_gc): Remove static qualifier.
193
194 * src/macmenu.c: Synchronize with changes in w32menu.c.
195 [MAC_OSX]: Include Carbon headers.
196 (set_frame_menubar): Check equality of vector representation of
197 scroll bars using Fequal instead of EQ.
198 (mac_menu_show): Use Carbon routine GetWindowPort.
199 (mac_dialog): Likewise.
200 (add_menu_item): Use Carbon routines CountMenuItems,
201 EnableMenuItem, and DisableMenuItem.
202
203 * src/macterm.c: Synchronize with changes in w32term.c.
204 [MAC_OSX]: Include Carbon headers.
205 (XDrawLine): Use Carbon routine GetWindowPort.
206 (XClearArea): Likewise.
207 (XClearWindow): Use Carbon routines GetWindowPort and
208 GetWindowPortBounds.
209 (mac_draw_bitmap): Use Carbon routines GetWindowPort and
210 GetPortPixMap.
211 (mac_set_clip_rectangle): Use Carbon routine GetWindowPort.
212 (mac_reset_clipping): Use Carbon routine GetWindowPort.
213 (XFillRectangle): Likewise.
214 (mac_draw_rectangle): Likewise.
215 (mac_draw_rectangle_to_pixmap): Likewise.
216 (mac_draw_string_common): Likewise.
217 (mac_copy_area): Use Carbon routines GetWindowPort and
218 GetPortPixMap.
219 (mac_scroll_area): Use Carbon routines GetWindowPort and
220 GetQDGlobalsScreenBits.
221 (x_flush): Call Carbon routine QDFlushPortBuffer.
222 (x_update_end): Use Carbon routine GetWindowPort; call x_flush.
223 (x_draw_fringe_bitmap): Call mac_reset_clipping before returning.
224 (x_draw_image_glyph_string): Likewise.
225 (x_draw_stretch_glyph_string): Likewise.
226 (construct_mouse_click): Call Carbon routine GetWindowPort.
227 (note_mouse_movement): Call Carbon routine GetWindowPortBounds.
228 (XTmouse_position): Call Carbon routine GetWindowPort.
229 (x_scroll_bar_create): Create scroll bar with proc
230 kControlScrollBarProc.
231 (XTset_vertical_scroll_bar) [MAC_OSX]: Set width to 16.
232 (activate_scroll_bar): Call ActivateControl instead of
233 SetControlMaximum.
234 (deactivate_scroll_bar): Call DeactivateControl instead of
235 SetControlMaximum.
236 (x_scroll_bar_handle_click): Use default case for scroll
237 indicator.
238 (x_scroll_bar_report_motion): Call Carbon routine GetWindowPort.
239 (x_calc_absolute_position): Call Carbon routines GetWindowPort and
240 GetWindowPortBounds.
241 (init_font_name_table): Call Carbon Font Manager routines to
242 iterate through all fonts.
243 (XLoadQueryFont): Call Carbon routines GetPortTextFont,
244 GetPortTextSize, and GetPortTextFace.
245 (do_init_managers): Do not initialize Mac Toolbox under Carbon.
246 (is_emacs_window): New function to filter out non-Emacs windows
247 passed back by WaitNextEvent.
248 (do_mouse_moved): Call Carbon routine GetWindowPort.
249 (do_apple_menu): No apple menu handler under Carbon.
250 (do_zoom_window): Call Carbon routines GetWindowPort,
251 GetQDGlobalsScreenBits, SetWindowStandardState, and
252 GetWindowPortBounds.
253 (init_required_apple_events): Use UPP procedure type converter.
254 (main): Don't define for Carbon version.
255 (XTread_socket): Don't check interrupt_input_blocked. Don't call
256 check_alarm. Call Carbon routines GetWindowPort,
257 GetQDGlobalScreenBits, GetWindowPortBounds, and InvalWindowRect.
258 (NewMacWindow): Set making_terminal_window to 0. Call Carbon
259 routine GetWindowPort.
260 (mac_initialize): Rename from x_initialize. Use new Doc string
261 format.
262
263 * inc/macterm.h: Synchronize with changes in w32term.h.
264
265 * inc/macgui.h [MAC_OSX]: Use OpaqueWindowPtr* instead of
266 WindowPtr.
267
2682002-01-28 Kim F. Storm <storm@cua.dk>
269
270 * src/macterm.c (x_erase_phys_cursor): Don't erase cursor if
271 cursor row is invisible. This can happen if cursor is on top line
272 of a window, and we switch to a buffer with a header line.
273
2742001-12-22 Pavel Jan\e,Am\e(Bk <Pavel@Janik.cz>
275
276 * cw5-mcp.xml, cw6-mcp.xml, makefile.MPW: Remove mocklisp files.
277
2782001-12-13 Eli Zaretskii <eliz@is.elta.co.il>
279
280 * src/macfns.c (x_report_frame_params): Make the scroll-bar-width
281 frame parameter have a numeric value all the time.
282
2832001-12-08 Pavel Jan\e,Am\e(Bk <Pavel@Janik.cz>
284
285 * COPYING: New file.
286
2872001-12-06 Kim F. Storm <storm@cua.dk>
288
289 * src/macfns.c (x_report_frame_params): Return actual fringe widths.
290
2912001-12-01 Kim F. Storm <storm@cua.dk>
292
293 The following changes add left-fringe and right-fringe
294 frame parameters to adjust fringe widths, or remove one or
295 both fringes. See ../src/ChangeLog for details.
296
297 * inc/macterm.h: Merged changes from xterm.h.
298 * src/macterm.c: Merged changes from xterm.c.
299 * src/macfns.c: Merged changes from xfns.c.
300
3012001-11-16 Pavel Jan\e,Am\e(Bk <Pavel@Janik.cz>
302
303 * src/macterm.c (waiting_for_input): Remove unnecessary declaration.
304
3052001-11-16 Kim F. Storm <storm@cua.dk>
306
307 The following changes are made to clean up the various internal
308 references to the fringes to actually use the term `fringe'.
309
310 * src/macfns.c: Use renamed symbols.
311
312 * src/macterm.c: Comment fixes. Use renamed symbols.
313 (fringe_bitmap_type): Renamed from bitmap_type.
314 (NO_FRINGE_BITMAP): Renamed from NO_BITMAP.
315 (x_draw_fringe_bitmap): Renamed from x_draw_bitmap.
316 (x_draw_row_fringe_bitmaps): Renamed from x_draw_row_bitmaps.
317
318 * inc/macterm.h: Comment fixes. Use renamed symbols.
319 (fringes_extra): Renamed from flags_areas_extra.
320 (FRAME_FRINGE_BITMAP_WIDTH): Renamed from FRAME_FLAGS_BITMAP_WIDTH.
321 (FRAME_FRINGE_BITMAP_HEIGHT): Renamed from FRAME_FLAGS_BITMAP_HEIGHT.
322 (FRAME_X_FRINGE_COLS): Renamed from FRAME_X_FLAGS_AREA_COLS.
323 (FRAME_X_FRINGE_WIDTH): Renamed from FRAME_X_FLAGS_AREA_WIDTH.
324 (FRAME_X_LEFT_FRINGE_WIDTH): Renamed from FRAME_X_LEFT_FLAGS_AREA_WIDTH.
325 (FRAME_X_RIGHT_FRINGE_WIDTH): Renamed from FRAME_X_RIGHT_FLAGS_AREA_WIDTH.
326
3272001-10-20 Gerd Moellmann <gerd@gnu.org>
328
329 * (Version 21.1 released.)
330
3312001-10-11 Stefan Monnier <monnier@cs.yale.edu>
332
333 * src/macfns.c (x_create_bitmap_from_file, x_find_image_file):
334 * src/mac.c (run_mac_command): Update calls to openp.
335
3362001-10-08 Stefan Monnier <monnier@cs.yale.edu>
337
338 * src/macmenu.c (Fx_popup_menu): Use Fkeymap_prompt.
339
340 * src/macterm.c: Include keymap.h.
341 (note_mode_line_highlight): Use KEYMAPP.
342
3432001-10-05 Gerd Moellmann <gerd@gnu.org>
344
345 * Branch for 21.1.
346
3472001-09-04 Andrew Choi <akochoi@cse.cuhk.edu.hk>
348
349 * src/macmenu.c (mac_menu_show): Use refcon of selected menu item.
350
351 * src/macterm.c (XTread_socket): Read all pending events in the
352 event queue instead of one.
353 (mac_to_x_fontname): Return name with jisx0201.1976-0 encoding if
354 a script code of -smJapanese is specified.
355 (x_font_name_to_mac_font_name): Also recognize the jisx0201.1976-0
356 encoding.
357 (init_font_name_table): Use a script code of -smJapanese instead
358 of smRoman for the second entry of a Japanese font.
359 (XLoadQueryFont): Recognize a font as having the smRoman script
360 code if its encoding is jisx0201.1976-0.
361
362 * makefile.MPW: Generate etc/DOC file from .elc files instead of
363 .el files.
364
365 * src/mac.c (stat): Don't fail for aliases.
366 (sys_open) [__MRC__]: Set file creator and type for newly-created
367 files.
368 (sleep) [__MRC__]: Place loop around WaitNextEvent to check time
369 elapsed instead of use WaitNextEvent call as a delay.
370
3712001-08-24 Andrew Choi <akochoi@cse.cuhk.edu.hk>
372
373 * src/macterm.c (init_font_name_table): Add an additional entry to
374 the font table with the script code smRoman for each Apple
375 Japanese font.
376 (XLoadQueryFont): Recognize a font as having the smRoman script
377 code even when FontToScript returns smJapanese if it is one of
378 those created above.
379
3802001-08-21 Andrew Choi <akochoi@cse.cuhk.edu.hk>
381
382 * INSTALL: Add to the note on using -opt speed in MPW the function
383 macterm.c (x_draw_hollow_cursor).
384
385 * src/macterm.c (mac_scroll_area): Call CopyBits with local
386 coordinates and portBits instead of global coordinates and
387 screenBits. Set fore color and back color to black and white,
388 respectively, before calling CopyBits.
389
390 * src/macterm.c (local_to_global_coord): Comment out.
391
392 * src/mac.c (mac-filename-to-unix): Change to
393 mac-file-name-to-posix.
394 (unix-filename-to-mac): Change to posix-file-name-to-mac.
395 (mac_to_unix_pathname): Change to mac_to_posix_pathname.
396 (unix_to_mac_pathname): Change to posix_to_mac_pathname.
397
398 * src/macterm.c (do_ae_open_documents): Change call to
399 mac_to_unix_pathname to mac_to_posix_pathname.
400
4012001-07-26 Andrew Choi <akochoi@i-cable.com>
402
403 * inc/macterm.h (x_display_list): Declare extern.
404
4052001-07-20 Pavel Jan\e,Am\e(Bk <Pavel@Janik.cz>
406
407 * src/macterm.c (xim_open_dpy): Fix typo.
408
4092001-06-26 Andrew Choi <akochoi@i-cable.com>
410
411 * README: Change references to SourceForge site to
412 ftp://ftp.gnu.org/gnu/mac/emacs/.
413
4142001-05-15 Gerd Moellmann <gerd@gnu.org>
415
416 * src/macterm.c (clear_mouse_face): Check for nil tip_frame.
417
4182001-05-15 Andrew Choi <akochoi@i-cable.com>
419
420 * src/Emacs.r: Change About box message.
421
422 * makefile.MPW: Add md5.c.x to EmacsObjects.
423
424 * src/mac.c (select): Call WaitNextEvent instead of Delay.
425 (pause): Ditto.
426 (sleep): Ditto.
427
428 * src/macterm.c (do_app_resume): Set cursor to arrow.
429 (clear_mouse_face): check for NIL Lisp object instead of null
430 pointer.
431
432 * INSTALL: Delete note on compiling Lisp files on a Unix system.
433 Add note on turning off end of line conversion.
434
4352001-02-27 Andrew Choi <akochoi@i-cable.com>
436
437 * src/macfns.c: Rename everything containing *busy_cursor* and
438 similar to *hourglass*.
439 Change IMAGE_POSITIVE_INTEGER_VALUE to
440 IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR throughout.
441 (x_set_font): If font hasn't changed, avoid recomputing faces and
442 other things, as in xfns.c.
443 (Qcancel_timer): New variable.
444 (syms_of_macfns): Rename x-busy-pointer-shape to
445 x-hourglass-pointer-shape, display-busy-cursor to
446 display-hourglass, busy-cursor-delay to hourglass-delay, as in
447 xfns.c.
448 (x_set_tool_bar_lines): Modify as in xfns.c
449 (x_change_window_heights): New function.
450
451 * inc/macterm.h (struct x_output): Rename busy_cursor to
452 hourglass_cursor, busy_window to hourglass_window, busy_p to
453 hourglass_p, as in xterm.h.
454
455 * src/macmenu.c (set_frame_menubar): Run activate-menu-bar-hook with
456 safe_run_hooks, as in xmenu.c.
457
458 * src/macterm.c (do_check_ram_size): New function.
459
460 * src/Emacs.r: Add ALRT resource #129 for alert when there is over
461 256 MB RAM.
462
4632001-02-20 Andrew Choi <akochoi@i-cable.com>
464
465 * mac/INSTALL:
466 * mac/README:
467 * mac/cw5-mcp.xml:
468 * mac/cw6-mcp.xml:
469 * mac/inc/alloca.h:
470 * mac/inc/defs-cw5.h:
471 * mac/inc/defs-cw6.h: Added copyright notice.
472
4732001-01-28 Andrew Choi <akochoi@i-cable.com>
474
475 * src/macterm.c (mac_font_pattern_match): Allocate three more
476 bytes to regex for '^', '$', and '\0'.
477
478 * src/macterm.c (x_list_fonts): Protect pattern and newlist from
479 garbage collection.
480
481 * src/macfns.c (QCconversion): Replaces QCalgorithm.
482
483 * src/macfns.c (image_ascent, lookup_image): Adapt to change of
484 image margins.
485
486 * src/macterm.c (x_produce_image_glyph, x_draw_image_foreground)
487 (x_draw_image_relief, x_draw_image_foreground_1)
488 (x_draw_image_glyph_string): Adapt to change of image margins.
489
490 * src/macterm.c (mac_to_x_fontname): Change charset name of
491 Simplify Chinese fonts from gb2312 to gb2312.1980 and Korean fonts
492 from ksc5601 to ksc5601.1989.
493
4942000-12-12 Andrew Choi <akochoi@i-cable.com>
495
496 * cw5-mcp.xml: add md5.c to project.
497
498 * cw6-mcp.xml: add md5.c to project.
499
500 * src/macfns.c (x_create_tip_frame, Fx_hide_tip): change to handle
501 Lisp_Object type tip_frame (was struct frame *) as in xfns.c.
502
5032000-11-26 Andrew Choi <akochoi@i-cable.com>
504
505 * src/macterm.c (x_handle_tool_bar_click):
506 (note_tool_bar_highlight): change references to members deleted
507 from struct frame as in xterm.c.
508
509 * inc/epaths.h: set PATH_EXEC to ~emacs/mac instead of
510 ~emacs/mac/bin.
511
5122000-10-25 Andrew Choi <akochoi@i-cable.com>
513
514 * cw5-mcp.xml: renamed from emacs-cw5.mcp.xml.
515
516 * cw6-mcp.xml: renamed from emacs-cw6.mcp.xml.
517
518 * inc/defs-cw5.h: renamed from inc/cmdline-defs-cw5.h.
519
520 * inc/defs-cw6.h: renamed from inc/cmdline-defs-cw6.h.
521
5222000-10-24 Andrew Choi <akochoi@i-cable.com>
523
524 * src/macterm.c (XTread_socket): check whether Lisp variable
525 mac-ready-for-drag-n-drop is bound rather than non-nil value.
526
5272000-10-20 Andrew Choi <akochoi@users.sourceforge.net>
528
529 * INSTALL: New file.
530
531 * README: New file.
532
533 * TODO: New file.
534
535 * emacs-cw5.mcp.xml: New file.
536
537 * emacs-cw6.mcp.xml: New file.
538
539 * makefile.MPW: New file.
540
541 * inc/alloca.h: New file.
542
543 * inc/cmdline-defs-cw5.h: New file.
544
545 * inc/cmdline-defs-cw6.h: New file.
546
547 * inc/config.h: New file.
548
549 * inc/dirent.h: New file.
550
551 * inc/epaths.h: New file.
552
553 * inc/m-mac.h: New file.
554
555 * inc/macgui.h: New file.
556
557 * inc/macterm.h: New file.
558
559 * inc/pwd.h: New file.
560
561 * inc/s-mac.h: New file.
562
563 * inc/termio.h: New file.
564
565 * inc/utime.h: New file.
566
567 * inc/utsname.h: New file.
568
569 * inc/sys/file.h: New file.
570
571 * inc/sys/ioctl.h: New file.
572
573 * inc/sys/param.h: New file.
574
575 * inc/sys/stat.h: New file.
576
577 * inc/sys/time.h: New file.
578
579 * inc/sys/types.h: New file.
580
581 * src/Emacs.r: New file.
582
583 * src/EmacsMPW.r: New file.
584
585 * src/chdir.c: New file.
586
587 * src/mac.c: New file.
588
589 * src/macfns.c: New file.
590
591 * src/macmenu.c: New file.
592
593 * src/macterm.c: New file.
594
595;; Local Variables:
596;; coding: iso-2022-7bit-unix
597;; End:
598
599 Copyright (C) 2001 Free Software Foundation, Inc.
600 Copying and distribution of this file, with or without modification,
601 are permitted provided the copyright notice and this notice are preserved.