diff options
| author | Eli Zaretskii | 2016-04-10 19:04:33 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2016-04-10 19:04:33 +0300 |
| commit | 668c7bc5ba761551ef0d08dc96080eb5aa169da1 (patch) | |
| tree | 645abdf4180791db1bf7bf8959252020db9f606b /etc | |
| parent | b57076929f0e904864e1457d5789f2fe6652fc84 (diff) | |
| download | emacs-668c7bc5ba761551ef0d08dc96080eb5aa169da1.tar.gz emacs-668c7bc5ba761551ef0d08dc96080eb5aa169da1.zip | |
Improve handling of non-ASCII characters in Git log messages
* lisp/vc/vc-git.el (vc-git-commits-coding-system): Now a defcustom.
(vc-git-log-output-coding-system): New defcustom.
(vc-git-print-log, vc-git-command, vc-git--call): Use
'vc-git-log-output-coding-system' for reading stuff from Git.
Don't override values of 'coding-system-for-read/write' if they
are bound by caller -- this allows the user to force an encoding
via "C-x RET c".
(vc-git-checkin): On MS-Windows, pass the log message via a
temporary file, to work around the limitations on passing
non-ASCII characters via command-line arguments. Force using the
'locale-coding-system' for Git command-line arguments. This fixes
problems with non-ASCII commit log messages on MS-Windows.
(Bug#23076)
* etc/NEWS: Mention the new vc-git related defcustoms.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/NEWS | 11 |
1 files changed, 11 insertions, 0 deletions
| @@ -987,6 +987,17 @@ back-end for the buffer's file, or remove it from version control. | |||
| 987 | the color range from 'vc-annotate-color-map' is applied to the | 987 | the color range from 'vc-annotate-color-map' is applied to the |
| 988 | background or to the foreground. | 988 | background or to the foreground. |
| 989 | 989 | ||
| 990 | --- | ||
| 991 | *** New options for customizing encoding of Git commit log messages. | ||
| 992 | The new options `vc-git-commits-coding-system' and | ||
| 993 | `vc-git-log-output-coding-system' allow to customize the encoding of | ||
| 994 | the log messages sent to Git when committing, and the decoding of the | ||
| 995 | log messages read from Git history commands. Both default to UTF-8; | ||
| 996 | if you customize them, make sure they are consistent with the Git | ||
| 997 | config variables i18n.commitEncoding and i18n.logOutputEncoding. | ||
| 998 | (`vc-git-commits-coding-system' existed previously, but was a | ||
| 999 | variable, not a user option.) | ||
| 1000 | |||
| 990 | +++ | 1001 | +++ |
| 991 | *** 'compare-windows' now compares text with the most recently selected window | 1002 | *** 'compare-windows' now compares text with the most recently selected window |
| 992 | instead of the next window. If you want the previous behavior of | 1003 | instead of the next window. If you want the previous behavior of |