Mercurial > emacs

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 11791: (0) -10000 -3000 -1000 -192 +192 +1000 +3000 +10000 +30000 +100000 tip
age author description
Thu, 11 May 1995 00:44:51 +0000 Roland McGrath (compilation-error-regexp-alist): Add regexps for IBM and Cray compilers.
Wed, 10 May 1995 23:38:12 +0000 Tom Tromey (tcl-add-fsf-menu): Use make-lucid-menu-keymap, not
Wed, 10 May 1995 18:22:21 +0000 Tom Tromey Bug fix in menu code for XEmacs.
Wed, 10 May 1995 15:03:48 +0000 Roland McGrath AIX support from Tim Bell <tbel@afsmail.cern.ch>: make-3-73-3 make-3-74
Tue, 09 May 1995 21:36:53 +0000 Tom Tromey Changed "Lucid Emacs" to "XEmacs".
Tue, 09 May 1995 20:22:38 +0000 Michael Meissner Add powerpc little endian support; Add powerpc variants; Add pentium variants
Tue, 09 May 1995 18:10:01 +0000 David J. MacKenzie Use sqrt (more portable) instead of fmod in -lm check.
Tue, 09 May 1995 17:44:05 +0000 Richard M. Stallman (BSD): Include sys/param.h instead of redefining BSD.
Tue, 09 May 1995 17:42:56 +0000 Richard M. Stallman Put nt/emacs.ico and nt/emacs.rc in dist.
Tue, 09 May 1995 17:41:20 +0000 Richard M. Stallman Do copy src/makefile.nt.
Tue, 09 May 1995 05:36:55 +0000 Richard M. Stallman (Info-directory-list): Use installation-directory,
Tue, 09 May 1995 05:35:45 +0000 Richard M. Stallman (Fcall_process): Keep reading till buffer is nearly full.
Tue, 09 May 1995 05:17:02 +0000 Karl Heuer Vdefault_minibuffer_frame is now part of KBOARD instead
Tue, 09 May 1995 05:16:50 +0000 Karl Heuer (struct kboard): New member Vdefault_minibuffer_frame.
Tue, 09 May 1995 05:16:19 +0000 Karl Heuer (init_kboard): Initialize Vdefault_minibuffer_frame.
Tue, 09 May 1995 05:01:05 +0000 Richard M. Stallman (VMS_SUPPORT): Add missing `.elc'.
Tue, 09 May 1995 04:58:10 +0000 Karl Heuer (make_frame_without_minibuffer): New arg KB.
Tue, 09 May 1995 04:57:39 +0000 Karl Heuer (Fx_create_frame): Pass kb to make_frame_without_minibuffer.
Tue, 09 May 1995 04:49:03 +0000 Karl Heuer [MULTI_FRAME] (make_terminal_frame): Don't set Vterminal_frame.
Tue, 09 May 1995 04:47:52 +0000 Richard M. Stallman (Funfocus_frame): Check for live X frame.
Tue, 09 May 1995 04:46:18 +0000 Karl Heuer [MULTI_FRAME] (init_window_once): Set Vterminal_frame
Tue, 09 May 1995 04:09:15 +0000 Richard M. Stallman (mail-font-lock-keywords): Make mail-header-separator into a regexp.
Tue, 09 May 1995 04:07:15 +0000 Richard M. Stallman (news-reply-mode): Add ^ to paragraph delimiters.
Tue, 09 May 1995 04:05:54 +0000 Richard M. Stallman (sc-no-blank-line-or-header): Make mail-header-separator into a regexp.
Tue, 09 May 1995 02:38:03 +0000 Karl Heuer (x_consider_frame_title): When setting multiple_frames,
Tue, 09 May 1995 02:25:50 +0000 Geoff Voelker removed ^Ms
Tue, 09 May 1995 02:19:20 +0000 Richard M. Stallman (popup-dialog-box): x-popup-dialog returns the value, not the cons cell.
Tue, 09 May 1995 02:07:55 +0000 Geoff Voelker Initial revision
Tue, 09 May 1995 01:32:05 +0000 Karl Heuer [MULTI_KBOARD] (read_char): If the character was for
Tue, 09 May 1995 00:49:04 +0000 Richard M. Stallman (news-setup): Bind mail-signature to nil.
Tue, 09 May 1995 00:30:26 +0000 Richard M. Stallman (prepare_menu_bars): Save and restore the match data.
Mon, 08 May 1995 23:53:13 +0000 Richard M. Stallman (ediff-revision-key): Default value nil.
Mon, 08 May 1995 23:23:37 +0000 Richard M. Stallman (info-insert-file-contents): Don't use
Mon, 08 May 1995 21:09:17 +0000 Richard M. Stallman (Helper-help): Use read-key-sequence.
Mon, 08 May 1995 19:50:10 +0000 Richard M. Stallman (add-log-current-defun): Handle objc-mode like c-mode;
Mon, 08 May 1995 16:24:55 +0000 Richard M. Stallman (Fdump_emacs): Don't use & before my_edata.
Mon, 08 May 1995 15:45:55 +0000 Richard M. Stallman (Fread_key_sequence): Doc fix.
Mon, 08 May 1995 15:42:59 +0000 Richard M. Stallman (Fraise_frame, Flower_frame): Make arg FRAME optional.
Mon, 08 May 1995 15:22:30 +0000 Richard M. Stallman (menu-bar-tools-menu): Rename key to `compare'.
Mon, 08 May 1995 14:48:26 +0000 Francesco Potort * delta.h (C_SWITCH_MACHINE): Let configure decide if this is a
Mon, 08 May 1995 06:22:36 +0000 Richard M. Stallman (region-cache.obj,vm-limit.obj): Dependencies defined.
Mon, 08 May 1995 04:59:49 +0000 Richard M. Stallman (Fdisplay_buffer): Initialize other, upper, lower.
Mon, 08 May 1995 00:45:17 +0000 Richard M. Stallman (get-method-definition, get-method-definition-1): New functions.
Sun, 07 May 1995 23:08:17 +0000 Richard M. Stallman Add C-escape binding.
Sun, 07 May 1995 23:02:13 +0000 Richard M. Stallman entered into RCS
Sun, 07 May 1995 22:36:27 +0000 Richard M. Stallman (main): Increase lock timeout to five minutes.
Sun, 07 May 1995 22:29:15 +0000 Richard M. Stallman (Fmatch_data, Fstore_match_data): Declared.
Sun, 07 May 1995 22:23:26 +0000 Richard M. Stallman (wait_reading_process_input): Pass arg in new call to set_waiting_for_input.
Sun, 07 May 1995 20:20:30 +0000 Richard M. Stallman (path-separator): Set to ";".
Sun, 07 May 1995 20:18:55 +0000 Richard M. Stallman (TRES): Defined.
Sun, 07 May 1995 20:17:48 +0000 Richard M. Stallman (obj): Use .c files.
Sun, 07 May 1995 20:16:49 +0000 Richard M. Stallman (CVTRES): Defined.
Sun, 07 May 1995 18:39:02 +0000 Richard M. Stallman (recover-session): Renamed from multiple-recover.
Sun, 07 May 1995 17:43:08 +0000 Richard M. Stallman (GETPGRP_NO_ARG): Defined
Sun, 07 May 1995 17:39:40 +0000 Richard M. Stallman (region_face, next_face_id): Make static.
Sun, 07 May 1995 17:32:17 +0000 Richard M. Stallman Provide noutline as well as outline.
Sun, 07 May 1995 17:30:36 +0000 Richard M. Stallman (isfloat_string): Reject strings like "0.5+".
Sun, 07 May 1995 09:02:39 +0000 Richard M. Stallman (Fmod): Fix the final adjustment, when f2 < 0 and f1 == 0.
Sun, 07 May 1995 06:13:58 +0000 Richard M. Stallman Clarification about running executable in place.
Sun, 07 May 1995 04:36:44 +0000 Richard M. Stallman Clarify effect of setting load-path before dumping.
Sun, 07 May 1995 00:39:49 +0000 Richard M. Stallman (syms_of_window): Doc fix.
Sun, 07 May 1995 00:38:42 +0000 Richard M. Stallman (pp-eval-expression): Update use of temp-buffer-show-function.
Sat, 06 May 1995 23:08:47 +0000 Richard M. Stallman Refer to file nt/install.
Sat, 06 May 1995 23:07:51 +0000 Richard M. Stallman (wait_reading_process_input): Don't call prepare_menu_bars.
Sat, 06 May 1995 23:04:13 +0000 Richard M. Stallman (gc_cons_threshold): Change back to int.
Sat, 06 May 1995 23:03:00 +0000 Richard M. Stallman (gc_cons_threshold): Change back to int.
Sat, 06 May 1995 21:58:08 +0000 Richard M. Stallman (i[345]86-*-bsdi2*): New configuration.
Sat, 06 May 1995 21:42:22 +0000 Richard M. Stallman (GETPGRP_NO_ARG): New definition.
Sat, 06 May 1995 21:27:16 +0000 David J. MacKenzie Make sure CDPATH doesn't mess up PWD check.
Sat, 06 May 1995 20:15:46 +0000 Richard M. Stallman (bcmp, bcopy): Fix backward BSTRING conditionals.
Sat, 06 May 1995 20:14:52 +0000 Richard M. Stallman [! emacs]: #undef REL_ALLOC.
Sat, 06 May 1995 20:13:31 +0000 Richard M. Stallman Delete all APOLLO conditionals.
Sat, 06 May 1995 08:00:08 +0000 Richard M. Stallman (prepare_menu_bars): Clear size-change flag before running
Sat, 06 May 1995 04:34:53 +0000 Richard M. Stallman (x-colors): Delete "medium forest green" in both forms.
Sat, 06 May 1995 04:30:06 +0000 Richard M. Stallman (x-colors): Delete "medium goldenrod" in both forms.
Sat, 06 May 1995 04:23:22 +0000 Richard M. Stallman (gnus-use-generic-from): Doc fix.
Sat, 06 May 1995 02:18:20 +0000 Richard M. Stallman (ispell-region): If position not visible, (sit-for 0).
Sat, 06 May 1995 01:54:19 +0000 Richard M. Stallman (lw_refigure_widget) [USE_MOTIF]: Fix backward if.
Sat, 06 May 1995 01:52:22 +0000 Richard M. Stallman All autoload cookies disabled.
Sat, 06 May 1995 01:45:50 +0000 Richard M. Stallman (gnus-group-mode): Set truncate-lines.
Fri, 05 May 1995 22:55:29 +0000 Richard M. Stallman (days_per_month): Move variable to top level.
Fri, 05 May 1995 22:54:04 +0000 Richard M. Stallman (Fencode_time): Rename arg from min to minute.
Fri, 05 May 1995 22:31:11 +0000 Richard M. Stallman (sendmail-send-it): Check continuation lines
Fri, 05 May 1995 09:50:51 +0000 Richard Kenner Add more NetBSD cases: atrai, sun3*, and mac68k.
Fri, 05 May 1995 07:01:59 +0000 Richard M. Stallman [USE_X_TOOLKIT] (x_window): Always pass position in geometry.
Fri, 05 May 1995 05:11:46 +0000 Richard M. Stallman (HAVE_VFORK): Add #undef.
Fri, 05 May 1995 04:48:46 +0000 Richard M. Stallman (GETPGRP_NO_ARG): Defined.
Fri, 05 May 1995 03:04:06 +0000 Richard M. Stallman (string_display_width): Renamed from string_width.
Fri, 05 May 1995 03:02:02 +0000 Richard M. Stallman (make_gap): Make this new error check also check exceeding VALBITS.
Fri, 05 May 1995 03:00:07 +0000 Richard M. Stallman (Vx_sent_selection_hooks, Vx_lost_selection_hooks, Vselection_alist)
Fri, 05 May 1995 02:59:15 +0000 Richard M. Stallman (Fnumber_to_string, Fstring_to_number):
Fri, 05 May 1995 02:56:50 +0000 Richard M. Stallman (doprnt): Handle long EMACS_INT in sprintf.
Fri, 05 May 1995 02:56:20 +0000 Richard M. Stallman (read1): Handle long EMACS_INT in atol.
Fri, 05 May 1995 02:55:21 +0000 Richard M. Stallman (Fexecute_extended_command): Handle long EMACS_INT in sprintf.
Fri, 05 May 1995 02:23:56 +0000 Richard M. Stallman (print): Make the printing understand EMACS_INTs
Fri, 05 May 1995 02:21:21 +0000 Richard M. Stallman (bcopy, bzero, bcmp): Don't let string.h prototype these.
Fri, 05 May 1995 02:16:54 +0000 Richard M. Stallman (list_processes_1): Cast XFASTINT for passing to sprintf.
Fri, 05 May 1995 01:30:32 +0000 Richard M. Stallman Don't try to define backquote.
Fri, 05 May 1995 00:34:00 +0000 Karl Heuer (Qbefore_string, Qafter_string): New vars.
Thu, 04 May 1995 22:36:05 +0000 Richard M. Stallman [!__GNUC__] (LINKER): Defined.
Thu, 04 May 1995 22:16:18 +0000 Richard M. Stallman (make_gap): Don't allow buffer size that won't fit in int.
Thu, 04 May 1995 21:57:30 +0000 Richard M. Stallman Include config.h.
Thu, 04 May 1995 21:55:08 +0000 Richard M. Stallman (${etc}DOC): Put SOME_MACHINE_OBJECTS before obj.
Thu, 04 May 1995 21:37:43 +0000 Richard M. Stallman (arith_driver): Make accum and next EMACS_INTs.
Thu, 04 May 1995 20:44:55 +0000 Richard M. Stallman ('\`): Use backslash for reading the backquote.
Thu, 04 May 1995 20:01:13 +0000 Richard M. Stallman (ALL_CFLAGS): Add -I../src.
Thu, 04 May 1995 18:54:55 +0000 Karl Heuer Fix spelling of author's name.
Thu, 04 May 1995 17:24:40 +0000 Richard M. Stallman Initial revision
Thu, 04 May 1995 17:13:20 +0000 Richard M. Stallman (read1): New arg FIRST_IN_LIST; all callers changed.
Thu, 04 May 1995 16:27:01 +0000 Richard M. Stallman (parse_modifiers, apply_modifiers): Don't assume 32-bit EMACS_INT.
Thu, 04 May 1995 16:20:15 +0000 Richard M. Stallman (Fdelete_overlay): Was mistakenly called Fdelete_overlays.
Thu, 04 May 1995 16:19:40 +0000 Richard M. Stallman (gc_cons_threshold): Make this an EMACS_INT.
Thu, 04 May 1995 16:19:08 +0000 Richard M. Stallman (gc_cons_threshold): Make this an EMACS_INT.
Thu, 04 May 1995 16:17:44 +0000 Richard M. Stallman (search_buffer): Cast p_limit to EMACS_INT not int.
Thu, 04 May 1995 16:17:23 +0000 Richard M. Stallman (GETPGRP_NO_ARG): Define.
Thu, 04 May 1995 16:15:43 +0000 Richard M. Stallman [__osf__]: Include string.h and stdlib.h.
Thu, 04 May 1995 06:46:51 +0000 Richard M. Stallman (xmalloc): Declare it to return long *.
Thu, 04 May 1995 06:46:37 +0000 Richard M. Stallman (xmalloc, xrealloc): Declare them long *.
Thu, 04 May 1995 06:46:14 +0000 Richard M. Stallman (C_entries): Cast result of xrealloc.
Thu, 04 May 1995 06:28:15 +0000 Richard M. Stallman (HAVE_FMOD): Defined.
Thu, 04 May 1995 03:49:31 +0000 Richard M. Stallman (reorder_modifiers): Cast apply_modifiers arg to int.
Thu, 04 May 1995 03:47:32 +0000 Richard M. Stallman (reorder_modifiers): Use XINT.
Wed, 03 May 1995 21:38:13 +0000 Richard M. Stallman (m68*-apollo-*): Renamed from m68*-apollo*.
Wed, 03 May 1995 21:28:14 +0000 Richard M. Stallman (CANNOT_DUMP, VIRT_ADDR_VARIES, LIBS_TERMCAP)
Wed, 03 May 1995 20:27:05 +0000 Richard M. Stallman (directory_file_name): Add APOLLO conditional.
Wed, 03 May 1995 19:44:00 +0000 Richard M. Stallman Don't copy in src/s/*.inp. Don't copy nt/src.
Wed, 03 May 1995 15:44:24 +0000 Richard M. Stallman Doc auto-save-list-file-name.
Wed, 03 May 1995 00:09:43 +0000 Karl Heuer (scribe-chapter): Change to C-c C-c.
Tue, 02 May 1995 23:52:13 +0000 Karl Heuer (gomoku-human-plays): Change to C-c C-p.
Tue, 02 May 1995 23:48:07 +0000 Karl Heuer (gnus-uu-interactive-scan-directory): Change to C-c C-d.
Tue, 02 May 1995 23:26:58 +0000 Karl Heuer (outline-rebullet-current-heading): Change to C-c *.
Tue, 02 May 1995 23:06:11 +0000 Karl Heuer (get_local_map): Use Fget_char_property, so that
Tue, 02 May 1995 18:16:30 +0000 Richard M. Stallman (Fset_buffer_modified_p): Use the truename for locking.
Tue, 02 May 1995 18:15:54 +0000 Richard M. Stallman (Finsert_file_contents): Use file_truename for unlocking.
Tue, 02 May 1995 18:13:47 +0000 Richard M. Stallman (prepare_to_modify_buffer): Use file_truename for locking.
Tue, 02 May 1995 16:27:24 +0000 Richard M. Stallman (union fail_stack_elt): New union.
Tue, 02 May 1995 04:50:07 +0000 Karl Heuer (xmenu_show, menubar_selection_callback): Move declaration
Tue, 02 May 1995 04:41:26 +0000 Karl Heuer (kbd_buffer_get_event): New arg USED_MOUSE_MENU.
Tue, 02 May 1995 04:00:23 +0000 Richard M. Stallman (S-delete): Fix typo (was C-delete).
Tue, 02 May 1995 03:57:27 +0000 Richard M. Stallman (hide-ifdef-mode-prefix-key): Change to C-c @.
Tue, 02 May 1995 03:47:29 +0000 Richard M. Stallman Warn about nested repetition.
Tue, 02 May 1995 02:18:34 +0000 Karl Heuer (update_frame): Don't put cursor in echo area unless
Tue, 02 May 1995 02:17:21 +0000 Karl Heuer (display_text_line): Don't move the cursor if it's supposed to
Tue, 02 May 1995 01:57:30 +0000 Richard M. Stallman Describe uses of C-c followed by punctuation chars.
Tue, 02 May 1995 01:50:32 +0000 Richard M. Stallman (outline-minor-mode-prefix): Change to C-c @.
Tue, 02 May 1995 01:44:22 +0000 Richard M. Stallman (texinfo-mode-map): Delete C-c ] binding.
Tue, 02 May 1995 01:37:11 +0000 Richard M. Stallman (forms--mode-commands): Delete C-c ? binding.
Tue, 02 May 1995 01:33:38 +0000 Richard M. Stallman (news-reply-mode-map): Delete C-c ? binding.
Tue, 02 May 1995 01:13:59 +0000 Richard M. Stallman (isearch-mode): Doc fix.
Tue, 02 May 1995 00:52:53 +0000 Richard M. Stallman (iso-accents-mode): Doc fix.
Mon, 01 May 1995 23:12:19 +0000 Karl Heuer (redisplay): Don't move the cursor if it's supposed to
Mon, 01 May 1995 18:26:28 +0000 Richard M. Stallman (buffer-substring-no-properties): New function.
Mon, 01 May 1995 18:25:55 +0000 Richard M. Stallman (expand-mail-aliases): Use buffer-substring-no-properties.
Mon, 01 May 1995 17:16:40 +0000 Richard M. Stallman (makefile-mode): Set dabbrev-abbrev-skip-leading-regexp.
Mon, 01 May 1995 15:52:55 +0000 Richard M. Stallman (tpu-copy-keyfile): New function.
Mon, 01 May 1995 15:49:09 +0000 Richard M. Stallman (set-auto-mode): If buffer has no file, use buffer name.
Mon, 01 May 1995 05:23:49 +0000 Richard M. Stallman (jka-compr-write-region): Handle the append
Sun, 30 Apr 1995 23:50:15 +0000 Richard M. Stallman (main): Delete duplicate code for -version.
Sun, 30 Apr 1995 23:37:26 +0000 Richard M. Stallman Comment change.
Sun, 30 Apr 1995 19:50:56 +0000 Richard M. Stallman (Fdo_auto_save): Record visited file name
Sun, 30 Apr 1995 19:50:00 +0000 Richard M. Stallman (normal-top-level): Set auto-save-list-file-name.
Sun, 30 Apr 1995 19:46:44 +0000 Richard M. Stallman (multiple-recover, multiple-recover-finish): New commands.
Sun, 30 Apr 1995 19:18:47 +0000 Richard M. Stallman (standard_args): Add #ifdef VMS for -map.
Sun, 30 Apr 1995 15:49:01 +0000 Richard M. Stallman Fix delq example.
Sun, 30 Apr 1995 15:34:52 +0000 Paul Eggert (datearg): If rlog options are specified explicitly,
Sun, 30 Apr 1995 15:27:38 +0000 Richard M. Stallman Mention file-regular-p operation.
Sun, 30 Apr 1995 07:45:45 +0000 Richard M. Stallman (command-line-1): Implement -L/--directory option.
Sat, 29 Apr 1995 23:02:54 +0000 Richard M. Stallman [HAVE_UNISTD_H]: Include unistd.h.
Sat, 29 Apr 1995 20:29:44 +0000 Richard M. Stallman (standard_args): Add -L/--directory/-directory.
Sat, 29 Apr 1995 20:21:41 +0000 Richard M. Stallman (PUSH_FAILURE_INT, POP_FAILURE_INT): Use WIDE_INT.
Sat, 29 Apr 1995 19:25:19 +0000 Richard M. Stallman (jka-compr-insert-file-contents): When visiting,
Sat, 29 Apr 1995 16:49:41 +0000 Richard M. Stallman (command-line): Handle -iconic and -icon-type here.
Sat, 29 Apr 1995 16:47:57 +0000 Richard M. Stallman (Fcall_process): Extend BUFFER arg so it can specify
Sat, 29 Apr 1995 16:37:06 +0000 Richard M. Stallman (compile-internal): Disable undo before erasing
Sat, 29 Apr 1995 16:32:03 +0000 Richard M. Stallman (tex-view): Nice error if tex-dvi-view-command is nil.
Sat, 29 Apr 1995 05:49:04 +0000 Richard M. Stallman (*-sun-sunos4.1.3*): Use sunos4shr.h.
Sat, 29 Apr 1995 05:31:05 +0000 Richard M. Stallman (ORDINARY_LINK): Defined.
Sat, 29 Apr 1995 04:21:23 +0000 Karl Heuer (popup_get_selection): Use x_non_menubar_window_to_frame.
Sat, 29 Apr 1995 04:20:12 +0000 Karl Heuer (read_char, read_char_x_menu_prompt): Exclude
Sat, 29 Apr 1995 04:19:45 +0000 Karl Heuer Declare x_non_menubar_window_to_frame.
Sat, 29 Apr 1995 04:19:13 +0000 Karl Heuer (x_non_menubar_window_to_frame): New function.
Sat, 29 Apr 1995 04:17:56 +0000 Karl Heuer (x_term_init): Add stub to initialize Vsystem_key_alist.
Fri, 28 Apr 1995 01:43:02 +0000 Karl Heuer (create_process): Don't reference pty_name if !HAVE_PTYS.
Fri, 28 Apr 1995 01:26:00 +0000 Karl Heuer (sunos4.1.3): Use shared libraries, since that's
Thu, 27 Apr 1995 18:35:38 +0000 Michael Meissner Support for pre-BFD versions of Linux ld.
Thu, 27 Apr 1995 13:22:29 +0000 Richard Kenner (i[34]86:*:3.2:*) test for /usr/options/cb.name before calling uname.
Wed, 26 Apr 1995 21:47:35 +0000 Karl Heuer (vc-next-action-on-file): Add missing let-binding.
Wed, 26 Apr 1995 21:42:20 +0000 Karl Heuer (vc-default-backend, vc-path, vc-consult-headers):
Wed, 26 Apr 1995 21:00:55 +0000 Karl Heuer (extraclean): Depend on maintainer-clean, not
Wed, 26 Apr 1995 20:59:05 +0000 Karl Heuer (maintainer-clean): Renamed from realclean.
Wed, 26 Apr 1995 20:45:43 +0000 Michael Meissner Support Linux elf and a.out systems; Add parisc support
Wed, 26 Apr 1995 14:27:47 +0000 Richard Kenner (CRAY*Y-MP:*:*:*): New entry.
less more | rev 11791: (0) -10000 -3000 -1000 -192 +192 +1000 +3000 +10000 +30000 +100000 tip