emacs/lisp/vc, branch nick.lloyd-bytecode-jit Emacs is the extensible, customizable, self-documenting real-time display editor. Handle patch terminators produced by git and bzr patch export 2017-01-31T15:50:26+00:00 Dima Kogan 2017-01-31T05:43:32+00:00 189df8262e54c486658784801da3e90b29a548df Patch by Juri Linkov posted in the #9597 bug report * lisp/vc/diff-mode.el (diff-sanity-check-hunk): Find and ignore terminator (Bug #9597, #5302) 
Patch by Juri Linkov posted in the #9597 bug report

* lisp/vc/diff-mode.el (diff-sanity-check-hunk): Find and ignore
terminator (Bug #9597, #5302)
Fix Bug#25524 2017-01-29T09:49:10+00:00 Tino Calancha 2017-01-29T09:49:10+00:00 0073223c23749ffd6bd3f882bc30a82cc37efd2a * lisp/vc/diff-mode.el (diff-beginning-of-hunk): Return position at the beginning off the hunk. (diff-file-junk-re): Add SVN keywords. 
* lisp/vc/diff-mode.el (diff-beginning-of-hunk):
Return position at the beginning off the hunk.
(diff-file-junk-re): Add SVN keywords.
ediff-difference-vector-alist: Drop duplicated definition 2017-01-25T06:15:16+00:00 Tino Calancha 2017-01-25T06:15:16+00:00 cf9ce4fcfc38ef3eda01fcc504f4d792fcabe6d5 * lisp/vc/ediff-init.el (ediff-difference-vector-alist): Drop duplicated definition. (ediff-difference-vector-A, ediff-difference-vector-B) (ediff-difference-vector-C, ediff-difference-vector-Ancestor): Move definition before 'ediff-difference-vector-alist'. 
* lisp/vc/ediff-init.el (ediff-difference-vector-alist):
Drop duplicated definition.
(ediff-difference-vector-A, ediff-difference-vector-B)
(ediff-difference-vector-C, ediff-difference-vector-Ancestor):
Move definition before 'ediff-difference-vector-alist'.
diff-hunk-kill independent of point inside headers 2017-01-21T02:54:55+00:00 Tino Calancha 2017-01-21T02:54:55+00:00 e5e42cefd7f2eb47d2c8660a7a317e8b08d36a82 Make diff-apply-hunk and diff-hunk-kill independent of the point position in a diff header (Bug#17544). This change allows to apply hunks in order. It also makes possible to press M-k repeatedly to kill hunks in the order they appear in the buffer. See discussion on #Bug25105. * lisp/vc/diff-mode.el (diff-file-junk-re): Move definition before it's used. (diff--at-diff-header-p): New predicate; return non-nil when point is inside a hunk header, a file header, or within a line matching diff-file-junk-re. (diff-beginning-of-hunk): Use it. Check if the point is inside a diff header, in the middle of a hunk, or before the first hunk. (diff-apply-hunk): Call diff-beginning-of-hunk with non-nil arg before apply the hunk. (diff-hunk-kill, diff-file-kill): Call diff-beginning-of-hunk with non-nil arg after kill the hunks. (diff-post-command-hook): Call diff-beginning-of-hunk with non-nil argument. 
Make diff-apply-hunk and diff-hunk-kill independent of the point
position in a diff header (Bug#17544).
This change allows to apply hunks in order.  It also makes possible to
press M-k repeatedly to kill hunks in the order they appear in the buffer.
See discussion on #Bug25105.
* lisp/vc/diff-mode.el (diff-file-junk-re):
Move definition before it's used.
(diff--at-diff-header-p): New predicate; return non-nil when point
is inside a hunk header, a file header, or within a line
matching diff-file-junk-re.
(diff-beginning-of-hunk): Use it.
Check if the point is inside a diff header, in the middle of a hunk,
or before the first hunk.
(diff-apply-hunk): Call diff-beginning-of-hunk with non-nil arg
before apply the hunk.
(diff-hunk-kill, diff-file-kill):
Call diff-beginning-of-hunk with non-nil arg after kill the hunks.
(diff-post-command-hook): Call diff-beginning-of-hunk with non-nil argument.
; Revert "Improve diff-mode navigation/manipulation" 2017-01-21T02:54:38+00:00 Tino Calancha 2017-01-21T02:54:38+00:00 1508b538fd8f8c2e00aadcea42ac36013fad02e3 This reverts commit 2c8a7e50d24daf19ea7d86f1cfeaa98a41c56085. This change causes regressions: https://lists.gnu.org/archive/html/emacs-devel/2016-11/msg00738.html The following related commits are reverted as well: 61c6a10e3110490dadac4577cc540053341ff25c a283d655db88cdcc8cb53d8e2578e1cdf751c84b 6b6abe0dba6a9a2e5f78aac3814421886e7a184f e5ef59b87da5c2ddfa22f7342efe29b3eea6ed97 73349822cbd6e50526eda9c75453584d73dfca83 Fixes: debbugs:25105, 25400. 
This reverts commit 2c8a7e50d24daf19ea7d86f1cfeaa98a41c56085.
This change causes regressions:
https://lists.gnu.org/archive/html/emacs-devel/2016-11/msg00738.html
The following related commits are reverted as well:
61c6a10e3110490dadac4577cc540053341ff25c
a283d655db88cdcc8cb53d8e2578e1cdf751c84b
6b6abe0dba6a9a2e5f78aac3814421886e7a184f
e5ef59b87da5c2ddfa22f7342efe29b3eea6ed97
73349822cbd6e50526eda9c75453584d73dfca83

Fixes: debbugs:25105, 25400.
Avoid inefficient regex in diff-refine-hunk (Bug#25410) 2017-01-19T01:37:31+00:00 Noam Postavsky 2017-01-13T04:32:44+00:00 8c0fcaf66733f0538a3f024f383cb34a3c93d73c * lisp/vc/diff-mode.el (diff--forward-while-leading-char): New function. (diff-refine-hunk): Use it instead of trying to match multiple lines with a single lines. 
* lisp/vc/diff-mode.el (diff--forward-while-leading-char): New function.
(diff-refine-hunk): Use it instead of trying to match multiple lines
with a single lines.
Remove leftover references to log-view-message-face 2017-01-14T03:56:37+00:00 Dmitry Gutov 2017-01-14T03:56:37+00:00 5b9f08fb867a9a3dca0bc81064202d53d1d52538 * lisp/vc/vc-bzr.el (vc-bzr-log-view-mode): Use log-view-message. * lisp/vc/vc-git.el (vc-git-root-log-format): Same. * lisp/vc/vc-hg.el (vc-hg-root-log-format): Same. 
* lisp/vc/vc-bzr.el (vc-bzr-log-view-mode): Use log-view-message.

* lisp/vc/vc-git.el (vc-git-root-log-format): Same.

* lisp/vc/vc-hg.el (vc-hg-root-log-format): Same.
Merge from origin/emacs-25 2017-01-01T09:10:47+00:00 Paul Eggert 2017-01-01T09:10:47+00:00 bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017 
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
Merge from origin/emacs-25 2017-01-01T09:02:45+00:00 Paul Eggert 2017-01-01T09:02:45+00:00 4f7a90bf6ce831063d721324e712f8c38e85c678 9adb101 Document 'describe-fontset' 229315c ; Add missing symbol quoting. 3d94931 Repair desktop restoration on text terminals 43022f9 Ignore forward-sexp-function in js-mode indentation code b19fb49 Improve documentation of 'define-coding-system' 467768f Fix Bug#25162 6db78ae Fix a typo in define-abbrev-table 5f7d906 Bump makeinfo requirement from 4.7 to 4.13 442e2f6 Fixes related to select-enable-clipboard e4ac450 Define struct predicate before acccesors 08decbd Doc fix for vc-git 5531e75 Further improve make-dist checking 953bf67 Improve previous make-dist change 129645a Make make-dist --snapshot do some sanity checks # Conflicts: # lisp/menu-bar.el 
9adb101 Document 'describe-fontset'
229315c ; Add missing symbol quoting.
3d94931 Repair desktop restoration on text terminals
43022f9 Ignore forward-sexp-function in js-mode indentation code
b19fb49 Improve documentation of 'define-coding-system'
467768f Fix Bug#25162
6db78ae Fix a typo in define-abbrev-table
5f7d906 Bump makeinfo requirement from 4.7 to 4.13
442e2f6 Fixes related to select-enable-clipboard
e4ac450 Define struct predicate before acccesors
08decbd Doc fix for vc-git
5531e75 Further improve make-dist checking
953bf67 Improve previous make-dist change
129645a Make make-dist --snapshot do some sanity checks

# Conflicts:
#	lisp/menu-bar.el
Update copyright year to 2017 2017-01-01T03:42:26+00:00 Paul Eggert 2017-01-01T03:14:01+00:00 5badc81c1cdfbb261ad3e6d1b753defb15712f26 Run admin/update-copyright. 
Run admin/update-copyright.