SOURCES: 7.2.086 (NEW), 7.2.087 (NEW) - new
adamg
adamg at pld-linux.org
Fri Feb 6 17:47:06 CET 2009
Author: adamg Date: Fri Feb 6 16:47:06 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- new
---- Files affected:
SOURCES:
7.2.086 (NONE -> 1.1) (NEW)
SOURCES:
7.2.087 (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/7.2.086
diff -u /dev/null SOURCES/7.2.086:1.1
--- /dev/null Fri Feb 6 17:47:06 2009
+++ SOURCES/7.2.086 Fri Feb 6 17:47:00 2009
@@ -0,0 +1,98 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.086
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.086
+Problem: Using ":diffget 1" in buffer 1 corrupts the text.
+Solution: Don't do anything when source and destination of ":diffget" or
+ ":diffput" is the same buffer. (Dominique Pelle)
+Files: src/diff.c
+
+
+*** ../vim-7.2.085/src/diff.c Sun Nov 30 15:15:56 2008
+--- src/diff.c Wed Jan 14 20:40:25 2009
+***************
+*** 8,14 ****
+ */
+
+ /*
+! * diff.c: code for diff'ing two or three buffers.
+ */
+
+ #include "vim.h"
+--- 8,14 ----
+ */
+
+ /*
+! * diff.c: code for diff'ing two, three or four buffers.
+ */
+
+ #include "vim.h"
+***************
+*** 116,122 ****
+ * Add a buffer to make diffs for.
+ * Call this when a new buffer is being edited in the current window where
+ * 'diff' is set.
+! * Marks the current buffer as being part of the diff and requireing updating.
+ * This must be done before any autocmd, because a command may use info
+ * about the screen contents.
+ */
+--- 116,122 ----
+ * Add a buffer to make diffs for.
+ * Call this when a new buffer is being edited in the current window where
+ * 'diff' is set.
+! * Marks the current buffer as being part of the diff and requiring updating.
+ * This must be done before any autocmd, because a command may use info
+ * about the screen contents.
+ */
+***************
+*** 929,935 ****
+ goto theend;
+
+ #ifdef UNIX
+! /* Temporaraly chdir to /tmp, to avoid patching files in the current
+ * directory when the patch file contains more than one patch. When we
+ * have our own temp dir use that instead, it will be cleaned up when we
+ * exit (any .rej files created). Don't change directory if we can't
+--- 929,935 ----
+ goto theend;
+
+ #ifdef UNIX
+! /* Temporarily chdir to /tmp, to avoid patching files in the current
+ * directory when the patch file contains more than one patch. When we
+ * have our own temp dir use that instead, it will be cleaned up when we
+ * exit (any .rej files created). Don't change directory if we can't
+***************
+*** 2129,2134 ****
+--- 2129,2136 ----
+ EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg);
+ return;
+ }
++ if (buf == curbuf)
++ return; /* nothing to do */
+ idx_other = diff_buf_idx(buf);
+ if (idx_other == DB_COUNT)
+ {
+*** ../vim-7.2.085/src/version.c Thu Jan 22 18:32:55 2009
+--- src/version.c Thu Jan 22 20:46:54 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+ { /* Add new patch number below this line */
++ /**/
++ 86,
+ /**/
+
+--
+Shift happens.
+ -- Doppler
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: SOURCES/7.2.087
diff -u /dev/null SOURCES/7.2.087:1.1
--- /dev/null Fri Feb 6 17:47:07 2009
+++ SOURCES/7.2.087 Fri Feb 6 17:47:04 2009
@@ -0,0 +1,53 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.087
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.087
+Problem: Adding URL to 'path' doesn't work to edit a file.
+Solution: Skip simplify_filename() for URLs. (Matt Wosniski)
+Files: src/misc2.c
+
+
+*** ../vim-7.2.086/src/misc2.c Wed Dec 24 12:53:33 2008
+--- src/misc2.c Sun Jan 18 12:26:20 2009
+***************
+*** 4696,4702 ****
+ stackp->ffs_filearray_cur = i + 1;
+ ff_push(search_ctx, stackp);
+
+! simplify_filename(file_path);
+ if (mch_dirname(ff_expand_buffer, MAXPATHL)
+ == OK)
+ {
+--- 4696,4703 ----
+ stackp->ffs_filearray_cur = i + 1;
+ ff_push(search_ctx, stackp);
+
+! if (!path_with_url(file_path))
+! simplify_filename(file_path);
+ if (mch_dirname(ff_expand_buffer, MAXPATHL)
+ == OK)
+ {
+*** ../vim-7.2.086/src/version.c Thu Jan 22 20:48:07 2009
+--- src/version.c Thu Jan 22 21:30:36 2009
+***************
+*** 678,679 ****
+--- 678,681 ----
+ { /* Add new patch number below this line */
++ /**/
++ 87,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+21. Your dog has its own home page.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
More information about the pld-cvs-commit
mailing list