diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-24 12:49:22 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-24 12:49:22 -0700 |
| commit | 169043d6625acab49a9a12fb046321d96036cb7d (patch) | |
| tree | ed2601b80026f976d4db71157689bb705f2daa01 /lisp | |
| parent | 77f497d292ace3e841827a7b12a18be5f78fe425 (diff) | |
| parent | 9daf1cf1dd9e1025b615a0fea4dae81871e081da (diff) | |
| download | emacs-169043d6625acab49a9a12fb046321d96036cb7d.tar.gz | |
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'
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/descr-text.el | 2 | ||||
| -rw-r--r-- | lisp/dired-aux.el | 4 | ||||
| -rw-r--r-- | lisp/vc/vc-git.el | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lisp/descr-text.el b/lisp/descr-text.el index a352ed0849c..5f1a4304342 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 aafceeaa9e0..b23b04a45fa 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 2fd84f102f8..8568a94bbdb 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)))) |