Mercurial > emacs

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 107533: (0) -100000 -30000 -10000 -3000 -1000 -192 +192 +1000 +3000 tip
age author description
Wed, 24 Mar 2010 01:18:03 +0100 Juanma Barranquero Fix typos in Changelog.
Wed, 24 Mar 2010 01:17:31 +0100 Juanma Barranquero Fix typos.
Wed, 24 Mar 2010 01:16:45 +0100 Juanma Barranquero * frames.texi (Cursor Parameters): Fix typo. (Bug#5760)
Mon, 22 Mar 2010 19:37:11 -0700 Glenn Morris * textmodes/flyspell.el (sgml-lexical-context): Autoload it. (Bug#5752)
Mon, 22 Mar 2010 13:28:27 -0400 Chong Yidong * indent.el (indent-for-tab-command): Doc fix.
Mon, 22 Mar 2010 17:21:22 +0000 Alan Mackenzie cc-engine.el (c-remove-stale-state-cache): Fix off-by-one error. Fixes
Mon, 22 Mar 2010 17:56:22 +0100 Juanma Barranquero Fix typos.
Mon, 22 Mar 2010 08:26:56 +0100 Jan D. bug #5736: Allow X-resource menuBar to take on/off as documented.
Sun, 21 Mar 2010 18:13:26 -0400 Chong Yidong * dired.texi (Dired Updating): Document dired-auto-revert-buffer.
Sun, 21 Mar 2010 14:32:19 -0400 Chong Yidong Document multi-isearch-buffers and tab-always-indent.
Sun, 21 Mar 2010 11:28:53 -0400 Chong Yidong * processes.texi (Network Processes): Document seqpacket type.
Sun, 21 Mar 2010 11:09:29 -0400 Chong Yidong NEWS: Re-organize Lisp changes for Emacs 23.2.
Sat, 20 Mar 2010 13:24:06 -0400 Chong Yidong Document font-use-system-font.
Sat, 20 Mar 2010 12:37:39 +0900 YAMAMOTO Mitsuharu xfns.c (Fx_create_frame) [USE_LUCID]: Add BLOCK_INPUT around XLoadQueryFont.
Fri, 19 Mar 2010 11:27:49 -0400 Chong Yidong `make uninstall' fix (Bug#5620).
Fri, 19 Mar 2010 11:15:27 -0400 Chong Yidong Document Bug#5541.
Mon, 22 Mar 2010 17:50:29 +0100 Juanma Barranquero Fix typos in docstrings.
Mon, 22 Mar 2010 17:37:32 +0100 Juanma Barranquero Fix typos in mh-e.
Mon, 22 Mar 2010 16:49:52 +0100 Juanma Barranquero Fix typos in Gnus.
Fri, 19 Mar 2010 14:22:15 +0100 Juanma Barranquero * lisp/minibuffer.el (completion-in-region-functions): Fix docstring typos.
Wed, 17 Mar 2010 21:49:35 -0700 Glenn Morris Restore user option rmail-highlight-face.
Tue, 16 Mar 2010 13:24:44 -0400 Chong Yidong Woman parsing fix (Bug#5729).
Tue, 16 Mar 2010 16:05:46 +0900 Kenichi Handa language/indian.el (devanagari-composable-pattern): Add more consonants.
Tue, 16 Mar 2010 14:50:19 +0900 Kenichi Handa Fix the ccl encoder for the case that the output buffer is fullfilled.
Tue, 16 Mar 2010 11:16:09 +0900 Kenichi Handa coding.c (decode_coding_ccl): Fix previous change for the multibyte case.
Tue, 16 Mar 2010 16:04:46 +0900 Kenichi Handa language/indian.el (devanagari-composable-pattern): Add more consonants.
Tue, 16 Mar 2010 14:48:41 +0900 Kenichi Handa Fix the ccl encoder for the case that the output buffer is fullfilled.
Tue, 16 Mar 2010 11:14:40 +0900 Kenichi Handa coding.c (decode_coding_ccl): Fix previous change for the multibyte case.
Tue, 16 Mar 2010 10:04:20 +0900 Kenichi Handa from trunk
Mon, 15 Mar 2010 11:51:48 -0400 Chong Yidong Fix bug in `format' (Bug#5710).
Mon, 15 Mar 2010 11:45:03 +0100 Francesc Rocher Remove CEDET entry in MORE.STUFF.
Sun, 14 Mar 2010 21:10:47 +0100 Michael Albinus * lisp/net/trampver.el: Update release number.
Sat, 13 Mar 2010 12:02:01 -0800 Glenn Morris * copyright: Add note about lisp/cedet/semantic/imenu.el.
Sat, 13 Mar 2010 11:57:29 -0800 Glenn Morris * Makefile.in (ELCFILES): Add cedet/semantic/imenu.el.
Sat, 13 Mar 2010 11:55:44 -0800 Glenn Morris * cedet/semantic/imenu.el: Fix typo in copyright header.
Sat, 13 Mar 2010 20:11:01 +0100 Michael Albinus * net/tramp.el (tramp-find-executable): Use
Sat, 13 Mar 2010 10:49:54 -0500 Chong Yidong * cedet/semantic/imenu.el: New file from the CEDET repository (Bug#5412).
Thu, 11 Mar 2010 19:19:17 -0800 Glenn Morris Close bug#4427.
Thu, 11 Mar 2010 08:25:46 -0800 Dan Nicolaescu (auto-mode-alist): Accept more verilog file patterns.
Wed, 10 Mar 2010 22:58:54 -0800 Glenn Morris License updates for some test/cedet/tests files.
Wed, 10 Mar 2010 22:54:51 -0800 Glenn Morris * bugtracker: Debbugs's X-Emacs mail headers are now X-GNU headers.
Wed, 10 Mar 2010 23:03:11 -0500 Chong Yidong Bump version to 23.1.94 and regenerate ldefs-boot.el. EMACS_PRETEST_23_1_94
Wed, 10 Mar 2010 21:44:35 -0500 Chong Yidong Fix ChangeLog typo.
Wed, 10 Mar 2010 21:41:21 -0500 Chong Yidong Fix ChangeLog typo.
Wed, 24 Mar 2010 09:41:07 -0400 Sam Steingold fix a typo in last patch
Wed, 24 Mar 2010 04:30:28 -0500 Ted Zlatanov Add a list of HTTP status code symbols and their text, mapped by number.
Tue, 23 Mar 2010 23:32:45 -0700 Glenn Morris * vc-bzr.el (vc-bzr-log-edit-mode): Add --fixes support to
Tue, 23 Mar 2010 20:53:32 -0700 Glenn Morris * cedet/ede/project-am.el (ede-shell-run-something): Declare.
Tue, 23 Mar 2010 20:38:17 -0700 Glenn Morris * vc.el (vc-modify-change-comment): Pass MODE to vc-start-logentry.
Tue, 23 Mar 2010 20:34:06 -0700 Glenn Morris * vc-bzr.el, vc-hg.el (log-edit-mode): Declare.
Tue, 23 Mar 2010 20:30:53 -0700 Glenn Morris * vc-dispatcher.el (vc-start-logentry): Doc fix.
Tue, 23 Mar 2010 20:27:24 -0700 Glenn Morris * log-edit.el (log-edit-before-checkin-process): Doc fix.
Tue, 23 Mar 2010 20:21:53 -0700 Glenn Morris * mail-source.el (gnus-message): Declare.
Tue, 23 Mar 2010 20:19:15 -0700 Glenn Morris * cedet/semantic/bovine/c.el (semantic-c-describe-environment):
Tue, 23 Mar 2010 14:22:46 -0400 Sam Steingold Fix bug#5620: recalculate all markers on compilation buffer
Tue, 23 Mar 2010 12:27:10 -0400 Sam Steingold update author's email
Tue, 23 Mar 2010 18:18:52 +0200 Juri Linkov * occur-testsuite.el: New file.
Tue, 23 Mar 2010 18:09:45 +0200 Juri Linkov Implement Occur multi-line matches.
Tue, 23 Mar 2010 17:48:09 +0200 Juri Linkov * replace.el (occur-engine-line): Add optional arg `keep-props'.
Tue, 23 Mar 2010 07:38:13 +0000 Katsumi Yamaoka Synch with Gnus trunk
Tue, 23 Mar 2010 07:37:09 +0000 Katsumi Yamaoka Synch with Gnus trunk
Tue, 23 Mar 2010 07:35:06 +0000 Katsumi Yamaoka Merge from mainline.
Tue, 23 Mar 2010 07:32:05 +0000 Katsumi Yamaoka Synch with Gnus trunk
Tue, 23 Mar 2010 07:29:49 +0000 Katsumi Yamaoka Synch with Gnus trunk
Tue, 23 Mar 2010 07:28:39 +0000 Katsumi Yamaoka Merge from mainline.
Tue, 23 Mar 2010 09:16:57 +0200 Juri Linkov * replace.el (occur-accumulate-lines, occur-engine):
Tue, 23 Mar 2010 09:11:50 +0200 Juri Linkov * finder.el: Remove TODO tasks.
Tue, 23 Mar 2010 06:43:05 +0000 Katsumi Yamaoka Merge from mainline.
Tue, 23 Mar 2010 01:05:35 +0000 Katsumi Yamaoka Merge from mainline.
Mon, 22 Mar 2010 19:47:41 -0700 Dan Nicolaescu * s/gnu-linux.h (LIBS_SYSTEM): Remove, same as default.
Mon, 22 Mar 2010 19:42:25 -0700 Dan Nicolaescu * s/netbsd.h: Remove commented out code.
Mon, 22 Mar 2010 19:39:19 -0700 Dan Nicolaescu Simplify LIBS_MACHINE definitions.
Mon, 22 Mar 2010 20:59:49 -0400 Stefan Monnier Add a new completion style `substring'.
Mon, 22 Mar 2010 12:51:59 -0700 Dan Nicolaescu Remove dead code dealing with POSIX_SIGNALS.
Mon, 22 Mar 2010 09:33:21 -0400 Stefan Monnier Get rid of .elc files after removal of the corresponding .el.
Mon, 22 Mar 2010 08:51:19 +0100 Jan D. * Makefile.in (compile-main): cd to $(lisp) in a sub-shell, so we
Mon, 22 Mar 2010 08:50:40 +0100 Jan D. Makefile.in (compile-main): cd to $(lisp) in a sub-shell, so we
Mon, 22 Mar 2010 08:34:25 +0100 Jan D. Merge from trunk
Mon, 22 Mar 2010 00:24:25 -0400 Stefan Monnier Get rid of the ELCFILES abomination, again.
Sun, 21 Mar 2010 19:56:56 -0700 Dan Nicolaescu * keyboard.c (Fset_input_interrupt_mode): Remove code depending on NO_SOCK_SIGIO,
Sun, 21 Mar 2010 12:59:04 -0700 Dan Nicolaescu (BSD_SYSTEM, BSD4_2): Remove conditionals, we only
Sun, 21 Mar 2010 12:32:38 -0700 Dan Nicolaescu * m/ibmrs6000.h (ORDINARY_LINK): Move definition ...
Sun, 21 Mar 2010 12:57:49 +0100 Andreas Schwab Use absolute directory names substituted by configure
Sun, 21 Mar 2010 12:27:46 +0100 Andreas Schwab Expand ${bootstrap_exe} before chdir
Sun, 21 Mar 2010 12:52:51 +0200 Juri Linkov Fix message of multi-line occur regexps and multi-buffer header lines.
Sat, 20 Mar 2010 17:46:31 -0400 Stefan Monnier Use more relative file and directory names in `lisp' make rules.
Sat, 20 Mar 2010 14:21:44 -0500 Ted Zlatanov Fix unbalanced parenthesis in secrets.el.
Sat, 20 Mar 2010 15:04:44 -0400 Stefan Monnier (hide-sublevels): Unfix the paren non-typo! (bug#5738).
Sat, 20 Mar 2010 11:17:59 -0700 Glenn Morris Use faces not variables for font-lock customization in rst.el.
Sat, 20 Mar 2010 11:13:46 -0700 Glenn Morris Cosmetic changes to lib-src/Makefile.in.
Sat, 20 Mar 2010 01:11:59 -0700 Dan Nicolaescu Remove support for old GNU/Linux using libc version 5.
Sat, 20 Mar 2010 00:57:11 -0700 Dan Nicolaescu Consolidate redundant definitions in s/bsd-common.h.
Sat, 20 Mar 2010 00:09:31 -0700 Dan Nicolaescu Consolidate redundant definitions.
Fri, 19 Mar 2010 23:48:13 -0700 Dan Nicolaescu Remove support for old UNIX System V systems.
Fri, 19 Mar 2010 22:52:55 -0700 Dan Nicolaescu Remove support for Solaris on PPC and for old versions.
Fri, 19 Mar 2010 22:18:05 -0700 Dan Nicolaescu * s/openbsd.h: Remove support for non-ELF and for systems that do
Sat, 20 Mar 2010 03:29:12 +0200 Juri Linkov * s-region.el: Move to obsolete.
Fri, 19 Mar 2010 18:03:39 -0700 Dan Nicolaescu Remove non-working support for lynxos 3.0.
Fri, 19 Mar 2010 17:46:01 -0700 Dan Nicolaescu Remove obsolete uses of HAVE_SHM.
Fri, 19 Mar 2010 15:19:54 +0100 Juanma Barranquero lisp/vc-dispatcher.el (vc-do-command): Remove reference to `vc-path'.
Fri, 19 Mar 2010 11:29:02 +0100 Michael Albinus * auth-source.el (netrc-machine-user-or-password): Autoload.
Fri, 19 Mar 2010 02:46:08 -0700 Dan Nicolaescu * .dir-locals.el (c-mode): Turn on whitespace-mode for diff-mode.
Fri, 19 Mar 2010 02:42:13 -0700 Dan Nicolaescu * vc-hooks.el (vc-path): Remove variable and obsolete declaration.
Fri, 19 Mar 2010 02:37:41 -0700 Dan Nicolaescu Add special markup processing for commit logs.
Thu, 18 Mar 2010 23:32:47 -0400 Stefan Monnier (hide-sublevels): Don't hide trailing newline (and fix paren typo).
Thu, 18 Mar 2010 20:19:09 -0700 Glenn Morris Regenerate ldefs-boot.el.
Thu, 18 Mar 2010 19:55:37 -0700 Glenn Morris Stop message.el from loading about 40 libraries it doesn't always need.
Thu, 18 Mar 2010 19:44:37 -0700 Glenn Morris Regenerate src/config.in.
Thu, 18 Mar 2010 19:42:32 -0700 Glenn Morris * configure.in (HAVE_LIBNCURSES): Add a description to make autoheader happy.
Thu, 18 Mar 2010 12:57:21 +0100 Jan D. Check for tputs and friends, abort if not found (bug #5735)
Thu, 18 Mar 2010 12:56:23 +0100 Jan D. Check for tputs and friends, abort if not found (bug #5735)
Thu, 18 Mar 2010 08:22:27 +0100 Jan D. Merge from trunk
Mon, 15 Mar 2010 09:18:20 +0100 Jan D. Merge from trunk
Thu, 11 Mar 2010 11:05:39 +0100 Jan D. Merge from trunk
Mon, 08 Mar 2010 13:05:51 +0100 Jan D. Merge from trunk
Wed, 17 Mar 2010 23:47:12 -0700 Glenn Morris * emacs-lisp/autoload.el (autoload-rubric): Doc fix.
Wed, 17 Mar 2010 23:44:36 -0700 Glenn Morris Use query-replace-{from,to}-history-variable in more places.
Wed, 17 Mar 2010 23:37:26 -0700 Glenn Morris Simplify some leim/Makefile.in clean rules.
Wed, 17 Mar 2010 23:33:39 -0700 Glenn Morris * Makefile.in (dot): Remove, since ../ is used throughout the other Makefiles.
Wed, 17 Mar 2010 23:27:55 -0700 Glenn Morris Remove obsolete code in emacs.c that chooses a bug reporting address.
Wed, 17 Mar 2010 23:21:21 -0700 Glenn Morris * mail/hashcash.el (declare-function): Remove duplicate definition.
Wed, 17 Mar 2010 23:18:47 -0700 Glenn Morris Minor simplifications for emacsbug.el.
Wed, 17 Mar 2010 23:13:45 -0700 Glenn Morris Remove supercite.el's need for sendmail.el.
Wed, 17 Mar 2010 22:59:32 -0700 Glenn Morris * configure: Fix comment mistake in previous change.
Wed, 17 Mar 2010 22:57:21 -0700 Glenn Morris Regenerate configure.
Wed, 17 Mar 2010 22:54:09 -0700 Glenn Morris Doc fix.
Wed, 17 Mar 2010 22:49:31 -0700 Glenn Morris Replace some cpp with autoconf.
Wed, 17 Mar 2010 22:25:13 -0700 Glenn Morris * calendar/cal-french.el: Convert to utf-8.
Wed, 17 Mar 2010 22:17:11 -0700 Glenn Morris Close bug#5720.
Wed, 17 Mar 2010 21:54:51 -0700 Glenn Morris * files.el (interpreter-mode-alist): Use emacs-lisp-mode for Emacs scripts.
Wed, 17 Mar 2010 02:53:43 +0000 Katsumi Yamaoka (mml-read-tag): Unquote values with `read' to reverse prin1 in mml-insert-tag
Wed, 17 Mar 2010 02:51:21 +0000 Katsumi Yamaoka (mml-read-tag): Unquote values with `read' to reverse prin1 in mml-insert-tag
Tue, 16 Mar 2010 22:06:37 +0000 Katsumi Yamaoka Merge from mainline.
Tue, 16 Mar 2010 00:21:21 +0000 Katsumi Yamaoka Merge from mainline.
Mon, 15 Mar 2010 22:14:49 +0000 Katsumi Yamaoka Merge from mainline.
Mon, 15 Mar 2010 01:43:38 +0000 Katsumi Yamaoka Merge from mainline.
Tue, 16 Mar 2010 17:45:07 +0100 Michael Albinus * net/secrets.el (secrets-enabled): New variable. Use it instead
Tue, 16 Mar 2010 00:27:31 +0100 Michael Albinus * net/secrets.el (top): Register the D-Bus signals only when the
Mon, 15 Mar 2010 13:16:46 -0400 Chong Yidong Put non-GTK X scroll-bars on left.
Mon, 15 Mar 2010 01:39:53 +0000 Katsumi Yamaoka (mm-charset-to-coding-system): Use coding-system-from-name
Mon, 15 Mar 2010 01:38:28 +0000 Katsumi Yamaoka (mm-charset-to-coding-system): Use coding-system-from-name
Sun, 14 Mar 2010 21:56:41 +0000 Katsumi Yamaoka Merge from mainline.
Sun, 14 Mar 2010 23:28:52 +0200 Juri Linkov Add finder unknown keywords.
Sun, 14 Mar 2010 23:15:02 +0200 Juri Linkov Fix keywords.
Sat, 13 Mar 2010 21:33:54 +0100 Michael Albinus * etc/NEWS: Add secrets.el.
Sat, 13 Mar 2010 14:54:29 -0500 Chong Yidong Fix bug in `format' (Bug#5710).
Sat, 13 Mar 2010 10:29:13 -0500 Eli Zaretskii Commit the change in src/Makefile.in announced in rev 99649.
Sat, 13 Mar 2010 11:16:37 +0100 Andreas Schwab Remove obsolete .cvsignore files
Sat, 13 Mar 2010 03:52:05 -0500 Eli Zaretskii Spell out in ChangeLog the purpose of revision 99649.
Fri, 12 Mar 2010 18:13:27 -0500 Chong Yidong Document Customize and scroll-bar changes.
Fri, 12 Mar 2010 18:13:02 -0500 Chong Yidong * xfns.c (Fx_create_frame): Set default to Qright.
Fri, 12 Mar 2010 18:08:30 -0500 Chong Yidong Allow using list-colors-display to set colors in the Color widget.
Fri, 12 Mar 2010 17:56:30 -0500 Chong Yidong Improvements to the Custom interface.
Fri, 12 Mar 2010 16:42:05 -0500 Chong Yidong Update Custom arrow images.
Fri, 12 Mar 2010 14:13:38 -0500 Chong Yidong Fix last change to use existing comm Custom group instead of `net'.
Fri, 12 Mar 2010 12:47:22 -0500 Chong Yidong Reorganize Custom groups.
Fri, 12 Mar 2010 12:32:30 -0500 Chong Yidong Put scroll-bar on right by default on UNIX.
Fri, 12 Mar 2010 11:34:27 -0500 Eli Zaretskii Don't use termcap.c on Posix platforms, only on MS-DOS.
Fri, 12 Mar 2010 00:07:18 -0800 Dan Nicolaescu Fix typo.
Fri, 12 Mar 2010 00:04:54 -0800 Dan Nicolaescu Add .dir-locals.el support for file-less buffers.
Thu, 11 Mar 2010 19:13:01 -0800 Glenn Morris Regenerate configure.
Thu, 11 Mar 2010 17:29:30 -0800 Dan Nicolaescu Add support for shelving snapshots and for showing shelves.
Thu, 11 Mar 2010 22:42:19 +0200 Juri Linkov Add a NEWS entry for animated image API.
Wed, 10 Mar 2010 22:20:24 -0800 Glenn Morris * cus-edit.el (customize-changed-options-previous-release): Bump to 23.1.
Wed, 10 Mar 2010 22:17:08 -0800 Glenn Morris Minor animated image housekeeping.
Wed, 10 Mar 2010 22:10:50 -0800 Glenn Morris Rotate NEWS to NEWS.23, create new NEWS for Emacs 24.
Wed, 10 Mar 2010 10:17:13 -0500 Chong Yidong Bump version to 24.0.50.
Wed, 10 Mar 2010 09:45:21 -0500 Stefan Monnier Cleanup setup of gl_state in various parts of the code.
Wed, 10 Mar 2010 23:16:06 +0900 Miles Bader quick-install-emacs: Use more portable shell syntax
Wed, 10 Mar 2010 23:14:34 +0900 Miles Bader quick-install-emacs: Be more picky about files we avoid installing
Wed, 10 Mar 2010 01:32:43 -0500 Stefan Monnier vc-git.el (vc-git-revision-table): Include remote branches.
Wed, 10 Mar 2010 00:18:51 -0500 Stefan Monnier Merge pending branch
Sun, 07 Mar 2010 15:08:38 -0500 Stefan Monnier Start laying out a plan for Emacs-24
Sun, 07 Mar 2010 21:02:20 +0200 Juri Linkov Animated image API.
Tue, 09 Mar 2010 22:24:44 +0900 Miles Bader (vc-git-print-log): Use "tformat:" for shortlog, instead of "format:"
Mon, 08 Mar 2010 19:14:53 +0200 Juri Linkov Fix numeric keywords.
Mon, 08 Mar 2010 11:17:30 -0500 Chong Yidong Additional fix for rfc822-addresses (Bug#5692).
Mon, 08 Mar 2010 14:00:18 +0100 Juanma Barranquero Fix typos in Changelogs.
Mon, 08 Mar 2010 20:40:36 +0900 Kenichi Handa Fix bug# in ChangeLog.
Mon, 08 Mar 2010 20:30:58 +0900 Kenichi Handa Add coding system windows-1256 (alias cp1256).
Mon, 08 Mar 2010 20:39:36 +0900 Kenichi Handa Fix bug# in ChangeLog.
Mon, 08 Mar 2010 10:53:37 +0900 Kenichi Handa from trunk
Mon, 08 Mar 2010 10:52:57 +0900 Kenichi Handa Add bug# in ChangeLog.
Mon, 08 Mar 2010 10:50:35 +0900 Kenichi Handa Add coding system windows-1256 (alias cp1256).
Wed, 03 Mar 2010 15:04:00 +0900 Kenichi Handa from trunk
Sun, 07 Mar 2010 18:34:40 +0100 Andreas Schwab Don't end parsing rfc822 addresses prematurely (Bug#5692)
Sun, 07 Mar 2010 09:45:53 -0500 Chong Yidong Correct pathname for vc-git-annotate-extract-revision-at-line (Bug#5657)
Sat, 06 Mar 2010 15:35:04 -0500 Chong Yidong NEWS: Clarify last change.
Sat, 06 Mar 2010 15:33:04 -0500 Chong Yidong NEWS: Document change to Lisp reader for overflowing ints.
Sat, 06 Mar 2010 15:27:19 -0500 Chong Yidong * objects.texi (Integer Type): Take note of the read syntax exception for numbers that cannot fit in the integer type.
Sat, 06 Mar 2010 14:02:49 -0500 Chong Yidong Improve documentation for setting buffer-local vars (Bug#5688).
Sat, 06 Mar 2010 13:23:23 -0500 Chong Yidong * calculator.el (calculator): Don't bind split-window-keep-point (Bug#5674).
less more | rev 107533: (0) -100000 -30000 -10000 -3000 -1000 -192 +192 +1000 +3000 tip