[Emacs-diffs] master 169043d 5/5: Merge from origin/emacs-25

[Paul Eggert]

branch: master
commit 169043d6625acab49a9a12fb046321d96036cb7d
Merge: 77f497d 9daf1cf
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from origin/emacs-25
    
    9daf1cf * etc/NEWS: Improve wording of vc-git-log-output-coding-syste...
    0cd2e92 Don't kill ~/ if it's the top level directory
    4f40f5f describe-char: fix insert char documentation
    87ee542 (vc-git-mode-line-string): Don't use `replace-regexp-in-string'
---
 etc/NEWS           |   14 +++++++-------
 lisp/descr-text.el |    2 +-
 lisp/dired-aux.el  |    4 ++--
 lisp/vc/vc-git.el  |    2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index a03f74d..3cf88c1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1387,13 +1387,13 @@ background or to the foreground.
 
 ---
 *** New options for customizing encoding of Git commit log messages.
-The new options `vc-git-commits-coding-system' and
-`vc-git-log-output-coding-system' allow to customize the encoding of
-the log messages sent to Git when committing, and the decoding of the
-log messages read from Git history commands.  Both default to UTF-8;
-if you customize them, make sure they are consistent with the Git
-config variables i18n.commitEncoding and i18n.logOutputEncoding.
-(`vc-git-commits-coding-system' existed previously, but was a
+The new user options 'vc-git-commits-coding-system' and
+'vc-git-log-output-coding-system' specify the encoding of log messages
+sent to Git when committing, and the decoding of log messages read
+from Git history commands.  These options default to UTF-8; if
+customized, they should be consistent with the Git config variables
+i18n.commitEncoding and i18n.logOutputEncoding.
+('vc-git-commits-coding-system' existed previously, but was a
 variable, not a user option.)
 
 +++
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index a352ed0..5f1a430 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -619,7 +619,7 @@ relevant to POS."
                           (let ((name
                                  (or (get-char-code-property char 'name)
                                      (get-char-code-property char 'old-name))))
-                            (if name
+                            (if (and name (assoc-string name (ucs-names)))
                                 (format
                                  "type \"C-x 8 RET %x\" or \"C-x 8 RET %s\""
                                  char name)
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index aafceea..b23b04a 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -2514,8 +2514,8 @@ Lower levels are unaffected."
         (cur-dir (dired-current-directory))
         (cons (assoc-string cur-dir dired-switches-alist))
         buffer-read-only)
-    (if (equal cur-dir default-directory)
-       (error "Attempt to kill top level directory"))
+    (when (equal cur-dir (expand-file-name default-directory))
+      (error "Attempt to kill top level directory"))
     (prog1
        (if remember-marks (dired-remember-marks beg end))
       (delete-region beg end)
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 2fd84f1..8568a94 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -284,7 +284,7 @@ Should be consistent with the Git config value 
i18n.logOutputEncoding."
          (def-ml (vc-default-mode-line-string 'Git file))
          (help-echo (get-text-property 0 'help-echo def-ml))
          (face   (get-text-property 0 'face def-ml)))
-    (propertize (replace-regexp-in-string (concat rev "\\'") disp-rev def-ml t 
t)
+    (propertize (concat (substring def-ml 0 4) disp-rev)
                 'face face
                 'help-echo (concat help-echo "\nCurrent revision: " rev))))