diff options
author | leo <event.riga@gmail.com> | 2017-11-02 14:25:50 +0100 |
---|---|---|
committer | Jean Delvare <jdelvare@suse.de> | 2017-11-02 14:25:50 +0100 |
commit | 0f2a913751c8e37a190b783decfa933f199b48cd (patch) | |
tree | a0f93b345bafb927331c973c833ba03774ce4c3a | |
parent | e086eaf82793bcc4037786ae4ee3bdd594cb993f (diff) | |
download | quilt-0f2a913751c8e37a190b783decfa933f199b48cd.tar.gz |
quilt.el: fix emacs compatibility issue
One user reported the following issue as bug #51977:
Lisp error: (wrong-type-argument stringp nil)
file-name-nondirectory(nil)
(let ((p (file-name-nondirectory (quilt-top-patch)))) (if (not p) "none" (let ((p2 (file-name-sans-extension p))) (if (< (length p2) 10) p2 (concat (substring p2 0 8) "..")))))
quilt-short-patchname()
(concat " Q:" (quilt-short-patchname))
(setq quilt-mode-line (concat " Q:" (quilt-short-patchname)))
quilt-update-modeline()
This change should fix it.
https://savannah.nongnu.org/bugs/?51977
-rw-r--r-- | lib/quilt.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/quilt.el b/lib/quilt.el index 545e965..47b65b9 100644 --- a/lib/quilt.el +++ b/lib/quilt.el @@ -184,11 +184,11 @@ result)))) (defun quilt-short-patchname () - "Return shortened name of top patch. Return nil if there is on the bottom of patch stack." - (let ((p (file-name-nondirectory (quilt-top-patch)))) + "Return shortened name of top patch. Return \"none\" when on the bottom patch stack." + (let ((p (quilt-top-patch))) (if (not p) "none" - (let ((p2 (file-name-sans-extension p))) + (let ((p2 (file-name-sans-extension (file-name-nondirectory p)))) (if (< (length p2) 10) p2 (concat (substring p2 0 8) "..")))))) |