From 42bc065a6a05995ec365a5df09100989c03b822c Mon Sep 17 00:00:00 2001 From: Vaidheeswaran C Date: Tue, 23 Feb 2016 20:46:00 +1100 Subject: [PATCH 1/2] Make buttons in header lines work * lisp/help-mode.el (help-button-action): `help-xref-button' in header line doesn't work (bug#21024). Backport: (cherry picked from commit c11e565a6b6d09fa39d4c3ef65bef08190eaecc1) --- lisp/help-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/help-mode.el b/lisp/help-mode.el index e0f3351e67d..7b95e5fb04e 100644 --- a/lisp/help-mode.el +++ b/lisp/help-mode.el @@ -107,7 +107,7 @@ The format is (FUNCTION ARGS...).") (defun help-button-action (button) "Call BUTTON's help function." - (help-do-xref (button-start button) + (help-do-xref nil (button-get button 'help-function) (button-get button 'help-args))) From dfe16506a98681b390b119a137776f10ed637126 Mon Sep 17 00:00:00 2001 From: Drew Adams Date: Tue, 23 Feb 2016 21:12:55 +1100 Subject: [PATCH 2/2] (ls-lisp-insert-directory): Make -B work * lisp/ls-lisp.el (ls-lisp-insert-directory): Make -B work (bug#20776). Backport: (cherry picked from commit ef52e66efd78aac4c4e5bd5e11870e5ba3b37a1e) --- lisp/ls-lisp.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 6b5304caada..85e91cdadc0 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -348,7 +348,9 @@ SWITCHES is a *list* of characters. TIME-INDEX is the time index into file-attributes according to SWITCHES. WILDCARD-REGEXP is nil or an *Emacs regexp*. FULL-DIRECTORY-P means file is a directory and SWITCHES does not contain `d', so that a full listing is expected." - (if (or wildcard-regexp full-directory-p) + (if (or (and wildcard-regexp + (not (string= "[^~]\\'" wildcard-regexp))) ; Switch -B pseudo-wildcard regexp + full-directory-p) (let* ((dir (file-name-as-directory file)) (default-directory dir) ; so that file-attributes works (file-alist